gentoo auto-resync : 18:03:2024 - 06:49:50

7 files changed, 18 insertions, 8 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index da906bc26b60..a2b2d1c5df8f 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/openh264/Manifest b/media-libs/openh264/Manifest
index a091649c8cf5..14ba7dfa31f8 100644
--- a/media-libs/openh264/Manifest
+++ b/media-libs/openh264/Manifest
@@ -8,5 +8,5 @@ DIST openh264-2.4.0.tar.gz 60297968 BLAKE2B d725896979e8178277e304ac0d94e59f0971
 DIST openh264-2.4.1.tar.gz 60297304 BLAKE2B c66dbe8003072c406641b3f1453df6d8e574b5526d6748d5f4efa4921ca6a438df2e491143dc07c8f9297d253e97cd4ee2dada450845e7d9323cb31dddc6fff4 SHA512 eb99144addd2e9c352bb95e752366e104ac6b0ddc84311dc7c87dafb803f8e7fe4d1e726833d49f8cc6d3914508e19c3a25ef82637a4993e8af3f504aa005baf
 EBUILD openh264-2.3.1-r3.ebuild 3949 BLAKE2B 68b79ae51de85dc5c4c19fe2f1d5460ce8d0a076e3201d68cafbe0155d9c2d49f127919e30b1d16ce6dc8b0b2359bcdbf8d586c42c95cef2b77afc072fb4f91b SHA512 50aec0bab131871d007a1915c5305b76ea3e1c1f91741ab3596d05a6ac8b0269e57243e4b0ed2a56464c5ddce8a95916a4f8035a1bf5440c4dab75ea09e404fb
 EBUILD openh264-2.4.0-r1.ebuild 4075 BLAKE2B 13b56a985102aa4ae61278ec4105fa7f41898b4e69a617b569aa3b6217bc9f6db0da1ed2c199cd3e34892ce9f51d9ab4dcc4daeb57b54cff7f322f6b5a67ee6f SHA512 09d887692e0434fc324b8b76db18e2d7f3ee225d31ed757f188f4192863af7913a7e2884d3360fce636445f832e111e69705369d62efd9ea665b578218a72987
-EBUILD openh264-2.4.1.ebuild 3950 BLAKE2B 430b29c0c6015c750152a36c3a6b4588dc698b0b7652ffcccfa99b815ae469df3e825c2eafc76aae6059de7b75ff7215f5158730e876990308590515e04f7dca SHA512 abf8deb75d9de5f79c571da76db3bd15b34cce558aba315d3c20611e4f055521fe63484acc184982c16a50d2577455353ac711c58afa4c970308ee54d638edd5
+EBUILD openh264-2.4.1.ebuild 3949 BLAKE2B 8cabac671c0ce0ae21fda65955ccf6cd63fc5ad92136ab0c4454e9b8bc03825584380746a8edad7fdeb654ea805bf918e8970d8656dc0aa89ef931e462c2a6c3 SHA512 1eb3a1453db5ebb645e3f1f664c0ea35bad318225ce8f81e0f3dfab257f5cdff0ee584275ef1e218e851287fe1905f72619c9ec877801ae3308549bcf73f7962
 MISC metadata.xml 627 BLAKE2B aa6bcd394a1b792f8d0fc89030f34df7f0366f049f52ee11a90af301ca901a07acfc1d34a0d6d237a7d713db53b707b3b9f08d3c86574d6067f6ff7e8cf99c3a SHA512 55a7a5ee5f716e9eb1e5711d45a93fe27f057b54240511de72ade7f88c53eeac72f1bf1b524d22278c0fafbea70e1b5892262ee1b97370d70a0258bad7220e30
