gentoo auto-resync : 15:04:2024 - 12:04:02

3 files changed, 84 insertions, 1 deletions

diff --git a/media-libs/libmatemixer/Manifest b/media-libs/libmatemixer/Manifest
index 72ca6ec546cd..9bece0a1156a 100644
--- a/media-libs/libmatemixer/Manifest
+++ b/media-libs/libmatemixer/Manifest
@@ -1,5 +1,6 @@
+AUX libmatemixer-1.26.1-slibtool.patch 2920 BLAKE2B 0d0f88531b6cca7cc2674cd1a704cd83494358f558847cba7771dc9b9fb8406a89202ffd2a3ed90af8c380d3d4340bdb215957a3f40e94ca71fc14b05ed004db SHA512 37fe8f890541d6c4d46a911c71d1775b4c6dc6a59a75521eb8f4d55c1960dfc5e162d6bfde033d6f4d94b00cc9681e598148b1ba7892afc24f0067d6621d437c
 DIST libmatemixer-1.26.1.tar.xz 497560 BLAKE2B a84922fa8743749e0120845a462de84d2057049957207357e4212a1e6201c60bd31b873282764ec2e2380e3a0c76dd498deaef32bdefb9f012b141d9adad280f SHA512 a67a63bbf76b69ba78a537f7690230f45c5875b4358991e73604aacf001baa40ee994101d486218be8000be43be6561b6f25f4f38ae00310c5a08affb6dafbdb
 DIST libmatemixer-1.28.0.tar.xz 497120 BLAKE2B 8f747bfe304082caea08b7443ba3b3170b8dcaf049dd8c3eabe2eb3124007e9c80b17d400ea8bb522031309f3428674e4a50ca7ad15939ad9a47fe82a09d3a41 SHA512 9bfe33a851eae10564ccad5d578a76c565cba1d8c720b89eb1105c8d507436b31d6d0c9c1112dbf6b8cc7def97f14ff19feb6f55d6cf8de2d0421b5cf1dfc485
-EBUILD libmatemixer-1.26.1.ebuild 853 BLAKE2B 7289200b26508fa3426971551727461427a4f914605f5400a93a9cfd833928866dc983dbb15fcd74ed19a2cf0ecbe256d6bb967b46738618770cbb8d17010b34 SHA512 0a22b975dda91633541960f8403e1afdbecfb1fd09d2af919cfed1f8e12b505a122a487f91111decc52af79ee196564fb1c84568421653134c48a981a547330e
+EBUILD libmatemixer-1.26.1.ebuild 954 BLAKE2B 0c30edfddd345233eb70efca70ebc19f47a0164faeed116130164f259670fe53711f1008a3b555cfe959fa64c3d9a6aa1665eacce520140dbe8f18342791bdeb SHA512 121376bd96a67b0e0bdcb2b5a536adb8999fa9686a806f2b62d026f2e1e666120fddccef341cd703d2947e1be0425e2841e7793b13a78dab790cabc15ddfc37f
 EBUILD libmatemixer-1.28.0.ebuild 855 BLAKE2B faadec9ba959cc4cdcf285bbd86cfc0b904b6dae9ca88f0173efbfe551830d4371e6203342bbcb21d7760e305beb319e47b3577f0eb56c22bd0650b0f3377401 SHA512 5503321b20368d7c417c8ec70b8abeb47b82e674e3c97eb61d954c2dca842b8b6156a68975d4b639acea0603e7a2d0bd7a854c08269b1f1c8600d1bc30ba5e87
 MISC metadata.xml 491 BLAKE2B f5b9487a7b5961bb5cc2bb9fdcfb8327ebe38f381b3909ff6521e5564badfae24146ebc6f1f18bd527f04eb39fc520d216fa92489b82bf366b95bdfd0105d9fb SHA512 9cab1c35d98d6196d286436ba6d26624df8cf30ac88d94e755d5214e6d8d0dcce279ffea5a84abe1430f99e0506805e3d109fd2a1f0423dbee7949a24efc65e8
