gentoo auto-resync : 10:01:2024 - 19:03:44

4 files changed, 8 insertions, 29 deletions

diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 7cf5d19a67ff..c510aeb1eeee 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -6,7 +6,6 @@ AUX opencv-4.5.0-link-with-cblas-for-lapack.patch 726 BLAKE2B adbffd961c88229bf8
 AUX opencv-4.8.0-arm64-fp16.patch 12222 BLAKE2B 18803d74cb57bbc303c8159ca69d24dcc47d00a314bfdababeadd3b85306d289c8b35a1106011086931396e0ab82d98964434d0c0eaa34c25451c766ca9b9199 SHA512 1d9d42a711a1ae0ec7f1f641a68271d4b36f6b8701997a05d65c633d3531cad75e4edbf71c4f80cc59a9a14baa8ddebf19081dc67b99898dce13da8e3746227e
 AUX opencv-4.8.0-fix-cuda-12.2.0.patch 1920 BLAKE2B c43157c4859666a962fa40ed435aeab6b17ac01b9b67dbba0955fb7c009504b1780f5de2a40ee63db245cadf0da41b40fda0d7e06ad719071b12ba385f693ea2 SHA512 5ab0c15811748307971e8939a40c08c2c9cf3e38d2acafff72a3890f6d7c7133d8c7a087cf1a05b2dbe1907dd88911872c61c10f7638edb46ee679f658b265c6
 AUX opencv-4.8.0-fix-flatbuffer.patch 1764 BLAKE2B 806f61bf7017fbcb5b5058686db9dd2272eb61d6a2952f0f029bc76d62172a18f9a21661426f13cfd5066fc60710b218bb9b2dfded61e33040469da0e0b72c94 SHA512 2679f52c3df16b7daac1fafa0b24796568a2555de03805ee6ee6b2e08a2be9f63fca44c1b472f5ffe2dfb7fe8b3d754b3ba39a71419974613a9b3de70a09cefb
-AUX opencv-4.8.0-fix-protobuf.patch 543 BLAKE2B 2c3ac7ddeda366cb117d5deddefe732dd6918bc54e468b1cc8d95e40bb9e5cde1776046a894e8f26416edffa39dc6c97547cbd688e0566587f9690e721b4c1e1 SHA512 799e3f3d019624476a285c2795d28f022bb126e9b9f511b153aef131a7cae2e3fb6361bd21b7ea34dfea984e3ef9e1a0a40d09a5a72a808a31e1eb15548b15a7
 AUX opencv-4.8.1-ade-0.1.2a.tar.gz.patch 652 BLAKE2B 91b933513485c5e4a33b3711328f01752ea8f77bf26701744ff9a7d56f899227c1f5899dd68ec7050929c2068e2d5dc805533173543ac0ab5a5db827a6d075c3 SHA512 61267dae88ca1e9f5d99e6d57101c0a0a2df2bc5fc9f646d14953707f8c1f4fc9f58e7861b007f5970603f267f797c43cbc35e29aa66e343fcfa6e568750934e
 AUX opencv-4.8.1-drop-python2-detection.patch 1041 BLAKE2B bd7c4f66b36d04b57a4493df1b00ee6700ed6f28464f2538bde62d2b2a3d29ebb82946a1765540e6977ce6ee111dc2f37c3419ee74536f9c55340ae2e550d48a SHA512 7e5e36fa1fc312a4c791c099618c73b2f4ed5810a66f4de4ead5d0f5917d60c191c55289538bf908bcfa45522939ddfac62505e79fbfb7c3ea046a2027b576ff
 AUX opencv-4.8.1-eliminate-lto-compiler-warnings.patch 1241 BLAKE2B eead5a16616fd9afcced21180e8e336e32ad387ff4010c55e5edcf2f81f09244c4914c98ab0439911f5ab8df1f61527a83ff5f09db65743fc5266748fc8bf969 SHA512 b3907b9d9f96f107fd27189961fe1a15b5706f66524cf21ea342ed04eedfa21c08d7572001d3afb70c54a7bfef56093fd7f8ac7a5dd9ea768f1b0412b5658eec
@@ -32,6 +31,6 @@ DIST opencv_3rdparty-a8b69ccc738421293254aec5ddb38bd523503252.tar.gz 920403 BLAK
 DIST opencv_3rdparty-b2bfc75f6aea5b1f834ff0f0b865a7c18ff1459f.tar.gz 10036903 BLAKE2B c13559569808db24105049e2081bc466c0e8b6dab58bcc69001e49ff82e03ec4701e25648b5e542b7df2c8e522abfbd82c9825e66c37d6a673847b41bf6effae SHA512 3fc44f12802aa1dad0b12372d53242ae2134a2d74ca0b6d8e4639551623426106781a41d77ebfce79ac625a49aec26b0d7425e0d31f09bab6a15e3d43caef8bc
 DIST opencv_3rdparty-fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d.tar.gz 1470898 BLAKE2B f1794cc8f8684501f670db3d720c02f35c57ebe91f276cc21dea1f1c1426740d03569143fec74380e941703b5086db5f013ca913fb296eda99559115fd53ca30 SHA512 07118b9d688bf0ff34a6e4ca1548006124d80d11e7b48f08c9e1910b64249b1dad0ace460f50adda0ecb69b90871fc59cc25f451570c63f7c6d6ba2b92d8801c
 DIST vgg_boostdesc-3.2.0.tar.gz 1867770 BLAKE2B 1fa5b58e73b6fa56ecf8d19af22298f729942ee1369082e173445d09d3de767bf844bad3d2b462efc1199c392f37c88ba49a9996ba8bfd84b4abeba7de94db63 SHA512 4a046aedd639c8eb4b295b0f499e756deb66210ca083f0124c75531e540663367cb58f6d175f66c4713324177036cd89a8869bdab2de8d1736dafc7f00ef9f44