diff --git a/media-libs/openh264/openh264-2.4.1.ebuild b/media-libs/openh264/openh264-2.4.1.ebuild
index 4b0b071171da..e3de53822e92 100644
--- a/media-libs/openh264/openh264-2.4.1.ebuild
+++ b/media-libs/openh264/openh264-2.4.1.ebuild
@@ -18,7 +18,7 @@ LICENSE="BSD"
 # (2.2.0 needed a minor bump due to undocumented but breaking ABI changes, just to be sure.
 #  https://github.com/cisco/openh264/issues/3459 )
 SLOT="0/7"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc64 ~riscv ~sparc ~x86"
 IUSE="cpu_flags_arm_neon cpu_flags_x86_avx2 +plugin test utils"
 
 RESTRICT="bindist !test? ( test )"
diff --git a/media-libs/sdl-image/Manifest b/media-libs/sdl-image/Manifest
index e2d2d241f517..1ceac135d7fe 100644
--- a/media-libs/sdl-image/Manifest
+++ b/media-libs/sdl-image/Manifest
@@ -1,3 +1,3 @@
 DIST sdl-image-1.2.12_p20220527.tar.gz 10888198 BLAKE2B 413e130794ca3c59226e18f4380bc34fb497aadbe01da67ce2c9c76ebbaa5d3e47bad31043d823510ff62ef4bfaa4834d57799b7ea733f11ab66e58b37007583 SHA512 e0a091e1f1a646409c2f636b6e913b6532f31fa498a234fc669dd56b75dda34234818a22d7c3b5385cb50eb3af53316fa2f658a6739b40e4dd5d9513118143c6
-EBUILD sdl-image-1.2.12_p20220527-r1.ebuild 1867 BLAKE2B 2a7f171f2f383300e040563aadf9d6a582d65711589e7732515988c3754944f7325890e09fc0ec99be76ca7e1fe17f486b9228f4aa6d112bed68a8d52222ae6b SHA512 bd15244f9f8e281ae179ab0dd9a058518322cb775b20f17d722238928071a2db5bc02efcbd1691e0b5efc4103457bc01093a418091ba653f4e7445ccb97d80c0
+EBUILD sdl-image-1.2.12_p20220527-r1.ebuild 1918 BLAKE2B 53fe394e244e483d406e3c485e80e176d4ca6243389f7f5c7183df938f45d55bc0e2f8b6854fbf5717f896560364ea0e6dcf9d59b61d6adb67ed71ab627e5387 SHA512 390c6d81d00cc7e28058773e0d318158cfc7da7234b01aa15c98f945cc3efcde7f32861e6121dcb817f9b4b3cad53c2e9f76ed8695294649f59a82c34ab13c3e
 MISC metadata.xml 365 BLAKE2B e7adf1771a0e52171d5ace8c77b8fb4b65019796c885f279e813b22f5a1abbefcee1fa9189a479788db4e5d1d2b96cf61f79e6881c816a19f0270fb69521e8d6 SHA512 80cc2d8d6af06bd4a43448c91747a2f04c477a59e19c9b46007b444c949e60664c26b8dc51755b67d7dfbd13a218b4126301f10fa3074d65740a8bfc7a0fe477
diff --git a/media-libs/sdl-image/sdl-image-1.2.12_p20220527-r1.ebuild b/media-libs/sdl-image/sdl-image-1.2.12_p20220527-r1.ebuild
index ef69929df5ef..41ace8cefe08 100644
--- a/media-libs/sdl-image/sdl-image-1.2.12_p20220527-r1.ebuild
+++ b/media-libs/sdl-image/sdl-image-1.2.12_p20220527-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -7,7 +7,7 @@ EAPI=8
 # or take new snapshots every so often as no SDL 1 / 1.2.x releases
 # will be made anymore.
 
-inherit toolchain-funcs multilib-minimal
+inherit autotools toolchain-funcs multilib-minimal
 
 SDL_IMAGE_COMMIT="633dc522f5114f6d473c910dace62e8ca27a1f7d"
 
