gentoo auto-resync : 16:06:2024 - 00:09:44

8 files changed, 80 insertions, 61 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 5e3a545efc1a..70eed29c8754 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/audiofile/Manifest b/media-libs/audiofile/Manifest
index b80a2b1c3ac2..7c9c41dc70ae 100644
--- a/media-libs/audiofile/Manifest
+++ b/media-libs/audiofile/Manifest
@@ -6,6 +6,5 @@ AUX audiofile-0.3.6-gcc6-build-fixes.patch 3785 BLAKE2B 7f016bfa9af8a440e31bcc39
 AUX audiofile-0.3.6-mingw32.patch 687 BLAKE2B dec0680a401890f64a659a7303b089d03a40001d2b73da66c174663f818e5e72b7b8985e8fa220c15685b4cd857ba24cefb341c95059a4d9e10ae81a580a8f50 SHA512 b568b189f7316a41c724b02ee881adcdcb0e01fe22d4d6adc82fefef3296c34822943ec1cb299169dfd8fcdac9c260e1dd69fc9b5b6b4058382cc2f246c382f8
 AUX audiofile-0.3.6-strict-prototypes.patch 2339 BLAKE2B ff14877c949bdb218ddd75ee95a0ddcd4014838d461fd19dc2c62feee2c1d3cb2796b12945b172d1a41a137dc197538f68e6e5280f67b39e698d22b46ee5b001 SHA512 26fd421be981208a18bd970054efc50e5b370937af9cd972e7a9206e3b92f389032808e4207726d17807e0c60cdc562826a77c288d85c0ae06534f7f036e2d78
 DIST audiofile-0.3.6.tar.xz 530760 BLAKE2B 5263e66b92471c8b7e8ad73a5065966fc93fd92d70481df804451353bafe44d670ec48b183bc19a7ac60025ea73b234d6aef1017fb220c16d14c68a27db027e4 SHA512 f3b58210a4ef3ac8e08a368a78e0f4b8345456d084bdebfd20d1631fa75e562aa58d31863a502b6ff18178327aa5b87403566bd34566fa52bdfc8e01de400bcb
-EBUILD audiofile-0.3.6-r5.ebuild 1500 BLAKE2B c3232545abbe95cb22e6b888bcb7d7bc0e0c16df9dcd870267f7c9f12f998ba184746ea8da5595a4b8a58377a2833ae102fad4b4694e7748a1872e11ea9ffa16 SHA512 56a1b26e1602e62b92bc8a12b228f6b0d9d74d2a94d51124895292f8ef34e278b8477314800b8c28ec0f98cc2d518b87553b226708f13bb9012be7c01960a88b
 EBUILD audiofile-0.3.6-r6.ebuild 1551 BLAKE2B 118a527bcc1764f5f0317d845a69dd71029db1d19202ee2cf7ce38e345ac14131f75fd6ed393fc181dd1df27ab233d023e305b343f86282bedb08951992e6c2f SHA512 54a1b264bad164625d678544545854b7643c63ef31dc6a254a2403fcb14eb0405a45f4408f911bfec6c07d252bb28f4d569346ba212062357e69d30bf1f8c4bf
 MISC metadata.xml 336 BLAKE2B 18b66d291c0365b27f19c51c65e78aa7b2c205a2a5283c9e80ed0e76f38ad360b84f63957776a22bf104e06a4512c1ee68f34166c6287cf480627dadffda8cf6 SHA512 dc6c56768595088eb45ef8ce040bd95e7fff676ec410909b6f79250cb04daa523fd03cb9a827dfd9fbb10d2fe50dcfe6a070dbf877d790f5d74439f34a217d82
