[arch-commits] Commit in openzwave/repos (3 files)

Felix Yan felixonmars at archlinux.org
Tue Jul 7 16:03:22 UTC 2020 

    Date: Tuesday, July 7, 2020 @ 16:03:22
  Author: felixonmars
Revision: 659083

archrelease: copy trunk to community-staging-x86_64

Added:
  openzwave/repos/community-staging-x86_64/
  openzwave/repos/community-staging-x86_64/PKGBUILD
    (from rev 659082, openzwave/trunk/PKGBUILD)
  openzwave/repos/community-staging-x86_64/openzwave-system-libs.patch
    (from rev 659082, openzwave/trunk/openzwave-system-libs.patch)

-----------------------------+
 PKGBUILD                    |   43 ++++++++++++++++++
 openzwave-system-libs.patch |   98 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 141 insertions(+)

Copied: openzwave/repos/community-staging-x86_64/PKGBUILD (from rev 659082, openzwave/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD	                        (rev 0)
+++ community-staging-x86_64/PKGBUILD	2020-07-07 16:03:22 UTC (rev 659083)
@@ -0,0 +1,43 @@
+# Maintainer: Maxime Gauduin <alucryd at arch
+# Contributor: Jameson Pugh <imntreal at gmail.com>
+
+pkgname=openzwave
+pkgver=1.6
+pkgrel=3
+pkgdesc='A C++ library to control Z-Wave Networks via a USB Z-Wave Controller'
+arch=(x86_64)
+url=http://www.openzwave.net
+license=(LGPL3)
+depends=(
+  hidapi
+  tinyxml
+)
+makedepends=(
+  doxygen
+  git
+)
+source=(
+  git+https://github.com/OpenZWave/open-zwave.git#tag=v${pkgver}
+  openzwave-system-libs.patch
+)
+sha256sums=('SKIP'
+            '7480115fb887a37ba84ac553c66fea39b731b9789d8d176a139a663b33dd21e5')
+
+prepare() {
+  cd open-zwave
+
+  patch -Np1 -i ../openzwave-system-libs.patch
+}
+
+build() {
+  export CFLAGS="$CFLAGS -Wno-stringop-truncation -Wno-maybe-uninitialized"
+  export CXXFLAGS="$CXXFLAGS -Wno-stringop-truncation -Wno-maybe-uninitialized"
+
+  make -C open-zwave
+}
+
+package() {
+  make DESTDIR="${pkgdir}" PREFIX=/usr instlibdir=usr/lib/ sysconfdir=etc/openzwave -C open-zwave install
+}
+
+# vim: ts=2 sw=2 et:

Copied: openzwave/repos/community-staging-x86_64/openzwave-system-libs.patch (from rev 659082, openzwave/trunk/openzwave-system-libs.patch)
===================================================================
--- community-staging-x86_64/openzwave-system-libs.patch	                        (rev 0)
+++ community-staging-x86_64/openzwave-system-libs.patch	2020-07-07 16:03:22 UTC (rev 659083)
@@ -0,0 +1,98 @@
+diff -rupN open-zwave.orig/cpp/build/Makefile open-zwave/cpp/build/Makefile
+--- open-zwave.orig/cpp/build/Makefile	2019-07-18 09:49:01.185154576 +0200
++++ open-zwave/cpp/build/Makefile	2019-07-18 09:58:36.413855845 +0200
+@@ -23,7 +23,7 @@ DEBUG_LDFLAGS	:= -g
+ 
+ #default Libraries we should link with
+ ifneq ($(UNAME),FreeBSD)
+-LIBS += -lresolv
++LIBS += -lresolv -ltinyxml
+ endif
+ 
+ top_srcdir := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))../../)
+@@ -84,47 +84,19 @@ endif
+ #where to put the temporary library
+ LIBDIR	?= $(top_builddir)
+ 
+-INCLUDES	:= -I $(top_srcdir)/cpp/src -I $(top_srcdir)/cpp/tinyxml/
++INCLUDES	:= -I $(top_srcdir)/cpp/src
+ 
+ 
+ ifeq ($(USE_HID),1)
+-INCLUDES += -I $(top_srcdir)/cpp/hidapi/hidapi/
++INCLUDES += -I /usr/include/hidapi/
+ CFLAGS += -DUSE_HID
+-
+-ifeq ($(UNAME),Darwin)
+-SOURCES_HIDAPI =$(top_srcdir)/cpp/hidapi/mac
+-else ifeq ($(UNAME),FreeBSD)
+-SOURCES_HIDAPI =$(top_srcdir)/cpp/hidapi/libusb
+-else ifeq ($(UNAME),NetBSD)
+-SOURCES_HIDAPI =$(top_srcdir)/cpp/hidapi/libusb
+-else ifeq ($(UNAME),SunOS)
+-SOURCES_HIDAPI =$(top_srcdir)/cpp/hidapi/libusb
+-else
+-SOURCES_HIDAPI =$(top_srcdir)/cpp/hidapi/linux
+-LIBS += -ludev
+-endif
++LIBS += -ludev -lhidapi-libusb
+ endif # USE_HID
+ 
+-SOURCES		:= $(top_srcdir)/cpp/src $(top_srcdir)/cpp/src/command_classes $(top_srcdir)/cpp/tinyxml \
+-	$(top_srcdir)/cpp/src/value_classes $(top_srcdir)/cpp/src/platform $(top_srcdir)/cpp/src/platform/unix $(SOURCES_HIDAPI) $(top_srcdir)/cpp/src/aes/
+-VPATH = $(top_srcdir)/cpp/src:$(top_srcdir)/cpp/src/command_classes:$(top_srcdir)/cpp/tinyxml:\
+-	$(top_srcdir)/cpp/src/value_classes:$(top_srcdir)/cpp/src/platform:$(top_srcdir)/cpp/src/platform/unix:$(SOURCES_HIDAPI):$(top_srcdir)/cpp/src/aes/
+-
+-tinyxml := $(notdir $(wildcard $(top_srcdir)/cpp/tinyxml/*.cpp))
+-
+-ifeq ($(USE_HID),1)
+-ifeq ($(UNAME),Darwin)
+-hidapi := $(notdir $(wildcard $(top_srcdir)/cpp/hidapi/mac/*.c))
+-else ifeq ($(UNAME),FreeBSD)
+-hidapi := $(notdir $(wildcard $(top_srcdir)/cpp/hidapi/libusb/*.c))
+-else ifeq ($(UNAME),NetBSD)
+-hidapi := $(notdir $(wildcard $(top_srcdir)/cpp/hidapi/libusb/*.c))
+-else ifeq ($(UNAME),SunOS)
+-hidapi := $(notdir $(wildcard $(top_srcdir)/cpp/hidapi/libusb/*.c))
+-else
+-hidapi := $(notdir $(wildcard $(top_srcdir)/cpp/hidapi/linux/*.c)) # we do not want the libusb version
+-endif
+-endif # USE_HID
++SOURCES		:= $(top_srcdir)/cpp/src $(top_srcdir)/cpp/src/command_classes \
++	$(top_srcdir)/cpp/src/value_classes $(top_srcdir)/cpp/src/platform $(top_srcdir)/cpp/src/platform/unix $(top_srcdir)/cpp/src/aes/
++VPATH = $(top_srcdir)/cpp/src:$(top_srcdir)/cpp/src/command_classes:\
++	$(top_srcdir)/cpp/src/value_classes:$(top_srcdir)/cpp/src/platform:$(top_srcdir)/cpp/src/platform/unix:$(top_srcdir)/cpp/src/aes/
+ 
+ ifeq ($(BITBAKE_ENV),1)
+ ar_option := "rc"
+@@ -147,8 +119,6 @@ printversion:
+ 	@echo "Building OpenZWave Version $(GITVERSION)"	
+ 
+ 
+--include $(patsubst %.cpp,$(DEPDIR)/%.d,$(tinyxml))
+--include $(patsubst %.c,$(DEPDIR)/%.d,$(hidapi))
+ -include $(patsubst %.cpp,$(DEPDIR)/%.d,$(cclasses))
+ -include $(patsubst %.cpp,$(DEPDIR)/%.d,$(vclasses))
+ -include $(patsubst %.cpp,$(DEPDIR)/%.d,$(pform))
+@@ -167,9 +137,7 @@ $(top_srcdir)/cpp/src/vers.cpp:
+ 
+ #$(OBJDIR)/vers.o:	$(top_builddir)/vers.cpp
+ 
+-$(LIBDIR)/libopenzwave.a:	$(patsubst %.cpp,$(OBJDIR)/%.o,$(tinyxml)) \
+-			$(patsubst %.c,$(OBJDIR)/%.o,$(hidapi)) \
+-			$(patsubst %.c,$(OBJDIR)/%.o,$(aes)) \
++$(LIBDIR)/libopenzwave.a:	$(patsubst %.c,$(OBJDIR)/%.o,$(aes)) \
+ 			$(patsubst %.cpp,$(OBJDIR)/%.o,$(cclasses)) \
+ 			$(patsubst %.cpp,$(OBJDIR)/%.o,$(vclasses)) \
+ 			$(patsubst %.cpp,$(OBJDIR)/%.o,$(pform)) \
+@@ -179,9 +147,7 @@ $(LIBDIR)/libopenzwave.a:	$(patsubst %.c
+ 	@$(AR) $(ar_option) $@ $+
+ 	@$(RANLIB) $@
+ 
+-$(LIBDIR)/$(SHARED_LIB_NAME):	$(patsubst %.cpp,$(OBJDIR)/%.o,$(tinyxml)) \
+-			$(patsubst %.c,$(OBJDIR)/%.o,$(hidapi)) \
+-			$(patsubst %.c,$(OBJDIR)/%.o,$(aes)) \
++$(LIBDIR)/$(SHARED_LIB_NAME):	$(patsubst %.c,$(OBJDIR)/%.o,$(aes)) \
+ 			$(patsubst %.cpp,$(OBJDIR)/%.o,$(cclasses)) \
+ 			$(patsubst %.cpp,$(OBJDIR)/%.o,$(vclasses)) \
+ 			$(patsubst %.cpp,$(OBJDIR)/%.o,$(pform)) \

More information about the arch-commits mailing list