@@ -32,6 +32,11 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
+src_prepare() {
+	default
+	eautoreconf
+}
+
 multilib_src_configure() {
 	local myeconfargs=(
 		--disable-jpg-shared
diff --git a/media-libs/zmusic/Manifest b/media-libs/zmusic/Manifest
index a0713c8a5fa7..f03291d91f9b 100644
--- a/media-libs/zmusic/Manifest
+++ b/media-libs/zmusic/Manifest
@@ -1,4 +1,4 @@
 AUX zmusic-1.1.4-gcc-13.patch 4687 BLAKE2B 357cc66bb9a639f3e3507484aba5cc179b4a20f09a7cfbdd1d9e4be0bc77daa47ed7653ac3d7f08817879744bd516b87cd01fbc50251e8e374d205cf239a89d8 SHA512 433b7309a3528f6cf8f82f853dde936507bf3477f1278eb8cfd4228a02203611c150af8e08e7231ac60b4844ecafe9149d0a532154a876f7d3d8afc6a752889a
 DIST zmusic-1.1.4.tar.gz 1809045 BLAKE2B aae64fa8b10b44d79ce4738527e613e65c65a8e367dc998f966938ccc10b9689a58decb702c1ca943ed3371092b69ed91dbe4645b707626ac525d29d750334d5 SHA512 5188fb095897769514c4a4698fabb5640e7ca86fe0665d4bfe6649a940b00ac02d87decda626be8a848ba6db0a468cc985d74d0fda2d3da8657fee079e0bde73
-EBUILD zmusic-1.1.4.ebuild 1277 BLAKE2B d0b9d6777e7e4df7896bc57148839f67870e99b43cc1d485a250db64ede3814ce81e2cb50f22c7a298264668b2c553768b4f18df14d88d9af64da472292154fe SHA512 8ff6a43b32fcaa2e2adf26719ae4071defdc3bd8aa716947a04b0a1ac933c234a5039da36e9b232e17b320bdbe953b9c58c5738439e4fd6ac4fdb85603c1ccb8
+EBUILD zmusic-1.1.4.ebuild 1397 BLAKE2B bb2fc347aed87ad739f46756d82ec923dc0b9d2c6f304b831b0a822d405cab4128093e6e0fb6989d36727f61f147a07e729a8e5742a802514d3b50ef1e1029d1 SHA512 7584aeb23e6fa02a52383192f0c68b30bf2659dfdf9190cc0dcd05447b62b0eb1614013e73588ef4266f222616768a2f16d537cebbfb730a58cd1159c60d95c3
 MISC metadata.xml 603 BLAKE2B 52e13af0f2edb86d365022e7a128c24c14ec3ca713934b807a4bcf017d8441cd83665b1cc2a99e43740ec199254163a32c2da34b3d9637e063e033c0a1b87c8f SHA512 fc3edde4fb851282af90a21d936e7d9b143a18f17a2074b942a284ff2a2cfd2aaf989d300e750e35d13777c123919b1c27a8de0f02814432ea11b4309b3d060d
diff --git a/media-libs/zmusic/zmusic-1.1.4.ebuild b/media-libs/zmusic/zmusic-1.1.4.ebuild
index e3c6a68b03d6..4b2775a4fc4f 100644
--- a/media-libs/zmusic/zmusic-1.1.4.ebuild
+++ b/media-libs/zmusic/zmusic-1.1.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake
+inherit cmake flag-o-matic
 
 MY_PN="ZMusic"
 DESCRIPTION="GZDoom's music system as a standalone library"
@@ -35,6 +35,11 @@ src_prepare() {
 }
 
 src_configure() {
+	# -Werror=odr
+	# https://bugs.gentoo.org/860117
+	# https://github.com/ZDoom/ZMusic/issues/56
+	filter-lto
+
 	local mycmakeargs=(
 		-DFORCE_INTERNAL_ZLIB=OFF
 		-DFORCE_INTERNAL_GME=ON