diff --git a/media-libs/opencv/opencv3-3.4.3.recipe b/media-libs/opencv/opencv3-3.4.3.recipe index 92756ffc3..4515ace02 100644 --- a/media-libs/opencv/opencv3-3.4.3.recipe +++ b/media-libs/opencv/opencv3-3.4.3.recipe @@ -9,11 +9,12 @@ COPYRIGHT="2000-2016, Intel Corporation 2015-2016, OpenCV Foundation 2015-2016, Itseez Inc." LICENSE="BSD (3-clause)" -REVISION="14" +REVISION="15" SOURCE_URI="https://github.com/opencv/opencv/archive/$portVersion.tar.gz" SOURCE_FILENAME="opencv-$portVersion.tar.gz" CHECKSUM_SHA256="4eef85759d5450b183459ff216b4c0fa43e87a4f6aa92c8af649f89336f002ec" SOURCE_DIR="opencv-$portVersion" +PATCHES="opencv3-$portVersion.patchset" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" @@ -28,7 +29,7 @@ portVersionCompat="$portVersion compat >= ${portVersion%%.*}" libVersion="$portVersion" libVersionCompat="$libVersion compat >= ${libVersion%.*}" -pythonVersion="3.9" +pythonVersion="3.10" PROVIDES=" opencv3$secondaryArchSuffix = $portVersionCompat @@ -108,9 +109,9 @@ BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:cblas$secondaryArchSuffix devel:eigen$secondaryArchSuffix - devel:libavcodec$secondaryArchSuffix - devel:libavformat$secondaryArchSuffix - devel:libavutil$secondaryArchSuffix + devel:libavcodec$secondaryArchSuffix >= 58 + devel:libavformat$secondaryArchSuffix >= 58 + devel:libavutil$secondaryArchSuffix >= 56 # devel:libcaffe$secondaryArchSuffix devel:libexif$secondaryArchSuffix devel:libfreetype$secondaryArchSuffix @@ -195,6 +196,7 @@ BUILD() cmake .. \ -DWITH_GDAL=ON \ -DWITH_IPP=OFF \ + -DWITH_LAPACK=OFF \ -DWITH_OPENGL=OFF \ -DWITH_QT=ON \ -DWITH_EIGEN=ON \ @@ -202,10 +204,12 @@ BUILD() -DCMAKE_SKIP_RPATH=ON \ -DENABLE_PIC=OFF \ -DOPENCV_ENABLE_NONFREE=ON \ + -DOPENCV_WARNINGS_ARE_ERRORS=OFF \ -DCMAKE_INSTALL_PREFIX:PATH="$prefix" \ -DOPENCV_OTHER_INSTALL_PATH:PATH="$dataDir" \ -DOpenBLAS_INCLUDE_DIR="$portPackageLinksDir/openblas${secondaryArchSuffix}_devel/develop/headers/$ARCH_SUBDIR" \ - -DOpenBLAS_LIB="$portPackageLinksDir/openblas${secondaryArchSuffix}_devel/develop/lib/$ARCH_SUBDIR" + -DOpenBLAS_LIB="$portPackageLinksDir/openblas${secondaryArchSuffix}_devel/develop/lib/$ARCH_SUBDIR" \ + -Wno-dev export DISABLE_ASLR=1 diff --git a/media-libs/opencv/patches/opencv3-3.4.3.patchset b/media-libs/opencv/patches/opencv3-3.4.3.patchset new file mode 100644 index 000000000..a0da692b1 --- /dev/null +++ b/media-libs/opencv/patches/opencv3-3.4.3.patchset @@ -0,0 +1,32 @@ +From b695400ff3c362b221fe86b845203f017607296a Mon Sep 17 00:00:00 2001 +From: Begasus +Date: Sat, 24 Feb 2024 09:42:21 +0100 +Subject: Disable warnings/werror filling the screen output/failing the build + + +diff --git a/cmake/OpenCVCompilerOptions.cmake b/cmake/OpenCVCompilerOptions.cmake +index 30e4a00..ac22f23 100644 +--- a/cmake/OpenCVCompilerOptions.cmake ++++ b/cmake/OpenCVCompilerOptions.cmake +@@ -83,7 +83,7 @@ if(CV_ICC AND NOT ENABLE_FAST_MATH) + endif() + endif() + +-if(CV_GCC OR CV_CLANG) ++if(CV_GCC OR CV_CLANG AND NOT HAIKU) + # High level of warnings. + add_extra_compiler_option(-W) + add_extra_compiler_option(-Wall) +@@ -110,6 +110,9 @@ if(CV_GCC OR CV_CLANG) + add_extra_compiler_option(-Winconsistent-missing-override) + endif() + endif() ++ if(HAIKU) ++ add_definitions(-Wno-deprecated-copy) ++ endif(HAIKU) + + if(ENABLE_NOISY_WARNINGS) + add_extra_compiler_option(-Wcast-align) +-- +2.43.2 +