gentoo auto-resync : 24:12:2024 - 06:30:57

11 files changed, 41 insertions, 12 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 2adaa73d4988..6e463c1d8450 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index d81e670ea59d..e0e94d180a6f 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -1,4 +1,4 @@
 DIST harfbuzz-10.1.0.tar.xz 17922136 BLAKE2B 7d78e31d045b984d8d1a8b1d1f8f282ff9b7dc748ffd65355266266e75064b14eb94ec6b1418e208ebb0fffb99ef174d1978ab14f0c318c1112c2d8005285979 SHA512 14b0e8fd417af9c78f36e532e3737c163902b85837be1028a8fd569508639b87afeb56f70a2313ba2f0f6d4b72bb6cee0bf50fb333dfc503c713e4d9cd86e9c3
-EBUILD harfbuzz-10.1.0.ebuild 2412 BLAKE2B c8dd2032d78c0af08f0b20b17c285c9b6a9d55550f951b5555f8b45e99884c08fdc7fae71e2c57f5d42e220566d1d8f52f5e0e7bb3501d3c52a80b8f65ac3b25 SHA512 21153ddb24dd2b80f14237d6667ff2f6f92f12da835d219a88733f15398f3d9212b1f638acf4f700201ae1876f99161ec37ad24dbc55236c4cf4d8e95cf2c4c3
-EBUILD harfbuzz-9999.ebuild 2420 BLAKE2B 9f13f312444fb438d920d46b82bcfa7fa3400dfb9064b9015efce564b21d69d6be7932e19042aa474b890170c5e8c3b24a0f05c49574f828d096b91d231003ad SHA512 986cdf49bb95513a02ad2e9bfe7399787aa5bb0c57eb964784d47f951dad66660221a49c3803a5eb7090f86a4a4e57721b086ec00b3663c5ff4061808b3b2883
+EBUILD harfbuzz-10.1.0.ebuild 2389 BLAKE2B 14dfefb842168446682edbd996827c0b32c163fd7997de89d7c43182bd90c0b80bf8ad799170ed0e948bea13ec301859d592712a66d8f97e1645b57507f782c0 SHA512 33ee38ac532f32abe13b45ce708137b09801fa16043e9e51ac64993df503de3e50a2e4f3f6e76295b09492a8f7ef41df3c9a8fec826bc9659d31a3a06fc8a9a0
+EBUILD harfbuzz-9999.ebuild 2397 BLAKE2B 55943323290a4ac4a01d5b76dcf69a931d9aac34dbc97a14843d506946ef71dc3895957d4171ab51e4cb24471e0ac8573bdb32ea5ee2898c19f8654e75bea2fa SHA512 1eef336030e753372c8369d2943a9fb393d414621f39bfa4f9b7d556673dac5b369c80d8108cb4655dd5207cd00e0076dc51e4cd36fb6cba4a7f408d7402a3a2
 MISC metadata.xml 649 BLAKE2B a03eb9e2b09fab01af900957a9f5d0a43836a77ce770bc2327bc8da299139d1175b59cc413d0a02d74d4fc4169ff3c9180a5c1cf8d6ff570b054bbceb55e89ba SHA512 94c0c007157e240abc17056e2efe877770ee0267bf9d710fdbac796110f4507d2bc628c3b22f74652a9c568e7c60fa513e680aeeb8895831aafede268c14be70
diff --git a/media-libs/harfbuzz/harfbuzz-10.1.0.ebuild b/media-libs/harfbuzz/harfbuzz-10.1.0.ebuild
index 65c323f24324..771a0996c06b 100644
--- a/media-libs/harfbuzz/harfbuzz-10.1.0.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-10.1.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{10..13} )
 inherit flag-o-matic meson-multilib python-any-r1 xdg-utils
 
 DESCRIPTION="An OpenType text shaping engine"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz"
+HOMEPAGE="https://harfbuzz.github.io/"
 
 if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/harfbuzz/harfbuzz.git"
diff --git a/media-libs/harfbuzz/harfbuzz-9999.ebuild b/media-libs/harfbuzz/harfbuzz-9999.ebuild
index 7214ae683e59..d5fe619aae87 100644
--- a/media-libs/harfbuzz/harfbuzz-9999.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-9999.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{10..13} )
 inherit flag-o-matic meson-multilib python-any-r1 xdg-utils
 
 DESCRIPTION="An OpenType text shaping engine"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz"
