From: Jan Rękorajski <baggins@pld-linux.org>
Date: Sun, 7 Mar 2021 21:20:17 +0000 (+0100)
Subject: - disable opencv support
X-Git-Tag: auto/th/zxing-cpp-2.3.0-0.20161123.3
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=b8749e922ca372fa91b9057a86e5d0c4665b7b08;p=packages%2Fzxing-cpp.git

- disable opencv support
- rel 3
---

diff --git a/no-opencv.patch b/no-opencv.patch
new file mode 100644
index 0000000..4376c46
--- /dev/null
+++ b/no-opencv.patch
@@ -0,0 +1,37 @@
+--- zxing-cpp-6b3cbe02a332bff0f5ba0416f221d3d3876afdc2/CMakeLists.txt~	2021-03-07 22:14:58.000000000 +0100
++++ zxing-cpp-6b3cbe02a332bff0f5ba0416f221d3d3876afdc2/CMakeLists.txt	2021-03-07 22:17:43.754471042 +0100
+@@ -63,34 +63,6 @@
+     add_definitions(-DNO_ICONV=1)
+ endif()
+ 
+-# OpenCV classes
+-find_package(OpenCV)
+-if(OpenCV_FOUND)
+-    file(GLOB_RECURSE LIBZXING_OPENCV_FILES
+-        "./opencv/src/*.cpp"
+-        "./opencv/src/*.h"
+-    )
+-    include_directories(${OpenCV_INCLUDE_DIRS})
+-    include_directories("./opencv/src/")
+-    add_library(libzxing-cv ${LIBZXING_OPENCV_FILES})
+-    set_target_properties(libzxing-cv PROPERTIES PREFIX "" SOVERSION 0)
+-    set(LIBZXING_FILES ${LIBZXING_FILES} ${LIBZXING_OPENCV_FILES})
+-    target_link_libraries(libzxing-cv libzxing ${OpenCV_LIBRARIES})
+-
+-    # Add OpenCV cli executable
+-    file(GLOB_RECURSE OPENCV_ZXING_FILES
+-        "./opencv-cli/src/*.cpp"
+-        "./opencv-cli/src/*.h"
+-    )
+-    add_executable(zxing-cv ${OPENCV_ZXING_FILES})
+-    target_link_libraries(zxing-cv libzxing-cv libzxing ${OpenCV_LIBRARIES})
+-
+-    install(TARGETS libzxing-cv zxing-cv
+-	LIBRARY DESTINATION lib${LIB_SUFFIX}
+-	RUNTIME DESTINATION bin
+-	ARCHIVE DESTINATION lib${LIB_SUFFIX})
+-endif()
+-
+ # Add cli executable.
+ file(GLOB_RECURSE ZXING_FILES
+     "./cli/src/*.cpp"
diff --git a/zxing-cpp.spec b/zxing-cpp.spec
index a114dca..5f40c40 100644
--- a/zxing-cpp.spec
+++ b/zxing-cpp.spec
@@ -1,8 +1,8 @@
 #
 # Conditional build:
-%bcond_without	opencv		# OpenCV interface
+%bcond_with	opencv		# OpenCV interface
 
-%define	rel	2
+%define	rel	3
 Summary:	C++ port of ZXing - 1D/2D barcode image processing library
 Summary(pl.UTF-8):	Port C++ biblioteki ZXing, przetwarzającej kody paskowe 1D/2D
 Name:		zxing-cpp
@@ -16,6 +16,7 @@ Group:		Libraries
 Source0:	https://github.com/glassechidna/zxing-cpp/archive/%{gitref}/%{name}-%{snap}.tar.gz
 # Source0-md5:	14a1766c04ac825fc588c03b2fb04be1
 Patch0:		%{name}-cmake.patch
+Patch1:		no-opencv.patch
 URL:		https://github.com/glassechidna/zxing-cpp
 BuildRequires:	cmake >= 2.8.0
 BuildRequires:	libstdc++-devel
@@ -56,12 +57,15 @@ Program do rozpoznawania kodów QR oparty na bibliotekach OpenCV/ZXing.
 %prep
 %setup -q -n %{name}-%{gitref}
 %patch0 -p1
+%if %{without opencv}
+%patch1 -p1
+%endif
 
 %build
 install -d build
 cd build
 %cmake .. \
-	%{!?with_opencv:-DOpenCV_FOUND=OFF}
+	%{!?with_opencv:-DOpenCV_FOUND:BOOL=OFF}
 
 %{__make}