-EBUILD opencv-4.8.0-r1.ebuild 21546 BLAKE2B 188f2883b59013f491619ef99bce3a7baedaf63876f6a1783cc7216b850dbf16196779dca3cc1928c634a1fbacd20b99efe438bd831373f05486bfcd10b52805 SHA512 67a521b21c3126826377fd9d8f1b179860d1e030022931bd0bc9f6965ee0b2de2e3fc6aeaf33d670e9b5dd8e718396624be9b8a22538279aea27e21f0f79a358
+EBUILD opencv-4.8.0-r3.ebuild 21551 BLAKE2B dc795690c4d8672c82ce44ba3e7fb67c32206155cc18624109da4106b0eee16d03fd3591d843af6bd1b5caf0c5050c4ee75201758e8a0d764ffdb4195844f301 SHA512 f9d927735bdd34d41b0dcc9a2a7ce5944c7f40f75934b0e93574ce2619d06a0d01527a20c1320a9cfd907ce11f51dddb3de2e413796ddf9f2f90d3932db5bbac
 EBUILD opencv-4.8.1-r1.ebuild 21641 BLAKE2B 066ba03a545f0952f15b2061e183beb8ab6fafebbd8ae9c6d13f687189889abcb5158e8baffc106dd5e2ee2971ad2b658aa3699cf64c8f5adead3a266d6553ec SHA512 453233aa0c6075722810ba736c5f04bfb0eefdb852c51185aeea19f62d254a667e4b46757cbcb393024114cb9bbd16bbd0fe172241156a53dfc1a7cca9d49b8f
-MISC metadata.xml 3496 BLAKE2B 8b592d16ed3235c2bcd5f199a7a59c2c33c8d2d4cf5e7c894b09a82134c0b2a9339e79da7bb55be15a038142f9396be38265d5c8a8a28d347d2b4db86b550aed SHA512 58d09b8dfa586c9d7abb4d0eedbff2e079233627d7748c2c0504b5596227590e0bd5c77aae699b3f12bd33e298dde585ac9bd73f746cb19affe6dbe483ef5ea6
+MISC metadata.xml 3428 BLAKE2B 17df3db9dc912981f85b6dd7e500b593504fe6d17c85d1ebc07afa8ab04266489550b03aa20ee80615f52f8e2a206c77b00d9bfc9096bf77239378fa0874a0db SHA512 15e6dc56efd85d9b6d173979ef5edc38978cf31f0b2700674ffda5fb53923df77453234b431c21ff61943c57218f8fe4fe611701abb630c9867ed990cf953d49
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/metadata.xml b/media-libs/opencv/metadata.xml
index 80f1912bd4fd..fc1efa988e96 100644
--- a/media-libs/opencv/metadata.xml
+++ b/media-libs/opencv/metadata.xml
@@ -34,7 +34,6 @@
 		<flag name="gflags">Use Google's C++ argument parsing library (<pkg>dev-cpp/gflags</pkg>)</flag>
 		<flag name="glog">Use Google's C++ logging library (<pkg>dev-cpp/glog</pkg>)</flag>
 		<flag name="gtk3">Enable <pkg>x11-libs/gtk+</pkg>:3 support</flag>
-		<flag name="lto">Build using Link Time Optimizations (LTO)</flag>
 		<flag name="non-free">Enable non-free components</flag>
 		<flag name="opencvapps">Enable compilation with opencvapps</flag>
 		<flag name="tbb">Enable multithreading with the Intel Threads Building Block (<pkg>dev-cpp/tbb</pkg>)</flag>
diff --git a/media-libs/opencv/opencv-4.8.0-r1.ebuild b/media-libs/opencv/opencv-4.8.0-r3.ebuild
index e5f917168501..99a65fe7d7c7 100644
--- a/media-libs/opencv/opencv-4.8.0-r1.ebuild
+++ b/media-libs/opencv/opencv-4.8.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="Apache-2.0"
 SLOT="0/${PV}" # subslot = libopencv* soname version
 KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86"
-IUSE="contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack lto opencl openexr opengl openmp opencvapps png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
+IUSE="contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack opencl openexr opengl openmp opencvapps png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
 
 # The following lines are shamelessly stolen from ffmpeg-9999.ebuild with modifications
 ARM_CPU_FEATURES=(
@@ -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
@@ -343,6 +342,9 @@ src_prepare() {
 }
 
 multilib_src_configure() {
+	# bug #919101 and https://github.com/opencv/opencv/issues/19020
+	filter-lto
+
 	# please dont sort here, order is the same as in CMakeLists.txt
 	GLOBALCMAKEARGS=(
 		# for protobuf
@@ -469,7 +471,6 @@ multilib_src_configure() {
 		-DENABLE_INSTRUMENTATION=OFF
 		-DGENERATE_ABI_DESCRIPTOR=OFF
 		-DDOWNLOAD_EXTERNAL_TEST_DATA=OFF
-		-DENABLE_LTO=$(usex lto)
 	# ===================================================
 	# things we want to be hard off or not yet figured out
 	# ===================================================