Browse Source

Merge pull request #6099 from cotequeiroz/libmraa-0.9

libmraa: Upgrade to version 0.9.0
lilik-openwrt-22.03
Hannu Nyman 7 years ago
committed by GitHub
parent
commit
77786f0807
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 12 deletions
  1. +3
    -3
      libs/libmraa/Makefile
  2. +3
    -9
      libs/libmraa/patches/0001-base.patch

+ 3
- 3
libs/libmraa/Makefile View File

@ -8,16 +8,16 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=libmraa PKG_NAME:=libmraa
PKG_VERSION:=0.8.0
PKG_VERSION:=0.9.0
PKG_RELEASE=$(PKG_SOURCE_VERSION) PKG_RELEASE=$(PKG_SOURCE_VERSION)
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/intel-iot-devkit/mraa.git PKG_SOURCE_URL:=https://github.com/intel-iot-devkit/mraa.git
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE_VERSION:=70600dece4138b0c0dbaff42f57828f1559cd840
PKG_SOURCE_VERSION:=049ba5fa9f2d18ac0ec6729c46916b34998d3c5f
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
PKG_MIRROR_HASH:=9cbda58e7c7790db3d62cee62f399975effcdc2d9688d3d6bb2b4a86748faff9
PKG_MIRROR_HASH:=0c81cff6dcfe401ead0d8976c6f9a6a86b75ab38413a45a40b7eb20b639d78e4
PKG_BUILD_DEPENDS:=node python/host swig/host node/host PKG_BUILD_DEPENDS:=node python/host swig/host node/host
CMAKE_INSTALL:=1 CMAKE_INSTALL:=1


+ 3
- 9
libs/libmraa/patches/0001-base.patch View File

@ -1,9 +1,3 @@
From 6fecad819376442d057bdd35a0909cfac9df02f5 Mon Sep 17 00:00:00 2001
From: John Crispin <blogic@openwrt.org>
Date: Thu, 23 Jul 2015 12:18:39 +0200
Subject: [PATCH 1/4] base
---
CMakeLists.txt | 10 ++++------ CMakeLists.txt | 10 ++++------
api/mraa/types.h | 1 + api/mraa/types.h | 1 +
include/mraa_internal.h | 7 +++++++ include/mraa_internal.h | 7 +++++++
@ -21,11 +15,11 @@ Subject: [PATCH 1/4] base
# Make a version file containing the current version from git. # Make a version file containing the current version from git.
-include (GetGitRevisionDescription) -include (GetGitRevisionDescription)
-git_describe (VERSION "--tags") -git_describe (VERSION "--tags")
-if ("x_${VERSION}" STREQUAL "x_GIT-NOTFOUND" OR "x_${VERSION}" STREQUAL "x_HEAD-HASH-NOTFOUND")
-if ("x_${VERSION}" STREQUAL "x_GIT-NOTFOUND" OR "x_${VERSION}" STREQUAL "x_HEAD-HASH-NOTFOUND" OR "x_${VERSION}" STREQUAL "x_-128-NOTFOUND")
- message (WARNING " - Install git to compile a production libmraa!") - message (WARNING " - Install git to compile a production libmraa!")
- set (VERSION "v0.8.0-dirty")
- set (VERSION "v0.8.1-dirty")
-endif () -endif ()
+set (VERSION "v0.8.0")
+set (VERSION "v0.9.0")
message (INFO " - libmraa Version ${VERSION}") message (INFO " - libmraa Version ${VERSION}")


Loading…
Cancel
Save