diff --git a/media-libs/audiofile/audiofile-0.3.6-r5.ebuild b/media-libs/audiofile/audiofile-0.3.6-r5.ebuild
deleted file mode 100644
index 63aa1be69749..000000000000
--- a/media-libs/audiofile/audiofile-0.3.6-r5.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools gnome.org multilib-minimal
-
-DESCRIPTION="An elegant API for accessing audio files"
-HOMEPAGE="https://audiofile.68k.org/"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0/1" # subslot = soname major version
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="flac"
-
-RDEPEND="flac? ( >=media-libs/flac-1.2.1:=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.3.6-gcc6-build-fixes.patch
-	"${FILESDIR}"/${PN}-0.3.6-CVE-2015-7747.patch
-	"${FILESDIR}"/${PN}-0.3.6-mingw32.patch
-	"${FILESDIR}"/${PN}-0.3.6-CVE-2017-68xx.patch
-	"${FILESDIR}"/${PN}-0.3.6-CVE-2018-13440-CVE-2018-17095.patch
-	"${FILESDIR}"/${PN}-0.3.6-strict-prototypes.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# Tests depend on statically compiled binaries to work, so we'll have to
-	# delete them later rather than not compile them at all
-	local myconf=(
-		--enable-largefile
-		# static needed for tests, bug #869677
-		--enable-static
-		--disable-werror
-		--disable-examples
-		$(use_enable flac)
-	)
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-}
-
-multilib_src_test() {
-	emake check
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	# package provides .pc file
-	find "${ED}" -name '*.la' -delete || die
-	find "${ED}" -name '*.a' -delete || die
-}
diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
index a3c410bafd6d..f9df5a31245a 100644
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -5,5 +5,5 @@ AUX fontconfig-2.14.2-math-fabs.patch 3159 BLAKE2B e3472ed44efdc2ffff81410864c7c
 DIST fontconfig-2.14.2.tar.xz 1440844 BLAKE2B 4efeeb7f9a6705d493128d00b60e681a20a47556f4c0d7787a5c7a6d2cbbc22f150cad7988a9836a9e72aeb61e2b6a196c00a071c7042c62283c7720cdbb743d SHA512 23483e0ae6aa7589fd37f9949a4cf951c5bff981739dbb446881e4cea86a208c0ab31e2358666eac724af1dc6a689a42733a7ce91cd3e76d8d91eacedb318085
 DIST fontconfig-2.15.0.tar.xz 1447820 BLAKE2B 17c85fddc4ab84111c4f50afb89ecd8792c3aeaa2690b38fd39fca6f6cece69e9ce0cd3af8a2e54968c79ad1f9bee1e444699a13c068d9dfd3dfe1212ff37533 SHA512 754cd5fffa198fc07a39cf7df683e9adfa7f54ab41fdff8c0eacc078fd35d3e01069ba343f2b045e0b40df88d9f1fc1ee0f7565799f9cb194a59cf95b64c4417
 EBUILD fontconfig-2.14.2-r3.ebuild 7198 BLAKE2B 0cec6c5a0d0fe0c9f289c3c137d57248a036da5a8ff9ffe53bf0f7f89f4c1ab9d9bb15d2500fd4c1037ed738e95a6c9094b0f93c5f8fe4498aa594d7d744f0ee SHA512 d1a3e613eaf7b36123475984d6b000a0185e0d1404451807327361089711b699409e6e309e447eb76785f0cb8c57d0678c9cd5331fd845fce3177affe793ed88
