public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/libmatemixer/, media-libs/libmatemixer/files/
Date: Tue, 28 Jun 2022 06:08:03 +0000 (UTC)	[thread overview]
Message-ID: <1656396355.ee0d32064e74722ddb1befc80a085648a96cbca7.sam@gentoo> (raw)

commit:     ee0d32064e74722ddb1befc80a085648a96cbca7
Author:     orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Tue Jun 21 03:32:54 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jun 28 06:05:55 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee0d3206

media-libs/libmatemixer: Add 1.26.0

Includes a patch to fix undefined references exposed with slibtool.

Bug: https://bugs.gentoo.org/785232
Upstream-PR: https://github.com/mate-desktop/libmatemixer/pull/37
Signed-off-by: orbea <orbea <AT> riseup.net>
Closes: https://github.com/gentoo/gentoo/pull/26014
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-libs/libmatemixer/Manifest                   |  1 +
 .../files/libmatemixer-1.26.0-slibtool.patch       | 71 ++++++++++++++++++++++
 media-libs/libmatemixer/libmatemixer-1.26.0.ebuild | 46 ++++++++++++++
 3 files changed, 118 insertions(+)

diff --git a/media-libs/libmatemixer/Manifest b/media-libs/libmatemixer/Manifest
index 7194be676e44..84c4291f198e 100644
--- a/media-libs/libmatemixer/Manifest
+++ b/media-libs/libmatemixer/Manifest
@@ -1 +1,2 @@
 DIST libmatemixer-1.24.1.tar.xz 484864 BLAKE2B 21458cdfa14119364c564993f6e67c320332fabc0595d5422b75dd57ea13bfd2754549de29be6cb11708cb016b459494920000df4f86953d55e0102652dc9816 SHA512 c4620d70c66196521296d2d4197a6e025629faf1324e726df7dd7b0e0444ee17b83355c5059ec17ef36f9f15e6ab3bf3bb82a152b087a11e929d7749c1e1d4e6
+DIST libmatemixer-1.26.0.tar.xz 489092 BLAKE2B 4b87b92904f038fb957dd17dfecc91a82597663b3470169658ed1325ffdc7c54f24269c1226fbb696337006729211e61d21af5dcdf18c3d05ce348656ae81f39 SHA512 6e97594f9a43f4e66c31e466d8a46ea5d77cb5b5ead26df6461b1529a3b6f1448768a981e7a527a4c07dda0e4cba7470e1fff8b316731da293cfdc0f18aacc73

diff --git a/media-libs/libmatemixer/files/libmatemixer-1.26.0-slibtool.patch b/media-libs/libmatemixer/files/libmatemixer-1.26.0-slibtool.patch
new file mode 100644
index 000000000000..05ad6a744fa8
--- /dev/null
+++ b/media-libs/libmatemixer/files/libmatemixer-1.26.0-slibtool.patch
@@ -0,0 +1,71 @@
+Upstream-PR: https://github.com/mate-desktop/libmatemixer/pull/37
+
+From 903dfc62b1898efb630286228c2e797162f5816c 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.0.ebuild b/media-libs/libmatemixer/libmatemixer-1.26.0.ebuild
new file mode 100644
index 000000000000..11789e114894
--- /dev/null
+++ b/media-libs/libmatemixer/libmatemixer-1.26.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
+fi
+
+DESCRIPTION="Mixer library for MATE Desktop"
+LICENSE="LGPL-2+"
+SLOT="0"
+
+IUSE="+alsa oss pulseaudio"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.50:2
+	>=sys-devel/gettext-0.19.8:*
+	alsa? ( >=media-libs/alsa-lib-1.0.5 )
+	pulseaudio? ( >=media-sound/pulseaudio-5.0.0:0[glib] )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/libintl
+"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	dev-util/gtk-doc
+	dev-util/gtk-doc-am
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-slibtool.patch # 785232
+)
+
+src_configure() {
+	mate_src_configure \
+		--disable-null \
+		$(use_enable alsa) \
+		$(use_enable oss) \
+		$(use_enable pulseaudio)
+}


                 reply	other threads:[~2022-06-28  6:08 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1656396355.ee0d32064e74722ddb1befc80a085648a96cbca7.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox