Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/libmatemixer/, media-libs/libmatemixer/files/
Date: Tue, 28 Jun 2022 06:08:08
Message-Id: 1656396355.ee0d32064e74722ddb1befc80a085648a96cbca7.sam@gentoo
1 commit: ee0d32064e74722ddb1befc80a085648a96cbca7
2 Author: orbea <orbea <AT> riseup <DOT> net>
3 AuthorDate: Tue Jun 21 03:32:54 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Tue Jun 28 06:05:55 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee0d3206
7
8 media-libs/libmatemixer: Add 1.26.0
9
10 Includes a patch to fix undefined references exposed with slibtool.
11
12 Bug: https://bugs.gentoo.org/785232
13 Upstream-PR: https://github.com/mate-desktop/libmatemixer/pull/37
14 Signed-off-by: orbea <orbea <AT> riseup.net>
15 Closes: https://github.com/gentoo/gentoo/pull/26014
16 Signed-off-by: Sam James <sam <AT> gentoo.org>
17
18 media-libs/libmatemixer/Manifest | 1 +
19 .../files/libmatemixer-1.26.0-slibtool.patch | 71 ++++++++++++++++++++++
20 media-libs/libmatemixer/libmatemixer-1.26.0.ebuild | 46 ++++++++++++++
21 3 files changed, 118 insertions(+)
22
23 diff --git a/media-libs/libmatemixer/Manifest b/media-libs/libmatemixer/Manifest
24 index 7194be676e44..84c4291f198e 100644
25 --- a/media-libs/libmatemixer/Manifest
26 +++ b/media-libs/libmatemixer/Manifest
27 @@ -1 +1,2 @@
28 DIST libmatemixer-1.24.1.tar.xz 484864 BLAKE2B 21458cdfa14119364c564993f6e67c320332fabc0595d5422b75dd57ea13bfd2754549de29be6cb11708cb016b459494920000df4f86953d55e0102652dc9816 SHA512 c4620d70c66196521296d2d4197a6e025629faf1324e726df7dd7b0e0444ee17b83355c5059ec17ef36f9f15e6ab3bf3bb82a152b087a11e929d7749c1e1d4e6
29 +DIST libmatemixer-1.26.0.tar.xz 489092 BLAKE2B 4b87b92904f038fb957dd17dfecc91a82597663b3470169658ed1325ffdc7c54f24269c1226fbb696337006729211e61d21af5dcdf18c3d05ce348656ae81f39 SHA512 6e97594f9a43f4e66c31e466d8a46ea5d77cb5b5ead26df6461b1529a3b6f1448768a981e7a527a4c07dda0e4cba7470e1fff8b316731da293cfdc0f18aacc73
30
31 diff --git a/media-libs/libmatemixer/files/libmatemixer-1.26.0-slibtool.patch b/media-libs/libmatemixer/files/libmatemixer-1.26.0-slibtool.patch
32 new file mode 100644
33 index 000000000000..05ad6a744fa8
34 --- /dev/null
35 +++ b/media-libs/libmatemixer/files/libmatemixer-1.26.0-slibtool.patch
36 @@ -0,0 +1,71 @@
37 +Upstream-PR: https://github.com/mate-desktop/libmatemixer/pull/37
38 +
39 +From 903dfc62b1898efb630286228c2e797162f5816c Mon Sep 17 00:00:00 2001
40 +From: orbea <orbea@××××××.net>
41 +Date: Thu, 12 May 2022 18:34:52 -0700
42 +Subject: [PATCH] backends: Add missing dependencies
43 +
44 +When building the backends with slibtool they will fail with undefined
45 +references to libmatemixer.la. This is because they use -no-undefined
46 +which slibtool explicitly supports while GNU libtool will silently
47 +ignore it.
48 +
49 +Gentoo Bug: https://bugs.gentoo.org/785232
50 +---
51 + backends/alsa/Makefile.am | 1 +
52 + backends/null/Makefile.am | 4 +++-
53 + backends/oss/Makefile.am | 1 +
54 + backends/pulse/Makefile.am | 1 +
55 + 4 files changed, 6 insertions(+), 1 deletion(-)
56 +
57 +diff --git a/backends/alsa/Makefile.am b/backends/alsa/Makefile.am
58 +index 798ce8b..44990b5 100644
59 +--- a/backends/alsa/Makefile.am
60 ++++ b/backends/alsa/Makefile.am
61 +@@ -43,6 +43,7 @@ libmatemixer_alsa_la_SOURCES = \
62 + alsa-types.h
63 +
64 + libmatemixer_alsa_la_LIBADD = \
65 ++ $(top_builddir)/libmatemixer/libmatemixer.la \
66 + $(GLIB_LIBS) \
67 + $(UDEV_LIBS) \
68 + $(ALSA_LIBS)
69 +diff --git a/backends/null/Makefile.am b/backends/null/Makefile.am
70 +index f0371a7..11d4b7f 100644
71 +--- a/backends/null/Makefile.am
72 ++++ b/backends/null/Makefile.am
73 +@@ -18,7 +18,9 @@ libmatemixer_null_la_SOURCES = \
74 + null-backend.c \
75 + null-backend.h
76 +
77 +-libmatemixer_null_la_LIBADD = $(GLIB_LIBS)
78 ++libmatemixer_null_la_LIBADD = \
79 ++ $(top_builddir)/libmatemixer/libmatemixer.la \
80 ++ $(GLIB_LIBS)
81 +
82 + libmatemixer_null_la_LDFLAGS = \
83 + -avoid-version \
84 +diff --git a/backends/oss/Makefile.am b/backends/oss/Makefile.am
85 +index d9e1fa7..cc5735f 100644
86 +--- a/backends/oss/Makefile.am
87 ++++ b/backends/oss/Makefile.am
88 +@@ -32,6 +32,7 @@ libmatemixer_oss_la_SOURCES = \
89 + oss-types.h
90 +
91 + libmatemixer_oss_la_LIBADD = \
92 ++ $(top_builddir)/libmatemixer/libmatemixer.la \
93 + $(GLIB_LIBS) \
94 + $(OSS_LIBS)
95 +
96 +diff --git a/backends/pulse/Makefile.am b/backends/pulse/Makefile.am
97 +index b07cc7e..a079af1 100644
98 +--- a/backends/pulse/Makefile.am
99 ++++ b/backends/pulse/Makefile.am
100 +@@ -62,6 +62,7 @@ libmatemixer_pulse_la_SOURCES = \
101 + pulse-types.h
102 +
103 + libmatemixer_pulse_la_LIBADD = \
104 ++ $(top_builddir)/libmatemixer/libmatemixer.la \
105 + $(GLIB_LIBS) \
106 + $(PULSEAUDIO_LIBS)
107 +
108
109 diff --git a/media-libs/libmatemixer/libmatemixer-1.26.0.ebuild b/media-libs/libmatemixer/libmatemixer-1.26.0.ebuild
110 new file mode 100644
111 index 000000000000..11789e114894
112 --- /dev/null
113 +++ b/media-libs/libmatemixer/libmatemixer-1.26.0.ebuild
114 @@ -0,0 +1,46 @@
115 +# Copyright 1999-2022 Gentoo Authors
116 +# Distributed under the terms of the GNU General Public License v2
117 +
118 +EAPI=7
119 +
120 +inherit mate
121 +
122 +if [[ ${PV} != 9999 ]]; then
123 + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
124 +fi
125 +
126 +DESCRIPTION="Mixer library for MATE Desktop"
127 +LICENSE="LGPL-2+"
128 +SLOT="0"
129 +
130 +IUSE="+alsa oss pulseaudio"
131 +
132 +COMMON_DEPEND="
133 + >=dev-libs/glib-2.50:2
134 + >=sys-devel/gettext-0.19.8:*
135 + alsa? ( >=media-libs/alsa-lib-1.0.5 )
136 + pulseaudio? ( >=media-sound/pulseaudio-5.0.0:0[glib] )
137 +"
138 +
139 +RDEPEND="${COMMON_DEPEND}
140 + virtual/libintl
141 +"
142 +
143 +DEPEND="${COMMON_DEPEND}
144 + app-text/docbook-xml-dtd:4.1.2
145 + dev-util/gtk-doc
146 + dev-util/gtk-doc-am
147 + virtual/pkgconfig
148 +"
149 +
150 +PATCHES=(
151 + "${FILESDIR}"/${P}-slibtool.patch # 785232
152 +)
153 +
154 +src_configure() {
155 + mate_src_configure \
156 + --disable-null \
157 + $(use_enable alsa) \
158 + $(use_enable oss) \
159 + $(use_enable pulseaudio)
160 +}