+HOMEPAGE="https://harfbuzz.github.io/"
 
 if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/harfbuzz/harfbuzz.git"
diff --git a/media-libs/leptonica/Manifest b/media-libs/leptonica/Manifest
index 4aa7380ec950..ee82783ce96d 100644
--- a/media-libs/leptonica/Manifest
+++ b/media-libs/leptonica/Manifest
@@ -2,6 +2,6 @@ DIST leptonica-1.83.1.tar.gz 14028566 BLAKE2B 56c501f16eb58366e4ed2f168f714adef9
 DIST leptonica-1.84.1.tar.gz 14102299 BLAKE2B 1da9b5bd2b72fa82320126dd8e6e647fbc50be0dcd71a0f8e392d9617911fe4f224d51158ab230476afbf7fd0e15cae1b59d8469cbf68a43893ada09a8d93673 SHA512 949be33a09e1dfc04527f5401d3d682999bd6904dca0b4950b457d12564e3290ec5b62ab4b14ef14d6f499a0fbfa0ebc37c2e8ab2966913883127b9489f47e97
 DIST leptonica-1.85.0.tar.gz 14757419 BLAKE2B db26f30121f8fa7807068d3e55c1cc3ed2f8a7a6f8bb8cc46a240257d11842000b63a4b08542c87a90bc446ccb53a1fe36823661416ec120da8e9b199ddb8def SHA512 ad097f8238bb88f044511bedb6debfb8a1492a4636348b21ce103034d3878ae1097e7ca8de9c39ef01f34589526d7e8aee68fb1b83aae5ffc0026c04360b882c
 EBUILD leptonica-1.83.1.ebuild 2066 BLAKE2B b72ce63ca165aea03f386bc43f5be4240d1a342ac7c9010a7a9fe46d6b1f0664e11deb96236d93f087c2bbd28df69457c4ac37cd2c5d82b3e6e499cda8616c8b SHA512 468c40bc767edaec9b4b7f285f568420908ee791567d281fe39d29e2a3484233eb0fd671b124c2c4acf9e71fa4a8ffe5e48c8b24f96a35c20dc1c41f372d283c
-EBUILD leptonica-1.84.1-r2.ebuild 2085 BLAKE2B 645debca4868a3858a8d9777bb0441370f1daa2c17ee372d61dcfb3534a915c0265a0abfe39222c4bf3fe0e627fe4f3ff1452fde0dc412f6985438d7f8f1e828 SHA512 ea3894a80ec10e00df2378851031d5a0dd8d660431720972e08198fb9bafa7bd27ae0ac6cb80dbb997196fbaa624f136d939c8b19b7a65f3c8ae8db7514a3a4d
+EBUILD leptonica-1.84.1-r2.ebuild 2084 BLAKE2B 3708f80a31d4b25ada027601c944bcdfaccb7ed70519b215dabf084bd7c0dd46c6f0c81fc2af22c59349a9fbf786f39db26b62eb64b9e5cb498ddcec4b3d07b8 SHA512 eb11e0a075c7f5c1df373e8c3c839e4f6b5ae8644d6dc412160dd1e7ecfe30e9c4a83c7deef7ecb6d527596f47343cfa12bd04ff27490d964a3240b7282c2428
 EBUILD leptonica-1.85.0.ebuild 2089 BLAKE2B 73f72e54751b764805a9a989380a9a95b12335dac9a6ed95900592de021309603685b53ca41d1d552fb009bf32db93ecbaa0b04e5e459fcd9807e748d9807c28 SHA512 77c35f7ff8733ab08a76ceea9664e5f5e4db4059e1357822647fd8dfeb8c3063fc0f1d0f9ea27add800312bb0e94a3689d1409b5b8ba27664a3025c05ea9a630
 MISC metadata.xml 669 BLAKE2B 27b4a63ae3b2603632b28a501a22ea6142f35969386be65d4b4ded7311a046d21d7a4faddcb1558a3872e80d708eeb22bb2d03a90d009383c3e34016ef1778d8 SHA512 3a547cefac4630ed8fc4b041a1925be4f3aced7aff960b7e98109da12d9c8e4e2ec3a85fae9f991516cb67fea4e9edeab1c46280741795991e01b0ace7aa9d16
