- updated to 20190321 snapshot (with opencv 4 patches)

- updated patches, adjusted no-opencv patch to provide USE_OPENCV cmake option

diff --git a/no-opencv.patch b/no-opencv.patch
index 4376c46a49ab6904d50f7cc7f7d11340120be2c1..bf33dda68bc2ca0e1e1b1b40a232fff467e2518a 100644 (file)
--- a/no-opencv.patch
+++ b/no-opencv.patch
@@ -1,37 +1,26 @@
---- 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)
+--- zxing-cpp-e0e40ddec63f38405aca5c8c1ff60b85ec8b1f10/CMakeLists.txt.orig     2021-06-19 09:30:02.182786429 +0200
++++ zxing-cpp-e0e40ddec63f38405aca5c8c1ff60b85ec8b1f10/CMakeLists.txt  2021-06-19 09:34:19.041394907 +0200
+@@ -3,6 +3,7 @@
+ project(zxing)
+ 
+ option(BUILD_TESTING "Enable generation of test targets" OFF)
++option(USE_OPENCV "OpenCV interface" ON)
+ 
+ set(CMAKE_LIBRARY_PATH /opt/local/lib ${CMAKE_LIBRARY_PATH})
+ 
+@@ -57,6 +58,7 @@
+ endif()
+ 
+ # OpenCV classes
++if(USE_OPENCV)
+ find_package(OpenCV)
+ if(OpenCV_FOUND)
+     file(GLOB_RECURSE LIBZXING_OPENCV_FILES
+@@ -87,6 +89,7 @@
+       RUNTIME DESTINATION bin
+       ARCHIVE DESTINATION lib${LIB_SUFFIX})
  endif()
++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-cmake.patch b/zxing-cpp-cmake.patch
index 28a7d39872134ad40d95f5a454b190b3ff4eec80..4a7668e9377568fa65c6936ef12301918b152b94 100644 (file)
--- a/zxing-cpp-cmake.patch
+++ b/zxing-cpp-cmake.patch
@@ -1,29 +1,29 @@
---- zxing-cpp-6b3cbe02a332bff0f5ba0416f221d3d3876afdc2/CMakeLists.txt.orig     2016-11-22 04:34:19.000000000 +0100
-+++ zxing-cpp-6b3cbe02a332bff0f5ba0416f221d3d3876afdc2/CMakeLists.txt  2017-04-17 09:00:41.098731903 +0200
-@@ -51,21 +51,9 @@
-     include_directories(SYSTEM "./core/lib/win32/")
+--- zxing-cpp-e0e40ddec63f38405aca5c8c1ff60b85ec8b1f10/CMakeLists.txt.orig     2019-03-20 14:52:05.000000000 +0100
++++ zxing-cpp-e0e40ddec63f38405aca5c8c1ff60b85ec8b1f10/CMakeLists.txt  2021-06-19 09:59:00.886700396 +0200
+@@ -44,21 +44,9 @@
+     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
  endif()
  
 -# OpenCV classes
 -find_package(OpenCV)
 -if(OpenCV_FOUND)
--    file(GLOB_RECURSE LIBZXING_OPENCV_FILES
--        "./opencv/src/*.cpp"
--        "./opencv/src/*.h"
+-    list(APPEND LIBZXING_FILES
+-        opencv/src/zxing/MatSource.cpp
+-        opencv/src/zxing/MatSource.h
 -    )
--    set(LIBZXING_FILES ${LIBZXING_FILES} ${LIBZXING_OPENCV_FILES})
+-
 -    include_directories(${OpenCV_INCLUDE_DIRS})
--    include_directories("./opencv/src/")
+-    include_directories(opencv/src)
 -endif()
 -
- include_directories("./core/src/")
+ include_directories(core/src)
  add_library(libzxing ${LIBZXING_FILES})
 -set_target_properties(libzxing PROPERTIES PREFIX "")
 +set_target_properties(libzxing PROPERTIES PREFIX "" SOVERSION 0)
  
  find_package(Iconv)
  if(ICONV_FOUND)
-@@ -75,14 +63,32 @@
+@@ -68,14 +56,32 @@
      add_definitions(-DNO_ICONV=1)
  endif()
  
@@ -58,15 +58,15 @@
  endif()
  
  # Add cli executable.
-@@ -94,9 +100,9 @@
- add_executable(zxing ${ZXING_FILES})
+@@ -88,9 +94,9 @@
  target_link_libraries(zxing libzxing)
- install(TARGETS zxing libzxing
+ 
+ install(TARGETS zxing libzxing EXPORT zxing-targets
 -      LIBRARY DESTINATION lib
 +      LIBRARY DESTINATION lib${LIB_SUFFIX}
        RUNTIME DESTINATION bin
--      ARCHIVE DESTINATION lib)
-+      ARCHIVE DESTINATION lib${LIB_SUFFIX})
- install(DIRECTORY core/src/zxing/ DESTINATION include/zxing FILES_MATCHING PATTERN "*.h")
+-      ARCHIVE DESTINATION lib
++      ARCHIVE DESTINATION lib${LIB_SUFFIX}
+     INCLUDES DESTINATION include
+ )
  
- # Add testrunner executable.

diff --git a/zxing-cpp.spec b/zxing-cpp.spec
index a3f44c3b79306d043028ec414bbaf38fdf39946c..916a2ac3482ec95548418e6afc433016b5c3cd0b 100644 (file)
--- a/zxing-cpp.spec
+++ b/zxing-cpp.spec
@@ -2,25 +2,25 @@
 # Conditional build:
 %bcond_with    opencv          # OpenCV interface
 
-%define        rel     4
+%define        rel     1
 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
 # no version information in sources; cpp port has been removed from zxing repository between 2.3.0 and 3.0.0 releases
 Version:       2.3.0
-%define        gitref  6b3cbe02a332bff0f5ba0416f221d3d3876afdc2
-%define        snap    20161123
+%define        gitref  e0e40ddec63f38405aca5c8c1ff60b85ec8b1f10
+%define        snap    20190321
 Release:       0.%{snap}.%{rel}
 License:       Apache v2.0
 Group:         Libraries
 Source0:       https://github.com/glassechidna/zxing-cpp/archive/%{gitref}/%{name}-%{snap}.tar.gz
-# Source0-md5: 14a1766c04ac825fc588c03b2fb04be1
+# Source0-md5: 41d2af7fc424e1c6129192bd87d54c5f
 Patch0:                %{name}-cmake.patch
 Patch1:                no-opencv.patch
 URL:           https://github.com/glassechidna/zxing-cpp
 BuildRequires: cmake >= 2.8.0
-BuildRequires: libstdc++-devel
-%{?with_opencv:BuildRequires:  opencv-devel}
+BuildRequires: libstdc++-devel >= 6:4.7
+%{?with_opencv:BuildRequires:  opencv-devel >= 2}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -34,7 +34,7 @@ Summary:      Header files for ZXing library
 Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki ZXing
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
-Requires:      libstdc++-devel
+Requires:      libstdc++-devel >= 6:4.7
 
 %description devel
 Header files for ZXing library.
@@ -57,15 +57,13 @@ 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:BOOL=OFF}
+       %{!?with_opencv:-DUSE_OPENCV=OFF}
 
 %{__make}
 
@@ -99,10 +97,12 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libzxing.so
 %{_includedir}/zxing
+%dir %{_libdir}/zxing
+%{_libdir}/zxing/cmake
 
 %if %{with opencv}
 %files opencv
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libzxing-cv.so.0
 %attr(755,root,root) %{_bindir}/zxing-cv
+%attr(755,root,root) %{_libdir}/libzxing-cv.so.0
 %endif