commit: 75eee21436198227c02ae33e67d718c626cc2646 Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com> AuthorDate: Fri Jan 5 21:20:25 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Jan 10 12:41:01 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75eee214
media-libs/opencv: 4.8.0-r1 drop broken protobuf patch This might be the cause for runtime failures. Bug: https://bugs.gentoo.org/916189 Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/34663 Signed-off-by: Sam James <sam <AT> gentoo.org> .../opencv/files/opencv-4.8.0-fix-protobuf.patch | 20 -------------------- ...opencv-4.8.0-r1.ebuild => opencv-4.8.0-r2.ebuild} | 3 +-- 2 files changed, 1 insertion(+), 22 deletions(-) diff --git a/media-libs/opencv/files/opencv-4.8.0-fix-protobuf.patch b/media-libs/opencv/files/opencv-4.8.0-fix-protobuf.patch deleted file mode 100644 index 937e00e0c024..000000000000 --- a/media-libs/opencv/files/opencv-4.8.0-fix-protobuf.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/cmake/OpenCVFindProtobuf.cmake -+++ b/cmake/OpenCVFindProtobuf.cmake -@@ -31,7 +31,7 @@ if(BUILD_PROTOBUF) - set(HAVE_PROTOBUF TRUE) - else() - unset(Protobuf_VERSION CACHE) -- find_package(Protobuf QUIET) -+ find_package(protobuf) - - # Backwards compatibility - # Define camel case versions of input variables -@@ -50,7 +50,7 @@ else() - endforeach() - # end of compatibility block - -- if(Protobuf_FOUND) -+ if(protobuf_FOUND) - if(TARGET protobuf::libprotobuf) - set(Protobuf_LIBRARIES "protobuf::libprotobuf") - else() diff --git a/media-libs/opencv/opencv-4.8.0-r1.ebuild b/media-libs/opencv/opencv-4.8.0-r2.ebuild similarity index 99% rename from media-libs/opencv/opencv-4.8.0-r1.ebuild rename to media-libs/opencv/opencv-4.8.0-r2.ebuild index e5f917168501..2671f7fab885 100644 --- a/media-libs/opencv/opencv-4.8.0-r1.ebuild +++ b/media-libs/opencv/opencv-4.8.0-r2.ebuild @@ -87,7 +87,7 @@ REQUIRED_USE=" RDEPEND=" app-arch/bzip2[${MULTILIB_USEDEP}] - dev-libs/protobuf:=[${MULTILIB_USEDEP}] + <dev-libs/protobuf-23:=[${MULTILIB_USEDEP}] sys-libs/zlib[${MULTILIB_USEDEP}] cuda? ( dev-util/nvidia-cuda-toolkit:0= ) contribdnn? ( dev-libs/flatbuffers:= ) @@ -292,7 +292,6 @@ PATCHES=( "${FILESDIR}"/${PN}-4.1.2-opencl-license.patch "${FILESDIR}"/${PN}-4.4.0-disable-native-cpuflag-detect.patch "${FILESDIR}"/${PN}-4.5.0-link-with-cblas-for-lapack.patch - "${FILESDIR}"/${PN}-4.8.0-fix-protobuf.patch "${FILESDIR}"/${PN}-4.8.0-fix-flatbuffer.patch "${FILESDIR}"/${PN}-4.8.0-arm64-fp16.patch "${FILESDIR}"/${PN}-4.8.0-fix-cuda-12.2.0.patch