-EBUILD fontconfig-2.15.0.ebuild 7152 BLAKE2B ba10d7b9df4f7578709f32e638df1a97076e4a168ceba9d44307ec37f447d8840f0eb29e0061f1d035cb3027a760e8aa0f1be6e408e97933a374cebdea4bff17 SHA512 b48d26c4d00ae21bd402406f2a4962602c8383b5ee01916c483f1fc914a47f911d67c240b9a667e7b9f3a66de01c222d536da909a29eb877672b06327da8353d
+EBUILD fontconfig-2.15.0.ebuild 7151 BLAKE2B fedc9a31bbe43e21eeed0fe1055ff63ff19c5e49ad9dae1b2f5a3d7a4acdb0bfe785e40150a74085ee6f05edc89ed9a0393917ef207075f38969e3b2d11d8084 SHA512 74946f1d8275d69606bd371ffee71b49abb3484839e0feb24460c40b7eb65ba2c24deff758ca7d394651fa04bfdbcf4d610f0aa304843df918f3b7b992b989cb
 MISC metadata.xml 672 BLAKE2B d23112b5d408aed97ad68bc9a141a570c22fd6bbf0022e979b7006817ae27bcba21be43558cb42df06f3c280cbed5570c62805bb69be8a64b1f41bd90b200bc0 SHA512 1ff9c1f22b9766127692eec4824ce966f7a7305ddfae0dd1d8b0e5b432926508dd7a898eada6c182e02c985e11c2f9a22f13eac195333ed32952af0e89015e9a
diff --git a/media-libs/fontconfig/fontconfig-2.15.0.ebuild b/media-libs/fontconfig/fontconfig-2.15.0.ebuild
index 7ab50bcc86a5..a59cfd33c9c5 100644
--- a/media-libs/fontconfig/fontconfig-2.15.0.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.15.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://fontconfig.org/release/${P}.tar.xz"
 LICENSE="MIT"
 SLOT="1.0"
 if ! [[ $(ver_cut 3) -ge 90 ]] ; then
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 IUSE="doc nls test"
 RESTRICT="!test? ( test )"
diff --git a/media-libs/libmpd/Manifest b/media-libs/libmpd/Manifest
index 1431b93b0a2e..ba52d2a0687f 100644
--- a/media-libs/libmpd/Manifest
+++ b/media-libs/libmpd/Manifest
@@ -1,4 +1,6 @@
 AUX libmpd-11.8.17-remove-strndup.patch 439 BLAKE2B 35f5f6efc5233ea61ce7967c52bf69d3aa44814d3506534d4272ef3df454e93e14005cce25b929d066dd4e4d1c1c28a08e7d6b59c490c1926e46fa61d1bf8511 SHA512 0b0c3b28abd7aaf540d6133ad5a72f5e0fc2cca593bc870106c17d9b1828a2bb35880436a489261ef1c56bbb176e0809d6f09165108bf867f776902cd5757fff
+AUX libmpd-11.8.17-return-0-instead-of-null.patch 1301 BLAKE2B 34afa197ed7d6418e15896d2ea1d5e9f6493546146cbf1d93d45a1fdeec88520ef26a62c02d080fb7093ecee845647929e92a1f08f1a0c1c0a8d8b5bf49a43f9 SHA512 19698d9092c0393c34e61710db09a02c7b288a55211f814a8a6dd5278cb9358a510978f1f44df173d73ef1c75b924a613babd8a7a1c0180e13c205612a3749db
 DIST libmpd-11.8.17.tar.gz 365015 BLAKE2B ed6afc3a90fa8a6b6e53ecfd67d195133a6bbecf4ddb3960247b5b2944624f0851d73229145a2ccb7eb3ca84b1d3a245dd3cc1de39f3bd9d5bd21f58f6576e18 SHA512 ffe2880834a4a39745a5327d628781e16eeb8cd1ec17402dda46ad96ff402bc0d8b4312ba058a39242ad9bb8c3a0bb6feb2c5ea2a30ef9be97652fdb5c02572d
 EBUILD libmpd-11.8.17-r1.ebuild 877 BLAKE2B 4f4a354614dddd8863090387c44d6ae9d5d1c1829d3a53bd0b5380f873571547821c28b2e95287e6d37489811adb99651b43afd6e8919ce3d429b3e2d133f386 SHA512 a4dfe2f01f4b9409e663b2d4adc168c4468e3ee4a98005f50f576fd7be756727c4aefa3626f41223daae278c872409f959b432c59da86668962dc2035b02611a
