diff options
| -rw-r--r-- | media-libs/opencv/files/opencv-4.8.0-fix-protobuf.patch | 20 | ||||
| -rw-r--r-- | media-libs/opencv/opencv-4.8.0-r2.ebuild (renamed from media-libs/opencv/opencv-4.8.0-r1.ebuild) | 3 |
2 files changed, 1 insertions, 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 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 |