pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
opencv: update LICENSE (it changed in 4.5), explain lapack problem
Module Name: pkgsrc-wip
Committed By: Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By: wiz
Date: Fri Feb 7 22:52:18 2025 +0100
Changeset: 9de9c68b3f49f1b3b1a7a378fd576df99216f9c9
Modified Files:
opencv/Makefile.common
opencv/buildlink3.mk
Log Message:
opencv: update LICENSE (it changed in 4.5), explain lapack problem
restore protobuf to bl3.mk file
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=9de9c68b3f49f1b3b1a7a378fd576df99216f9c9
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
opencv/Makefile.common | 21 ++++++++++++++++++++-
opencv/buildlink3.mk | 2 +-
2 files changed, 21 insertions(+), 2 deletions(-)
diffs:
diff --git a/opencv/Makefile.common b/opencv/Makefile.common
index 4ee8f88b2a..5722d6f2cf 100644
--- a/opencv/Makefile.common
+++ b/opencv/Makefile.common
@@ -11,7 +11,7 @@ CATEGORIES= graphics devel
MASTER_SITES= ${MASTER_SITE_GITHUB:=opencv/}
HOMEPAGE= https://opencv.org/
-LICENSE= modified-bsd
+LICENSE= apache-2.0
USE_LANGUAGES= c c++
USE_CXX_FEATURES= c++17
@@ -33,6 +33,25 @@ CMAKE_CONFIGURE_ARGS+= -DCMAKE_CXX_STANDARD=17
# doesn't build on NetBSD with libva-2.22.0
CMAKE_CONFIGURE_ARGS+= -DWITH_VA=OFF
#.include "../../multimedia/libva/buildlink3.mk"
+
+# lapack: disabled because it makes the build fail with
+# n file included from /scratch/wip/opencv/work/opencv-4.11.0/modules/core/src/hal_internal.cpp:50:
+# modules/core/src/hal_internal.cpp: In function 'int lapack_gemm_c(const fptype*, size_t, const fptype*, size_t, fptype, const fptype*, size_t, fptype, fptype*, size_t, int, int, int, int)':
+# modules/core/src/hal_internal.cpp:518:48: error: expected unqualified-id before '_Complex'
+# 518 | int ldsrc1 = (int)(src1_step / sizeof(std::complex<fptype>));
+# | ^~~~~~~
+## Pulled in via numpy, too, but we need to handle it explicitly
+## for LAPACK C API and CMake tests here.
+#BLAS_C_INTERFACE= yes
+#.include "../../mk/blas.buildlink3.mk"
+#CMAKE_CONFIGURE_ARGS+= -DWITH_LAPACK=ON
+#CMAKE_CONFIGURE_ARGS+= -DBLA_PREFER_PKGCONFIG=ON
+#CMAKE_CONFIGURE_ARGS+= -DBLA_PKGCONFIG_BLAS=${BLAS_PC}
+#CMAKE_CONFIGURE_ARGS+= -DBLA_PKGCONFIG_LAPACK=${LAPACK_PC}
+#CMAKE_CONFIGURE_ARGS+= -DBLA_PKGCONFIG_CBLAS=${CBLAS_PC}
+#CMAKE_CONFIGURE_ARGS+= -DBLA_PKGCONFIG_LAPACKE=${LAPACKE_PC}
+#CMAKE_CONFIGURE_ARGS+= -DOPENCV_SKIP_LAPACK_EXTERN_C=ON
+
CMAKE_CONFIGURE_ARGS.SunOS+= -DENABLE_PRECOMPILED_HEADERS=OFF
CMAKE_CONFIGURE_ARGS.SunOS+= -DOPENCV_PYTHON_SKIP_LINKER_EXCLUDE_LIBS=ON
diff --git a/opencv/buildlink3.mk b/opencv/buildlink3.mk
index 6b395c821f..e031627065 100644
--- a/opencv/buildlink3.mk
+++ b/opencv/buildlink3.mk
@@ -14,7 +14,7 @@ BUILDLINK_INCDIRS.opencv+= include/opencv4
pkgbase := opencv
.include "../../mk/pkg-build-options.mk"
-#.include "../../devel/protobuf/buildlink3.mk"
+.include "../../devel/protobuf/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../graphics/openjpeg/buildlink3.mk"
.if ${PKG_BUILD_OPTIONS.opencv:Mjasper}
Home |
Main Index |
Thread Index |
Old Index