diff options
Diffstat (limited to 'media-libs/alsa-lib')
| -rw-r--r-- | media-libs/alsa-lib/Manifest | 8 | ||||
| -rw-r--r-- | media-libs/alsa-lib/alsa-lib-1.2.2-r1.ebuild | 83 | ||||
| -rw-r--r-- | media-libs/alsa-lib/alsa-lib-1.2.5.1.ebuild (renamed from media-libs/alsa-lib/alsa-lib-1.2.3.2-r1.ebuild) | 18 | ||||
| -rw-r--r-- | media-libs/alsa-lib/files/alsa-lib-1.2.2-change-order-of-pcm-devices.patch | 80 | ||||
| -rw-r--r-- | media-libs/alsa-lib/files/alsa-lib-1.2.2-namehint-add-omit_noargs.patch | 108 |
5 files changed, 15 insertions, 282 deletions
diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest index 2f4fefedd09f..0b509387e512 100644 --- a/media-libs/alsa-lib/Manifest +++ b/media-libs/alsa-lib/Manifest @@ -1,13 +1,9 @@ AUX alsa-lib-1.1.6-missing_files.patch 5349 BLAKE2B 9ce6d529b78aa90dd5c507173f6a4b55f7b45a1e5e005760c07b3b000aef62c17ccd4f5815135c511006565e182619d2535c4eebe07d7825e4d871b6d9365d1d SHA512 879d11cf369a1aab2cc86c72ba90ad3dfeced2395c4cafda064a89a8f7790f032d4bc1c9065a86be28a3f7656bf91b4148df4e59d962ba4470221dc13a4fec90 -AUX alsa-lib-1.2.2-change-order-of-pcm-devices.patch 2198 BLAKE2B 21db0baeb6bb130c2ed537eaf6509f54fa4970a54ddc90b82217e47e63e1161e76bed54161f5cb19f79d999ccb1079571938bb7591ac378ca13cb94527d6b629 SHA512 3be6b6a50dc570df19e77132b519aba4b5a04fc25056eaaa882c8a32f632389efd358bfe7aec833651acd63e964b1f411f86fcfbb9abf30072ba14f561af3bc5 -AUX alsa-lib-1.2.2-namehint-add-omit_noargs.patch 3450 BLAKE2B f5fc66626a8f99d018bf476ec327c5734e96adf9f5dfdf97212cb220837f42c93879ef7641d3775c8238fc5fe27a5fc85959d4fca7e0fcd62b69009d895bdd1c SHA512 6f71ab0b4424b684dbd6ba0b2a3ce0de05ec3124ec1c3223ccb35afaff02dfed834af2d42d8d1cb8bb7f2e96051277bbf18ba5687e94f15d753cf1b86cdd33f8 AUX alsa-lib-1.2.4-musl.patch 1082 BLAKE2B f905b0b020afcc8124a128c29da015ce0629d46a2671a1af65a3e2bf666c383b0b85387a337c268eb8e1217d17b6dd8e5eabd66e2cb3e8dafcbe0959cfe4574a SHA512 b809b547822acb486baa33038771aef4a66930a3bfe495dde815d1f551e15f1543484efffe30bb6faf2f21e309c8b6956b4479ac1edf19933af32ff5517867e3 -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 -EBUILD alsa-lib-1.2.2-r1.ebuild 2180 BLAKE2B aa741e7e53d443b27d520ccf0a525384085844c64d5289ed22067b65ec0ee4cc9a4a75d68891fc6c830513b95de0ad6cac8280aa6cf7a5d37c9c6acc6aa27c82 SHA512 37fcd87e520494e1f0797cd5b023d9eac4dd78ed894588f85d223bb2a4b49da824381254cfd79905bb686a2751d22299d199df4eca5989b09ca8ac08786f4c8b -EBUILD alsa-lib-1.2.3.2-r1.ebuild 2117 BLAKE2B 9e6c389cd0915a78ab9b6b6ddb6ae82a1bef79f5f316c3bc26481ab38ee1eb88f32f059cec764e0e127eba7978322c516aece84bf784250e958df7d93fe98dc0 SHA512 12f9735f278467a883b189c74d03cf8c78940dc18d21175a5938565db3acc7b2a17a7aca927055728dbd965510387fdbcf4b2158a1f8f1af6542d54258fec8cf EBUILD alsa-lib-1.2.4.ebuild 2184 BLAKE2B ec54b9d6096709fffee836715f2eda6539091ee7dca58a9b131fff6301c54e5069204569082f1ef8d99f5c832eed7e216233e7add1bf8050cb029431940f3018 SHA512 9267b26b819bc407c21986c60086d0503b108395c1ef238302956ea7a55fdd41ec72963e4fb30617f79a9981e3232be51517913fe0158bf91027b551d6cdcc4c +EBUILD alsa-lib-1.2.5.1.ebuild 2505 BLAKE2B efc2a4c86f03f45019d8dc127f9ce84765718cf12d6948865600db6f5a17bbb07eaaaee4f8e1f814754b8278984c2bff12274124d1817a892e6844435dc86078 SHA512 6c7d07cdbfc6313c21afe7e95e6c34256bf5d9e6bb1a41074d8a24394f57b8def194d396a720105a401bddc60926675d4ef37026d6211926cee32c06ace7d2f1 EBUILD alsa-lib-1.2.5_p20210604.ebuild 2977 BLAKE2B e0434a80ecf3694f1d5d483f55e6983db087e804027f2896cd98ca1f11f429f4cf29c6caa80ac1f937f6c26e86e23a13acc2dac48b4103935d077adb19c8288c SHA512 349716f1956ad1a37de3283347d83808232fe7bdd2dcdf13a6105c5d5901a4d54ef298684d4efada4b7c90cb7ca707b8e3c7c6466add7fc59716ae17390752a7 MISC metadata.xml 502 BLAKE2B 06ee247fafa9de0b13dc4723279d82367bf580e8ad5216b301e23e1abf2a4ea464febaf456c31a91d223bec81603c1b65c2de0fb5fe491d464cfae754ecc6ad5 SHA512 0ca6ff20c3eda2f898d20df9e8a572b9a8d0504bf3a79bc1ef14026ea8b72e13638cbd3ef63ce2bf19efea80729ca25c27ca131d965edad4a4d3d23ac1352085 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 1a2b04a4cebf..000000000000 --- 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.5.1.ebuild index af903f22501a..7b6a92ccd5fc 100644 --- a/media-libs/alsa-lib/alsa-lib-1.2.3.2-r1.ebuild +++ b/media-libs/alsa-lib/alsa-lib-1.2.5.1.ebuild @@ -1,18 +1,26 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{7,8} ) +PYTHON_COMPAT=( python3_{7,8,9} ) 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" +if [[ ${PV} == *_p* ]] ; then + # Please set correct commit ID for a snapshot release!!! + COMMIT="abe805ed6c7f38e48002e575535afd1f673b9bcd" + SRC_URI="https://git.alsa-project.org/?p=${PN}.git;a=snapshot;h=${COMMIT};sf=tgz -> ${P}.tar.gz" + S="${WORKDIR}"/${PN}-${COMMIT:0:7} +else + # TODO: Upstream does publish .sig files, so someone could implement verify-sig ;) + SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2" +fi LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="alisp debug doc elibc_uclibc python +thread-safety" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" @@ -25,7 +33,7 @@ RDEPEND="python? ( ${PYTHON_DEPS} ) DEPEND="${RDEPEND}" PATCHES=( - "${FILESDIR}/${PN}-1.1.6-missing_files.patch" #652422 + "${FILESDIR}/${PN}-1.1.6-missing_files.patch" # bug #652422 ) pkg_setup() { 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 b21e184f8770..000000000000 --- 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 34ffa01f1055..000000000000 --- 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 |