commit 3d8f4c2bf072085b1714e4be1e8c0c3e2e645db5
Author: Jan Palus <[email protected]>
Date: Mon Jan 23 11:19:24 2023 +0100
drop commented out broken patches
openzwave-exceptions.patch | 19 ------
openzwave-hidapi.patch | 86 --------------------------
openzwave-tinyxml.patch | 148 ---------------------------------------------
openzwave.spec | 6 --
4 files changed, 259 deletions(-)
---
diff --git a/openzwave.spec b/openzwave.spec
index 0b5d1a7..f9a8db7 100644
--- a/openzwave.spec
+++ b/openzwave.spec
@@ -8,10 +8,6 @@ URL: http://www.openzwave.net
#Source0:
https://github.com/OpenZWave/open-zwave/archive/%{version}.tar.gz
Source0: http://old.openzwave.com/downloads/%{name}-%{version}.tar.gz
# Source0-md5: c9fd07d9d5bb971d97537e25ca5e73ce
-# Use system tinyxml
-Patch1: %{name}-tinyxml.patch
-# Use system hidapi
-Patch2: %{name}-hidapi.patch
BuildRequires: doxygen
BuildRequires: graphviz
BuildRequires: hidapi-devel >= 0.8.0
@@ -43,8 +39,6 @@ using openzwave
%prep
%setup -q
-#%patch1 -p1 -b.tinyxml
-#%patch2 -p1 -b.hidapi
%build
major_ver=$(echo %{version} | awk -F \. {'print $1'})
diff --git a/openzwave-exceptions.patch b/openzwave-exceptions.patch
deleted file mode 100644
index 9ebb016..0000000
--- a/openzwave-exceptions.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/cpp/src/Defs.h 2016-04-10 22:08:44.000000000 -0500
-+++ b/cpp/src/Defs.h 2017-07-08 12:57:26.524725436 -0500
-@@ -146,14 +146,13 @@
- }
-
- #include "OZWException.h"
--#define OPENZWAVE_DISABLE_EXCEPTIONS
- #if defined(_MSC_VER)
- # define __MYFUNCTION__ __FUNCTION__
- #else
- # define __MYFUNCTION__ __FILE__
- #endif
--// Exceptions : define OPENZWAVE_DISABLE_EXCEPTIONS in compiler flags to
enable exceptions instead of exit function
--#ifndef OPENZWAVE_DISABLE_EXCEPTIONS
-+// Exceptions : define OPENZWAVE_ENABLE_EXCEPTIONS in compiler flags to
enable exceptions instead of exit function
-+#ifdef OPENZWAVE_ENABLE_EXCEPTIONS
-
- # define OZW_FATAL_ERROR(exitCode, msg) Log::Write(
LogLevel_Error,"Exception: %s:%d - %d - %s",
std::string(__MYFUNCTION__).substr(std::string(__MYFUNCTION__).find_last_of("/\\")
+ 1).c_str(), __LINE__, exitCode, msg); \
-
throw OZWException(__MYFUNCTION__, __LINE__, exitCode, msg)
diff --git a/openzwave-hidapi.patch b/openzwave-hidapi.patch
deleted file mode 100644
index af516d2..0000000
--- a/openzwave-hidapi.patch
+++ /dev/null
@@ -1,86 +0,0 @@
---- a/cpp/build/Makefile 2017-07-22 18:47:08.989986000 -0500
-+++ b/cpp/build/Makefile 2017-07-22 18:50:08.630119378 -0500
-@@ -66,31 +66,15 @@
- #where to put the temporary library
- LIBDIR ?= $(top_builddir)
-
--INCLUDES := -I $(top_srcdir)/cpp/src -I $(top_srcdir)/cpp/hidapi/hidapi/
--
--ifeq ($(UNAME),Darwin)
--SOURCES_HIDAPI =$(top_srcdir)/cpp/hidapi/mac
--else ifeq ($(UNAME),FreeBSD)
--SOURCES_HIDAPI =$(top_srcdir)/cpp/hidapi/libusb
--else
--SOURCES_HIDAPI =$(top_srcdir)/cpp/hidapi/linux
--endif
-+INCLUDES := -I $(top_srcdir)/cpp/src -I /usr/include/hidapi/
-
-
- 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 $(SOURCES_HIDAPI) $(top_srcdir)/cpp/src/aes/
-+ $(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:$(SOURCES_HIDAPI):$(top_srcdir)/cpp/src/aes/
-+
$(top_srcdir)/cpp/src/value_classes:$(top_srcdir)/cpp/src/platform:$(top_srcdir)/cpp/src/platform/unix:$(top_srcdir)/cpp/src/aes/
-
-
--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
--hidapi := $(notdir $(wildcard $(top_srcdir)/cpp/hidapi/linux/*.c)) # we do
not want the libusb version
--endif
--
- ifeq ($(BITBAKE_ENV),1)
- ar_option := "rc"
- endif
-@@ -112,7 +96,6 @@
- @echo "Building OpenZWave Version $(GITVERSION)"
-
-
---include $(patsubst %.c,$(DEPDIR)/%.d,$(hidapi))
- -include $(patsubst %.cpp,$(DEPDIR)/%.d,$(cclasses))
- -include $(patsubst %.cpp,$(DEPDIR)/%.d,$(vclasses))
- -include $(patsubst %.cpp,$(DEPDIR)/%.d,$(pform))
-@@ -131,8 +114,7 @@
-
- #$(OBJDIR)/vers.o: $(top_builddir)/vers.cpp
-
--$(LIBDIR)/libopenzwave.a: $(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)) \
-@@ -142,15 +124,14 @@
- @$(AR) $(ar_option) $@ $+
- @$(RANLIB) $@
-
--$(LIBDIR)/$(SHARED_LIB_NAME): $(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)) \
- $(patsubst %.cpp,$(OBJDIR)/%.o,$(indep)) \
- $(OBJDIR)/vers.o
- @echo "Linking Shared Library"
-- @$(LD) $(LDFLAGS) $(TARCH) -o $@ $+ $(LIBS) -ltinyxml
-+ @$(LD) $(LDFLAGS) $(TARCH) -o $@ $+ $(LIBS) -lhidapi-libusb -ltinyxml
- @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 2017-07-22 18:47:08.989986000 -0500
-+++ b/cpp/examples/MinOZW/Makefile 2017-07-22 18:51:44.854269158 -0500
-@@ -20,8 +20,8 @@
- #where is put the temporary library
- LIBDIR ?= $(top_builddir)
-
--INCLUDES := -I $(top_srcdir)/cpp/src -I $(top_srcdir)/cpp/hidapi/hidapi/
--LIBS = $(wildcard $(LIBDIR)/*.so $(LIBDIR)/*.dylib
$(top_builddir)/cpp/build/*.so $(top_builddir)/cpp/build/*.dylib ) -ltinyxml
-+INCLUDES := -I $(top_srcdir)/cpp/src -I /usr/include/hidapi/
-+LIBS = $(wildcard $(LIBDIR)/*.so $(LIBDIR)/*.dylib
$(top_builddir)/cpp/build/*.so $(top_builddir)/cpp/build/*.dylib )
-lhidapi-libusb -ltinyxml
- LIBSDIR = $(abspath $(dir $(firstword $(LIBS))))
- minozwsrc := $(notdir $(wildcard $(top_srcdir)/cpp/examples/MinOZW/*.cpp))
- VPATH := $(top_srcdir)/cpp/examples/MinOZW
diff --git a/openzwave-tinyxml.patch b/openzwave-tinyxml.patch
deleted file mode 100644
index 4a62285..0000000
--- a/openzwave-tinyxml.patch
+++ /dev/null
@@ -1,148 +0,0 @@
-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)
-
--INCLUDES := -I $(top_srcdir)/cpp/src -I $(top_srcdir)/cpp/tinyxml/ -I
$(top_srcdir)/cpp/hidapi/hidapi/
-+INCLUDES := -I $(top_srcdir)/cpp/src -I $(top_srcdir)/cpp/hidapi/hidapi/
-
- ifeq ($(UNAME),Darwin)
- SOURCES_HIDAPI =$(top_srcdir)/cpp/hidapi/mac
-@@ -80,13 +80,11 @@ SOURCES_HIDAPI =$(top_srcdir)/cpp/hidapi/linux
- endif
-
-
--SOURCES := $(top_srcdir)/cpp/src
$(top_srcdir)/cpp/src/command_classes $(top_srcdir)/cpp/tinyxml \
-+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 $(SOURCES_HIDAPI) $(top_srcdir)/cpp/src/aes/
--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))
-@@ -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))
-@@ -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
-
--$(LIBDIR)/libopenzwave.a: $(patsubst %.cpp,$(OBJDIR)/%.o,$(tinyxml)) \
-- $(patsubst %.c,$(OBJDIR)/%.o,$(hidapi)) \
-+$(LIBDIR)/libopenzwave.a: $(patsubst %.c,$(OBJDIR)/%.o,$(hidapi)) \
- $(patsubst %.c,$(OBJDIR)/%.o,$(aes)) \
- $(patsubst %.cpp,$(OBJDIR)/%.o,$(cclasses)) \
- $(patsubst %.cpp,$(OBJDIR)/%.o,$(vclasses)) \
-@@ -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)) \
-- $(patsubst %.c,$(OBJDIR)/%.o,$(hidapi)) \
-+$(LIBDIR)/$(SHARED_LIB_NAME): $(patsubst %.c,$(OBJDIR)/%.o,$(hidapi)) \
- $(patsubst %.c,$(OBJDIR)/%.o,$(aes)) \
- $(patsubst %.cpp,$(OBJDIR)/%.o,$(cclasses)) \
- $(patsubst %.cpp,$(OBJDIR)/%.o,$(vclasses)) \
-@@ -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"
-- @$(LD) $(LDFLAGS) $(TARCH) -o $@ $+ $(LIBS)
-+ @$(LD) $(LDFLAGS) $(TARCH) -o $@ $+ $(LIBS) -ltinyxml
- @ln -sf $(SHARED_LIB_NAME) $(LIBDIR)/$(SHARED_LIB_UNVERSIONED)
-
- $(top_builddir)/libopenzwave.pc: $(top_srcdir)/cpp/build/libopenzwave.pc.in
$(PKGCONFIG)
-@@ -179,11 +174,11 @@ $(top_builddir)/ozw_config:
$(top_srcdir)/cpp/build/ozw_config.in
- -e 's|[@]pkgconfigfile@|$(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)/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)/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
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/openzwave.git/commitdiff/2833bc986ce14f92015755a180836b04c29d0b4f
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
