From 0a3feeaba4dbc58966dccdbbfcd7fb14deef0831 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Sun, 16 Jun 2024 00:09:44 +0100
Subject: gentoo auto-resync : 16:06:2024 - 00:09:44

---
 media-libs/libmpd/Manifest                         |  2 ++
 .../libmpd-11.8.17-return-0-instead-of-null.patch  | 35 ++++++++++++++++++
 media-libs/libmpd/libmpd-11.8.17-r2.ebuild         | 41 ++++++++++++++++++++++
 3 files changed, 78 insertions(+)
 create mode 100644 media-libs/libmpd/files/libmpd-11.8.17-return-0-instead-of-null.patch
 create mode 100644 media-libs/libmpd/libmpd-11.8.17-r2.ebuild

(limited to 'media-libs/libmpd')

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
+}
-- 
cgit v1.2.3