removed ovis module with dependency on ogre [release 4.7.0-4mamba;Sun May 07 2023]

opencv.spec

@@ -2,7 +2,7 @@
 %define javaver %(echo %version | cut -d. -f1-3 | tr -d .)
 Name:          opencv
 Version:       4.7.0
-Release:       1mamba
+Release:       4mamba
 Summary:       Collection of algorithms for computer vision
 Group:         Development/Libraries
 Vendor:        openmamba
@@ -10,6 +10,7 @@ Distribution:  openmamba
 Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
 URL:           https://opencv.org/
 Source:        https://github.com/opencv/opencv.git/%{version}/opencv-%{version}.tar.bz2
+Source1:       https://github.com/opencv/opencv_contrib.git/%{version}/opencv_contrib-%{version}.tar.bz2
 Patch2:        opencv-2.4.9-buildfix-x86-asm-constraint.patch
 Patch3:        opencv-2.4.10-i586-inconsistent-constraint-asm.patch
 Patch4:        opencv-4.1.2-cmake-includedir.patch
@@ -19,27 +20,35 @@ BuildRequires: glibc-devel
 BuildRequires: libavcodec-ffmpeg-devel
 BuildRequires: libavformat-ffmpeg-devel
 BuildRequires: libavutil-ffmpeg-devel
-BuildRequires: libcairo-devel
 BuildRequires: libdc1394-devel
+BuildRequires: libfreetype-devel
 BuildRequires: libgcc
-BuildRequires: libgdk-pixbuf-devel
 BuildRequires: libglib-devel
+BuildRequires: libglvnd-devel
 BuildRequires: libgst-plugins-base-devel
 BuildRequires: libgstreamer-devel
-BuildRequires: libgtk3-devel
+BuildRequires: libharfbuzz-devel
+BuildRequires: libhdf5-devel
 BuildRequires: libjpeg-devel
 BuildRequires: libopenblas-devel
 BuildRequires: libopenexr-devel
 BuildRequires: libopenjpeg-devel
 BuildRequires: libpng-devel
+BuildRequires: libprotobuf-devel
 BuildRequires: libpython27-devel
-BuildRequires: libpython3-devel
+BuildRequires: libpython310-devel
 BuildRequires: libstdc++6-devel
 BuildRequires: libswscale-ffmpeg-devel
+BuildRequires: libtbb-devel
+%ifnarch arm
+BuildRequires: libtesseract-devel
+%endif
 BuildRequires: libtiff-devel
+BuildRequires: libvtk-devel
 BuildRequires: libwebp-devel
 BuildRequires: libxine-devel
 BuildRequires: libz-devel
+BuildRequires: qt6-qtbase-devel
 ## AUTOBUILDREQ-END
 Requires:      lib%{name} = %{?epoch:%epoch:}%{version}-%{release}
 
@@ -75,7 +84,7 @@ Requires:      %{name} = %{?epoch:%epoch:}%{version}-%{release}
 %description -n java-%{name}
 This package contains Python bindings for the OpenCV library.
 
-%package -n python-cv
+%package -n python-cv-py2
 Summary:       Python bindings for apps which use OpenCV
 Group:         Development/Libraries
 Requires:      %{name} = %{?epoch:%epoch:}%{version}-%{release}
@@ -83,33 +92,41 @@ Requires:      python-Pillow
 Requires:      python-numpy
 Provides:      opencv-python
 Obsoletes:     opencv-python <= 4.1.2-4mamba
+Obsoletes:     python-cv < 4.7.0-2mamba
 
-%description -n python-cv
+%description -n python-cv-py2
 This package contains Python bindings for the OpenCV library.
 
-%package -n python-cv-py3
+%package -n python-cv-py310
 Summary:       Python bindings for apps which use OpenCV
 Group:         Development/Libraries
 Requires:      %{name} = %{?epoch:%epoch:}%{version}-%{release}
-Requires:      python-Pillow-py3
+Requires:      python-Pillow-py310
-Requires:      python-numpy-py3
+Requires:      python-numpy-py310
+Obsoletes:     python-cv-py3 < 4.7.0-2mamba
 Obsoletes:     python-cv-py36 <= 4.1.2-4mamba
 