+EBUILD libmpd-11.8.17-r2.ebuild 935 BLAKE2B 7dca9364ad5dad740a3d0641988a7391cf3bc3d2b0875926be939c215288dddd2f867894f609c39e86aa234b4e7ac014a391ee6fc8f1b5e3830fc7f5a5d049de SHA512 0cbee115dd7b4ebf27410782f5edb4584eb95a1987235e49fbf13cfbb2b8f1f325924aca072a359a36e65f6eeef1ab5128c47414c4f140d6bd34ac5539a3eb55
 MISC metadata.xml 252 BLAKE2B 648cca48f0a3b65ded6fd96d45d3f23cfae98bfa6b5f683383f1f49eedf763f99e034958d5a91ef3bf0904304eb7fa78dd7a582cf337762df4bd59c1eeaafb4e SHA512 cff6482e227806ef72806b8b925a4f5a3dfb87c26007a4614e1891524f18fb33c49d4d774d824676b02664d2703d8d8e8605e2f15983346868f4ba49405b75c4
diff --git a/media-libs/libmpd/files/libmpd-11.8.17-return-0-instead-of-null.patch b/media-libs/libmpd/files/libmpd-11.8.17-return-0-instead-of-null.patch
new file mode 100644
index 000000000000..e021110fb479
--- /dev/null
+++ b/media-libs/libmpd/files/libmpd-11.8.17-return-0-instead-of-null.patch
@@ -0,0 +1,35 @@
+https://bugs.gentoo.org/932791
+From: Brahmajit Das <brahmajit.xyz@gmail.com>
+Date: Fri, 14 Jun 2024 17:48:26 +0000
+Subject: [PATCH 1/1] src/libmpd-playlist.c: Return 0 instead of NULL
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+First reported on Gentoo Linux with GCC 14. GCC 14 comes with
+-Wint-conversion enabled, thus resulting in build errors such as
+libmpd-playlist.c: In function ‘mpd_playlist_load’:
+libmpd-playlist.c:783:24: error: returning ‘void *’ from a function with return type ‘int’ makes integer from pointer without a cast [-Wint-conversion]
+  783 |                 return NULL;
+      |                        ^~~~
+make[2]: *** [Makefile:367: libmpd-playlist.lo] Error 1
+
+NULL is defined as ((void *)0) where as mpd_playlist_load has a return
+type of int, thus returning 0 would be more appropriate.
+
+Refer: https://bugs.gentoo.org/932791
+Signed-off-by: Brahmajit Das <brahmajit.xyz@gmail.com>
+--- a/src/libmpd-playlist.c
++++ b/src/libmpd-playlist.c
+@@ -780,7 +780,7 @@ int mpd_playlist_load(MpdObj *mi, const char *path)
+ 	if(mpd_lock_conn(mi))
+ 	{
+ 		debug_printf(DEBUG_ERROR,"lock failed\n");
+-		return NULL;
++		return 0;
+ 	}
+     mpd_sendLoadCommand(mi->connection,path);
+ 	mpd_finishCommand(mi->connection);
+-- 
+2.45.2
+
diff --git a/media-libs/libmpd/libmpd-11.8.17-r2.ebuild b/media-libs/libmpd/libmpd-11.8.17-r2.ebuild
new file mode 100644
index 000000000000..95e03eada009
--- /dev/null
+++ b/media-libs/libmpd/libmpd-11.8.17-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="A library handling connections to a MPD server"
+HOMEPAGE="https://gmpclient.org/"
+SRC_URI="http://download.sarine.nl/Programs/gmpc/$(ver_cut 1-2)/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc static-libs"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-text/doxygen )
+"
+DEPEND=">=dev-libs/glib-2.16:2"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-remove-strndup.patch
+	"${FILESDIR}"/${P}-return-0-instead-of-null.patch
+)
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_compile() {
+	emake
+	use doc && emake -C doc doc
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( doc/html/* )
+	default
+	find "${D}" -name '*.la' -type f -delete || die
+	rm "${ED}"/usr/share/doc/${PF}/{README,ChangeLog} || die
+}