diff --git a/media-libs/leptonica/leptonica-1.84.1-r2.ebuild b/media-libs/leptonica/leptonica-1.84.1-r2.ebuild
index 40dd63bf68ca..1d72ab53ffd1 100644
--- a/media-libs/leptonica/leptonica-1.84.1-r2.ebuild
+++ b/media-libs/leptonica/leptonica-1.84.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/DanBloomberg/${PN}/releases/download/${PV}/${P}.tar.
 
 LICENSE="Apache-2.0"
 SLOT="0/6"
-KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc x86 ~ppc-macos"
 IUSE="gif jpeg jpeg2k png static-libs test tiff utils webp zlib"
 # N.B. Tests need some features enabled:
 REQUIRED_USE="
diff --git a/media-libs/libshumate/Manifest b/media-libs/libshumate/Manifest
index b2720a73001c..f6d5e4d96e2d 100644
--- a/media-libs/libshumate/Manifest
+++ b/media-libs/libshumate/Manifest
@@ -1,3 +1,4 @@
+AUX libshumate-1.2.3-json-glib-1.9.2.patch 951 BLAKE2B 09de4b923c53859e05dce1d953ddf64efcb9ecc70bbdd2592816e9db28c63b229c3616c7888ae080e1246943d4017a9f9757333216cfd4c0c44452cbd4d12e2d SHA512 964b86217875d100ab7694670bd0b5462b4d6e7c97f8cc2c59b8ec38b51d2b122b96d22571aa6002e4dfc97ca1c64e94258314454cbade7fd91d579e9d96230d
 DIST libshumate-1.1.3.tar.xz 299644 BLAKE2B f07a583e1fd142a0601c725840e84397ed04962f828cbc15217dcdc0d767015664a06252879416e9422cb32154406dae2742ffb511404c5923ce9acab7efae0c SHA512 163cce5c9aca2f3c52da3ecb3b4a651798e314d38a145ed4c69b0510303c72a0934c24084036ca2dfaab8b008753a37f7116b0bd2907cddc78a2aceee4f847d2
 DIST libshumate-1.1.4.tar.xz 299700 BLAKE2B 1f60b0807d99c8ea675be2ca85ada1929c51aa1a5f27bb5565ddba062626c4bde447f95ad4b7e02b6d3f57af1365501e64b5bca18dc566b3bf0ae1f47d5c638f SHA512 f2bb90255a43fbdf9b17bd69260c9054378959900adbc26db9b7417f98595f1d5c9221db4f31b78a546f7bd30d95175f4210fc7db11db6704d7de4c9ad000619
 DIST libshumate-1.2.2.tar.xz 321216 BLAKE2B f0f26798fc9a32707d5e669c0af5396ddcdff0bea9f93150f29751ab952f72bfed457f105ea0835d3b31fbb3d66934139e1a6a06e1d056d47bf2f270cc32b23c SHA512 9e1f3f26aa591ac681ccd4613ae921f4e3f3863bacd0a0dc3be56f52749135d6c035535111808d18929d5be2a6461a47739e586f20081f485bb992b4e0a22c3a
@@ -5,5 +6,5 @@ DIST libshumate-1.2.3.tar.xz 321768 BLAKE2B 42349a0d96d35972cf5440470983792ffe89
 EBUILD libshumate-1.1.3.ebuild 1608 BLAKE2B 7ba44ffb6b282e97b5c25fa9eaeaf09d8ea0448664b8d9e1a3e646f0a4c130af9ff83f5f0fdebcbe3030a80ce0fbff7827f5d2a2085e023bd49172360f6e6353 SHA512 c9f976ad26fdf93d058c64100f9db65fd9f9242fa146a7f551dec1ea5749a22581d2a51518689daf7800ed1be173cc77b5cf88852546c7e2f23c5ae7831c7f0e
 EBUILD libshumate-1.1.4.ebuild 1611 BLAKE2B 5dc2303798124fa9f570b592951c3b7820cde4847c4e7d1d6ae6877c7a811088597bc8fa4e5c40083c487afb38d78035a27c22dfe5c2d532a2329a61a226623a SHA512 25a71dfb501c443f83bc1486bf7fa6532eb04d28401bce4f54bbaae83cfd7d43660ebe2fa7d8e5565590332cd5712f181c8b1a8488080bccf3f3b50a02b8d0f6
 EBUILD libshumate-1.2.2.ebuild 1399 BLAKE2B 007218fb1c6fb00949ba4b63af434f7329f087813f8b3f04b712a2f945d6cda1da0bf8315545e299cae676f2dfe95cf21d402be3c02f1c0900371624ff5c3832 SHA512 7c83e5ba08fbf90b73be399b875c5d83ed7378145a26738f83f4b6762a1c94b2e7e572e0c2ca222e0f6cb21b144cdbfa8faf0ca117327118645b23aa01a5c854
