From: "Lars Wendler" <polynomial-c@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/alsa-lib/files/, media-libs/alsa-lib/
Date: Wed, 16 Jun 2021 17:17:45 +0000 (UTC) [thread overview]
Message-ID: <1623863855.862b72f03dd319eca3ba50717c53a4e70b5622c9.polynomial-c@gentoo> (raw)
commit: 862b72f03dd319eca3ba50717c53a4e70b5622c9
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 16 17:17:35 2021 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Jun 16 17:17:35 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=862b72f0
media-libs/alsa-lib: Removed old
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
media-libs/alsa-lib/Manifest | 2 -
media-libs/alsa-lib/alsa-lib-1.2.2-r1.ebuild | 83 ----------------
media-libs/alsa-lib/alsa-lib-1.2.3.2-r1.ebuild | 84 ----------------
...lsa-lib-1.2.2-change-order-of-pcm-devices.patch | 80 ---------------
.../alsa-lib-1.2.2-namehint-add-omit_noargs.patch | 108 ---------------------
5 files changed, 357 deletions(-)
diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index 278675767a8..7d94b680606 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -1,5 +1,3 @@
-DIST alsa-lib-1.2.2.tar.bz2 1030747 BLAKE2B 176054c7783452fcd0b30482f4d85fb88a1364a97f79830f2c22cd578275280fa64537d00a08f3e3b1420e4aeb4e4269c7523cb4296db3ed095bcf078b452726 SHA512 d21adb3ff998918c7d1820f9ce2aaf4202dd45ccb87cb092d49da8b2402b6ddaad06325be0fd59f17393a5d9958e3743bfccb4b14bdb947a42e7d791d73c7033
-DIST alsa-lib-1.2.3.2.tar.bz2 1038591 BLAKE2B 70ba972953f71fc6ac20f6f3e91361b5aed72c8c7887252331a01334ec4cc154c1bfea02dfaf0f76f8244b8cf73426d83577dcf55aa0033f80ee303d23386df6 SHA512 1fbc6360fda841bd9ca488739bdc9f4142c1b4a07ff767f48f1e160e3d4dff914aed422c97088e238b5e77d7e30aa79ff72569c3348a4cf4a412e1e4bce0bf2a
DIST alsa-lib-1.2.4.tar.bz2 1044405 BLAKE2B e1d5d9afe21dac693645274ae4ec8a607c9fcc9915ba4ebccfdb539d44b9353ba07529e2c8eaca119884b926d4467285313c945c9015a788101fe532064442db SHA512 12086952dc8f16f1cb6946517858e17b1c3276aeda9ff5703a84bb38aa78eb4c4e9cb4485c5b3f21f174fdbd976b3bcbbc481e85cb2460652858490df51ae844
DIST alsa-lib-1.2.5.1.tar.bz2 1069073 BLAKE2B 5464cc7f263bdf7b10aa7e1f542ad6dbc55bf300156fd1bded00375c41a518d4b14f96e28eb1c60a6ce7cc6e27da4b2e8598cd867f15417f260fc23513f93e11 SHA512 01998ffa449e925ff552c13aea47f9540903afdc533086067c78dcaba4d239c347180d3d28bb0000e6d19b7779c7249fcc77a30057930ca22d18ba55e163fa1c
DIST alsa-lib-1.2.5_p20210604.tar.gz 814186 BLAKE2B d3bc2f42a0266c1af33953026eecb97d9d4f2cc845924b762b7f6777d15e2a3f60347bd3d6184a8b431ebe703c3b06bcbfbef67345064fbcd14b223e5e4d0e4e SHA512 e04ac38ae6f4b97ac75584c36562ad620820be5156206dc6466b8bfac0d50d1c8e588fac7d5e9d8716c9c89b82ebd9ae9cbc8137080a433a5ddde8177c102a99
diff --git a/media-libs/alsa-lib/alsa-lib-1.2.2-r1.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.2-r1.ebuild
deleted file mode 100644
index 1a2b04a4ceb..00000000000
--- a/media-libs/alsa-lib/alsa-lib-1.2.2-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-inherit autotools multilib-minimal python-single-r1
-
-DESCRIPTION="Advanced Linux Sound Architecture Library"
-HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
-SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="alisp debug doc elibc_uclibc python +thread-safety"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-BDEPEND="doc? ( >=app-doc/doxygen-1.2.6 )"
-RDEPEND="python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.1.6-missing_files.patch" #652422
- "${FILESDIR}/${P}-change-order-of-pcm-devices.patch" #718106
- "${FILESDIR}/${P}-namehint-add-omit_noargs.patch" #718106
-)
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- find . -name Makefile.am -exec sed -i -e '/CFLAGS/s:-g -O2::' {} + || die
- # https://bugs.gentoo.org/509886
- if use elibc_uclibc ; then
- sed -i -e 's:oldapi queue_timer:queue_timer:' test/Makefile.am || die
- fi
- # https://bugs.gentoo.org/545950
- sed -i -e '5s:^$:\nAM_CPPFLAGS = -I$(top_srcdir)/include:' test/lsb/Makefile.am || die
- default
- eautoreconf
-}
-
-multilib_src_configure() {
- local myeconfargs=(
- --disable-maintainer-mode
- --disable-resmgr
- --enable-aload
- --enable-rawmidi
- --enable-seq
- --enable-shared
- # enable Python only on final ABI
- $(multilib_native_use_enable python)
- $(use_enable alisp)
- $(use_enable thread-safety)
- $(use_with debug)
- $(usex elibc_uclibc --without-versioned '')
- )
-
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
- emake
-
- if multilib_is_native_abi && use doc; then
- emake doc
- grep -FZrl "${S}" doc/doxygen/html | \
- xargs -0 sed -i -e "s:${S}::" || die
- fi
-}
-
-multilib_src_install() {
- multilib_is_native_abi && use doc && local HTML_DOCS=( doc/doxygen/html/. )
- default
-}
-
-multilib_src_install_all() {
- find "${ED}" -type f \( -name '*.a' -o -name '*.la' \) -delete || die
- dodoc ChangeLog doc/asoundrc.txt NOTES TODO
-}
diff --git a/media-libs/alsa-lib/alsa-lib-1.2.3.2-r1.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.3.2-r1.ebuild
deleted file mode 100644
index af903f22501..00000000000
--- a/media-libs/alsa-lib/alsa-lib-1.2.3.2-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-inherit autotools multilib-minimal python-single-r1
-
-DESCRIPTION="Advanced Linux Sound Architecture Library"
-HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
-SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="alisp debug doc elibc_uclibc python +thread-safety"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-BDEPEND="doc? ( >=app-doc/doxygen-1.2.6 )"
-RDEPEND="python? ( ${PYTHON_DEPS} )
- media-libs/alsa-topology-conf
- media-libs/alsa-ucm-conf
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.1.6-missing_files.patch" #652422
-)
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- find . -name Makefile.am -exec sed -i -e '/CFLAGS/s:-g -O2::' {} + || die
- # https://bugs.gentoo.org/509886
- if use elibc_uclibc ; then
- sed -i -e 's:oldapi queue_timer:queue_timer:' test/Makefile.am || die
- fi
- # https://bugs.gentoo.org/545950
- sed -i -e '5s:^$:\nAM_CPPFLAGS = -I$(top_srcdir)/include:' test/lsb/Makefile.am || die
- default
- eautoreconf
-}
-
-multilib_src_configure() {
- local myeconfargs=(
- --disable-maintainer-mode
- --disable-resmgr
- --enable-aload
- --enable-rawmidi
- --enable-seq
- --enable-shared
- # enable Python only on final ABI
- $(multilib_native_use_enable python)
- $(use_enable alisp)
- $(use_enable thread-safety)
- $(use_with debug)
- $(usex elibc_uclibc --without-versioned '')
- )
-
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
- emake
-
- if multilib_is_native_abi && use doc; then
- emake doc
- grep -FZrl "${S}" doc/doxygen/html | \
- xargs -0 sed -i -e "s:${S}::" || die
- fi
-}
-
-multilib_src_install() {
- multilib_is_native_abi && use doc && local HTML_DOCS=( doc/doxygen/html/. )
- default
-}
-
-multilib_src_install_all() {
- find "${ED}" -type f \( -name '*.a' -o -name '*.la' \) -delete || die
- dodoc ChangeLog doc/asoundrc.txt NOTES TODO
-}
diff --git a/media-libs/alsa-lib/files/alsa-lib-1.2.2-change-order-of-pcm-devices.patch b/media-libs/alsa-lib/files/alsa-lib-1.2.2-change-order-of-pcm-devices.patch
deleted file mode 100644
index b21e184f877..00000000000
--- a/media-libs/alsa-lib/files/alsa-lib-1.2.2-change-order-of-pcm-devices.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 27c7927842a691ef13724cd16fb26264680c6aa2 Mon Sep 17 00:00:00 2001
-From: Jaroslav Kysela <perex@perex.cz>
-Date: Sat, 29 Feb 2020 10:30:37 +0100
-Subject: [PATCH] conf: change the order of PCM devices in alsa.conf
-
-Appearently, some applications use the first device for probe or so.
-
-Fixes: https://github.com/alsa-project/alsa-lib/issues/27
-
-Signed-off-by: Jaroslav Kysela <perex@perex.cz>
----
- src/conf/alsa.conf | 46 +++++++++++++++++++++++-----------------------
- 1 file changed, 23 insertions(+), 23 deletions(-)
-
-diff --git a/src/conf/alsa.conf b/src/conf/alsa.conf
-index 0998058..a091b81 100644
---- a/src/conf/alsa.conf
-+++ b/src/conf/alsa.conf
-@@ -119,29 +119,6 @@ defaults.timer.subdevice 0
- # PCM interface
- #
-
--# redirect to load-on-demand extended pcm definitions
--pcm.cards cards.pcm
--
--pcm.default cards.pcm.default
--pcm.sysdefault cards.pcm.default
--pcm.front cards.pcm.front
--pcm.rear cards.pcm.rear
--pcm.center_lfe cards.pcm.center_lfe
--pcm.side cards.pcm.side
--pcm.surround21 cards.pcm.surround21
--pcm.surround40 cards.pcm.surround40
--pcm.surround41 cards.pcm.surround41
--pcm.surround50 cards.pcm.surround50
--pcm.surround51 cards.pcm.surround51
--pcm.surround71 cards.pcm.surround71
--pcm.iec958 cards.pcm.iec958
--pcm.spdif iec958
--pcm.hdmi cards.pcm.hdmi
--pcm.dmix cards.pcm.dmix
--pcm.dsnoop cards.pcm.dsnoop
--pcm.modem cards.pcm.modem
--pcm.phoneline cards.pcm.phoneline
--
- pcm.hw {
- @args [ CARD DEV SUBDEV ]
- @args.CARD {
-@@ -323,6 +300,29 @@ pcm.null {
- }
- }
-
-+# redirect to load-on-demand extended pcm definitions
-+pcm.cards cards.pcm
-+
-+pcm.default cards.pcm.default
-+pcm.sysdefault cards.pcm.default
-+pcm.front cards.pcm.front
-+pcm.rear cards.pcm.rear
-+pcm.center_lfe cards.pcm.center_lfe
-+pcm.side cards.pcm.side
-+pcm.surround21 cards.pcm.surround21
-+pcm.surround40 cards.pcm.surround40
-+pcm.surround41 cards.pcm.surround41
-+pcm.surround50 cards.pcm.surround50
-+pcm.surround51 cards.pcm.surround51
-+pcm.surround71 cards.pcm.surround71
-+pcm.iec958 cards.pcm.iec958
-+pcm.spdif iec958
-+pcm.hdmi cards.pcm.hdmi
-+pcm.dmix cards.pcm.dmix
-+pcm.dsnoop cards.pcm.dsnoop
-+pcm.modem cards.pcm.modem
-+pcm.phoneline cards.pcm.phoneline
-+
- #
- # Control interface
- #
---
-1.8.3.1
diff --git a/media-libs/alsa-lib/files/alsa-lib-1.2.2-namehint-add-omit_noargs.patch b/media-libs/alsa-lib/files/alsa-lib-1.2.2-namehint-add-omit_noargs.patch
deleted file mode 100644
index 34ffa01f105..00000000000
--- a/media-libs/alsa-lib/files/alsa-lib-1.2.2-namehint-add-omit_noargs.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-From 09e78da4cade7b8fecb8f36717b85c456f2e5487 Mon Sep 17 00:00:00 2001
-From: Jaroslav Kysela <perex@perex.cz>
-Date: Sun, 1 Mar 2020 19:57:06 +0100
-Subject: [PATCH] conf: namehint - add omit_noargs to the hint section
-
-Do not list simple surround devices in the namehint function by default.
-
-Fixes: https://github.com/alsa-project/alsa-lib/issues/27
-
-Signed-off-by: Jaroslav Kysela <perex@perex.cz>
----
- src/conf/pcm/surround21.conf | 1 +
- src/conf/pcm/surround40.conf | 1 +
- src/conf/pcm/surround41.conf | 1 +
- src/conf/pcm/surround50.conf | 1 +
- src/conf/pcm/surround51.conf | 1 +
- src/conf/pcm/surround71.conf | 1 +
- src/control/namehint.c | 6 +++++-
- 7 files changed, 11 insertions(+), 1 deletion(-)
-
-diff --git a/src/conf/pcm/surround21.conf b/src/conf/pcm/surround21.conf
-index 1cf1b7a..ad19507 100644
---- a/src/conf/pcm/surround21.conf
-+++ b/src/conf/pcm/surround21.conf
-@@ -57,5 +57,6 @@ pcm.!surround21 {
- hint {
- description "2.1 Surround output to Front and Subwoofer speakers"
- device_output $DEV
-+ omit_noargs true
- }
- }
-diff --git a/src/conf/pcm/surround40.conf b/src/conf/pcm/surround40.conf
-index 9788ad4..7c61502 100644
---- a/src/conf/pcm/surround40.conf
-+++ b/src/conf/pcm/surround40.conf
-@@ -55,5 +55,6 @@ pcm.!surround40 {
- hint {
- description "4.0 Surround output to Front and Rear speakers"
- device_output $DEV
-+ omit_noargs true
- }
- }
-diff --git a/src/conf/pcm/surround41.conf b/src/conf/pcm/surround41.conf
-index 7b4ef3b..cb6c044 100644
---- a/src/conf/pcm/surround41.conf
-+++ b/src/conf/pcm/surround41.conf
-@@ -61,5 +61,6 @@ pcm.!surround41 {
- hint {
- description "4.1 Surround output to Front, Rear and Subwoofer speakers"
- device_output $DEV
-+ omit_noargs true
- }
- }
-diff --git a/src/conf/pcm/surround50.conf b/src/conf/pcm/surround50.conf
-index 7d9a9e7..70d5406 100644
---- a/src/conf/pcm/surround50.conf
-+++ b/src/conf/pcm/surround50.conf
-@@ -61,5 +61,6 @@ pcm.!surround50 {
- hint {
- description "5.0 Surround output to Front, Center and Rear speakers"
- device_output $DEV
-+ omit_noargs true
- }
- }
-diff --git a/src/conf/pcm/surround51.conf b/src/conf/pcm/surround51.conf
-index e67f007..d0236e4 100644
---- a/src/conf/pcm/surround51.conf
-+++ b/src/conf/pcm/surround51.conf
-@@ -57,5 +57,6 @@ pcm.!surround51 {
- hint {
- description "5.1 Surround output to Front, Center, Rear and Subwoofer speakers"
- device_output $DEV
-+ omit_noargs true
- }
- }
-diff --git a/src/conf/pcm/surround71.conf b/src/conf/pcm/surround71.conf
-index a26c3f3..66792dd 100644
---- a/src/conf/pcm/surround71.conf
-+++ b/src/conf/pcm/surround71.conf
-@@ -59,5 +59,6 @@ pcm.!surround71 {
- hint {
- description "7.1 Surround output to Front, Center, Side, Rear and Woofer speakers"
- device_output $DEV
-+ omit_noargs true
- }
- }
-diff --git a/src/control/namehint.c b/src/control/namehint.c
-index 60c48ae..169bd42 100644
---- a/src/control/namehint.c
-+++ b/src/control/namehint.c
-@@ -287,10 +287,14 @@ static int try_config(snd_config_t *config,
- err = -EINVAL;
- goto __cleanup;
- }
-+ if (list->card < 0 &&
-+ snd_config_search(cfg, "omit_noargs", &n) >= 0 &&
-+ snd_config_get_bool(n) > 0)
-+ goto __skip_add;
- if (level == 1 &&
- snd_config_search(cfg, "show", &n) >= 0 &&
- snd_config_get_bool(n) <= 0)
-- goto __skip_add;
-+ goto __skip_add;
- if (buf1 == NULL &&
- snd_config_search(cfg, "description", &n) >= 0 &&
- snd_config_get_string(n, &str) >= 0) {
---
-1.8.3.1
next reply other threads:[~2021-06-16 17:17 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-16 17:17 Lars Wendler [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-10-30 20:41 [gentoo-commits] repo/gentoo:master commit in: media-libs/alsa-lib/files/, media-libs/alsa-lib/ Sam James
2023-09-07 14:48 Sam James
2023-12-13 1:54 Sam James
2024-01-28 17:35 Matt Turner
2024-11-23 17:37 Sam James
2024-12-15 16:38 Sam James
2025-03-15 17:53 Sam James
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=1623863855.862b72f03dd319eca3ba50717c53a4e70b5622c9.polynomial-c@gentoo \
--to=polynomial-c@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