haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-23 04:00:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

opencv3, revbump, use latest gdal (#13018)

Browse Source
This commit is contained in:
Schrijvers Luc
2025-10-05 11:23:03 +02:00
committed by GitHub
parent 4544721e9b
commit a21427c8dd
2 changed files with 34 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
media-libs/opencv/opencv3-3.4.3.recipe
View File

@@ -9,7 +9,7 @@ COPYRIGHT="2000-2016, Intel Corporation
2015-2016, OpenCV Foundation
2015-2016, Itseez Inc."
LICENSE="BSD (3-clause)"
REVISION="16"
REVISION="17"
SOURCE_URI="https://github.com/opencv/opencv/archive/$portVersion.tar.gz"
SOURCE_FILENAME="opencv-$portVersion.tar.gz"
CHECKSUM_SHA256="4eef85759d5450b183459ff216b4c0fa43e87a4f6aa92c8af649f89336f002ec"
@@ -116,7 +116,7 @@ BUILD_REQUIRES="
# devel:libcaffe$secondaryArchSuffix
devel:libexif$secondaryArchSuffix
devel:libfreetype$secondaryArchSuffix
devel:libgdal$secondaryArchSuffix
devel:libgdal$secondaryArchSuffix >= 30
# devel:libgflags$secondaryArchSuffix
devel:libGL$secondaryArchSuffix
devel:libglib_2.0$secondaryArchSuffix
@@ -194,22 +194,24 @@ BUILD()
fi
cmake .. \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_INSTALL_PREFIX:PATH="$prefix" \
-DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
-DWITH_GDAL=ON \
-DWITH_IPP=OFF \
-DWITH_LAPACK=OFF \
-DWITH_OPENGL=OFF \
-DWITH_QT=ON \
-DWITH_EIGEN=ON \
-DCMAKE_BUILD_TYPE=Release \
-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" \
-DBUILD_TESTS=OFF -Wno-dev
-DBUILD_TESTS=OFF \
-Wno-dev
export DISABLE_ASLR=1

31
media-libs/opencv/patches/opencv3-3.4.3.patchset
View File

@@ -1,4 +1,4 @@
From 80218b1cc6b1cd17ae80ce2160cfb1f7210eb943 Mon Sep 17 00:00:00 2001
From 5638939c5c2ec82c4b2a6d5b89f1e37c5c894962 Mon Sep 17 00:00:00 2001
From: Begasus <begasus@gmail.com>
Date: Sat, 24 Feb 2024 09:42:21 +0100
Subject: Disable warnings/werror filling the screen output/failing the build
@@ -28,10 +28,10 @@ index 30e4a00..ac22f23 100644
if(ENABLE_NOISY_WARNINGS)
add_extra_compiler_option(-Wcast-align)
--
2.45.2
2.50.1
From 0df0430d2124a3169db8348c8765172f3851d014 Mon Sep 17 00:00:00 2001
From be436bf9aaef3f1c86d06f6d7c3e4d2454040256 Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Wed, 8 Jan 2025 15:17:38 +0100
Subject: import upstream patch
@@ -60,5 +60,28 @@ index b8b70fe..d03ce2e 100644
if( xstep == 1 )
--
2.45.2
2.50.1
From ae15d1619a818d56ccebfd7ebe38081bbf1ee8d5 Mon Sep 17 00:00:00 2001
From: Luc Schrijvers <begasus@gmail.com>
Date: Sun, 5 Oct 2025 11:09:32 +0200
Subject: Fix build for cmake >= 4
diff --git a/cmake/OpenCVGenPkgconfig.cmake b/cmake/OpenCVGenPkgconfig.cmake
index 425c0fa..9642a4b 100644
--- a/cmake/OpenCVGenPkgconfig.cmake
+++ b/cmake/OpenCVGenPkgconfig.cmake
@@ -110,7 +110,7 @@ endif()
# =============================================================================
else() # DEFINED CMAKE_HELPER_SCRIPT
-cmake_minimum_required(VERSION 2.8.12.2)
+cmake_minimum_required(VERSION 3.5)
cmake_policy(SET CMP0012 NEW)
include("${CMAKE_HELPER_SCRIPT}")
include("${OpenCV_SOURCE_DIR}/cmake/OpenCVUtils.cmake")
--
2.50.1