Hello community, here is the log from the commit of package opencv for openSUSE:Factory checked in at 2019-09-02 12:39:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/opencv (Old) and /work/SRC/openSUSE:Factory/.opencv.new.7948 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "opencv" Mon Sep 2 12:39:38 2019 rev:76 rq:726804 version:4.1.1 Changes: -------- --- /work/SRC/openSUSE:Factory/opencv/opencv.changes 2019-08-27 15:25:40.788711210 +0200 +++ /work/SRC/openSUSE:Factory/.opencv.new.7948/opencv.changes 2019-09-02 12:39:50.809806787 +0200 @@ -1,0 +2,11 @@ +Wed Aug 28 15:05:46 UTC 2019 - Marius Kittler <[email protected]> + +- Include pkg-config file in opencv-devel package + * Add opencv-includedir.patch + +------------------------------------------------------------------- +Tue Aug 27 10:23:45 UTC 2019 - Jan Engelhardt <[email protected]> + +- Avoid use of ®/™ signs in specfiles as per guidelines. + +------------------------------------------------------------------- @@ -939 +949,0 @@ - New: ---- opencv-includedir.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ opencv.spec ++++++ --- /var/tmp/diff_new_pack.2x5fe7/_old 2019-09-02 12:39:55.265805983 +0200 +++ /var/tmp/diff_new_pack.2x5fe7/_new 2019-09-02 12:39:55.265805983 +0200 @@ -49,6 +49,8 @@ Patch1: opencv-build-compare.patch # PATCH-FIX-OPENSUSE 0001-Do-not-include-glx.h-when-using-GLES.patch -- Fix build error on 32bit ARM, due to incompatible pointer types, https://github.com/opencv/opencv/issues/9171 Patch2: 0001-Do-not-include-glx.h-when-using-GLES.patch +# PATCH-FIX-OPENSUSE opencv-includedir.patch -- Fix wrong include path in pkgconfig file +Patch3: opencv-includedir.patch BuildRequires: cmake BuildRequires: fdupes BuildRequires: libeigen3-devel @@ -108,7 +110,7 @@ %endif %description -OpenCV means Intel® Open Source Computer Vision Library. It is a collection of C +OpenCV means Intel Open Source Computer Vision Library. It is a collection of C functions and a few C++ classes that implement some popular Image Processing and Computer Vision algorithms. @@ -199,6 +201,7 @@ %endif -DOPENCV_INCLUDE_INSTALL_PATH=%{_includedir} \ -DOPENCV_LICENSES_INSTALL_PATH=%{_licensedir}/%{name} \ + -DOPENCV_GENERATE_PKGCONFIG=ON \ -DINSTALL_C_EXAMPLES=ON \ -DINSTALL_PYTHON_EXAMPLES=ON \ -DENABLE_OMIT_FRAME_POINTER=OFF \ @@ -258,6 +261,9 @@ # Remove LD_LIBRARY_PATH wrapper script, we install into proper library dirs rm %{buildroot}%{_bindir}/setup_vars_opencv4.sh +# Fix duplicated install prefix in pkg-config file +sed -i -e 's|//usr||g' %{buildroot}%{_libdir}/pkgconfig/opencv4.pc + %fdupes -s %{buildroot}%{_docdir}/%{name}-doc/examples %fdupes -s %{buildroot}%{_includedir} @@ -303,6 +309,7 @@ %license LICENSE LICENSE.contrib %{_includedir}/opencv2/ %{_libdir}/lib*.so +%{_libdir}/pkgconfig/opencv4.pc %dir %{_libdir}/cmake/opencv4 %{_libdir}/cmake/opencv4/OpenCVConfig*.cmake %{_libdir}/cmake/opencv4/OpenCVModules*.cmake ++++++ opencv-includedir.patch ++++++ diff -u -r opencv-4.0.1/cmake/templates/opencv-XXX.pc.in opencv-4.0.1-includedir/cmake/templates/opencv-XXX.pc.in --- opencv-4.0.1/cmake/templates/opencv-XXX.pc.in 2018-12-22 07:03:30.000000000 +0000 +++ opencv-4.0.1-includedir/cmake/templates/opencv-XXX.pc.in 2019-02-07 15:08:15.016613349 +0000 @@ -11,4 +10,4 @@ Version: @OPENCV_VERSION_PLAIN@ Libs: @OPENCV_PC_LIBS@ Libs.private: @OPENCV_PC_LIBS_PRIVATE@ -Cflags: -I${includedir_old} -I${includedir_new} +Cflags: -I${includedir_new}
