diff options
| author | Pedro Filipe <pedrofilipecerqueira@outlook.com> | 2019-10-01 01:44:32 -0300 |
|---|---|---|
| committer | Andy Postnikov <apostnikov@gmail.com> | 2019-10-04 13:33:06 +0300 |
| commit | 57a020175603249ce882c82a1a48079cca391bb8 (patch) | |
| tree | ae6b296357143e3c0a3b5b8390fb08c4e7ac430f /community | |
| parent | 743b2bfa80cac1b076612baf6e2fe8a07bdc59a4 (diff) | |
| download | aports-57a020175603249ce882c82a1a48079cca391bb8.tar.bz2 aports-57a020175603249ce882c82a1a48079cca391bb8.tar.xz | |
community/openzwave: upgrade to 1.6.921
Diffstat (limited to 'community')
| -rw-r--r-- | community/openzwave/0001-fix-build-on-ppc64le.patch | 13 | ||||
| -rw-r--r-- | community/openzwave/016d6e5d6a2d61674032805886418923d20604b9.patch | 24 | ||||
| -rw-r--r-- | community/openzwave/APKBUILD | 10 |
3 files changed, 9 insertions, 38 deletions
diff --git a/community/openzwave/0001-fix-build-on-ppc64le.patch b/community/openzwave/0001-fix-build-on-ppc64le.patch index 93abcf7313..60f0c34dd9 100644 --- a/community/openzwave/0001-fix-build-on-ppc64le.patch +++ b/community/openzwave/0001-fix-build-on-ppc64le.patch @@ -14,15 +14,12 @@ diff --git a/cpp/build/Makefile b/cpp/build/Makefile index a632f79..2d7c337 100644 --- a/cpp/build/Makefile +++ b/cpp/build/Makefile -@@ -15,7 +15,7 @@ - # what flags we will use for compiling in debug mode - DEBUG_CFLAGS := -Wall -Wno-unknown-pragmas -Wno-inline -Wno-format -Werror -Wno-error=sequence-point -Wno-sequence-point -ggdb -DDEBUG -fPIC -DSYSCONFDIR="\"$(PREFIX)/etc/openzwave/\"" +@@ -16,7 +16,7 @@ + DEBUG_CFLAGS := -Wformat -Wall -Wno-unknown-pragmas -Wno-inline -Werror -Wno-error=sequence-point -Wno-sequence-point -ggdb -DDEBUG -fPIC -DSYSCONFDIR="\"$(PREFIX)/etc/openzwave/\"" + DEBUG_CPPFLAGS := -std=c++11 # what flags we will use for compiling in release mode --RELEASE_CFLAGS := -Wall -Wno-unknown-pragmas -Werror -Wno-format -Wno-error=sequence-point -Wno-sequence-point -O3 -DNDEBUG -fPIC -DSYSCONFDIR="\"$(PREFIX)/etc/openzwave/\"" +-RELEASE_CFLAGS := -Wall -Wno-unknown-pragmas -Werror -Wno-error=sequence-point -Wno-sequence-point -O3 -DNDEBUG -fPIC -DSYSCONFDIR="\"$(PREFIX)/etc/openzwave/\"" +RELEASE_CFLAGS := -Wall -Wno-unknown-pragmas -Werror -Wno-format -Wno-error=sequence-point -Wno-error=restrict -Wno-sequence-point -Os -DNDEBUG -fPIC -DSYSCONFDIR="\"$(PREFIX)/etc/openzwave/\"" + RELEASE_CPPFLAGS := -std=c++11 #what flags we will use for linking in debug mode DEBUG_LDFLAGS := -g - --- -2.19.2 - diff --git a/community/openzwave/016d6e5d6a2d61674032805886418923d20604b9.patch b/community/openzwave/016d6e5d6a2d61674032805886418923d20604b9.patch deleted file mode 100644 index fc834b51d2..0000000000 --- a/community/openzwave/016d6e5d6a2d61674032805886418923d20604b9.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 016d6e5d6a2d61674032805886418923d20604b9 Mon Sep 17 00:00:00 2001 -From: Carlo Landmeter <clandmeter@gmail.com> -Date: Mon, 8 Feb 2016 14:05:35 +0100 -Subject: [PATCH] Support multiple CPPFLAGS - ---- - Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index 81023a3..ab94b8c 100644 ---- a/Makefile -+++ b/Makefile -@@ -17,8 +17,8 @@ PREFIX ?= /usr/local - export PREFIX - - all: -- CPPFLAGS=$(CPPFLAGS) $(MAKE) -C $(top_srcdir)/cpp/build/ -$(MAKEFLAGS) -- CPPFLAGS=$(CPPFLAGS) $(MAKE) -C $(top_srcdir)/cpp/examples/MinOZW/ -$(MAKEFLAGS) -+ CPPFLAGS="$(CPPFLAGS)" $(MAKE) -C $(top_srcdir)/cpp/build/ -$(MAKEFLAGS) -+ CPPFLAGS="$(CPPFLAGS)" $(MAKE) -C $(top_srcdir)/cpp/examples/MinOZW/ -$(MAKEFLAGS) - - install: - $(MAKE) -C $(top_srcdir)/cpp/build/ -$(MAKEFLAGS) $(MAKECMDGOALS) diff --git a/community/openzwave/APKBUILD b/community/openzwave/APKBUILD index f503a89cf5..13634d8742 100644 --- a/community/openzwave/APKBUILD +++ b/community/openzwave/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: pkgname=openzwave -pkgver=1.4.164 -pkgrel=4 +pkgver=1.6.921 +pkgrel=0 pkgdesc="a C++ and DotNet library to control Z-Wave Networks via a Z-Wave Controller." url="http://www.openzwave.net/" arch="all" @@ -14,7 +14,6 @@ checkdepends="perl-xml-simple" options="!check" # FIXME tests failing subpackages="$pkgname-dev $pkgname-doc $pkgname-libs" source="http://old.openzwave.com/downloads/openzwave-$pkgver.tar.gz - 016d6e5d6a2d61674032805886418923d20604b9.patch 0001-fix-build-on-ppc64le.patch " builddir="$srcdir"/openzwave-$pkgver @@ -35,6 +34,5 @@ package() { sysconfdir=etc/openzwave install } -sha512sums="a844f931bc9140e96e43c39e948317dc4271865480897ef76c1f955c59963bda8ddfb9e1a0a021fa4de5692653613277a7c74418f07d5d1678969433ff2357e4 openzwave-1.4.164.tar.gz -0fb85325ddc1cd621e697115291973c6744fdaf27a124494547f5d3c41d6148ac581b6fcdf59572e337d13a857604b5c28a75a6018d08c6d6623ad1a1d695416 016d6e5d6a2d61674032805886418923d20604b9.patch -67e43688d44a43f416e85f035703a8eee11d12f3bf64e93d56b15927bb48bd4cb21e9111876da061a6bc7e75cdae92688ea061e8db8688438ea27a6d3cd7eab2 0001-fix-build-on-ppc64le.patch" +sha512sums="32060266cf7ba444cea6a318442a0603dbdf3d84784c462951e7a468ca92361eae396e8a2d5a417b2fc999a35bd439edad5951f8be699bbd8ec6f0c20e5a7194 openzwave-1.6.921.tar.gz +23aac3bf8664cff3f32a839057d2b1ed564cb1b754eed595f12a8e31b3ca2955a7c85eb3f79e1831d62ad2c2dfe7237d8e65dac88af009b891e15c392400f385 0001-fix-build-on-ppc64le.patch" |