diff --git a/media-libs/libmatemixer/files/libmatemixer-1.26.1-slibtool.patch b/media-libs/libmatemixer/files/libmatemixer-1.26.1-slibtool.patch
new file mode 100644
index 000000000000..5573021f8f47
--- /dev/null
+++ b/media-libs/libmatemixer/files/libmatemixer-1.26.1-slibtool.patch
@@ -0,0 +1,74 @@
+https://bugs.gentoo.org/785232
+https://bugs.gentoo.org/921214
+https://github.com/mate-desktop/libmatemixer/pull/37
+https://github.com/mate-desktop/libmatemixer/commit/cb9e62b6d101cb42cdcf3ec7617616e6c4a4bb35
+
+From cb9e62b6d101cb42cdcf3ec7617616e6c4a4bb35 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Thu, 12 May 2022 18:34:52 -0700
+Subject: [PATCH] backends: Add missing dependencies
+
+When building the backends with slibtool they will fail with undefined
+references to libmatemixer.la. This is because they use -no-undefined
+which slibtool explicitly supports while GNU libtool will silently
+ignore it.
+
+Gentoo Bug: https://bugs.gentoo.org/785232
+---
+ backends/alsa/Makefile.am  | 1 +
+ backends/null/Makefile.am  | 4 +++-
+ backends/oss/Makefile.am   | 1 +
+ backends/pulse/Makefile.am | 1 +
+ 4 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/backends/alsa/Makefile.am b/backends/alsa/Makefile.am
+index 798ce8b..44990b5 100644
+--- a/backends/alsa/Makefile.am
++++ b/backends/alsa/Makefile.am
+@@ -43,6 +43,7 @@ libmatemixer_alsa_la_SOURCES =                                  \
+ 	alsa-types.h
+ 
+ libmatemixer_alsa_la_LIBADD =                                   \
++	$(top_builddir)/libmatemixer/libmatemixer.la            \
+ 	$(GLIB_LIBS)                                            \
+ 	$(UDEV_LIBS)						\
+ 	$(ALSA_LIBS)
+diff --git a/backends/null/Makefile.am b/backends/null/Makefile.am
+index f0371a7..11d4b7f 100644
+--- a/backends/null/Makefile.am
++++ b/backends/null/Makefile.am
+@@ -18,7 +18,9 @@ libmatemixer_null_la_SOURCES =                                  \
+ 	null-backend.c                                          \
+ 	null-backend.h
+ 
+-libmatemixer_null_la_LIBADD = $(GLIB_LIBS)
++libmatemixer_null_la_LIBADD =                                   \
++	$(top_builddir)/libmatemixer/libmatemixer.la            \
++	$(GLIB_LIBS)
+ 
+ libmatemixer_null_la_LDFLAGS =                                  \
+ 	-avoid-version                                          \
+diff --git a/backends/oss/Makefile.am b/backends/oss/Makefile.am
+index d9e1fa7..cc5735f 100644
+--- a/backends/oss/Makefile.am
++++ b/backends/oss/Makefile.am
+@@ -32,6 +32,7 @@ libmatemixer_oss_la_SOURCES =                                   \
+ 	oss-types.h
+ 
+ libmatemixer_oss_la_LIBADD =                                    \
++	$(top_builddir)/libmatemixer/libmatemixer.la            \
+ 	$(GLIB_LIBS)                                            \
+ 	$(OSS_LIBS)
+ 
+diff --git a/backends/pulse/Makefile.am b/backends/pulse/Makefile.am
+index b07cc7e..a079af1 100644
+--- a/backends/pulse/Makefile.am
++++ b/backends/pulse/Makefile.am
+@@ -62,6 +62,7 @@ libmatemixer_pulse_la_SOURCES =                                 \
+ 	pulse-types.h
+ 
+ libmatemixer_pulse_la_LIBADD =                                  \
++	$(top_builddir)/libmatemixer/libmatemixer.la            \
+ 	$(GLIB_LIBS)                                            \
+ 	$(PULSEAUDIO_LIBS)
+ 
diff --git a/media-libs/libmatemixer/libmatemixer-1.26.1.ebuild b/media-libs/libmatemixer/libmatemixer-1.26.1.ebuild
index c79ef1bf118d..1ba6542f321d 100644
--- a/media-libs/libmatemixer/libmatemixer-1.26.1.ebuild
+++ b/media-libs/libmatemixer/libmatemixer-1.26.1.ebuild
@@ -38,6 +38,14 @@ RDEPEND="${COMMON_DEPEND}
 DEPEND="${COMMON_DEPEND}
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.26.1-slibtool.patch #921214
+)
+
+src_prepare() {
+	mate_src_prepare
+}
+
 src_configure() {
 	mate_src_configure \
 		--disable-null \