* [gentoo-commits] repo/gentoo:master commit in: media-libs/alsa-lib/, media-libs/alsa-lib/files/
@ 2015-10-08 17:16 Mike Frysinger
0 siblings, 0 replies; 12+ messages in thread
From: Mike Frysinger @ 2015-10-08 17:16 UTC (permalink / raw
To: gentoo-commits
commit: 962a094e5e7db16e2b9d26a8a69564329f7dee4b
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 8 16:22:52 2015 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Thu Oct 8 17:07:41 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=962a094e
media-libs/alsa-lib: add upstream fix for cross-compiling
The configure script would blindly ignore $CC when cross-compiling.
Add the upstream commit that deletes that insanity.
media-libs/alsa-lib/alsa-lib-1.0.29.ebuild | 1 +
.../files/alsa-lib-1.0.29-cross-compile.patch | 46 ++++++++++++++++++++++
2 files changed, 47 insertions(+)
diff --git a/media-libs/alsa-lib/alsa-lib-1.0.29.ebuild b/media-libs/alsa-lib/alsa-lib-1.0.29.ebuild
index 288a03f..4e127b0 100644
--- a/media-libs/alsa-lib/alsa-lib-1.0.29.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.0.29.ebuild
@@ -34,6 +34,7 @@ pkg_setup() {
src_prepare() {
find . -name Makefile.am -exec sed -i -e '/CFLAGS/s:-g -O2::' {} + || die
+ epatch "${FILESDIR}"/${P}-cross-compile.patch
# https://bugs.gentoo.org/509886
use elibc_uclibc && { sed -i -e 's:oldapi queue_timer:queue_timer:' test/Makefile.am || die; }
epatch_user
diff --git a/media-libs/alsa-lib/files/alsa-lib-1.0.29-cross-compile.patch b/media-libs/alsa-lib/files/alsa-lib-1.0.29-cross-compile.patch
new file mode 100644
index 0000000..11fd99a
--- /dev/null
+++ b/media-libs/alsa-lib/files/alsa-lib-1.0.29-cross-compile.patch
@@ -0,0 +1,46 @@
+fix from upstream
+
+From c82417650a1ea4446c19dd82bfab9d8e6cd5a969 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Tue, 15 Sep 2015 18:48:02 +0300
+Subject: [PATCH] build: Do not try to detect cross-compiler
+
+cross compilers are passed via path may not be a gcc based cross
+compiler in such cases this check fails and try's to force gcc based
+cross compiler detection, This code is a convenience that limits the
+build system
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+---
+ configure.ac | 14 --------------
+ 1 file changed, 14 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index a482b3e..a14e52d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -27,20 +27,6 @@ AC_PREFIX_DEFAULT(/usr)
+
+ dnl Checks for programs.
+
+-dnl try to gues cross-compiler if not set
+-if test "x$host" != "x$build" -a -z "`echo $CC | grep -e '-gcc'`";
+-then
+- AC_MSG_CHECKING(for cross-compiler)
+-
+- which ${program_prefix}gcc >/dev/null 2>&1 && CC=${program_prefix}gcc
+- which ${host_cpu}-${host_os}-gcc >/dev/null 2>&1 \
+- && CC=${host_cpu}-${host_os}-gcc
+- which ${host_cpu}-${host_vendor}-${host_os}-gcc >/dev/null 2>&1 \
+- && CC=${host_cpu}-${host_vendor}-${host_os}-gcc
+-
+- AC_MSG_RESULT($CC)
+-fi
+-
+ CFLAGS="$CFLAGS -D_GNU_SOURCE"
+
+
+--
+2.5.2
+
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/alsa-lib/, media-libs/alsa-lib/files/
@ 2017-05-18 11:44 Lars Wendler
0 siblings, 0 replies; 12+ messages in thread
From: Lars Wendler @ 2017-05-18 11:44 UTC (permalink / raw
To: gentoo-commits
commit: 52a1599622bde2aedd43ee53373f28c8a3d7d457
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu May 18 11:44:48 2017 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu May 18 11:44:48 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52a15996
media-libs/alsa-lib: Removed old.
Package-Manager: Portage-2.3.5, Repoman-2.3.2
media-libs/alsa-lib/Manifest | 1 -
media-libs/alsa-lib/alsa-lib-1.0.29.ebuild | 87 ----------------------
.../files/alsa-lib-1.0.29-cross-compile.patch | 46 ------------
3 files changed, 134 deletions(-)
diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index 9406ce64732..d4771b2b49e 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -1,4 +1,3 @@
-DIST alsa-lib-1.0.29.tar.bz2 905417 SHA256 73043c35eb9636be0f4af6a240235c213f12a25feb1f04aeeac8cb7e30fcbdd0 SHA512 c9c2dcd3105abadcfdff104770a1f7683d83f6b9df64eebe9f9efc1ecab3ca4cef43718b5b15526bdabf2862ce55ec665732bb0390fc8e6492e2c1cebec9294c WHIRLPOOL 330877960733e847c12f133f93acc58a2053303b4437c5aaf21e2c4df0c47389df28ed093ab6606ee3cb854389b359d981dc547fba08bab03cff1c99f93e72d8
DIST alsa-lib-1.1.2.tar.bz2 947423 SHA256 d38dacd9892b06b8bff04923c380b38fb2e379ee5538935ff37e45b395d861d6 SHA512 a6c6675b1fd86955ef5072b9e6090795fc6b0b16f32481bece049e5f100e689be48b6416ff7cf36abfc67e0b94f420e08c15ff13a9701987d6bb69a8fa567e8a WHIRLPOOL 7aa68f305cb5ad58e9bdaeb3eee5fa7a37e9f606640789a9c778ff1bfd9b458d80e6ccfa9f73f9ad5b3a229ea988fa9b6d64b929c87f64ea9376a778f30eed0d
DIST alsa-lib-1.1.3.tar.bz2 962001 SHA256 71282502184c592c1a008e256c22ed0ba5728ca65e05273ceb480c70f515969c SHA512 f5dbe2375a8c66af14378314a5238284d4ed63dfc86a750c0c6e8f6cdb6b1ea2d8ef26f870b5d152dc0b77d9b40821cab523f6734902b91583beb08e28c66850 WHIRLPOOL f33871789a7cc06a9db83fd659abdfeb7940d61a24ad7c71866f843d8c0c29eaf0e0770a2034dee2526c96835935b88c2fe882184c86528c98e7d4901f94b27d
DIST alsa-lib-1.1.4.tar.bz2 973825 SHA256 82f50a09487079755d93e4c9384912196995bade6280bce9bfdcabf094bfb515 SHA512 8dfc5cc8872138b9e7e234934e317d797e100ac99dac86a2a2e4bdcc0d49e8a05b4089b98341051b407750bed93c2713fae5218318e5ce6cc7db2801165a1c10 WHIRLPOOL 74eb6742d93b6f2988ea9f583623edd985897db278e5dcac6916b3e9b772f16db326feb37b81a191405cc43ec2a55d313e74293ccbb43281b15f3056bd8f623f
diff --git a/media-libs/alsa-lib/alsa-lib-1.0.29.ebuild b/media-libs/alsa-lib/alsa-lib-1.0.29.ebuild
deleted file mode 100644
index d2f2aa0fac2..00000000000
--- a/media-libs/alsa-lib/alsa-lib-1.0.29.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# no support for python3_2 or above yet wrt #471326
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils multilib multilib-minimal python-single-r1
-
-DESCRIPTION="Advanced Linux Sound Architecture Library"
-HOMEPAGE="http://www.alsa-project.org/"
-SRC_URI="mirror://alsaproject/lib/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
-IUSE="alisp debug doc elibc_uclibc python"
-
-RDEPEND="python? ( ${PYTHON_DEPS} )
- abi_x86_32? (
- !<=app-emulation/emul-linux-x86-soundlibs-20130224-r1
- !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
- )"
-DEPEND="${RDEPEND}
- doc? ( >=app-doc/doxygen-1.2.6 )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- find . -name Makefile.am -exec sed -i -e '/CFLAGS/s:-g -O2::' {} + || die
- epatch "${FILESDIR}"/${P}-cross-compile.patch
- # https://bugs.gentoo.org/509886
- use elibc_uclibc && { sed -i -e 's:oldapi queue_timer:queue_timer:' test/Makefile.am || die; }
- epatch_user
- eautoreconf
-}
-
-multilib_src_configure() {
- local myconf
- # enable Python only on final ABI
- if multilib_is_native_abi; then
- myconf="$(use_enable python)"
- else
- myconf="--disable-python"
- fi
- use elibc_uclibc && myconf+=" --without-versioned"
-
- ECONF_SOURCE=${S} \
- econf \
- --disable-maintainer-mode \
- --enable-shared \
- --disable-resmgr \
- --enable-rawmidi \
- --enable-seq \
- --enable-aload \
- $(use_with debug) \
- $(use_enable alisp) \
- ${myconf}
-}
-
-multilib_src_compile() {
- emake
-
- if multilib_is_native_abi && use doc; then
- emake doc
- fgrep -Zrl "${S}" doc/doxygen/html | \
- xargs -0 sed -i -e "s:${S}::"
- fi
-}
-
-multilib_src_install() {
- emake DESTDIR="${D}" install
- if multilib_is_native_abi && use doc; then
- dohtml -r doc/doxygen/html/.
- fi
-}
-
-multilib_src_install_all() {
- prune_libtool_files --all
- find "${ED}"/usr/$(get_libdir)/alsa-lib -name '*.a' -exec rm -f {} +
- dodoc ChangeLog doc/asoundrc.txt NOTES TODO
-}
diff --git a/media-libs/alsa-lib/files/alsa-lib-1.0.29-cross-compile.patch b/media-libs/alsa-lib/files/alsa-lib-1.0.29-cross-compile.patch
deleted file mode 100644
index 11fd99a2f9e..00000000000
--- a/media-libs/alsa-lib/files/alsa-lib-1.0.29-cross-compile.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-fix from upstream
-
-From c82417650a1ea4446c19dd82bfab9d8e6cd5a969 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 15 Sep 2015 18:48:02 +0300
-Subject: [PATCH] build: Do not try to detect cross-compiler
-
-cross compilers are passed via path may not be a gcc based cross
-compiler in such cases this check fails and try's to force gcc based
-cross compiler detection, This code is a convenience that limits the
-build system
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
----
- configure.ac | 14 --------------
- 1 file changed, 14 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index a482b3e..a14e52d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -27,20 +27,6 @@ AC_PREFIX_DEFAULT(/usr)
-
- dnl Checks for programs.
-
--dnl try to gues cross-compiler if not set
--if test "x$host" != "x$build" -a -z "`echo $CC | grep -e '-gcc'`";
--then
-- AC_MSG_CHECKING(for cross-compiler)
--
-- which ${program_prefix}gcc >/dev/null 2>&1 && CC=${program_prefix}gcc
-- which ${host_cpu}-${host_os}-gcc >/dev/null 2>&1 \
-- && CC=${host_cpu}-${host_os}-gcc
-- which ${host_cpu}-${host_vendor}-${host_os}-gcc >/dev/null 2>&1 \
-- && CC=${host_cpu}-${host_vendor}-${host_os}-gcc
--
-- AC_MSG_RESULT($CC)
--fi
--
- CFLAGS="$CFLAGS -D_GNU_SOURCE"
-
-
---
-2.5.2
-
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/alsa-lib/, media-libs/alsa-lib/files/
@ 2018-04-05 11:50 Lars Wendler
0 siblings, 0 replies; 12+ messages in thread
From: Lars Wendler @ 2018-04-05 11:50 UTC (permalink / raw
To: gentoo-commits
commit: 69e184dd4ff12b9f4d0df8d7db5187dd6d630c42
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 5 11:50:04 2018 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Apr 5 11:50:20 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69e184dd
media-libs/alsa-lib: Revbump to add python3 support.
Also fixed build with USE="alisp"
Package-Manager: Portage-2.3.28, Repoman-2.3.9
...a-lib-1.1.6.ebuild => alsa-lib-1.1.6-r1.ebuild} | 7 +-
.../files/alsa-lib-1.1.6-missing_files.patch | 196 +++++++++++++++++++++
2 files changed, 201 insertions(+), 2 deletions(-)
diff --git a/media-libs/alsa-lib/alsa-lib-1.1.6.ebuild b/media-libs/alsa-lib/alsa-lib-1.1.6-r1.ebuild
similarity index 95%
rename from media-libs/alsa-lib/alsa-lib-1.1.6.ebuild
rename to media-libs/alsa-lib/alsa-lib-1.1.6-r1.ebuild
index d707b7888ae..f03ea3f74da 100644
--- a/media-libs/alsa-lib/alsa-lib-1.1.6.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.1.6-r1.ebuild
@@ -3,8 +3,7 @@
EAPI=6
-# no support for python3_2 or above yet wrt #471326
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
inherit autotools multilib multilib-minimal python-single-r1
@@ -23,6 +22,10 @@ DEPEND="${RDEPEND}
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+PATCHES=(
+ "${FILESDIR}/${P}-missing_files.patch" #652422
+)
+
pkg_setup() {
use python && python-single-r1_pkg_setup
}
diff --git a/media-libs/alsa-lib/files/alsa-lib-1.1.6-missing_files.patch b/media-libs/alsa-lib/files/alsa-lib-1.1.6-missing_files.patch
new file mode 100644
index 00000000000..909a00b985b
--- /dev/null
+++ b/media-libs/alsa-lib/files/alsa-lib-1.1.6-missing_files.patch
@@ -0,0 +1,196 @@
+https://bugs.gentoo.org/652422
+
+--- alsa-lib-1.1.6/src/conf/cards/aliases.alisp
++++ alsa-lib-1.1.6/src/conf/cards/aliases.alisp
+@@ -0,0 +1,29 @@
++(setq snd_card_aliases_array
++ (
++ ("YMF724" . "YMF744")
++ ("YMF724F" . "YMF744")
++ ("YMF740" . "YMF744")
++ ("YMF740C" . "YMF744")
++ ("YMF754" . "YMF744")
++ ("CMIPCI" . "CMI8338")
++ ("CMI8738" . "CMI8338")
++ ("CMI8738-MC4" . "CMI8738-MC6")
++ ("E-mu APS" . "EMU10K1")
++ ("GUS Max" . "GUS")
++ ("GUS ACE" . "GUS")
++ ("GUS Extreme" . "GUS")
++ ("AMD InterWave" . "GUS")
++ ("Dynasonic 3-D" . "GUS")
++ ("InterWave STB" . "GUS")
++ )
++)
++
++(defun snd_card_alias (cardname)
++ (setq r (assq cardname snd_card_aliases_array))
++ (setq r (if (null r) cardname r))
++ (unsetq r)
++)
++
++(defun snd_card_alias_unset ()
++ (unsetq snd_card_aliases_array snd_card_alias)
++)
+--- alsa-lib-1.1.6/src/conf/cards/SI7018/sndoc-mixer.alisp
++++ alsa-lib-1.1.6/src/conf/cards/SI7018/sndoc-mixer.alisp
+@@ -0,0 +1,11 @@
++;
++; SiS SI7018 mixer abstract layer
++;
++; Copyright (c) 2003 Jaroslav Kysela <perex@perex.cz>
++; License: GPL v2 (http://www.gnu.org/licenses/gpl.html)
++;
++
++(defun sndoc_mixer_open (hctl pcm)
++ (princ "sndoc_mixer_open: hctl=" hctl " pcm=" pcm "\n")
++ 0
++)
+--- alsa-lib-1.1.6/src/conf/cards/SI7018/sndop-mixer.alisp
++++ alsa-lib-1.1.6/src/conf/cards/SI7018/sndop-mixer.alisp
+@@ -0,0 +1,11 @@
++;
++; SiS SI7018 mixer abstract layer
++;
++; Copyright (c) 2003 Jaroslav Kysela <perex@perex.cz>
++; License: GPL v2 (http://www.gnu.org/licenses/gpl.html)
++;
++
++(defun sndop_mixer_open (hctl pcm)
++ (princ "sndop_mixer_open: hctl=" hctl " pcm=" pcm "\n")
++ 0
++)
+--- alsa-lib-1.1.6/src/conf/smixer.conf
++++ alsa-lib-1.1.6/src/conf/smixer.conf
+@@ -0,0 +1,13 @@
++_full smixer-python.so
++usb {
++ searchl "USB"
++ lib smixer-usb.so
++}
++ac97 {
++ searchl "AC97a:"
++ lib smixer-ac97.so
++}
++hda {
++ searchl "HDA:"
++ lib smixer-hda.so
++}
+--- alsa-lib-1.1.6/src/conf/sndo-mixer.alisp
++++ alsa-lib-1.1.6/src/conf/sndo-mixer.alisp
+@@ -0,0 +1,115 @@
++;
++; Toplevel configuration for the ALSA Ordinary Mixer Interface
++;
++; Copyright (c) 2003 Jaroslav Kysela <perex@perex.cz>
++; License: GPL v2 (http://www.gnu.org/licenses/gpl.html)
++;
++
++(defun sndo_include (hctl stream)
++ (setq info (Acall "ctl_card_info" (Acall "hctl_ctl" hctl)))
++ (if (= (Aerror info) 0)
++ (progn
++ (setq info (Aresult info))
++ (setq driver (cdr (assq "driver" (unsetq info))))
++ (setq file (concat (path "data") "/alsa/cards/" (snd_card_alias driver) "/sndo" stream "-mixer.alisp"))
++ (setq r (include file))
++ (when (= r -2) (Asyserr "unable to find file " file))
++ )
++ (setq r (Aerror info))
++ )
++ (unsetq info driver file r)
++)
++
++(defun sndo_mixer_open_fcn (hctl stream pcm)
++ (setq fcn (concat "sndo" stream "_mixer_open"))
++ (setq r (if (exfun fcn) (funcall fcn hctl pcm) 0))
++ (when (= r 0)
++ (setq hctls (if hctls (cons hctls (cons hctl)) hctl))
++ )
++ (unsetq fcn r)
++)
++
++(defun sndo_mixer_open_hctl (name stream pcm)
++ (setq hctl (Acall "hctl_open" name nil))
++ (setq r (Aerror hctl))
++ (when (= r 0)
++ (setq hctl (Aresult hctl))
++ (setq r (sndo_include hctl stream))
++ (if (= r 0)
++ (setq r (sndo_mixer_open_fcn hctl stream pcm))
++ (Acall "hctl_close" hctl)
++ )
++ )
++ (unsetq hctl r)
++)
++
++(defun sndo_mixer_open_virtual (name stream pcm)
++ (setq file (concat (path "data") "/alsa/virtual/" name "/sndo" stream "-mixer.alisp"))
++ (setq r (include file))
++ (when (= r -2) (Asyserr "unable to find file " file))
++ (when (= r 0) (setq r (sndo_mixer_open_fcn nil stream pcm)))
++ (unsetq file r)
++)
++
++(defun sndo_mixer_open1 (name stream)
++ (if (compare-strings name 0 2 "hw:" 0 2)
++ (sndo_mixer_open_hctl name stream nil)
++ (sndo_mixer_open_virtual name stream nil)
++ )
++)
++
++(defun sndo_mixer_open (pname cname)
++ (setq r (sndo_mixer_open1 pname "p"))
++ (when (= r 0) (setq r (sndo_mixer_open1 cname "c")))
++ (when (!= r 0) (sndo_mixer_close))
++ (unsetq sndo_mixer_open
++ sndo_mixer_open_pcm sndo_mixer_open_pcm1
++ sndo_mixer_open_virtual sndo_mixer_open_fcn
++ sndo_include r)
++)
++
++(defun sndo_mixer_open_pcm1 (pcm stream)
++ (setq info (Acall "pcm_info" pcm))
++ (setq r (Aerror info))
++ (when (= r 0)
++ (setq info (Aresult info))
++ (setq card (cdr (assq "card" info)))
++ (setq r
++ (if (< card 0)
++ (sndo_mixer_open_virtual (Acall "pcm_name" pcm) stream pcm)
++ (sndo_mixer_open_hctl (format "hw:%i" card) stream pcm)
++ )
++ )
++ )
++ (unsetq info card r)
++)
++
++(defun sndo_mixer_open_pcm (ppcm cpcm)
++ (setq r (sndo_mixer_open_pcm1 ppcm "p"))
++ (when (= r 0) (setq r (sndo_mixer_open_pcm1 cpcm "c")))
++ (when (!= r 0) (sndo_mixer_close))
++ (unsetq sndo_mixer_open
++ sndo_mixer_open_pcm sndo_mixer_open_pcm1
++ sndo_mixer_open_virtual sndo_mixer_open_fcn
++ sndo_include r)
++)
++
++(defun sndo_mixer_close1 (hctl stream)
++ (when hctl
++ (progn
++ (setq fcn (concat "sndo" stream "_mixer_close"))
++ (when (exfun fcn) (funcall fcn hctl))
++ (unsetq fcn)
++ (Acall "hctl_close" hctl)
++ )
++ )
++)
++
++(defun sndo_mixer_close nil
++ (sndo_mixer_close1 (nth 1 hctls) "c")
++ (sndo_mixer_close1 (nth 0 hctls) "p")
++ (snd_card_alias_unset)
++ (unsetq hctls)
++)
++
++(include (concat (path "data") "/alsa/cards/aliases.alisp"))
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/alsa-lib/, media-libs/alsa-lib/files/
@ 2019-11-25 21:14 Lars Wendler
0 siblings, 0 replies; 12+ messages in thread
From: Lars Wendler @ 2019-11-25 21:14 UTC (permalink / raw
To: gentoo-commits
commit: e5883f1964b837ad24addc4c24b7bea731012979
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 25 21:13:32 2019 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Nov 25 21:14:48 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5883f19
media-libs/alsa-lib: Revbump to fix pulseaudio build
Reported-by: crabbed halo ablution <crabbedhaloablution <AT> icloud.com>
Tested-by: crabbed halo ablution <crabbedhaloablution <AT> icloud.com>
Thanks-to: James Le Cuirot <chewi <AT> gentoo.org>
Closes: https://bugs.gentoo.org/700870
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
media-libs/alsa-lib/alsa-lib-1.2.1.1-r1.ebuild | 86 ++++++++++++++++++++++
.../alsa-lib-1.2.1.1-ucm_add_asoundlib_h.patch | 25 +++++++
2 files changed, 111 insertions(+)
diff --git a/media-libs/alsa-lib/alsa-lib-1.2.1.1-r1.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.1.1-r1.ebuild
new file mode 100644
index 00000000000..704317dcf5a
--- /dev/null
+++ b/media-libs/alsa-lib/alsa-lib-1.2.1.1-r1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+
+inherit autotools multilib multilib-minimal python-single-r1
+
+DESCRIPTION="Advanced Linux Sound Architecture Library"
+HOMEPAGE="https://alsa-project.org/"
+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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="alisp debug doc elibc_uclibc python +thread-safety"
+
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}
+ doc? ( >=app-doc/doxygen-1.2.6 )"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.1.6-missing_files.patch" #652422
+ "${FILESDIR}/${P}-ucm_add_asoundlib_h.patch" #700870
+)
+
+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}::"
+ fi
+}
+
+multilib_src_install() {
+ emake DESTDIR="${D}" install
+ if multilib_is_native_abi && use doc; then
+ docinto html
+ dodoc -r doc/doxygen/html/.
+ fi
+}
+
+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.1.1-ucm_add_asoundlib_h.patch b/media-libs/alsa-lib/files/alsa-lib-1.2.1.1-ucm_add_asoundlib_h.patch
new file mode 100644
index 00000000000..3c6072b8c3d
--- /dev/null
+++ b/media-libs/alsa-lib/files/alsa-lib-1.2.1.1-ucm_add_asoundlib_h.patch
@@ -0,0 +1,25 @@
+From: Jaroslav Kysela <perex@perex.cz>
+Date: Sat, 23 Nov 2019 14:38:35 +0000 (+0100)
+Subject: ucm: use-case.h - add <alsa/asoundlib.h> include
+X-Git-Url: https://git.alsa-project.org/?p=alsa-lib.git;a=commitdiff_plain;h=1a4b362115b5e1bb4f5b888919ffd11736adbf0c
+
+ucm: use-case.h - add <alsa/asoundlib.h> include
+
+It is required for snd_ctl_elem_id_t and snd_mixer_selem_id_t.
+
+Signed-off-by: Jaroslav Kysela <perex@perex.cz>
+---
+
+diff --git a/include/use-case.h b/include/use-case.h
+index 8a37121..80073ef 100644
+--- a/include/use-case.h
++++ b/include/use-case.h
+@@ -42,6 +42,8 @@
+ extern "C" {
+ #endif
+
++#include <alsa/asoundlib.h>
++
+ /**
+ * \defgroup ucm Use Case Interface
+ * The ALSA Use Case manager interface.
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/alsa-lib/, media-libs/alsa-lib/files/
@ 2020-02-20 15:49 Lars Wendler
0 siblings, 0 replies; 12+ messages in thread
From: Lars Wendler @ 2020-02-20 15:49 UTC (permalink / raw
To: gentoo-commits
commit: ca92929fd4d999f04d0e8c5aa5e78af9cc3eb229
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 20 15:49:00 2020 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Feb 20 15:49:33 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca92929f
media-libs/alsa-lib: Removed old
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
media-libs/alsa-lib/Manifest | 3 -
media-libs/alsa-lib/alsa-lib-1.1.2.ebuild | 86 ----------------------
media-libs/alsa-lib/alsa-lib-1.1.9.ebuild | 83 ---------------------
media-libs/alsa-lib/alsa-lib-1.2.1.1-r1.ebuild | 86 ----------------------
.../alsa-lib-1.2.1.1-ucm_add_asoundlib_h.patch | 25 -------
5 files changed, 283 deletions(-)
diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index 0fab83a64ee..b4503372211 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -1,6 +1,3 @@
-DIST alsa-lib-1.1.2.tar.bz2 947423 BLAKE2B 09cd6a625d8f681c5515fd925191fb5468158ed77cc3878c076f4344e4d8f7b15e9872d3d6635710049ca14199851f2343246e94810fe2a0bb0d1e02915c941e SHA512 a6c6675b1fd86955ef5072b9e6090795fc6b0b16f32481bece049e5f100e689be48b6416ff7cf36abfc67e0b94f420e08c15ff13a9701987d6bb69a8fa567e8a
DIST alsa-lib-1.1.8.tar.bz2 1002562 BLAKE2B a531ab501943924d007f7ae0e4489deea805ccbc8f2f02d3ee392aa2dbe54ffe31f58ee1744308f851a68f693c83125088708e901d0d83e4a7a5f644ef448aa3 SHA512 50ae107c6efe8200b4c41e0463e099d16e149332f1d3a22c3e81d3e7d980b7f93f3610fc9711ef62067caeb1054e7ea612ba3903bf8a91ebeffa48687cf80eed
-DIST alsa-lib-1.1.9.tar.bz2 1058187 BLAKE2B 60454be162a0f36334602586762f8ce657d2883636bcb65ae91dedce62297bd40f3dbdc6213ef773542708b367f8796e143b1fc987c40de6d5d5a69a648f6b18 SHA512 402e39cca82d17555e3e52ef06b8ed9dcf58531da393809a7b5cf18658299fa90ee8a60bfc5213482d7a02b13140c441f1333b144556f44ab4adb786a2fb3c49
-DIST alsa-lib-1.2.1.1.tar.bz2 1002960 BLAKE2B 6df2145e0fdd42b86759a6250f6fa3d18075d1bbff1c5ec0b4b6130f934ab369e5cc0edd9a53c3b6298dce0d374a9888c5fc63ae0d42b3fd0ef5ca97eff00369 SHA512 8a0b6f1ecc58d60991b4509e791b1581eebae57cd754b0b4829e66b1cfee81d588b04f42a17f598f06310b9658d9f46fd748cca516cc48b6f2989389c22c42e9
DIST alsa-lib-1.2.1.2.tar.bz2 1004129 BLAKE2B e8bf117f3036a32b020897f16b9648ac105c499f547ae157508720502722d4e1a651719c86a4e2756ca7a3c573a1f17c02524125ccaad12bcb8c7c71675c898a SHA512 e8286fd55f63ee0d95513279d0885c287533de89b7af6c338413dec5d38ba4f5a15da1a4a4ce36e052614e4b730e3778782dab9979d82958283be17b48604913
DIST alsa-lib-1.2.2.tar.bz2 1030747 BLAKE2B 176054c7783452fcd0b30482f4d85fb88a1364a97f79830f2c22cd578275280fa64537d00a08f3e3b1420e4aeb4e4269c7523cb4296db3ed095bcf078b452726 SHA512 d21adb3ff998918c7d1820f9ce2aaf4202dd45ccb87cb092d49da8b2402b6ddaad06325be0fd59f17393a5d9958e3743bfccb4b14bdb947a42e7d791d73c7033
diff --git a/media-libs/alsa-lib/alsa-lib-1.1.2.ebuild b/media-libs/alsa-lib/alsa-lib-1.1.2.ebuild
deleted file mode 100644
index 11c4a371fbd..00000000000
--- a/media-libs/alsa-lib/alsa-lib-1.1.2.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# no support for python3_2 or above yet wrt #471326
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils ltprune multilib multilib-minimal python-single-r1
-
-DESCRIPTION="Advanced Linux Sound Architecture Library"
-HOMEPAGE="https://alsa-project.org/"
-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 ~sh sparc x86 ~amd64-linux ~x86-linux"
-IUSE="alisp debug doc elibc_uclibc python"
-
-RDEPEND="python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
- doc? ( >=app-doc/doxygen-1.2.6 )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-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
- use elibc_uclibc && { sed -i -e 's:oldapi queue_timer:queue_timer:' test/Makefile.am || die; }
- # 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 myconf
- # enable Python only on final ABI
- if multilib_is_native_abi; then
- myconf="$(use_enable python)"
- else
- myconf="--disable-python"
- fi
- use elibc_uclibc && myconf+=" --without-versioned"
-
- ECONF_SOURCE=${S} \
- econf \
- --disable-maintainer-mode \
- --enable-shared \
- --disable-resmgr \
- --enable-rawmidi \
- --enable-seq \
- --enable-aload \
- $(use_with debug) \
- $(use_enable alisp) \
- ${myconf}
-}
-
-multilib_src_compile() {
- emake
-
- if multilib_is_native_abi && use doc; then
- emake doc
- fgrep -Zrl "${S}" doc/doxygen/html | \
- xargs -0 sed -i -e "s:${S}::"
- fi
-}
-
-multilib_src_install() {
- emake DESTDIR="${D}" install
- if multilib_is_native_abi && use doc; then
- docinto html
- dodoc -r doc/doxygen/html/.
- fi
-}
-
-multilib_src_install_all() {
- prune_libtool_files --all
- find "${ED}"/usr/$(get_libdir)/alsa-lib -name '*.a' -exec rm -f {} +
- docinto ""
- dodoc ChangeLog doc/asoundrc.txt NOTES TODO
-}
diff --git a/media-libs/alsa-lib/alsa-lib-1.1.9.ebuild b/media-libs/alsa-lib/alsa-lib-1.1.9.ebuild
deleted file mode 100644
index ba510e92609..00000000000
--- a/media-libs/alsa-lib/alsa-lib-1.1.9.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=( python{2_7,3_{6,7}} )
-
-inherit autotools multilib multilib-minimal python-single-r1
-
-DESCRIPTION="Advanced Linux Sound Architecture Library"
-HOMEPAGE="https://alsa-project.org/"
-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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="alisp debug doc elibc_uclibc python +thread-safety"
-
-RDEPEND="python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
- doc? ( >=app-doc/doxygen-1.2.6 )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-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
- use elibc_uclibc && { sed -i -e 's:oldapi queue_timer:queue_timer:' test/Makefile.am || die; }
- # 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}::"
- fi
-}
-
-multilib_src_install() {
- emake DESTDIR="${D}" install
- if multilib_is_native_abi && use doc; then
- docinto html
- dodoc -r doc/doxygen/html/.
- fi
-}
-
-multilib_src_install_all() {
- find "${ED}" \( -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.1.1-r1.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.1.1-r1.ebuild
deleted file mode 100644
index a9f1cec6097..00000000000
--- a/media-libs/alsa-lib/alsa-lib-1.2.1.1-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
-
-inherit autotools multilib multilib-minimal python-single-r1
-
-DESCRIPTION="Advanced Linux Sound Architecture Library"
-HOMEPAGE="https://alsa-project.org/"
-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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="alisp debug doc elibc_uclibc python +thread-safety"
-
-RDEPEND="python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
- doc? ( >=app-doc/doxygen-1.2.6 )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.1.6-missing_files.patch" #652422
- "${FILESDIR}/${P}-ucm_add_asoundlib_h.patch" #700870
-)
-
-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}::"
- fi
-}
-
-multilib_src_install() {
- emake DESTDIR="${D}" install
- if multilib_is_native_abi && use doc; then
- docinto html
- dodoc -r doc/doxygen/html/.
- fi
-}
-
-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.1.1-ucm_add_asoundlib_h.patch b/media-libs/alsa-lib/files/alsa-lib-1.2.1.1-ucm_add_asoundlib_h.patch
deleted file mode 100644
index 3c6072b8c3d..00000000000
--- a/media-libs/alsa-lib/files/alsa-lib-1.2.1.1-ucm_add_asoundlib_h.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Jaroslav Kysela <perex@perex.cz>
-Date: Sat, 23 Nov 2019 14:38:35 +0000 (+0100)
-Subject: ucm: use-case.h - add <alsa/asoundlib.h> include
-X-Git-Url: https://git.alsa-project.org/?p=alsa-lib.git;a=commitdiff_plain;h=1a4b362115b5e1bb4f5b888919ffd11736adbf0c
-
-ucm: use-case.h - add <alsa/asoundlib.h> include
-
-It is required for snd_ctl_elem_id_t and snd_mixer_selem_id_t.
-
-Signed-off-by: Jaroslav Kysela <perex@perex.cz>
----
-
-diff --git a/include/use-case.h b/include/use-case.h
-index 8a37121..80073ef 100644
---- a/include/use-case.h
-+++ b/include/use-case.h
-@@ -42,6 +42,8 @@
- extern "C" {
- #endif
-
-+#include <alsa/asoundlib.h>
-+
- /**
- * \defgroup ucm Use Case Interface
- * The ALSA Use Case manager interface.
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/alsa-lib/, media-libs/alsa-lib/files/
@ 2020-05-02 17:12 Andreas Sturmlechner
0 siblings, 0 replies; 12+ messages in thread
From: Andreas Sturmlechner @ 2020-05-02 17:12 UTC (permalink / raw
To: gentoo-commits
commit: bfc291932bcbb73cce8aebf8d522778e1a417b1b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat May 2 15:01:14 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat May 2 17:11:39 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfc29193
media-libs/alsa-lib: Fix PCM device reordering bug
Thanks-to: Alan Swanson <reiver <AT> improbability.net>
Closes: https://bugs.gentoo.org/718106
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-libs/alsa-lib/alsa-lib-1.2.2-r1.ebuild | 83 ++++++++++++++++
...lsa-lib-1.2.2-change-order-of-pcm-devices.patch | 80 +++++++++++++++
.../alsa-lib-1.2.2-namehint-add-omit_noargs.patch | 108 +++++++++++++++++++++
3 files changed, 271 insertions(+)
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
new file mode 100644
index 00000000000..d00305137f2
--- /dev/null
+++ b/media-libs/alsa-lib/alsa-lib-1.2.2-r1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+inherit autotools multilib-minimal python-single-r1
+
+DESCRIPTION="Advanced Linux Sound Architecture Library"
+HOMEPAGE="https://alsa-project.org/"
+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/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
new file mode 100644
index 00000000000..b21e184f877
--- /dev/null
+++ b/media-libs/alsa-lib/files/alsa-lib-1.2.2-change-order-of-pcm-devices.patch
@@ -0,0 +1,80 @@
+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
new file mode 100644
index 00000000000..34ffa01f105
--- /dev/null
+++ b/media-libs/alsa-lib/files/alsa-lib-1.2.2-namehint-add-omit_noargs.patch
@@ -0,0 +1,108 @@
+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
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/alsa-lib/, media-libs/alsa-lib/files/
@ 2021-05-28 1:41 Sam James
0 siblings, 0 replies; 12+ messages in thread
From: Sam James @ 2021-05-28 1:41 UTC (permalink / raw
To: gentoo-commits
commit: 5636983cd1c5a681e22e28b3a115c168f80f693d
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri May 28 01:40:42 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri May 28 01:40:56 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5636983c
media-libs/alsa-lib: fix musl build
Closes: https://bugs.gentoo.org/792570
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/alsa-lib/alsa-lib-1.2.4.ebuild | 3 +-
.../alsa-lib/files/alsa-lib-1.2.4-musl.patch | 32 ++++++++++++++++++++++
2 files changed, 34 insertions(+), 1 deletion(-)
diff --git a/media-libs/alsa-lib/alsa-lib-1.2.4.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.4.ebuild
index 51bdbff6f13..e7a0a5539cb 100644
--- a/media-libs/alsa-lib/alsa-lib-1.2.4.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.2.4.ebuild
@@ -25,7 +25,8 @@ 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
+ "${FILESDIR}/${PN}-1.2.4-musl.patch" # bug #792570
)
pkg_setup() {
diff --git a/media-libs/alsa-lib/files/alsa-lib-1.2.4-musl.patch b/media-libs/alsa-lib/files/alsa-lib-1.2.4-musl.patch
new file mode 100644
index 00000000000..54e6c0e0d23
--- /dev/null
+++ b/media-libs/alsa-lib/files/alsa-lib-1.2.4-musl.patch
@@ -0,0 +1,32 @@
+https://github.com/alsa-project/alsa-lib/commit/ad8c8e5503980295dd8e5e54a6285d2d7e32eb1e
+https://bugs.gentoo.org/792570
+
+From ad8c8e5503980295dd8e5e54a6285d2d7e32eb1e Mon Sep 17 00:00:00 2001
+From: Jaroslav Kysela <perex@perex.cz>
+Date: Thu, 22 Oct 2020 20:57:32 +0200
+Subject: [PATCH] dlmisc: the snd_plugin_dir_set / snd_plugin_dir must be
+ declared even for \!DL_ORIGIN_AVAILABLE
+
+Fixes: 8580c081c2 ("dlsym: add support for ALSA_PLUGIN_DIR environment variable")
+BugLink: https://github.com/alsa-project/alsa-lib/issues/91
+Signed-off-by: Jaroslav Kysela <perex@perex.cz>
+---
+ src/dlmisc.c | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/src/dlmisc.c b/src/dlmisc.c
+index c9517c55..f20eb593 100644
+--- a/src/dlmisc.c
++++ b/src/dlmisc.c
+@@ -42,11 +42,9 @@
+ #ifndef PIC
+ struct snd_dlsym_link *snd_dlsym_start = NULL;
+ #endif
+-#ifdef DL_ORIGIN_AVAILABLE
+ static int snd_plugin_dir_set = 0;
+ static char *snd_plugin_dir = NULL;
+ #endif
+-#endif
+
+ #if defined(DL_ORIGIN_AVAILABLE) && defined(HAVE_LIBPTHREAD)
+ static pthread_mutex_t snd_dlpath_mutex = PTHREAD_MUTEX_INITIALIZER;
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/alsa-lib/, media-libs/alsa-lib/files/
@ 2022-06-01 7:21 Lars Wendler
0 siblings, 0 replies; 12+ messages in thread
From: Lars Wendler @ 2022-06-01 7:21 UTC (permalink / raw
To: gentoo-commits
commit: 3dd45d3822d8761f7a9a4c2e66c1b69aba3c1e71
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 1 07:18:55 2022 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Jun 1 07:21:01 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3dd45d38
media-libs/alsa-lib: Removed old
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
media-libs/alsa-lib/Manifest | 3 -
media-libs/alsa-lib/alsa-lib-1.2.4.ebuild | 80 --------------------
media-libs/alsa-lib/alsa-lib-1.2.5.1.ebuild | 87 ----------------------
media-libs/alsa-lib/alsa-lib-1.2.6.ebuild | 87 ----------------------
.../alsa-lib/files/alsa-lib-1.2.4-musl.patch | 32 --------
5 files changed, 289 deletions(-)
diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index 5c3e358ac1cb..cf75cd21ef5a 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -1,5 +1,2 @@
-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.6.1.tar.bz2 1079670 BLAKE2B 4f3d1d078678773b4f6a569d0eea95d0cf89a846605c3a95e11b92f1fe0bd9fb164b8f710906f0de9675ade7ef2123375eb1221945bec511708d6fdd85c051b9 SHA512 70e539cf092b5d43e00e4134d8a3e184f0dc34312823e4b58a574320cbf06cb7369bc3251ecb1858033756a7a8c35d36faa8da48d49f6efe0cec905784adbd45
-DIST alsa-lib-1.2.6.tar.bz2 1079598 BLAKE2B 84a7a20fbea4025f2ac08acefa3a9ea9d2737585c5d5f09c8df3b5ccb998eaa09a7ec16a019a40c4d3e3e4b5209b961f9da23ec57c0bb9824bade9a3a0dd4350 SHA512 ae95718813abf62811fe44c6df2a8de5a1227da4b022c4dd97dd8e7c1001f48307ba36bf04208bdbe24e8a8eebf4ed5a59f40ee6750dcbe976678071c3f2f5b7
DIST alsa-lib-1.2.7.tar.bz2 1084924 BLAKE2B a3bfbbfcf31625be0749218b3c02b307da9077d4bd82e9f980b8e3d6f9275f3a3f3c8158bb28fb1c61724a35e794eb3f6cc8872202ff42fb847725058109087e SHA512 6bd48b07d659fddad792876326a93b2a549ce94bc191131670365599c31f81f737bfd8e94dec6fe296bc5d86df2e3e381bbb7a694d24fe7e8e501f1c994ed084
diff --git a/media-libs/alsa-lib/alsa-lib-1.2.4.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.4.ebuild
deleted file mode 100644
index a79d156fc211..000000000000
--- a/media-libs/alsa-lib/alsa-lib-1.2.4.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-IUSE="alisp debug doc 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" # bug #652422
- "${FILESDIR}/${PN}-1.2.4-musl.patch" # bug #792570
-)
-
-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/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)
- )
-
- 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.5.1.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.5.1.ebuild
deleted file mode 100644
index 5bae5dbf8736..000000000000
--- a/media-libs/alsa-lib/alsa-lib-1.2.5.1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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"
-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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="alisp debug doc 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" # bug #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/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)
- )
-
- 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.6.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.6.ebuild
deleted file mode 100644
index c9ea9965ca37..000000000000
--- a/media-libs/alsa-lib/alsa-lib-1.2.6.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit autotools multilib-minimal python-single-r1
-
-DESCRIPTION="Advanced Linux Sound Architecture Library"
-HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
-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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="alisp debug doc 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" # bug #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/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)
- )
-
- 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.4-musl.patch b/media-libs/alsa-lib/files/alsa-lib-1.2.4-musl.patch
deleted file mode 100644
index 54e6c0e0d23e..000000000000
--- a/media-libs/alsa-lib/files/alsa-lib-1.2.4-musl.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-https://github.com/alsa-project/alsa-lib/commit/ad8c8e5503980295dd8e5e54a6285d2d7e32eb1e
-https://bugs.gentoo.org/792570
-
-From ad8c8e5503980295dd8e5e54a6285d2d7e32eb1e Mon Sep 17 00:00:00 2001
-From: Jaroslav Kysela <perex@perex.cz>
-Date: Thu, 22 Oct 2020 20:57:32 +0200
-Subject: [PATCH] dlmisc: the snd_plugin_dir_set / snd_plugin_dir must be
- declared even for \!DL_ORIGIN_AVAILABLE
-
-Fixes: 8580c081c2 ("dlsym: add support for ALSA_PLUGIN_DIR environment variable")
-BugLink: https://github.com/alsa-project/alsa-lib/issues/91
-Signed-off-by: Jaroslav Kysela <perex@perex.cz>
----
- src/dlmisc.c | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/src/dlmisc.c b/src/dlmisc.c
-index c9517c55..f20eb593 100644
---- a/src/dlmisc.c
-+++ b/src/dlmisc.c
-@@ -42,11 +42,9 @@
- #ifndef PIC
- struct snd_dlsym_link *snd_dlsym_start = NULL;
- #endif
--#ifdef DL_ORIGIN_AVAILABLE
- static int snd_plugin_dir_set = 0;
- static char *snd_plugin_dir = NULL;
- #endif
--#endif
-
- #if defined(DL_ORIGIN_AVAILABLE) && defined(HAVE_LIBPTHREAD)
- static pthread_mutex_t snd_dlpath_mutex = PTHREAD_MUTEX_INITIALIZER;
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/alsa-lib/, media-libs/alsa-lib/files/
@ 2023-09-07 14:48 Sam James
0 siblings, 0 replies; 12+ messages in thread
From: Sam James @ 2023-09-07 14:48 UTC (permalink / raw
To: gentoo-commits
commit: 0cd39f1f240ebd443106c162bcd7c1b22a55f26c
Author: Violet Purcell <vimproved <AT> inventati <DOT> org>
AuthorDate: Thu Sep 7 12:05:56 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Sep 7 14:47:35 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cd39f1f
media-libs/alsa-lib: Backport UMP header file detection fix
Closes: https://bugs.gentoo.org/913513
Closes: https://bugs.gentoo.org/913521
Signed-off-by: Violet Purcell <vimproved <AT> inventati.org>
Closes: https://github.com/gentoo/gentoo/pull/32660
Signed-off-by: Sam James <sam <AT> gentoo.org>
...lib-1.2.10.ebuild => alsa-lib-1.2.10-r1.ebuild} | 1 +
| 31 ++++++++++++++++++++++
2 files changed, 32 insertions(+)
diff --git a/media-libs/alsa-lib/alsa-lib-1.2.10.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.10-r1.ebuild
similarity index 97%
rename from media-libs/alsa-lib/alsa-lib-1.2.10.ebuild
rename to media-libs/alsa-lib/alsa-lib-1.2.10-r1.ebuild
index bd8d097d5eff..b558003171cb 100644
--- a/media-libs/alsa-lib/alsa-lib-1.2.10.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.2.10-r1.ebuild
@@ -35,6 +35,7 @@ BDEPEND="doc? ( >=app-doc/doxygen-1.2.6 )"
PATCHES=(
"${FILESDIR}/${PN}-1.1.6-missing_files.patch" # bug #652422
"${FILESDIR}/${P}-musl-string.patch" # bug #913573, backport
+ "${FILESDIR}/${P}-ump-header-detection.patch" # bug #913573, backport
)
pkg_setup() {
diff --git a/media-libs/alsa-lib/files/alsa-lib-1.2.10-ump-header-detection.patch b/media-libs/alsa-lib/files/alsa-lib-1.2.10-ump-header-detection.patch
new file mode 100644
index 000000000000..a75aa3a85a06
--- /dev/null
+++ b/media-libs/alsa-lib/files/alsa-lib-1.2.10-ump-header-detection.patch
@@ -0,0 +1,31 @@
+From https://github.com/alsa-project/alsa-lib/commit/fcce13a6726c52882bd8b7131c61c4eba308792c Mon Sep 17 00:00:00 2001
+From: Jaroslav Kysela <perex@perex.cz>
+Date: Mon, 4 Sep 2023 09:38:26 +0200
+Subject: [PATCH] control.h: Fix ump header file detection
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Apparently, the control.h is used from apps separately (outside
+asoundlib.h). Avoid errors like:
+
+/usr/include/alsa/control.h:417:47: error: ‘snd_ump_endpoint_info_t’ has not been declared
+ 417 | int snd_ctl_ump_endpoint_info(snd_ctl_t *ctl, snd_ump_endpoint_info_t *info);
+ | ^~~~~~~~~~~~~~~~~~~~~~~
+/usr/include/alsa/control.h:418:44: error: ‘snd_ump_block_info_t’ has not been declared
+ 418 | int snd_ctl_ump_block_info(snd_ctl_t *ctl, snd_ump_block_info_t *info);
+ | ^~~~~~~~~~~~~~~~~~~~
+
+Fixes: https://github.com/alsa-project/alsa-lib/issues/348
+Signed-off-by: Jaroslav Kysela <perex@perex.cz>
+--- a/include/control.h
++++ b/include/control.h
+@@ -413,6 +413,8 @@ int snd_ctl_pcm_prefer_subdevice(snd_ctl_t *ctl, int subdev);
+ int snd_ctl_rawmidi_next_device(snd_ctl_t *ctl, int * device);
+ int snd_ctl_rawmidi_info(snd_ctl_t *ctl, snd_rawmidi_info_t * info);
+ int snd_ctl_rawmidi_prefer_subdevice(snd_ctl_t *ctl, int subdev);
++#endif
++#ifdef __ALSA_UMP_H
+ int snd_ctl_ump_next_device(snd_ctl_t *ctl, int *device);
+ int snd_ctl_ump_endpoint_info(snd_ctl_t *ctl, snd_ump_endpoint_info_t *info);
+ int snd_ctl_ump_block_info(snd_ctl_t *ctl, snd_ump_block_info_t *info);
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/alsa-lib/, media-libs/alsa-lib/files/
@ 2023-09-15 4:33 Sam James
0 siblings, 0 replies; 12+ messages in thread
From: Sam James @ 2023-09-15 4:33 UTC (permalink / raw
To: gentoo-commits
commit: 8da9ea49f14cfc17a49174d51b608f7484daba19
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 15 04:13:55 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Sep 15 04:33:09 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8da9ea49
media-libs/alsa-lib: fix 32-bit LFS mismatches
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/alsa-lib/alsa-lib-1.2.10-r2.ebuild | 102 ++++++++++++
...sa-lib-1.2.10-pcm-fix-segfault-32bit-libs.patch | 91 +++++++++++
...-1.2.10-reshuffle-included-files-config-h.patch | 174 +++++++++++++++++++++
3 files changed, 367 insertions(+)
diff --git a/media-libs/alsa-lib/alsa-lib-1.2.10-r2.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.10-r2.ebuild
new file mode 100644
index 000000000000..4b5a3c65e8bb
--- /dev/null
+++ b/media-libs/alsa-lib/alsa-lib-1.2.10-r2.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+inherit autotools multilib-minimal flag-o-matic python-single-r1
+
+DESCRIPTION="Advanced Linux Sound Architecture Library"
+HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
+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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="alisp debug doc python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+ media-libs/alsa-topology-conf
+ media-libs/alsa-ucm-conf
+ python? ( ${PYTHON_DEPS} )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( >=app-doc/doxygen-1.2.6 )"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.1.6-missing_files.patch" # bug #652422
+ "${FILESDIR}/${P}-musl-string.patch" # bug #913573, backport
+ "${FILESDIR}/${P}-ump-header-detection.patch" # bug #913573, backport
+ "${FILESDIR}/${P}-pcm-fix-segfault-32bit-libs.patch" # backport
+ "${FILESDIR}/${P}-reshuffle-included-files-config-h.patch" # backport
+)
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ default
+
+ find . -name Makefile.am -exec sed -i -e '/CFLAGS/s:-g -O2::' {} + || die
+ # bug #545950
+ sed -i -e '5s:^$:\nAM_CPPFLAGS = -I$(top_srcdir)/include:' test/lsb/Makefile.am || die
+
+ eautoreconf
+}
+
+multilib_src_configure() {
+ # Broken upstream. Could in theory work with -flto-partitions=none
+ # but it's a hack to workaround the real problem and not strictly safe.
+ # bug #616108, bug #669086, and https://github.com/alsa-project/alsa-lib/issues/6.
+ # (This bug is closed as of 1.2.9 but there's been no clear actual fix to it.
+ # Let us know if you can identify one.)
+ filter-lto
+
+ local myeconfargs=(
+ --disable-maintainer-mode
+ --disable-resmgr
+ --enable-aload
+ --enable-rawmidi
+ --enable-seq
+ --enable-shared
+ --enable-thread-safety
+
+ $(multilib_native_use_enable python)
+ $(use_enable alisp)
+ $(use_with debug)
+ )
+
+ 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 '*.la' -delete || die
+
+ dodoc ChangeLog doc/asoundrc.txt NOTES TODO
+}
diff --git a/media-libs/alsa-lib/files/alsa-lib-1.2.10-pcm-fix-segfault-32bit-libs.patch b/media-libs/alsa-lib/files/alsa-lib-1.2.10-pcm-fix-segfault-32bit-libs.patch
new file mode 100644
index 000000000000..4cd3614ee943
--- /dev/null
+++ b/media-libs/alsa-lib/files/alsa-lib-1.2.10-pcm-fix-segfault-32bit-libs.patch
@@ -0,0 +1,91 @@
+https://github.com/alsa-project/alsa-lib/commit/0e3dfb9f705ca78be34cd70fd59d67c431e29cc7
+
+From 0e3dfb9f705ca78be34cd70fd59d67c431e29cc7 Mon Sep 17 00:00:00 2001
+From: Takashi Iwai <tiwai@suse.de>
+Date: Sat, 9 Sep 2023 17:42:03 +0200
+Subject: [PATCH] pcm: Fix segfault with 32bit libs
+
+The recent rearrangement of header inclusion order caused a regression
+showing segfaults on 32bit Arm. The primary reason is the
+inconsistent compile condition depending on the inclusion of config.h;
+while most of other code include pcm_local.h (that implicitly includes
+config.h) at first, pcm_direct.c doesn't do it, hence the access with
+direct plugins crashes.
+
+For fixing it, we need to include config.h at the beginning. But,
+it's better to include pcm_local.h for all relevant code for
+consistency. The patch does it, and also it adds the guard in
+pcm_local.h for double inclusions.
+
+Fixes: ad3a8b8b314e ("reshuffle included files to include config.h as first")
+Link: https://github.com/alsa-project/alsa-lib/issues/352
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+--- a/src/pcm/pcm_direct.c
++++ b/src/pcm/pcm_direct.c
+@@ -19,6 +19,7 @@
+ *
+ */
+
++#include "pcm_local.h"
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <stddef.h>
+--- a/src/pcm/pcm_dmix.c
++++ b/src/pcm/pcm_dmix.c
+@@ -26,7 +26,7 @@
+ *
+ */
+
+-#include "config.h"
++#include "pcm_local.h"
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <stddef.h>
+--- a/src/pcm/pcm_dshare.c
++++ b/src/pcm/pcm_dshare.c
+@@ -26,6 +26,7 @@
+ *
+ */
+
++#include "pcm_local.h"
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <stddef.h>
+--- a/src/pcm/pcm_dsnoop.c
++++ b/src/pcm/pcm_dsnoop.c
+@@ -26,6 +26,7 @@
+ *
+ */
+
++#include "pcm_local.h"
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <stddef.h>
+--- a/src/pcm/pcm_local.h
++++ b/src/pcm/pcm_local.h
+@@ -20,6 +20,9 @@
+ *
+ */
+
++#ifndef __PCM_LOCAL_H
++#define __PCM_LOCAL_H
++
+ #include "config.h"
+
+ #include <stdio.h>
+@@ -1223,3 +1226,5 @@ static inline void snd_pcm_unlock(snd_pcm_t *pcm)
+ #define snd_pcm_lock(pcm) do {} while (0)
+ #define snd_pcm_unlock(pcm) do {} while (0)
+ #endif /* THREAD_SAFE_API */
++
++#endif /* __PCM_LOCAL_H */
+--- a/src/pcm/pcm_shm.c
++++ b/src/pcm/pcm_shm.c
+@@ -26,6 +26,7 @@
+ *
+ */
+
++#include "pcm_local.h"
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <stddef.h>
diff --git a/media-libs/alsa-lib/files/alsa-lib-1.2.10-reshuffle-included-files-config-h.patch b/media-libs/alsa-lib/files/alsa-lib-1.2.10-reshuffle-included-files-config-h.patch
new file mode 100644
index 000000000000..42493fef6af1
--- /dev/null
+++ b/media-libs/alsa-lib/files/alsa-lib-1.2.10-reshuffle-included-files-config-h.patch
@@ -0,0 +1,174 @@
+https://github.com/alsa-project/alsa-lib/commit/81a7a93636d9472fcb0c2ff32d9bfdf6ed10763d
+
+From 81a7a93636d9472fcb0c2ff32d9bfdf6ed10763d Mon Sep 17 00:00:00 2001
+From: Jaroslav Kysela <perex@perex.cz>
+Date: Wed, 13 Sep 2023 12:27:21 +0200
+Subject: [PATCH] reshuffle included files to include config.h as first - v2
+
+config.h may contain defines like _FILE_OFFSET_BITS which influence
+the system wide include files (off_t types, open -> open64 function
+usage etc.).
+
+Fixes: ad3a8b8b ("reshuffle included files to include config.h as first")
+Related: https://github.com/alsa-project/alsa-lib/pull/333
+Signed-off-by: Jaroslav Kysela <perex@perex.cz>
+--- a/src/control/setup.c
++++ b/src/control/setup.c
+@@ -29,13 +29,13 @@
+ *
+ */
+
++#include "local.h"
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <stdarg.h>
+ #include <unistd.h>
+ #include <string.h>
+ #include <ctype.h>
+-#include "local.h"
+
+ #ifndef DOC_HIDDEN
+ typedef struct {
+--- a/src/rawmidi/rawmidi.c
++++ b/src/rawmidi/rawmidi.c
+@@ -144,12 +144,12 @@ This example shows open and read/write rawmidi operations.
+ * Shows open and read/write rawmidi operations.
+ */
+
++#include "rawmidi_local.h"
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <stdarg.h>
+ #include <unistd.h>
+ #include <string.h>
+-#include "rawmidi_local.h"
+
+ /**
+ * \brief setup the default parameters
+--- a/src/rawmidi/rawmidi_local.h
++++ b/src/rawmidi/rawmidi_local.h
+@@ -19,10 +19,10 @@
+ *
+ */
+
++#include "local.h"
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <limits.h>
+-#include "local.h"
+
+ typedef struct {
+ int (*close)(snd_rawmidi_t *rawmidi);
+--- a/src/rawmidi/rawmidi_virt.c
++++ b/src/rawmidi/rawmidi_virt.c
+@@ -19,13 +19,11 @@
+ *
+ */
+
+-#include <stdio.h>
+-#include <stdlib.h>
++#include "rawmidi_local.h"
+ #include <unistd.h>
+ #include <string.h>
+ #include <fcntl.h>
+ #include <sys/ioctl.h>
+-#include "rawmidi_local.h"
+ #include "seq.h"
+ #include "seq_midi_event.h"
+
+--- a/src/rawmidi/ump.c
++++ b/src/rawmidi/ump.c
+@@ -4,10 +4,6 @@
+ * \brief Universal MIDI Protocol (UMP) Interface
+ */
+
+-#include <stdio.h>
+-#include <stdlib.h>
+-#include <limits.h>
+-#include "local.h"
+ #include "rawmidi_local.h"
+ #include "ump_local.h"
+
+--- a/src/seq/seq.c
++++ b/src/seq/seq.c
+@@ -777,8 +777,8 @@ void event_filter(snd_seq_t *seq, snd_seq_event_t *ev)
+
+ */
+
+-#include <poll.h>
+ #include "seq_local.h"
++#include <poll.h>
+
+ /****************************************************************************
+ * *
+--- a/src/seq/seq_hw.c
++++ b/src/seq/seq_hw.c
+@@ -20,9 +20,9 @@
+ *
+ */
+
++#include "seq_local.h"
+ #include <fcntl.h>
+ #include <sys/ioctl.h>
+-#include "seq_local.h"
+
+ #ifndef PIC
+ /* entry for static linking */
+--- a/src/seq/seq_local.h
++++ b/src/seq/seq_local.h
+@@ -23,10 +23,10 @@
+ #ifndef __SEQ_LOCAL_H
+ #define __SEQ_LOCAL_H
+
++#include "local.h"
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <limits.h>
+-#include "local.h"
+
+ #define SND_SEQ_OBUF_SIZE (16*1024) /* default size */
+ #define SND_SEQ_IBUF_SIZE 500 /* in event_size aligned */
+--- a/src/seq/seq_midi_event.c
++++ b/src/seq/seq_midi_event.c
+@@ -28,10 +28,10 @@
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
++#include "local.h"
+ #if HAVE_MALLOC_H
+ #include <malloc.h>
+ #endif
+-#include "local.h"
+
+ #ifndef DOC_HIDDEN
+
+--- a/src/seq/seqmid.c
++++ b/src/seq/seqmid.c
+@@ -20,14 +20,12 @@
+ *
+ */
+
+-#include <stdio.h>
+-#include <stdlib.h>
++#include "seq_local.h"
+ #include <unistd.h>
+ #include <string.h>
+ #include <fcntl.h>
+ #include <ctype.h>
+ #include <sys/ioctl.h>
+-#include "seq_local.h"
+
+ /**
+ * \brief queue controls - start/stop/continue
+--- a/src/userfile.c
++++ b/src/userfile.c
+@@ -18,7 +18,7 @@
+ *
+ */
+
+-#include <config.h>
++#include "config.h"
+ #include <string.h>
+ #include <errno.h>
+ #include <assert.h>
+
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/alsa-lib/, media-libs/alsa-lib/files/
@ 2024-02-17 6:40 Sam James
0 siblings, 0 replies; 12+ messages in thread
From: Sam James @ 2024-02-17 6:40 UTC (permalink / raw
To: gentoo-commits
commit: 747325624803925817185a5d3253e17f1c09c2a6
Author: Michal Rostecki <vadorovsky <AT> protonmail <DOT> com>
AuthorDate: Thu Feb 1 21:30:51 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Feb 17 06:38:28 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74732562
media-libs/alsa-lib: Bump alsa-lib to 1.2.11
Changes:
- Version bump to 1.2.11
- Add an upstream patch which fixes the build with lld
- alsa-project/alsa-lib@2a736a0
- The previous lld-related patches are not needed anymore
Signed-off-by: Michal Rostecki <vadorovsky <AT> protonmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/alsa-lib/Manifest | 1 +
media-libs/alsa-lib/alsa-lib-1.2.11.ebuild | 99 ++++++++++++++++++++++
...2.11-topology-correct-version-script-path.patch | 32 +++++++
3 files changed, 132 insertions(+)
diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index d9325967f41a..e85cb3c13e59 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -1 +1,2 @@
DIST alsa-lib-1.2.10.tar.bz2 1107007 BLAKE2B b2e4f8431e61f5bb56b2b5d124e67d5a68bbca3c647bebfa93f5e5ff092ec9ef3f6cb6315801fcd93e21151784814ff238d357313b8b44f32d4e7c9ee565388f SHA512 4ccbd1dc5a612044571c26290923009e4c3f7959b30a5d0bed47daa68bbefaff9059c4f0fa3bc16f22c1eed2d36f079139369f40243da5921ae4de02a4541939
+DIST alsa-lib-1.2.11.tar.bz2 1107150 BLAKE2B 7fb245ffbfb841bdd5cb9da08fb2ec0a4ce8d340d4d1461999aca558c67c16e7c596cd0bffab761b7b4549025b0fb25462fb352e6d3900fb42f00b47de58d34c SHA512 7bf2c541dff5262c0302a1c716ca10cdb5105f4e0ad48f3341c3c7e975b0c3ea835a298a05974c3e216a85912c368d8025ba3cdda3ff04a7683133ce5b2a286d
diff --git a/media-libs/alsa-lib/alsa-lib-1.2.11.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.11.ebuild
new file mode 100644
index 000000000000..7565309a3e0a
--- /dev/null
+++ b/media-libs/alsa-lib/alsa-lib-1.2.11.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit autotools multilib-minimal flag-o-matic python-single-r1
+
+DESCRIPTION="Advanced Linux Sound Architecture Library"
+HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
+if [[ ${PV} == *_p* ]] ; then
+ # Please set correct commit ID for a snapshot release!
+ COMMIT="7e3a3c2b0a092d0f568ba3c98365030dd91cc877"
+ 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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="alisp debug doc python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+ media-libs/alsa-topology-conf
+ media-libs/alsa-ucm-conf
+ python? ( ${PYTHON_DEPS} )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( >=app-text/doxygen-1.2.6 )"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.1.6-missing_files.patch" # bug #652422
+ "${FILESDIR}/${PN}-1.2.11-topology-correct-version-script-path.patch"
+)
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ default
+
+ find . -name Makefile.am -exec sed -i -e '/CFLAGS/s:-g -O2::' {} + || die
+ # bug #545950
+ sed -i -e '5s:^$:\nAM_CPPFLAGS = -I$(top_srcdir)/include:' test/lsb/Makefile.am || die
+
+ eautoreconf
+}
+
+multilib_src_configure() {
+ # Broken upstream. Could in theory work with -flto-partitions=none
+ # but it's a hack to workaround the real problem and not strictly safe.
+ # bug #616108, bug #669086, and https://github.com/alsa-project/alsa-lib/issues/6.
+ # (This bug is closed as of 1.2.9 but there's been no clear actual fix to it.
+ # Let us know if you can identify one.)
+ filter-lto
+
+ local myeconfargs=(
+ --disable-maintainer-mode
+ --disable-resmgr
+ --enable-aload
+ --enable-rawmidi
+ --enable-seq
+ --enable-shared
+ --enable-thread-safety
+
+ $(multilib_native_use_enable python)
+ $(use_enable alisp)
+ $(use_with debug)
+ )
+
+ 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 '*.la' -delete || die
+
+ dodoc ChangeLog doc/asoundrc.txt NOTES TODO
+}
diff --git a/media-libs/alsa-lib/files/alsa-lib-1.2.11-topology-correct-version-script-path.patch b/media-libs/alsa-lib/files/alsa-lib-1.2.11-topology-correct-version-script-path.patch
new file mode 100644
index 000000000000..d5442b29c8b5
--- /dev/null
+++ b/media-libs/alsa-lib/files/alsa-lib-1.2.11-topology-correct-version-script-path.patch
@@ -0,0 +1,32 @@
+From 2a736a0d2543f206fd2653aaae8a08a4c42eb917 Mon Sep 17 00:00:00 2001
+From: Jan Palus <jpalus@fastmail.com>
+Date: Tue, 30 Jan 2024 14:24:25 +0100
+Subject: [PATCH] topology: correct version script path
+
+contrary to libasound, version script for libatopology is a regular
+source file. while it's often the case that $(builddir) and $(srcdir)
+point to the same directory, they don't always have to. therefore path
+needs to point explicitly to $(srcdir) for Versions script in topology
+
+Closes: https://github.com/alsa-project/alsa-lib/pull/383
+Fixes: GH-382
+Fixes: dc7da761f3a2 ("topology: separate Versions linker script")
+Signed-off-by: Jan Palus <jpalus@fastmail.com>
+Signed-off-by: Jaroslav Kysela <perex@perex.cz>
+---
+ src/topology/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/topology/Makefile.am b/src/topology/Makefile.am
+index 04299588..e0b78373 100644
+--- a/src/topology/Makefile.am
++++ b/src/topology/Makefile.am
+@@ -2,7 +2,7 @@ EXTRA_DIST = Versions
+ COMPATNUM=@LIBTOOL_VERSION_INFO@
+
+ if VERSIONED_SYMBOLS
+-VSYMS = -Wl,--version-script=Versions
++VSYMS = -Wl,--version-script=$(srcdir)/Versions
+ else
+ VSYMS =
+ endif
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/alsa-lib/, media-libs/alsa-lib/files/
@ 2024-10-04 17:37 Andreas Sturmlechner
0 siblings, 0 replies; 12+ messages in thread
From: Andreas Sturmlechner @ 2024-10-04 17:37 UTC (permalink / raw
To: gentoo-commits
commit: bf7c4eaf807d34ad13b341718fe1274a4b757355
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 4 12:16:25 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Oct 4 17:36:59 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf7c4eaf
media-libs/alsa-lib: drop 1.2.10-r2, 1.2.10-r3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-libs/alsa-lib/Manifest | 1 -
media-libs/alsa-lib/alsa-lib-1.2.10-r2.ebuild | 102 ------------
media-libs/alsa-lib/alsa-lib-1.2.10-r3.ebuild | 103 ------------
.../alsa-lib/files/alsa-lib-1.2.10-lld-17.patch | 35 -----
.../files/alsa-lib-1.2.10-musl-string.patch | 40 -----
...sa-lib-1.2.10-pcm-fix-segfault-32bit-libs.patch | 91 -----------
...-1.2.10-reshuffle-included-files-config-h.patch | 174 ---------------------
| 31 ----
8 files changed, 577 deletions(-)
diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index d3ddaa9f97a8..6c09083fba1c 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -1,3 +1,2 @@
-DIST alsa-lib-1.2.10.tar.bz2 1107007 BLAKE2B b2e4f8431e61f5bb56b2b5d124e67d5a68bbca3c647bebfa93f5e5ff092ec9ef3f6cb6315801fcd93e21151784814ff238d357313b8b44f32d4e7c9ee565388f SHA512 4ccbd1dc5a612044571c26290923009e4c3f7959b30a5d0bed47daa68bbefaff9059c4f0fa3bc16f22c1eed2d36f079139369f40243da5921ae4de02a4541939
DIST alsa-lib-1.2.11.tar.bz2 1107150 BLAKE2B 7fb245ffbfb841bdd5cb9da08fb2ec0a4ce8d340d4d1461999aca558c67c16e7c596cd0bffab761b7b4549025b0fb25462fb352e6d3900fb42f00b47de58d34c SHA512 7bf2c541dff5262c0302a1c716ca10cdb5105f4e0ad48f3341c3c7e975b0c3ea835a298a05974c3e216a85912c368d8025ba3cdda3ff04a7683133ce5b2a286d
DIST alsa-lib-1.2.12.tar.bz2 1108712 BLAKE2B bcb48ad2c8687454b312e789c650136fee0db8cccf58e997b9d619aac5c74288b69220589efdcd3917eb1d781ef71be5fcd16d997c59c069fe20788d1a479068 SHA512 053e36e51c0ff28f07028b89c8845b50682a5c14035ab85c2fc8cae2f2f0d05e4cd45ed879602c15c1596fb7fe84bfd50ec0d119dfb55c66589a2d458a9b317d
diff --git a/media-libs/alsa-lib/alsa-lib-1.2.10-r2.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.10-r2.ebuild
deleted file mode 100644
index 47f51c323a5e..000000000000
--- a/media-libs/alsa-lib/alsa-lib-1.2.10-r2.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-inherit autotools multilib-minimal flag-o-matic python-single-r1
-
-DESCRIPTION="Advanced Linux Sound Architecture Library"
-HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
-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 ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-IUSE="alisp debug doc python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
- media-libs/alsa-topology-conf
- media-libs/alsa-ucm-conf
- python? ( ${PYTHON_DEPS} )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="doc? ( >=app-text/doxygen-1.2.6 )"
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.1.6-missing_files.patch" # bug #652422
- "${FILESDIR}/${P}-musl-string.patch" # bug #913573, backport
- "${FILESDIR}/${P}-ump-header-detection.patch" # bug #913573, backport
- "${FILESDIR}/${P}-pcm-fix-segfault-32bit-libs.patch" # backport
- "${FILESDIR}/${P}-reshuffle-included-files-config-h.patch" # backport
-)
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- default
-
- find . -name Makefile.am -exec sed -i -e '/CFLAGS/s:-g -O2::' {} + || die
- # bug #545950
- sed -i -e '5s:^$:\nAM_CPPFLAGS = -I$(top_srcdir)/include:' test/lsb/Makefile.am || die
-
- eautoreconf
-}
-
-multilib_src_configure() {
- # Broken upstream. Could in theory work with -flto-partitions=none
- # but it's a hack to workaround the real problem and not strictly safe.
- # bug #616108, bug #669086, and https://github.com/alsa-project/alsa-lib/issues/6.
- # (This bug is closed as of 1.2.9 but there's been no clear actual fix to it.
- # Let us know if you can identify one.)
- filter-lto
-
- local myeconfargs=(
- --disable-maintainer-mode
- --disable-resmgr
- --enable-aload
- --enable-rawmidi
- --enable-seq
- --enable-shared
- --enable-thread-safety
-
- $(multilib_native_use_enable python)
- $(use_enable alisp)
- $(use_with debug)
- )
-
- 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 '*.la' -delete || die
-
- dodoc ChangeLog doc/asoundrc.txt NOTES TODO
-}
diff --git a/media-libs/alsa-lib/alsa-lib-1.2.10-r3.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.10-r3.ebuild
deleted file mode 100644
index b2b07f72acaf..000000000000
--- a/media-libs/alsa-lib/alsa-lib-1.2.10-r3.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-inherit autotools multilib-minimal flag-o-matic python-single-r1
-
-DESCRIPTION="Advanced Linux Sound Architecture Library"
-HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
-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 ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-IUSE="alisp debug doc python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
- media-libs/alsa-topology-conf
- media-libs/alsa-ucm-conf
- python? ( ${PYTHON_DEPS} )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="doc? ( >=app-text/doxygen-1.2.6 )"
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.1.6-missing_files.patch" # bug #652422
- "${FILESDIR}/${P}-musl-string.patch" # bug #913573, backport
- "${FILESDIR}/${P}-ump-header-detection.patch" # bug #913573, backport
- "${FILESDIR}/${P}-pcm-fix-segfault-32bit-libs.patch" # backport
- "${FILESDIR}/${P}-reshuffle-included-files-config-h.patch" # backport
- "${FILESDIR}/${P}-lld-17.patch" # bug #914511, backport
-)
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- default
-
- find . -name Makefile.am -exec sed -i -e '/CFLAGS/s:-g -O2::' {} + || die
- # bug #545950
- sed -i -e '5s:^$:\nAM_CPPFLAGS = -I$(top_srcdir)/include:' test/lsb/Makefile.am || die
-
- eautoreconf
-}
-
-multilib_src_configure() {
- # Broken upstream. Could in theory work with -flto-partitions=none
- # but it's a hack to workaround the real problem and not strictly safe.
- # bug #616108, bug #669086, and https://github.com/alsa-project/alsa-lib/issues/6.
- # (This bug is closed as of 1.2.9 but there's been no clear actual fix to it.
- # Let us know if you can identify one.)
- filter-lto
-
- local myeconfargs=(
- --disable-maintainer-mode
- --disable-resmgr
- --enable-aload
- --enable-rawmidi
- --enable-seq
- --enable-shared
- --enable-thread-safety
-
- $(multilib_native_use_enable python)
- $(use_enable alisp)
- $(use_with debug)
- )
-
- 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 '*.la' -delete || die
-
- dodoc ChangeLog doc/asoundrc.txt NOTES TODO
-}
diff --git a/media-libs/alsa-lib/files/alsa-lib-1.2.10-lld-17.patch b/media-libs/alsa-lib/files/alsa-lib-1.2.10-lld-17.patch
deleted file mode 100644
index cba1e2e2d507..000000000000
--- a/media-libs/alsa-lib/files/alsa-lib-1.2.10-lld-17.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-https://bugs.gentoo.org/914511
-https://github.com/alsa-project/alsa-lib/issues/356
-https://github.com/alsa-project/alsa-lib/commit/96f60d829f2c9dc9ad9eda46410adaa41b4b0da0
-
-From 96f60d829f2c9dc9ad9eda46410adaa41b4b0da0 Mon Sep 17 00:00:00 2001
-From: Takashi Iwai <tiwai@suse.de>
-Date: Tue, 10 Oct 2023 08:20:15 +0200
-Subject: [PATCH] seq: Fix typos in symbol version definitions
-
-There were obvious typos in src/Versions.in that resulted in the
-undefined symbols. Correct those entries.
-
-Fixes: 2aefb5c41cc0 ("seq: Add UMP support")
-Closes: https://github.com/alsa-project/alsa-lib/issues/356
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
---- a/src/Versions.in
-+++ b/src/Versions.in
-@@ -158,13 +158,13 @@ ALSA_1.2.10 {
- @SYMBOL_PREFIX@snd_ctl_ump_block_info;
- @SYMBOL_PREFIX@snd_seq_ump_*;
- @SYMBOL_PREFIX@snd_seq_client_info_get_midi_version;
-- @SYMBOL_PREFIX@snd_seq_seq_client_info_get_ump_group_enabled;
-+ @SYMBOL_PREFIX@snd_seq_client_info_get_ump_group_enabled;
- @SYMBOL_PREFIX@snd_seq_client_info_get_ump_groupless_enabled;
-- @SYMBOL_PREFIX@snd_seq_seq_client_get_ump_conversion;
-+ @SYMBOL_PREFIX@snd_seq_client_info_get_ump_conversion;
- @SYMBOL_PREFIX@snd_seq_client_info_set_midi_version;
-- @SYMBOL_PREFIX@snd_seq_seq_client_info_set_ump_group_enabled;
-+ @SYMBOL_PREFIX@snd_seq_client_info_set_ump_group_enabled;
- @SYMBOL_PREFIX@snd_seq_client_info_set_ump_groupless_enabled;
-- @SYMBOL_PREFIX@snd_seq_seq_client_set_ump_conversion;
-+ @SYMBOL_PREFIX@snd_seq_client_info_set_ump_conversion;
- @SYMBOL_PREFIX@snd_seq_get_ump_endpoint_info;
- @SYMBOL_PREFIX@snd_seq_get_ump_block_info;
- @SYMBOL_PREFIX@snd_seq_set_ump_endpoint_info;
diff --git a/media-libs/alsa-lib/files/alsa-lib-1.2.10-musl-string.patch b/media-libs/alsa-lib/files/alsa-lib-1.2.10-musl-string.patch
deleted file mode 100644
index 49747dcfecbe..000000000000
--- a/media-libs/alsa-lib/files/alsa-lib-1.2.10-musl-string.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From https://github.com/alsa-project/alsa-lib/commit/10bd599970acc71c92f85eb08943eb8d3d702a9c Mon Sep 17 00:00:00 2001
-From: Jaroslav Kysela <perex@perex.cz>
-Date: Wed, 6 Sep 2023 15:16:44 +0200
-Subject: [PATCH] global.h: move __STRING() macro outside !PIC ifdef block
-
-It solves the musl libc compilation issue.
-
-control.c: In function 'snd_ctl_open_conf':
-../../include/global.h:98:36: warning: implicit declaration of function '__STRING' [-Wimplicit-function-declaratio]
- 98 | #define SND_DLSYM_VERSION(version) __STRING(version)
- | ^~~~~~~~
-
-Fixes: https://github.com/alsa-project/alsa-lib/issues/350
-Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---- a/include/global.h
-+++ b/include/global.h
-@@ -51,6 +51,11 @@ const char *snd_asoundlib_version(void);
- #define ATTRIBUTE_UNUSED __attribute__ ((__unused__))
- #endif
-
-+#ifndef __STRING
-+/** \brief Return 'x' argument as string */
-+#define __STRING(x) #x
-+#endif
-+
- #ifdef PIC /* dynamic build */
-
- /** \hideinitializer \brief Helper macro for #SND_DLSYM_BUILD_VERSION. */
-@@ -71,11 +76,6 @@ struct snd_dlsym_link {
-
- extern struct snd_dlsym_link *snd_dlsym_start;
-
--#ifndef __STRING
--/** \brief Return 'x' argument as string */
--#define __STRING(x) #x
--#endif
--
- /** \hideinitializer \brief Helper macro for #SND_DLSYM_BUILD_VERSION. */
- #define __SND_DLSYM_VERSION(prefix, name, version) _ ## prefix ## name ## version
- /**
diff --git a/media-libs/alsa-lib/files/alsa-lib-1.2.10-pcm-fix-segfault-32bit-libs.patch b/media-libs/alsa-lib/files/alsa-lib-1.2.10-pcm-fix-segfault-32bit-libs.patch
deleted file mode 100644
index 4cd3614ee943..000000000000
--- a/media-libs/alsa-lib/files/alsa-lib-1.2.10-pcm-fix-segfault-32bit-libs.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-https://github.com/alsa-project/alsa-lib/commit/0e3dfb9f705ca78be34cd70fd59d67c431e29cc7
-
-From 0e3dfb9f705ca78be34cd70fd59d67c431e29cc7 Mon Sep 17 00:00:00 2001
-From: Takashi Iwai <tiwai@suse.de>
-Date: Sat, 9 Sep 2023 17:42:03 +0200
-Subject: [PATCH] pcm: Fix segfault with 32bit libs
-
-The recent rearrangement of header inclusion order caused a regression
-showing segfaults on 32bit Arm. The primary reason is the
-inconsistent compile condition depending on the inclusion of config.h;
-while most of other code include pcm_local.h (that implicitly includes
-config.h) at first, pcm_direct.c doesn't do it, hence the access with
-direct plugins crashes.
-
-For fixing it, we need to include config.h at the beginning. But,
-it's better to include pcm_local.h for all relevant code for
-consistency. The patch does it, and also it adds the guard in
-pcm_local.h for double inclusions.
-
-Fixes: ad3a8b8b314e ("reshuffle included files to include config.h as first")
-Link: https://github.com/alsa-project/alsa-lib/issues/352
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
---- a/src/pcm/pcm_direct.c
-+++ b/src/pcm/pcm_direct.c
-@@ -19,6 +19,7 @@
- *
- */
-
-+#include "pcm_local.h"
- #include <stdio.h>
- #include <stdlib.h>
- #include <stddef.h>
---- a/src/pcm/pcm_dmix.c
-+++ b/src/pcm/pcm_dmix.c
-@@ -26,7 +26,7 @@
- *
- */
-
--#include "config.h"
-+#include "pcm_local.h"
- #include <stdio.h>
- #include <stdlib.h>
- #include <stddef.h>
---- a/src/pcm/pcm_dshare.c
-+++ b/src/pcm/pcm_dshare.c
-@@ -26,6 +26,7 @@
- *
- */
-
-+#include "pcm_local.h"
- #include <stdio.h>
- #include <stdlib.h>
- #include <stddef.h>
---- a/src/pcm/pcm_dsnoop.c
-+++ b/src/pcm/pcm_dsnoop.c
-@@ -26,6 +26,7 @@
- *
- */
-
-+#include "pcm_local.h"
- #include <stdio.h>
- #include <stdlib.h>
- #include <stddef.h>
---- a/src/pcm/pcm_local.h
-+++ b/src/pcm/pcm_local.h
-@@ -20,6 +20,9 @@
- *
- */
-
-+#ifndef __PCM_LOCAL_H
-+#define __PCM_LOCAL_H
-+
- #include "config.h"
-
- #include <stdio.h>
-@@ -1223,3 +1226,5 @@ static inline void snd_pcm_unlock(snd_pcm_t *pcm)
- #define snd_pcm_lock(pcm) do {} while (0)
- #define snd_pcm_unlock(pcm) do {} while (0)
- #endif /* THREAD_SAFE_API */
-+
-+#endif /* __PCM_LOCAL_H */
---- a/src/pcm/pcm_shm.c
-+++ b/src/pcm/pcm_shm.c
-@@ -26,6 +26,7 @@
- *
- */
-
-+#include "pcm_local.h"
- #include <stdio.h>
- #include <stdlib.h>
- #include <stddef.h>
diff --git a/media-libs/alsa-lib/files/alsa-lib-1.2.10-reshuffle-included-files-config-h.patch b/media-libs/alsa-lib/files/alsa-lib-1.2.10-reshuffle-included-files-config-h.patch
deleted file mode 100644
index 42493fef6af1..000000000000
--- a/media-libs/alsa-lib/files/alsa-lib-1.2.10-reshuffle-included-files-config-h.patch
+++ /dev/null
@@ -1,174 +0,0 @@
-https://github.com/alsa-project/alsa-lib/commit/81a7a93636d9472fcb0c2ff32d9bfdf6ed10763d
-
-From 81a7a93636d9472fcb0c2ff32d9bfdf6ed10763d Mon Sep 17 00:00:00 2001
-From: Jaroslav Kysela <perex@perex.cz>
-Date: Wed, 13 Sep 2023 12:27:21 +0200
-Subject: [PATCH] reshuffle included files to include config.h as first - v2
-
-config.h may contain defines like _FILE_OFFSET_BITS which influence
-the system wide include files (off_t types, open -> open64 function
-usage etc.).
-
-Fixes: ad3a8b8b ("reshuffle included files to include config.h as first")
-Related: https://github.com/alsa-project/alsa-lib/pull/333
-Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---- a/src/control/setup.c
-+++ b/src/control/setup.c
-@@ -29,13 +29,13 @@
- *
- */
-
-+#include "local.h"
- #include <stdio.h>
- #include <stdlib.h>
- #include <stdarg.h>
- #include <unistd.h>
- #include <string.h>
- #include <ctype.h>
--#include "local.h"
-
- #ifndef DOC_HIDDEN
- typedef struct {
---- a/src/rawmidi/rawmidi.c
-+++ b/src/rawmidi/rawmidi.c
-@@ -144,12 +144,12 @@ This example shows open and read/write rawmidi operations.
- * Shows open and read/write rawmidi operations.
- */
-
-+#include "rawmidi_local.h"
- #include <stdio.h>
- #include <stdlib.h>
- #include <stdarg.h>
- #include <unistd.h>
- #include <string.h>
--#include "rawmidi_local.h"
-
- /**
- * \brief setup the default parameters
---- a/src/rawmidi/rawmidi_local.h
-+++ b/src/rawmidi/rawmidi_local.h
-@@ -19,10 +19,10 @@
- *
- */
-
-+#include "local.h"
- #include <stdio.h>
- #include <stdlib.h>
- #include <limits.h>
--#include "local.h"
-
- typedef struct {
- int (*close)(snd_rawmidi_t *rawmidi);
---- a/src/rawmidi/rawmidi_virt.c
-+++ b/src/rawmidi/rawmidi_virt.c
-@@ -19,13 +19,11 @@
- *
- */
-
--#include <stdio.h>
--#include <stdlib.h>
-+#include "rawmidi_local.h"
- #include <unistd.h>
- #include <string.h>
- #include <fcntl.h>
- #include <sys/ioctl.h>
--#include "rawmidi_local.h"
- #include "seq.h"
- #include "seq_midi_event.h"
-
---- a/src/rawmidi/ump.c
-+++ b/src/rawmidi/ump.c
-@@ -4,10 +4,6 @@
- * \brief Universal MIDI Protocol (UMP) Interface
- */
-
--#include <stdio.h>
--#include <stdlib.h>
--#include <limits.h>
--#include "local.h"
- #include "rawmidi_local.h"
- #include "ump_local.h"
-
---- a/src/seq/seq.c
-+++ b/src/seq/seq.c
-@@ -777,8 +777,8 @@ void event_filter(snd_seq_t *seq, snd_seq_event_t *ev)
-
- */
-
--#include <poll.h>
- #include "seq_local.h"
-+#include <poll.h>
-
- /****************************************************************************
- * *
---- a/src/seq/seq_hw.c
-+++ b/src/seq/seq_hw.c
-@@ -20,9 +20,9 @@
- *
- */
-
-+#include "seq_local.h"
- #include <fcntl.h>
- #include <sys/ioctl.h>
--#include "seq_local.h"
-
- #ifndef PIC
- /* entry for static linking */
---- a/src/seq/seq_local.h
-+++ b/src/seq/seq_local.h
-@@ -23,10 +23,10 @@
- #ifndef __SEQ_LOCAL_H
- #define __SEQ_LOCAL_H
-
-+#include "local.h"
- #include <stdio.h>
- #include <stdlib.h>
- #include <limits.h>
--#include "local.h"
-
- #define SND_SEQ_OBUF_SIZE (16*1024) /* default size */
- #define SND_SEQ_IBUF_SIZE 500 /* in event_size aligned */
---- a/src/seq/seq_midi_event.c
-+++ b/src/seq/seq_midi_event.c
-@@ -28,10 +28,10 @@
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-+#include "local.h"
- #if HAVE_MALLOC_H
- #include <malloc.h>
- #endif
--#include "local.h"
-
- #ifndef DOC_HIDDEN
-
---- a/src/seq/seqmid.c
-+++ b/src/seq/seqmid.c
-@@ -20,14 +20,12 @@
- *
- */
-
--#include <stdio.h>
--#include <stdlib.h>
-+#include "seq_local.h"
- #include <unistd.h>
- #include <string.h>
- #include <fcntl.h>
- #include <ctype.h>
- #include <sys/ioctl.h>
--#include "seq_local.h"
-
- /**
- * \brief queue controls - start/stop/continue
---- a/src/userfile.c
-+++ b/src/userfile.c
-@@ -18,7 +18,7 @@
- *
- */
-
--#include <config.h>
-+#include "config.h"
- #include <string.h>
- #include <errno.h>
- #include <assert.h>
-
diff --git a/media-libs/alsa-lib/files/alsa-lib-1.2.10-ump-header-detection.patch b/media-libs/alsa-lib/files/alsa-lib-1.2.10-ump-header-detection.patch
deleted file mode 100644
index a75aa3a85a06..000000000000
--- a/media-libs/alsa-lib/files/alsa-lib-1.2.10-ump-header-detection.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From https://github.com/alsa-project/alsa-lib/commit/fcce13a6726c52882bd8b7131c61c4eba308792c Mon Sep 17 00:00:00 2001
-From: Jaroslav Kysela <perex@perex.cz>
-Date: Mon, 4 Sep 2023 09:38:26 +0200
-Subject: [PATCH] control.h: Fix ump header file detection
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Apparently, the control.h is used from apps separately (outside
-asoundlib.h). Avoid errors like:
-
-/usr/include/alsa/control.h:417:47: error: ‘snd_ump_endpoint_info_t’ has not been declared
- 417 | int snd_ctl_ump_endpoint_info(snd_ctl_t *ctl, snd_ump_endpoint_info_t *info);
- | ^~~~~~~~~~~~~~~~~~~~~~~
-/usr/include/alsa/control.h:418:44: error: ‘snd_ump_block_info_t’ has not been declared
- 418 | int snd_ctl_ump_block_info(snd_ctl_t *ctl, snd_ump_block_info_t *info);
- | ^~~~~~~~~~~~~~~~~~~~
-
-Fixes: https://github.com/alsa-project/alsa-lib/issues/348
-Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---- a/include/control.h
-+++ b/include/control.h
-@@ -413,6 +413,8 @@ int snd_ctl_pcm_prefer_subdevice(snd_ctl_t *ctl, int subdev);
- int snd_ctl_rawmidi_next_device(snd_ctl_t *ctl, int * device);
- int snd_ctl_rawmidi_info(snd_ctl_t *ctl, snd_rawmidi_info_t * info);
- int snd_ctl_rawmidi_prefer_subdevice(snd_ctl_t *ctl, int subdev);
-+#endif
-+#ifdef __ALSA_UMP_H
- int snd_ctl_ump_next_device(snd_ctl_t *ctl, int *device);
- int snd_ctl_ump_endpoint_info(snd_ctl_t *ctl, snd_ump_endpoint_info_t *info);
- int snd_ctl_ump_block_info(snd_ctl_t *ctl, snd_ump_block_info_t *info);
^ permalink raw reply related [flat|nested] 12+ messages in thread
end of thread, other threads:[~2024-10-04 17:37 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-04-05 11:50 [gentoo-commits] repo/gentoo:master commit in: media-libs/alsa-lib/, media-libs/alsa-lib/files/ Lars Wendler
-- strict thread matches above, loose matches on Subject: below --
2024-10-04 17:37 Andreas Sturmlechner
2024-02-17 6:40 Sam James
2023-09-15 4:33 Sam James
2023-09-07 14:48 Sam James
2022-06-01 7:21 Lars Wendler
2021-05-28 1:41 Sam James
2020-05-02 17:12 Andreas Sturmlechner
2020-02-20 15:49 Lars Wendler
2019-11-25 21:14 Lars Wendler
2017-05-18 11:44 Lars Wendler
2015-10-08 17:16 Mike Frysinger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox