commit: c0c6af076a8dddacc1fdc3ce600215acf0848110 Author: Alfred Wingate <parona <AT> protonmail <DOT> com> AuthorDate: Wed May 14 21:13:28 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu May 15 07:40:11 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0c6af07
media-libs/opencv: fix libspng link Closes: https://bugs.gentoo.org/955661 Signed-off-by: Alfred Wingate <parona <AT> protonmail.com> Part-of: https://github.com/gentoo/gentoo/pull/42092 Closes: https://github.com/gentoo/gentoo/pull/42092 Signed-off-by: Sam James <sam <AT> gentoo.org> .../files/opencv-4.11.0-fix-libspng-link.patch | 29 ++++++++++++++++++++++ media-libs/opencv/opencv-4.11.0.ebuild | 2 ++ 2 files changed, 31 insertions(+) diff --git a/media-libs/opencv/files/opencv-4.11.0-fix-libspng-link.patch b/media-libs/opencv/files/opencv-4.11.0-fix-libspng-link.patch new file mode 100644 index 000000000000..d05b5ac591a4 --- /dev/null +++ b/media-libs/opencv/files/opencv-4.11.0-fix-libspng-link.patch @@ -0,0 +1,29 @@ +https://bugs.gentoo.org/955661 +https://github.com/opencv/opencv/pull/27314 + +From 8fae4a65feb334de530174fd17147637c241e6b8 Mon Sep 17 00:00:00 2001 +From: Alfred Wingate <par...@protonmail.com> +Date: Wed, 14 May 2025 23:30:10 +0300 +Subject: [PATCH] cmake: set SPNG_LIBRARY for pkgconfig as well + +Pkgconfig will set SPNG_LIBRARIES but not SPNG_LIBRARY, this is an issue +as modules/imgcodecs/CmakeLists.txt uses SPNG_LIBRARY. + +Bug: https://bugs.gentoo.org/955661 +Fixes: c92815238e083563f1b03ac8c449ed848b13b0d9 +Signed-off-by: Alfred Wingate <par...@protonmail.com> +--- a/cmake/OpenCVFindLibsGrfmt.cmake ++++ b/cmake/OpenCVFindLibsGrfmt.cmake +@@ -304,6 +304,9 @@ if(WITH_SPNG) + else() + if(PkgConfig_FOUND) + pkg_check_modules(SPNG QUIET spng) ++ if(SPNG_FOUND) ++ set(SPNG_LIBRARY ${SPNG_LIBRARIES} CACHE INTERNAL "") ++ endif() + endif() + endif() + if(SPNG_FOUND) +-- +2.49.0 + diff --git a/media-libs/opencv/opencv-4.11.0.ebuild b/media-libs/opencv/opencv-4.11.0.ebuild index 289539649ec2..e28d08a36b61 100644 --- a/media-libs/opencv/opencv-4.11.0.ebuild +++ b/media-libs/opencv/opencv-4.11.0.ebuild @@ -381,6 +381,8 @@ PATCHES=( "${FILESDIR}/${PN}-4.10.0-cmake4.patch" # PR pending #27192 "${FILESDIR}/${PN}-4.11.0-qt-6.9.patch" # https://github.com/opencv/opencv/issues/27223 + "${FILESDIR}"/${PN}-4.11.0-fix-libspng-link.patch # PR pending #27314 + # TODO applied in src_prepare # "${FILESDIR}/${PN}_contrib-4.8.1-rgbd.patch"
