- rel 1

[packages/opencv.git] / opencv.spec

diff --git a/opencv.spec b/opencv.spec
index aded6b5aa30f56f6c3721e8227c8439fb57a5b57..21355349b77aa16ba97f7200001dea568f7b6dd3 100644 (file)
--- a/opencv.spec
+++ b/opencv.spec
@@ -55,7 +55,7 @@
 Summary:       A library of programming functions mainly aimed at real time computer vision
 Summary(pl.UTF-8):     Biblioteka funkcji do grafiki komputerowej w czasie rzeczywistym
 Name:          opencv
-Version:       4.5.5
+Version:       4.8.1
 Release:       1
 Epoch:         1
 %if %{with unicap} || %{with xine}
@@ -65,9 +65,9 @@ License:      BSD
 %endif
 Group:         Libraries
 Source0:       https://github.com/Itseez/opencv/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: a9782f01883fcf51451a183d05bda33d
+# Source0-md5: 7e3b6b5046e4e31226bbf4872091201c
 Source1:       https://github.com/Itseez/opencv_contrib/archive/%{version}/%{name}_contrib-%{version}.tar.gz
-# Source1-md5: 073793e8085ec2490b3386e04ee20fbc
+# Source1-md5: 16a34bb3c8107e5416e86ef003d5aeb6
 # See opencv_contrib-3.4.1/modules/xfeatures2d/cmake/download_boostdesc.cmake
 Source10:      https://raw.githubusercontent.com/opencv/opencv_3rdparty/34e4206aef44d50e6bbcd0ab06354b52e7466d26/boostdesc_bgm.i
 # Source10-md5:        0ea90e7a8f3f7876d450e4149c97c74f
@@ -96,14 +96,20 @@ Source23:   https://raw.githubusercontent.com/opencv/opencv_3rdparty/fccf7cd6a4b12
 Source30:      https://raw.githubusercontent.com/opencv/opencv_3rdparty/8afa57abc8229d611c4937165d20e2a2d9fc5a12/face_landmark_model.dat
 # Source30-md5:        7505c44ca4eb54b4ab1e4777cb96ac05
 # See opencv-4.5.1/modules/gapi/cmake/DownloadADE.cmake
-Source40:      https://github.com/opencv/ade/archive/v0.1.2a/ade-0.1.2a.zip
+Source40:      https://github.com/opencv/ade/archive/v0.1.2a/v0.1.2a.zip
 # Source40-md5:        fa4b3e25167319cb0fa9432ef8281945
+# See opencv_contrib-4.5.5/modules/wechat_qrcode/CMakeLists.txt
+Source50:      https://raw.githubusercontent.com/WeChatCV/opencv_3rdparty/a8b69ccc738421293254aec5ddb38bd523503252/detect.caffemodel
+# Source50-md5:        238e2b2d6f3c18d6c3a30de0c31e23cf
+Source51:      https://raw.githubusercontent.com/WeChatCV/opencv_3rdparty/a8b69ccc738421293254aec5ddb38bd523503252/detect.prototxt
+# Source51-md5:        6fb4976b32695f9f5c6305c19f12537d
+Source52:      https://raw.githubusercontent.com/WeChatCV/opencv_3rdparty/a8b69ccc738421293254aec5ddb38bd523503252/sr.caffemodel
+# Source52-md5:        cbfcd60361a73beb8c583eea7e8e6664
+Source53:      https://raw.githubusercontent.com/WeChatCV/opencv_3rdparty/a8b69ccc738421293254aec5ddb38bd523503252/sr.prototxt
+# Source53-md5:        69db99927a70df953b471daaba03fbef
 Patch0:                %{name}-ximea.patch
 Patch1:                python-install.patch
 Patch2:                pkgconfig-paths.patch
-Patch3:                no-cxx-in-c-header.patch
-Patch4:                gcc11.patch
-Patch5:                %{name}-ade.patch
 URL:           http://www.opencv.org/
 %{?with_pvapi:BuildRequires:   AVT_GigE_SDK-devel}
 %{?with_opencl:BuildRequires:  OpenCL-devel}