-EBUILD libshumate-1.2.3.ebuild 1396 BLAKE2B 167eafd6eb01ffdf413a81a73a87a8b36c4183ea2c97531fae9b3a94e21b2d54fab540b1424676520aa4064482802e23ca4f6150a26a3998d64081544f59e6c5 SHA512 0b2da140c256d74b2753e3fa03e51c6cf429d389ea1117885ede2dc35237cf0422969546c48ea6578f77116d7a9235bd9fe164d6b826ccc22f572694500d8a07
+EBUILD libshumate-1.2.3.ebuild 1458 BLAKE2B e81f9ce067ba2ae63abfaea3851e790d2af1a16e5a03668d395207fedea4fcd388e34217721f8cd91f77da692f8400b43bcb93bd0ef8d81d769dc78c0639bf90 SHA512 80e0c7ba4d70f53c30764a3a38d108411c028416021f7c54a8adffc5b9100d73d1e398bdec36a0497cb59cf641b024cd820c8ae43a52e0f145ef9dc585c6a789
 MISC metadata.xml 445 BLAKE2B 58a069a9ded7b8fab96c93fd3b11e1fd7b4ae4a58966f5bbeedb560547005a56f62167bc31aa5c05ca68f1855e12c2d915825922d5b6504e359893e0786579a5 SHA512 3e5352258641f4a9e6722777971cc3fb02359e831708c1749f2d77c7b15d147adbf54097d311435f5220cd49bab9e298b3379f4a59c0f4563a6706f608343299