-%description -n python-cv-py3
+%description -n python-cv-py310
 This package contains Python bindings for the OpenCV library.
 
 %debug_package
 
 %prep
-%setup -q
+%setup -q -a1
+#% setup -q -D -T
+#:<< _EOF
 
 %ifarch %{ix86}
-%patch2 -p1
+%patch 2 -p1
 %endif
 #%patch3 -p1
-%patch4 -p1
+%patch 4 -p1
+
+# FIXME: removing module requiring Ogre
+rm -rf opencv_contrib-%{version}/modules/ovis
 
 %build
+#:<< _EOF
 export JAVA_HOME=%{_jvmdir}/jdk
 export JAVACMD=%{_jvmdir}/jdk/bin/java
 #:<< _EOF
@@ -122,19 +139,28 @@ export JAVACMD=%{_jvmdir}/jdk/bin/java
 #PYTHON_PATH=`echo %python36_sitelib | sed "s|%{_prefix}/||"`
 %cmake -d build \
  -DCMAKE_BUILD_TYPE=Release \
+ -DWITH_OPENCL=ON \
+ -DWITH_OPENGL=ON \
+ -DOpenGL_GL_PREFERENCE=LEGACY \
+ -DWITH_TBB=ON \
+ -DWITH_VULKAN=ON \
+ -DWITH_QT=ON \
  -DWITH_GSTREAMER=1 \
  -DWITH_XINE=1 \
  -DWITH_UNICAP=1 \
  -DWITH_1394=1 \
  -DWITH_FFMPEG=1 \
  -DWITH_QUICKTIME=0 \
+ -DBUILD_PROTOBUF=OFF \
+ -DPROTOBUF_UPDATE_FILES=ON \
  -DBUILD_SWIG_PYTHON_SUPPORT=1 \
  -DINSTALL_C_EXAMPLES=0 \
- -DCMAKE_CXX_FLAGS:STRING="$RPM_OPT_FLAGS -D__STDC_CONSTANT_MACROS" \
+ -DCMAKE_CXX_FLAGS:STRING="%{optflags} -D__STDC_CONSTANT_MACROS" \
- -DPYTHON3_EXECUTABLE:PATH=%{__python3} \
+ -DPYTHON3_EXECUTABLE:PATH=%{__python310} \
- -DPYTHON3_PACKAGES_PATH:PATH=%{python3_sitelib} \
+ -DPYTHON3_PACKAGES_PATH:PATH=%{python310_sitelib} \
  -DOPENCV_GENERATE_PKGCONFIG=ON \
  -DOPENCV_ENABLE_NONFREE=ON \
+ -DOPENCV_EXTRA_MODULES_PATH=${PWD}/../opencv_contrib-%{version}/modules \
  -DENABLE_PRECOMPILED_HEADERS=OFF \
  -DLIB_SUFFIX=
 
@@ -190,17 +216,26 @@ rm -fr %{buildroot}%{_datadir}/opencv/doc
 %{_datadir}/java/opencv4/libopencv_java*.so
 %{_datadir}/java/opencv4/opencv-*.jar
 
-%files -n python-cv
+%files -n python-cv-py2
 %defattr(-,root,root)
 %dir %{python27_sitelib}/cv2
 %{python27_sitelib}/cv2/*
 
-%files -n python-cv-py3
+%files -n python-cv-py310
 %defattr(-,root,root)
-%dir %{python3_sitelib}/cv2
+%dir %{python310_sitelib}/cv2
-%{python3_sitelib}/cv2/*
+%{python310_sitelib}/cv2/*
 
 %changelog
+* Sun May 07 2023 Silvan Calarco <silvan.calarco@mambasoft.it> 4.7.0-4mamba
+- removed ovis module with dependency on ogre
+
+* Sat May 06 2023 Silvan Calarco <silvan.calarco@mambasoft.it> 4.7.0-3mamba
+- rebuilt with ogre 13.6.4
+
+* Sat May 06 2023 Silvan Calarco <silvan.calarco@mambasoft.it> 4.7.0-2mamba
+- rebuilt with extra opencv_contrib modules and other cmake options
+
 * Fri Dec 30 2022 Automatic Build System <autodist@mambasoft.it> 4.7.0-1mamba
 - automatic version update by autodist