@@ -134,8 +140,10 @@ BuildRequires:     gstreamer-plugins-base-devel >= 1.0
 %endif
 BuildRequires: jasper-devel
 %if %{with java}
-BuildRequires: jdk
 BuildRequires: java-xerces
+BuildRequires: jdk
+# jawt for installed jdk
+BuildRequires: jre-X11
 %endif
 BuildRequires: khrplatform-devel
 BuildRequires: libdc1394-devel >= 2
@@ -190,7 +198,7 @@ Requires:   %{name}-core = %{epoch}:%{version}-%{release}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                jver    %(echo %{version} | cut -d. -f1-3 | tr -d .)
-%define                sover   405
+%define                sover   408
 
 %description
 OpenCV (Open Source Computer Vision) is a library of programming
@@ -341,18 +349,14 @@ Wiązania Pythona 3 do OpenCV.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
 
 cache_file() {
        f="$1"
        d="$2"
        md5="$(md5sum "$f" | awk '{print $1}')"
        file="$(basename "$f")"
-       destfile="${md5}-${3:-${file}}"
        mkdir -p ".cache/$d"
-       ln -s --relative "$f" ".cache/$d/$destfile"
+       ln -s --relative "$f" ".cache/$d/$md5-$file"
 }
 for f in %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} %{SOURCE14} %{SOURCE15} %{SOURCE16}; do
        cache_file $f xfeatures2d/boostdesc
@@ -361,7 +365,10 @@ for f in %{SOURCE20} %{SOURCE21} %{SOURCE22} %{SOURCE23}; do
        cache_file $f xfeatures2d/vgg
 done
 cache_file %{SOURCE30} data
-cache_file %{SOURCE40} ade v0.1.2a.zip
+cache_file %{SOURCE40} ade
+for f in %{SOURCE50} %{SOURCE51} %{SOURCE52} %{SOURCE53}; do
+       cache_file $f wechat_qrcode
+done
 
 cd opencv_contrib-%{version}
 
@@ -443,6 +450,9 @@ mv $RPM_BUILD_ROOT%{_datadir}/opencv4/samples/* $RPM_BUILD_ROOT%{_examplesdir}/%
 %py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
 %py_postclean
 
+%py3_comp $RPM_BUILD_ROOT%{py3_sitedir}
+%py3_ocomp $RPM_BUILD_ROOT%{py3_sitedir}
+
 %if %{with java}
 # move to proper directories, create symlink
 install -d $RPM_BUILD_ROOT%{_javadir}
@@ -501,8 +511,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libopencv_alphamat.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libopencv_aruco.so.%{sover}
 %attr(755,root,root) %{_libdir}/libopencv_aruco.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libopencv_barcode.so.%{sover}
-%attr(755,root,root) %{_libdir}/libopencv_barcode.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libopencv_bgsegm.so.%{sover}
 %attr(755,root,root) %{_libdir}/libopencv_bgsegm.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libopencv_bioinspired.so.%{sover}
@@ -631,7 +639,6 @@ rm -rf $RPM_BUILD_ROOT
 # contrib
 %{_libdir}/libopencv_alphamat.so
 %{_libdir}/libopencv_aruco.so
-%{_libdir}/libopencv_barcode.so
 %{_libdir}/libopencv_bgsegm.so
 %{_libdir}/libopencv_bioinspired.so
 %{_libdir}/libopencv_ccalib.so
@@ -715,6 +722,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{py3_sitedir}/cv2/python-*
 %attr(755,root,root) %{py3_sitedir}/cv2/python-*/cv2.cpython-*.so
 %{py3_sitedir}/cv2/*.py
+%{py3_sitedir}/cv2/__pycache__
 %{py3_sitedir}/cv2/gapi
 %{py3_sitedir}/cv2/mat_wrapper
 %{py3_sitedir}/cv2/misc