diff --git a/media-libs/libshumate/files/libshumate-1.2.3-json-glib-1.9.2.patch b/media-libs/libshumate/files/libshumate-1.2.3-json-glib-1.9.2.patch
new file mode 100644
index 000000000000..113ab9411089
--- /dev/null
+++ b/media-libs/libshumate/files/libshumate-1.2.3-json-glib-1.9.2.patch
@@ -0,0 +1,28 @@
+https://bugs.gentoo.org/946836
+https://gitlab.gnome.org/GNOME/libshumate/-/issues/81
+https://gitlab.gnome.org/GNOME/libshumate/-/merge_requests/245
+
+From d1afd9316e0038c036c326ac5133502103fb9ecf Mon Sep 17 00:00:00 2001
+From: Marcus Lundblad <ml@dfupdate.se>
+Date: Mon, 19 Aug 2024 21:17:37 +0200
+Subject: [PATCH] tests: Escape \n in test with \\
+
+---
+ tests/vector-expression.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/vector-expression.c b/tests/vector-expression.c
+index 9e258fb..59d1d67 100644
+--- a/tests/vector-expression.c
++++ b/tests/vector-expression.c
+@@ -592,7 +592,7 @@ test_vector_expression_formatted_string ()
+   node = json_from_string ("[\"format\",\
+     \"Hello \",\
+     [\"concat\", \"world\", \"!\"], {\"font-scale\": 0.1},\
+-    \"\n\", {\"text-color\": [\"coalesce\", \"red\"]},\
++    \"\\n\", {\"text-color\": [\"coalesce\", \"red\"]},\
+     null,\
+     \"test\"\
+     ]", &error);
+-- 
+GitLab
diff --git a/media-libs/libshumate/libshumate-1.2.3.ebuild b/media-libs/libshumate/libshumate-1.2.3.ebuild
index 6f06f64be274..21cd8ca9eff9 100644
--- a/media-libs/libshumate/libshumate-1.2.3.ebuild
+++ b/media-libs/libshumate/libshumate-1.2.3.ebuild
@@ -33,6 +33,10 @@ BDEPEND="
 	vala? ( $(vala_depend) )
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.2.3-json-glib-1.9.2.patch
+)
+
 src_configure() {
 	local emesonargs=(
 		$(meson_use introspection gir)
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 49b4b69c45a5..3a8b3e653750 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -31,6 +31,6 @@ DIST opencv_contrib-4.10.0.tar.gz 55387316 BLAKE2B 5d6f884817b6d45b86833fcab1e31
 DIST opencv_contrib-4.9.0.tar.gz 59803362 BLAKE2B e6b90e9bd462f96ef010490d45105d7125622d6c49912653c0d387568ae7109b1cbcac4cc0f52c1f997a45ed75923caea90bf4ad9336e689a56742b029789038 SHA512 ebaee3b88bd7ae246727e65a98d9fbc1d9772a4181a1926f3af742410b78dc87d2386bcd96ac67d7fb1a3020c3717a2cdebdcf9304d6dfd9ea494004791cf043
 DIST opencv_extra-4.10.0.tar.gz 504349887 BLAKE2B 6e76860beb95cf00698980a19cfd2894e5bfe0d477d94352cbb2ff98688acbc1c404953cbc3baa95453588e7b9063175a067f24006c5d2719a6c75d15f2ef891 SHA512 1a581dad61bc1e5075af5afed2dd3d67793232a9e1219408448d08c518ae714cf0c4d5fec2c25791351a49a0d265fe051ea142b2170f82843e19e82f65abc8c6
 DIST opencv_extra-4.9.0.tar.gz 502141517 BLAKE2B ed7351f29c6fb80d56d5ef383af68322fa805c7689132f7ca9bb43c9a1319c5876ce6d5c40d583c955eb255dd82b876c94ed42625cd71b13830ec94b2cc75dc2 SHA512 f05c1eaed491d15107c858af5b33d0d5856070dcb6f94491ba33a172b2f0caf34905eb5d1787e1247bc888626478647fce0db7f3ccbc6d6faba0ee43fd6b6bfa
-EBUILD opencv-4.10.0.ebuild 43117 BLAKE2B 7e1e01182af22bd446df84ffd8f14957ff796938ca4c07fe14956133887208de14da983d484e2ea4ec93e6cb2868fa65f457d2e5fcf52d5c8c03aa1553752127 SHA512 a9ae7afb3b9b363d0317ca55c6e30b261fb3dd3050a235ed0fb3b957086c1e90589e7e0ad92b7d19dfa757859426844b5c0396e914876424eab00cac7db14069
+EBUILD opencv-4.10.0.ebuild 42997 BLAKE2B 355830c194b7d4435892491ef134732244fe54c861aa3a0f6b5757dba279c54e057994830b38068e0d10d8cc5e71d3da71b5776b5c587d721131e2eb2efee8e7 SHA512 b4745ee70eb6be7fce9e0ff5ac3a4649ca5fa5e2313967cddddd34fe3f753d980184f7db3ba069d49411c16585cb9ef19b454b62399285829399a6619c241fc6
 EBUILD opencv-4.9.0-r2.ebuild 35016 BLAKE2B 2f355e13f1a13e8d6b039ac8dea37fae80e3a6b3464406a668d809cbadb046b34afa022240fdfe474106543e28686b7b8746a391e06807bf8656ee0cdb657ae9 SHA512 f65508a457c94c903b045384f6afe23ee3730cd92321d959c51525a7e9e2c5b18b48a5c5d1c7fec3621af5d5aad28c09ad31311a46504a6ed340bb39bc15ce9a
 MISC metadata.xml 3937 BLAKE2B 5c56985141668333faa8e5f6f022207639cf1494bafba5ecfaf920b67a6b5de18d58c8535d2462ea6c973501400e927e5d15b220adc8b17dab78a184304849d3 SHA512 35cf8694e0a6e5a8017cff560238fc064493100da17bd35dc0ea926cd9a8e6de440cf1d860dc29df9b197c2b4f54a1e50152b495580f165ba44805443587672b
diff --git a/media-libs/opencv/opencv-4.10.0.ebuild b/media-libs/opencv/opencv-4.10.0.ebuild
index 83956ab44a8b..8db8ddc087ef 100644
--- a/media-libs/opencv/opencv-4.10.0.ebuild
+++ b/media-libs/opencv/opencv-4.10.0.ebuild
@@ -565,10 +565,6 @@ multilib_src_configure() {
 	# bug #919101 and https://github.com/opencv/opencv/issues/19020
 	filter-lto
 
-	if tc-is-gcc && [[ $(gcc-major-version) -ge 15 ]] && use contribdnn; then
-		append-cxxflags "-fno-tree-vectorize"
-	fi
-
 	# please don't sort here, order is the same as in CMakeLists.txt
 	local mycmakeargs=(
 		-DMIN_VER_CMAKE=3.26