From b86a06dc67429ef0199d3988b8ffb9784ca45b95 Mon Sep 17 00:00:00 2001
From: Michael Cronenworth <mike(a)cchtml.com>
Date: Mon, 31 Jul 2017 13:21:03 -0500
Subject: Update tinyxml patch
---
openzwave-tinyxml.patch | 108 +++++++++++++++++++++++++++++++++++++++---------
1 file changed, 89 insertions(+), 19 deletions(-)
diff --git a/openzwave-tinyxml.patch b/openzwave-tinyxml.patch
index 71a656f..4a62285 100644
--- a/openzwave-tinyxml.patch
+++ b/openzwave-tinyxml.patch
@@ -1,6 +1,17 @@
---- a/cpp/build/Makefile 2016-04-10 22:08:44.000000000 -0500
-+++ b/cpp/build/Makefile 2017-07-08 16:49:09.295958759 -0500
-@@ -66,7 +66,7 @@
+diff --git a/cpp/build/Makefile b/cpp/build/Makefile
+index d8bda225..90e15143 100644
+--- a/cpp/build/Makefile
++++ b/cpp/build/Makefile
+@@ -35,7 +35,7 @@ SHARED_LIB_NAME=libopenzwave.so.$(VERSION)
+ SHARED_LIB_UNVERSIONED=libopenzwave.so
+ endif
+
+-#if we are on a Mac, add these flags and libs to the compile and link phases
++#if we are on a Mac, add these flags and libs to the compile and link phases
+ ifeq ($(UNAME),Darwin)
+ CFLAGS += -c -DDARWIN
+ TARCH += -arch i386 -arch x86_64
+@@ -69,7 +69,7 @@ CFLAGS += $(CPPFLAGS)
#where to put the temporary library
LIBDIR ?= $(top_builddir)
@@ -9,7 +20,7 @@
ifeq ($(UNAME),Darwin)
SOURCES_HIDAPI =$(top_srcdir)/cpp/hidapi/mac
-@@ -77,14 +77,12 @@
+@@ -80,13 +80,11 @@ SOURCES_HIDAPI =$(top_srcdir)/cpp/hidapi/linux
endif
@@ -19,22 +30,30 @@
-VPATH =
$(top_srcdir)/cpp/src:$(top_srcdir)/cpp/src/command_classes:$(top_srcdir)/cpp/tinyxml:\
+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:$(SOURCES_HIDAPI):$(top_srcdir)/cpp/src/aes/
-
+-
-tinyxml := $(notdir $(wildcard $(top_srcdir)/cpp/tinyxml/*.cpp))
--
+
ifeq ($(UNAME),Darwin)
hidapi := $(notdir $(wildcard $(top_srcdir)/cpp/hidapi/mac/*.c))
- else ifeq ($(UNAME),FreeBSD)
-@@ -110,7 +108,6 @@
- @echo "Building OpenZWave Version $(GITVERSION)"
+@@ -114,10 +112,9 @@ clean:
+ @rm -rf $(DEPDIR) $(OBJDIR) $(LIBDIR)/libopenzwave.so* $(LIBDIR)/libopenzwave*.dylib
$(LIBDIR)/libopenzwave.a $(top_builddir)/libopenzwave.pc $(top_builddir)/docs/api
$(top_builddir)/Doxyfile $(top_srcdir)/cpp/src/vers.cpp
+
+ printversion:
+- @echo "Building OpenZWave Version $(GITVERSION)"
++ @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))
-@@ -130,8 +127,7 @@
+@@ -133,12 +130,11 @@ $(top_srcdir)/cpp/src/vers.cpp:
+ @echo 'uint16_t ozw_vers_minor = $(VERSION_MIN);' >>
$(top_srcdir)/cpp/src/vers.cpp
+ @echo 'uint16_t ozw_vers_revision = $(VERSION_REV);' >>
$(top_srcdir)/cpp/src/vers.cpp
+ @echo 'char ozw_version_string[] = "$(GITVERSION)";' >>
$(top_srcdir)/cpp/src/vers.cpp
+-
++
#$(OBJDIR)/vers.o: $(top_builddir)/vers.cpp
@@ -44,8 +63,8 @@
$(patsubst %.c,$(OBJDIR)/%.o,$(aes)) \
$(patsubst %.cpp,$(OBJDIR)/%.o,$(cclasses)) \
$(patsubst %.cpp,$(OBJDIR)/%.o,$(vclasses)) \
-@@ -142,8 +138,7 @@
- @$(AR) $@ $+
+@@ -149,8 +145,7 @@ $(LIBDIR)/libopenzwave.a: $(patsubst %.cpp,$(OBJDIR)/%.o,$(tinyxml))
\
+ @$(AR) $(ar_option) $@ $+
@$(RANLIB) $@
-$(LIBDIR)/$(SHARED_LIB_NAME): $(patsubst %.cpp,$(OBJDIR)/%.o,$(tinyxml)) \
@@ -54,7 +73,7 @@
$(patsubst %.c,$(OBJDIR)/%.o,$(aes)) \
$(patsubst %.cpp,$(OBJDIR)/%.o,$(cclasses)) \
$(patsubst %.cpp,$(OBJDIR)/%.o,$(vclasses)) \
-@@ -151,7 +146,7 @@
+@@ -158,7 +153,7 @@ $(LIBDIR)/$(SHARED_LIB_NAME): $(patsubst
%.cpp,$(OBJDIR)/%.o,$(tinyxml)) \
$(patsubst %.cpp,$(OBJDIR)/%.o,$(indep)) \
$(OBJDIR)/vers.o
@echo "Linking Shared Library"
@@ -63,16 +82,67 @@
@ln -sf $(SHARED_LIB_NAME) $(LIBDIR)/$(SHARED_LIB_UNVERSIONED)
$(top_builddir)/libopenzwave.pc: $(top_srcdir)/cpp/build/libopenzwave.pc.in
$(PKGCONFIG)
---- a/cpp/examples/MinOZW/Makefile 2016-04-10 22:08:44.000000000 -0500
-+++ b/cpp/examples/MinOZW/Makefile 2017-07-08 16:55:30.246818498 -0500
-@@ -18,8 +18,8 @@
- top_srcdir := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))../../../)
+@@ -179,11 +174,11 @@ $(top_builddir)/ozw_config: $(top_srcdir)/cpp/build/ozw_config.in
+ -e 's|[@]pkgconfigfile(a)|$(pkgconfigdir)/libopenzwave.pc|g' \
+ < "$<" > "$@"
+ @chmod +x $(top_builddir)/ozw_config
+-
++
+ ifeq ($(DOT),)
+-HAVE_DOT = -e 's|[@]HAVE_DOT@|NO|g'
++HAVE_DOT = -e 's|[@]HAVE_DOT@|NO|g'
+ else
+-HAVE_DOT = -e 's|[@]HAVE_DOT@|YES|g'
++HAVE_DOT = -e 's|[@]HAVE_DOT@|YES|g'
+ endif
+ $(top_builddir)/Doxyfile: $(top_srcdir)/docs/Doxyfile.in $(top_srcdir)/cpp/src/vers.cpp
+@@ -218,7 +213,7 @@ install: $(LIBDIR)/$(SHARED_LIB_NAME) doc
$(top_builddir)/libopenzwave.pc $(top_
+ @install -d $(DESTDIR)/$(includedir)/value_classes/
+ @install -m 0644 $(top_srcdir)/cpp/src/value_classes/*.h
$(DESTDIR)/$(includedir)/value_classes/
+ @install -d $(DESTDIR)/$(includedir)/platform/
+- @install -m 0644 $(top_srcdir)/cpp/src/platform/*.h
$(DESTDIR)/$(includedir)/platform/
++ @install -m 0644 $(top_srcdir)/cpp/src/platform/*.h $(DESTDIR)/$(includedir)/platform/
+ @install -d $(DESTDIR)/$(includedir)/platform/unix/
+ @install -m 0644 $(top_srcdir)/cpp/src/platform/unix/*.h
$(DESTDIR)/$(includedir)/platform/unix/
+ @install -d $(DESTDIR)/$(includedir)/aes/
+@@ -231,13 +226,13 @@ install: $(LIBDIR)/$(SHARED_LIB_NAME) doc
$(top_builddir)/libopenzwave.pc $(top_
+ @cp -r $(top_srcdir)/docs/* $(DESTDIR)/$(docdir)
+ @if [ -d "$(top_builddir)/docs/html/" ]; then cp -r
$(top_builddir)/docs/html/* $(DESTDIR)/$(docdir); fi
+ @echo "Installing Pkg-config Files"
+- @install -d $(DESTDIR)/$(pkgconfigdir)
++ @install -d $(DESTDIR)/$(pkgconfigdir)
+ @cp $(top_builddir)/libopenzwave.pc $(DESTDIR)/$(pkgconfigdir)
+ @install -d $(DESTDIR)/$(PREFIX)/bin/
+ @cp $(top_builddir)/ozw_config $(DESTDIR)/$(PREFIX)/bin/ozw_config
+ @chmod 755 $(DESTDIR)/$(PREFIX)/bin/ozw_config
+
+-
++
+
+ .SUFFIXES: .d .cpp .o .a
+ .PHONY: default clean install doc
+diff --git a/cpp/examples/MinOZW/Makefile b/cpp/examples/MinOZW/Makefile
+index 95d684b7..cbcbe991 100644
+--- a/cpp/examples/MinOZW/Makefile
++++ b/cpp/examples/MinOZW/Makefile
+@@ -20,8 +20,8 @@ top_srcdir := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))../../../)
+ #where is put the temporary library
+ LIBDIR ?= $(top_builddir)
-INCLUDES := -I $(top_srcdir)/cpp/src -I $(top_srcdir)/cpp/tinyxml/ -I
$(top_srcdir)/cpp/hidapi/hidapi/
--LIBS = $(wildcard $(LIBDIR)/*.so $(LIBDIR)/*.dylib $(top_builddir)/*.so
$(top_builddir)/*.dylib $(top_builddir)/cpp/build/*.so $(top_builddir)/cpp/build/*.dylib
)
+-LIBS = $(wildcard $(LIBDIR)/*.so $(LIBDIR)/*.dylib $(top_builddir)/cpp/build/*.so
$(top_builddir)/cpp/build/*.dylib )
+INCLUDES := -I $(top_srcdir)/cpp/src -I $(top_srcdir)/cpp/hidapi/hidapi/
-+LIBS = $(wildcard $(LIBDIR)/*.so $(LIBDIR)/*.dylib $(top_builddir)/*.so
$(top_builddir)/*.dylib $(top_builddir)/cpp/build/*.so $(top_builddir)/cpp/build/*.dylib )
-ltinyxml
++LIBS = $(wildcard $(LIBDIR)/*.so $(LIBDIR)/*.dylib $(top_builddir)/cpp/build/*.so
$(top_builddir)/cpp/build/*.dylib ) -ltinyxml
LIBSDIR = $(abspath $(dir $(firstword $(LIBS))))
minozwsrc := $(notdir $(wildcard $(top_srcdir)/cpp/examples/MinOZW/*.cpp))
VPATH := $(top_srcdir)/cpp/examples/MinOZW
+@@ -34,7 +34,7 @@ include $(top_srcdir)/cpp/build/support.mk
+
+ -include $(patsubst %.cpp,$(DEPDIR)/%.d,$(minozwsrc))
+
+-#if we are on a Mac, add these flags and libs to the compile and link phases
++#if we are on a Mac, add these flags and libs to the compile and link phases
+ ifeq ($(UNAME),Darwin)
+ CFLAGS += -DDARWIN
+ TARCH += -arch i386 -arch x86_64
--
cgit v1.1
https://src.fedoraproject.org/cgit/openzwave.git/commit/?h=f25&id=b86...