Merge remote-tracking branch 'up/main' into main-riscv64
Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>
This commit is contained in:
commit
3923e8e37e
GPG Key ID:
7A5F42FAF91FACC3
|
|
@ -4,3 +4,4 @@ face_landmark_model.dat.xz
|
|||
/b624b995ec9c439cbc2e9e6ee940d3a2-v0.1.1f.zip
|
||||
/fa4b3e25167319cb0fa9432ef8281945-v0.1.2a.zip
|
||||
/wechat-20230712.git3487ef7.tar.gz
|
||||
/dbb095a8bf3008e91edbbf45d8d34885-v0.1.2d.zip
|
||||
|
|
|
|||
|
|
@ -1,11 +0,0 @@
|
|||
--- ./cmake/OpenCVDetectPython.cmake.orig 2023-09-30 01:44:54.597603701 +0100
|
||||
+++ ./cmake/OpenCVDetectPython.cmake 2023-09-30 01:53:48.924119387 +0100
|
||||
@@ -216,7 +216,7 @@ if(NOT ${found})
|
||||
message(STATUS " PYTHON3_NUMPY_INCLUDE_DIRS")
|
||||
else()
|
||||
# Attempt to discover the NumPy include directory. If this succeeds, then build python API with NumPy
|
||||
- execute_process(COMMAND "${_executable}" -c "import os; os.environ['DISTUTILS_USE_SDK']='1'; import numpy.distutils; print(os.pathsep.join(numpy.distutils.misc_util.get_numpy_include_dirs()))"
|
||||
+ execute_process(COMMAND "${_executable}" -c "import numpy; print(numpy.get_include())"
|
||||
RESULT_VARIABLE _numpy_process
|
||||
OUTPUT_VARIABLE _numpy_include_dirs
|
||||
OUTPUT_STRIP_TRAILING_WHITESPACE)
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
diff -up opencv-4.1.2/cmake/templates/OpenCVConfig.cmake.in.orig opencv-4.1.2/cmake/templates/OpenCVConfig.cmake.in
|
||||
--- opencv-4.1.2/cmake/templates/OpenCVConfig.cmake.in.orig 2019-10-10 00:53:14.000000000 +0200
|
||||
+++ opencv-4.1.2/cmake/templates/OpenCVConfig.cmake.in 2019-10-17 11:08:46.626400320 +0200
|
||||
@@ -106,7 +106,7 @@ set(OpenCV_SHARED @BUILD_SHARED_LIBS@)
|
||||
set(OpenCV_USE_MANGLED_PATHS @OpenCV_USE_MANGLED_PATHS_CONFIGCMAKE@)
|
||||
|
||||
set(OpenCV_LIB_COMPONENTS @OPENCV_MODULES_CONFIGCMAKE@)
|
||||
-set(__OpenCV_INCLUDE_DIRS @OpenCV_INCLUDE_DIRS_CONFIGCMAKE@)
|
||||
+set(__OpenCV_INCLUDE_DIRS @OpenCV_INCLUDE_DIRS_CONFIGCMAKE@ @OpenCV_INCLUDE_DIRS_CONFIGCMAKE@/opencv2)
|
||||
|
||||
set(OpenCV_INCLUDE_DIRS "")
|
||||
foreach(d ${__OpenCV_INCLUDE_DIRS})
|
||||
diff -up opencv-4.1.2/cmake/templates/opencv-XXX.pc.in.orig opencv-4.1.2/cmake/templates/opencv-XXX.pc.in
|
||||
--- opencv-4.1.2/cmake/templates/opencv-XXX.pc.in.orig 2019-10-10 00:53:14.000000000 +0200
|
||||
+++ opencv-4.1.2/cmake/templates/opencv-XXX.pc.in 2019-10-17 11:04:11.486014573 +0200
|
||||
@@ -3,7 +3,7 @@
|
||||
prefix=@prefix@
|
||||
exec_prefix=@exec_prefix@
|
||||
libdir=@libdir@
|
||||
-includedir_old=@includedir@/opencv
|
||||
+includedir_old=@includedir@/opencv2
|
||||
includedir_new=@includedir@
|
||||
|
||||
Name: OpenCV
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/bash
|
||||
|
||||
VERSION=4.8.1
|
||||
VERSION=4.9.0
|
||||
|
||||
wget -c https://github.com/opencv/opencv/archive/${VERSION}/opencv-${VERSION}.tar.gz
|
||||
wget -c https://github.com/opencv/opencv_contrib/archive/${VERSION}/opencv_contrib-${VERSION}.tar.gz
|
||||
|
|
|
|||
82
opencv.spec
82
opencv.spec
|
|
@ -1,6 +1,7 @@
|
|||
%undefine __cmake_in_source_build
|
||||
|
||||
%bcond_with tests
|
||||
%bcond_without compat_openvc_pc
|
||||
%if %{without tests}
|
||||
%bcond_with extras_tests
|
||||
%else
|
||||
|
|
@ -8,7 +9,7 @@
|
|||
%endif
|
||||
# linters are enabled by default if BUILD_DOCS OR BUILD_EXAMPLES
|
||||
%bcond_with linters
|
||||
%bcond_with ffmpeg
|
||||
%bcond_without ffmpeg
|
||||
%bcond_without gstreamer
|
||||
%bcond_with eigen2
|
||||
%bcond_without eigen3
|
||||
|
|
@ -21,7 +22,7 @@
|
|||
%endif
|
||||
%bcond_without tbb
|
||||
%bcond_with cuda
|
||||
%bcond_with xine
|
||||
%bcond_without xine
|
||||
# Atlas need (missing: Atlas_CLAPACK_INCLUDE_DIR Atlas_CBLAS_LIBRARY Atlas_BLAS_LIBRARY Atlas_LAPACK_LIBRARY)
|
||||
# LAPACK may use atlas or openblas since now it detect openblas, atlas is not used anyway, more info please
|
||||
# check OpenCVFindLAPACK.cmake
|
||||
|
|
@ -40,7 +41,6 @@
|
|||
|
||||
%ifarch x86_64
|
||||
%bcond_without libmfx
|
||||
%bcond_without va
|
||||
%else
|
||||
%bcond_with libmfx
|
||||
%endif
|
||||
|
|
@ -55,6 +55,13 @@
|
|||
%bcond_with java
|
||||
%endif
|
||||
|
||||
%if 0%{?fedora}
|
||||
%bcond_without openexr
|
||||
%else
|
||||
%bcond_with openexr
|
||||
%endif
|
||||
|
||||
%bcond_without va
|
||||
%bcond_without vulkan
|
||||
|
||||
%define _lto_cflags %{nil}
|
||||
|
|
@ -68,7 +75,7 @@
|
|||
%endif
|
||||
|
||||
Name: opencv
|
||||
Version: 4.8.1
|
||||
Version: 4.9.0
|
||||
%global javaver %(foo=%{version}; echo ${foo//./})
|
||||
%global majorver %(foo=%{version}; a=(${foo//./ }); echo ${a[0]} )
|
||||
%global minorver %(foo=%{version}; a=(${foo//./ }); echo ${a[1]} )
|
||||
|
|
@ -77,7 +84,7 @@ Version: 4.8.1
|
|||
Release: 3.0.riscv64%{?dist}
|
||||
Summary: Collection of algorithms for computer vision
|
||||
# This is normal three clause BSD.
|
||||
License: BSD-3-Clause and Apache-2.0 and ISC
|
||||
License: BSD-3-Clause AND Apache-2.0 AND ISC
|
||||
URL: https://opencv.org
|
||||
# TO PREPARE TARBALLS FOR FEDORA
|
||||
# Edit opencv-clean.sh and set VERSION, save file and run opencv-clean.sh
|
||||
|
|
@ -91,9 +98,8 @@ Source1: %{name}_contrib-clean-%{version}.tar.gz
|
|||
Source2: %{name}_extra-clean-%{version}.tar.gz
|
||||
}
|
||||
Source3: face_landmark_model.dat.xz
|
||||
# from https://github.com/opencv/ade/archive/v0.1.2a.zip
|
||||
# mv v0.1.2a.zip $(md5sum v0.1.2a.zip | cut -d' ' -f1)-v0.1.2a.zip
|
||||
Source4: fa4b3e25167319cb0fa9432ef8281945-v0.1.2a.zip
|
||||
# SRC=v0.1.2d.zip ; wget https://github.com/opencv/ade/archive/$SRC; mv $SRC $(md5sum $SRC | cut -d' ' -f1)-$SRC
|
||||
Source4: dbb095a8bf3008e91edbbf45d8d34885-v0.1.2d.zip
|
||||
Source5: xorg.conf
|
||||
%global wechat_commit 3487ef7cde71d93c6a01bb0b84aa0f22c6128f6b
|
||||
%global wechat_shortcommit %(c=%{wechat_commit}; echo ${c:0:7})
|
||||
|
|
@ -102,7 +108,6 @@ Source6: https://github.com/WeChatCV/opencv_3rdparty/archive/%{wechat_com
|
|||
|
||||
Patch0: opencv-4.1.0-install_3rdparty_licenses.patch
|
||||
Patch3: opencv.python.patch
|
||||
Patch4: numpy.distutils_removal.patch
|
||||
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: cmake >= 2.6.3
|
||||
|
|
@ -130,10 +135,14 @@ BuildRequires: libpng-devel
|
|||
BuildRequires: libtiff-devel
|
||||
BuildRequires: libGL-devel
|
||||
BuildRequires: libv4l-devel
|
||||
%{?with_openexr:
|
||||
BuildRequires: OpenEXR-devel
|
||||
}
|
||||
%{?with_openni:
|
||||
BuildRequires: openni-devel
|
||||
%if 0%{?fedora}
|
||||
BuildRequires: openni-primesense
|
||||
%endif
|
||||
}
|
||||
%{?with_tbb:
|
||||
BuildRequires: tbb-devel
|
||||
|
|
@ -148,7 +157,13 @@ BuildRequires: pylint
|
|||
BuildRequires: python3-flake8
|
||||
}
|
||||
BuildRequires: swig >= 1.3.24
|
||||
%{?with_ffmpeg:BuildRequires: ffmpeg-devel >= 0.4.9}
|
||||
%{?with_ffmpeg:
|
||||
BuildRequires: pkgconfig(libavcodec)
|
||||
BuildRequires: pkgconfig(libavformat)
|
||||
BuildRequires: pkgconfig(libavutil)
|
||||
BuildRequires: pkgconfig(libswscale)
|
||||
BuildRequires: pkgconfig(libavdevice)
|
||||
}
|
||||
%if 0%{?fedora} || 0%{?rhel} > 7
|
||||
%{?with_gstreamer:BuildRequires: gstreamer1-devel gstreamer1-plugins-base-devel}
|
||||
%else
|
||||
|
|
@ -391,7 +406,6 @@ popd &>/dev/null
|
|||
|
||||
%patch -P 0 -p1 -b .install_3rdparty_licenses
|
||||
%patch -P 3 -p1 -b .python_install_binary
|
||||
%patch -P 4 -p1 -b .numpy.distutils_removal
|
||||
|
||||
pushd %{name}_contrib-%{version}
|
||||
#patch1 -p1 -b .install_cvv
|
||||
|
|
@ -420,6 +434,12 @@ install -pm 0644 %{S:4} .cache/ade/
|
|||
# non available on Fedora: FFMPEG, XINE
|
||||
# disabling IPP because it is closed source library from intel
|
||||
|
||||
# Workaround for "virtual memory exhausted: Cannot allocate memory"
|
||||
%ifarch %{ix86}
|
||||
export CFLAGS='%{build_cflags} -g1'
|
||||
export CXXFLAGS='%{build_cxxflags} -g1'
|
||||
%endif
|
||||
|
||||
%cmake \
|
||||
%if 0%{?fedora} > 38
|
||||
-DCMAKE_CXX_STANDARD=17 \
|
||||
|
|
@ -434,7 +454,8 @@ install -pm 0644 %{S:4} .cache/ade/
|
|||
%endif
|
||||
-DOpenGL_GL_PREFERENCE=GLVND \
|
||||
-DWITH_GDAL=ON \
|
||||
-DWITH_OPENEXR=ON \
|
||||
%{?with_openexr: -DWITH_OPENEXR=ON} \
|
||||
%{!?with_openexr: -DWITH_OPENEXR=OFF} \
|
||||
-DCMAKE_SKIP_RPATH=ON \
|
||||
-DWITH_CAROTENE=OFF \
|
||||
%ifarch x86_64 %{ix86}
|
||||
|
|
@ -488,7 +509,6 @@ install -pm 0644 %{S:4} .cache/ade/
|
|||
|
||||
%cmake_build
|
||||
|
||||
|
||||
%install
|
||||
%cmake_install
|
||||
cd %{__cmake_builddir}/python_loader/
|
||||
|
|
@ -501,7 +521,7 @@ ln -s -r %{buildroot}%{_jnidir}/opencv-%{javaver}.jar %{buildroot}%{_jnidir}/ope
|
|||
%endif
|
||||
|
||||
# For compatibility with existing opencv.pc application
|
||||
%{!?without_compat_openvc_pc:
|
||||
%{?with_compat_openvc_pc:
|
||||
ln -s opencv4.pc %{buildroot}%{_libdir}/pkgconfig/opencv.pc
|
||||
}
|
||||
|
||||
|
|
@ -544,7 +564,7 @@ ln -s -r %{buildroot}%{_jnidir}/opencv-%{javaver}.jar %{buildroot}%{_jnidir}/ope
|
|||
%dir %{_includedir}/opencv4
|
||||
%{_includedir}/opencv4/opencv2
|
||||
%{_libdir}/lib*.so
|
||||
%{!?without_compat_openvc_pc:
|
||||
%{?with_compat_openvc_pc:
|
||||
%{_libdir}/pkgconfig/opencv.pc
|
||||
}
|
||||
%{_libdir}/pkgconfig/opencv4.pc
|
||||
|
|
@ -567,9 +587,39 @@ ln -s -r %{buildroot}%{_jnidir}/opencv-%{javaver}.jar %{buildroot}%{_jnidir}/ope
|
|||
|
||||
|
||||
%changelog
|
||||
* Fri Dec 08 2023 David Abdurachmanov <davidlt@rivosinc.com> - 4.8.1-3.0.riscv64
|
||||
* Thu Mar 07 2024 David Abdurachmanov <davidlt@rivosinc.com> - 4.9.0-3.0.riscv64
|
||||
- Disable VTK on riscv64 for now
|
||||
|
||||
* Fri Feb 23 2024 Jerry James <loganjerry@gmail.com> - 4.9.0-3
|
||||
- Rebuild (coin-or-Clp)
|
||||
- Use uppercase connectives in SPDX expression
|
||||
- Reduce debuginfo level on i386 to avoid memory exhaustion
|
||||
|
||||
* Mon Feb 05 2024 Sérgio Basto <sergio@serjux.com> - 4.9.0-2
|
||||
- Revert drop compat symlink to opencv.pc
|
||||
|
||||
* Sun Jan 28 2024 Sérgio Basto <sergio@serjux.com> - 4.9.0-1
|
||||
- Update opencv to 4.9.0 (#2256160)
|
||||
- Enable ffmpeg and xine (now they are available on Fedora)
|
||||
- Really drop compat symlink for includes - rhbz#1830266
|
||||
Note: conditional builds with underscrore don't have _without option
|
||||
https://github.com/rpm-software-management/rpm/issues/1929
|
||||
|
||||
* Sun Jan 28 2024 Sandro Mani <manisandro@gmail.com> - 4.8.1-8
|
||||
- Rebuild (tesseract)
|
||||
|
||||
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.8.1-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.8.1-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Wed Jan 17 2024 Jonathan Wakely <jwakely@redhat.com> - 4.8.1-5
|
||||
- Rebuilt for TBB 2021.11
|
||||
|
||||
* Thu Jan 11 2024 Benjamin A. Beasley <code@musicinmybrain.net> - 4.8.1-4
|
||||
- Backport support for protobuf v22 and later from opencv 4.9.0
|
||||
|
||||
* Thu Nov 16 2023 Sandro Mani <manisandro@gmail.com> - 4.8.1-3
|
||||
- Rebuild (gdal)
|
||||
|
||||
|
|
|
|||
6
sources
6
sources
|
|
@ -1,5 +1,5 @@
|
|||
SHA512 (opencv-clean-4.8.1.tar.gz) = d148e05cbe29a6e7b0eec8258b6f0260193ace0fec87c6b61225a36f3432a29d9c86b77018e51b547996db3227b561968e54856063ce7f2e9c47bc72aba7f0fb
|
||||
SHA512 (opencv_contrib-clean-4.8.1.tar.gz) = cc5badd41b7c23e316d4984accc6373b608df591896827f9289dc511b163618036906c91f872cfa4de1fd3cc53838a6dfd5102e7c1856aa1f67b2c18323677f6
|
||||
SHA512 (opencv-clean-4.9.0.tar.gz) = 534d9c8bf9759008fd409f6c2c298d33aaf56a080229dccfaec98a789e4c309fc7872d85289f5c0a685f044f6c477f7c890a6788c35bc2f0aa795ec4f33b0ef6
|
||||
SHA512 (opencv_contrib-clean-4.9.0.tar.gz) = 595cb9bb5f1a57be883d7ccf448221bfad2c055a930a12f9658489d4a850be5b3f9e3ecd3949f45a183ccc4b8a62620af5d148039b4139c07d408fc3c789f076
|
||||
SHA512 (face_landmark_model.dat.xz) = 7558f29431bb9cad1f22ee067ad3ed41be8f68b865992eb7d3a5ce6b6b9e1d031cb03e33c3c149220ef8faebd0471703a8a3bbb06402bcc8ce76bd28317aa307
|
||||
SHA512 (fa4b3e25167319cb0fa9432ef8281945-v0.1.2a.zip) = ce5af0bd5d7fb04022f92fed130898959aecb954cc09da2fc923c76b37ee92d2233888592a4c6bca8006ac4d3fda9c6da80f316c924a407a7a5961d9832a681c
|
||||
SHA512 (dbb095a8bf3008e91edbbf45d8d34885-v0.1.2d.zip) = f6f87be8932c0c0ca40bec20b750ab3df27dac44f4507211c29c60f42160e3f2f2133b52c18245eff5241f216a3f5526d299937470b69b125e8eca369c8f6939
|
||||
SHA512 (wechat-20230712.git3487ef7.tar.gz) = bc4f220465de41df8af0cb35312c1db155976d05f13a60e43c1798b161d8f56388e34a59108fb3e27e8c97b53acfd198256d9ae420b5f70a32ddc1ea65c3c8a6
|
||||
|
|
|
|||
Loading…
Reference in New Issue