From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7A27115846A for ; Wed, 10 Jan 2024 12:41:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8D19AE2A79; Wed, 10 Jan 2024 12:41:29 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6F944E2A79 for ; Wed, 10 Jan 2024 12:41:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5AAFE3430CD for ; Wed, 10 Jan 2024 12:41:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9896014B1 for ; Wed, 10 Jan 2024 12:41:26 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1704890461.75eee21436198227c02ae33e67d718c626cc2646.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/files/, media-libs/opencv/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/opencv/files/opencv-4.8.0-fix-protobuf.patch media-libs/opencv/opencv-4.8.0-r1.ebuild media-libs/opencv/opencv-4.8.0-r2.ebuild X-VCS-Directories: media-libs/opencv/ media-libs/opencv/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 75eee21436198227c02ae33e67d718c626cc2646 X-VCS-Branch: master Date: Wed, 10 Jan 2024 12:41:26 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1b769f49-1873-473d-b242-a3d03b257a26 X-Archives-Hash: fa140ca8250c90b32699d9652d2edfba commit: 75eee21436198227c02ae33e67d718c626cc2646 Author: Paul Zander gmail com> AuthorDate: Fri Jan 5 21:20:25 2024 +0000 Commit: Sam James gentoo 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 gmail.com> Closes: https://github.com/gentoo/gentoo/pull/34663 Signed-off-by: Sam James 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}] +