Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump alsa packages to 1.2.11 #35146

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions media-libs/alsa-lib/Manifest
Original file line number Diff line number Diff line change
@@ -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
99 changes: 99 additions & 0 deletions media-libs/alsa-lib/alsa-lib-1.2.11.ebuild
Original file line number Diff line number Diff line change
@@ -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
}
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions media-sound/alsa-tools/Manifest
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
DIST alsa-tools-1.2.5.tar.bz2 1880907 BLAKE2B 1ecd7d24771e3f5899a7084a69196c9301b549dd331cbbbc55b6f0c694566147a9d5642cf94f0ad5ca5fcedb77daa1cb4615ce0ec0be157b32c9d756611a7cca SHA512 1c4ff947d9f2424056a6748e04a1250fb73443a3f470f61d0b563c91be082bc42d56e550d6cc27eaed3edcea2066a107e20455c959b053b5deafa2d811b7e498
DIST alsa-tools-1.2.11.tar.bz2 1882262 BLAKE2B 2c429cb0dceb1dcb186578e2109a1b3b6eece7ba5e8e1c6de14cc5e2f37ecc947469247e95fb894bb1171fa490deb000405135ec82e822d0fc24bf5c920ec724 SHA512 b5a29a83121a637eaa16d225875feeabaea893eabc61b97d0c18a5852d851ff2e6932bd732786bb43525b410c2bb9185261cc4509fd3ee5fd8536557f12b2154
158 changes: 158 additions & 0 deletions media-sound/alsa-tools/alsa-tools-1.2.11.ebuild
Original file line number Diff line number Diff line change
@@ -0,0 +1,158 @@
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

EAPI=8

inherit autotools flag-o-matic libtool xdg

DESCRIPTION="Advanced Linux Sound Architecture tools"
HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
SRC_URI="https://www.alsa-project.org/files/pub/tools/${P}.tar.bz2"

LICENSE="GPL-2"
SLOT="0.9"
KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"

IUSE="fltk gtk alsa_cards_hdsp alsa_cards_hdspm alsa_cards_mixart
alsa_cards_vx222 alsa_cards_usb-usx2y alsa_cards_sb16 alsa_cards_sbawe
alsa_cards_emu10k1 alsa_cards_emu10k1x alsa_cards_ice1712
alsa_cards_rme32 alsa_cards_rme96 alsa_cards_sscape alsa_cards_pcxhr"

# bug #468294
DEPEND="
>=media-libs/alsa-lib-${PV}
>=dev-python/pyalsa-1.0.26
fltk? ( >=x11-libs/fltk-1.3.0:1 )
gtk? (
dev-libs/gobject-introspection
x11-libs/gtk+:2
x11-libs/gtk+:3
)
"
# bug #456114
RDEPEND="
${DEPEND}
gtk? ( media-fonts/font-misc-misc )
"
BDEPEND="
virtual/pkgconfig
"

PATCHES=(
"${FILESDIR}"/envy24control-config-dir.patch
)

pkg_setup() {
ALSA_TOOLS=(
seq/sbiload
us428control
hwmixvolume
hda-verb
$(usev alsa_cards_mixart mixartloader)
$(usev alsa_cards_vx222 vxloader)
$(usev alsa_cards_usb-usx2y usx2yloader)
$(usev alsa_cards_pcxhr pcxhrloader)
$(usev alsa_cards_sscape sscape_ctl)
)

if use gtk; then
ALSA_TOOLS+=(
echomixer
hdajackretask
$(usev alsa_cards_ice1712 envy24control)
)
# Perhaps a typo the following && logic?
if use alsa_cards_rme32 && use alsa_cards_rme96 ; then
ALSA_TOOLS+=( rmedigicontrol )
fi
fi

if use alsa_cards_hdsp || use alsa_cards_hdspm ; then
ALSA_TOOLS+=(
hdsploader
$(usev fltk 'hdspconf hdspmixer')
)
fi

if use alsa_cards_sb16 || use alsa_cards_sbawe ; then
ALSA_TOOLS+=( sb16_csp )
fi

if use alsa_cards_emu10k1 || use alsa_cards_emu10k1x; then
ALSA_TOOLS+=( as10k1 ld10k1 )
fi
}

src_prepare() {
default

# This block only deals with the tools that still use GTK and the
# AM_PATH_GTK macro.
for dir in echomixer envy24control rmedigicontrol; do
has "${dir}" "${ALSA_TOOLS[*]}" || continue
pushd "${dir}" &> /dev/null || die
eautoreconf
popd &> /dev/null || die
done

# This block deals with the tools that are being patched
for dir in hdspconf; do
has "${dir}" "${ALSA_TOOLS[*]}" || continue
pushd "${dir}" &> /dev/null || die
eautoreconf
popd &> /dev/null || die
done

elibtoolize
}

src_configure() {
if use fltk; then
# hdspmixer requires fltk
append-ldflags "-L$(dirname $(fltk-config --libs))"
append-flags "-I$(fltk-config --includedir)"
fi

local f
for f in ${ALSA_TOOLS[@]} ; do
cd "${S}/${f}" || die
case "${f}" in
echomixer,envy24control,rmedigicontrol )
econf --with-gtk2
;;
* )
econf
;;
esac
done
}

src_compile() {
local f
for f in ${ALSA_TOOLS[@]} ; do
cd "${S}/${f}" || die
emake
done
}

src_install() {
local f
for f in ${ALSA_TOOLS[@]} ; do
# Install the main stuff
cd "${S}/${f}" || die
# hotplugdir is for usx2yloader/Makefile.am
emake DESTDIR="${D}" hotplugdir=/lib/firmware install

# Install the text documentation
local doc
for doc in README TODO ChangeLog AUTHORS; do
if [[ -f "${doc}" ]]; then
mv "${doc}" "${doc}.$(basename ${f})" || die
dodoc "${doc}.$(basename ${f})"
fi
done
done

# Punt at least /usr/lib/liblo10k1.la (last checked, 1.0.27)
find "${ED}" -type f -name '*.la' -delete || die
}
1 change: 1 addition & 0 deletions media-sound/alsa-utils/Manifest
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
DIST alsa-utils-1.2.10-patches.tar.xz 4984 BLAKE2B aa46afe25e709905285c3255d80a086b843c078d12385e8787812cb33ec0f16bff5fa1f35867166824978c99354cf74d10f2596e026b3b10b0180049486ea15f SHA512 d26e7276ac6636ac71d8bbaa9978999e13ce36f228c9854e90d29a63fae3cc0c3f8b2fb25effdd461d2b77e91fda3069987fa8355f5ef6f22a37af282e26ff6c
DIST alsa-utils-1.2.10.tar.bz2 1625707 BLAKE2B 077b4ad090c1ab40dd4fa22db01ae2a080ca849a5564dfe612654993297c80bd3584541c7e68aaad56c4c05538ba0de449e4677b1c4a9dfe56d8e11706c4ca35 SHA512 22adedf6d491d7768d24f054262a9c12bc952049db8374e104c0477ebf84266dcbeb0a2a3a1765b89958073d341f64dedbae63e3cae66f4983a0424e5cb3243f
DIST alsa-utils-1.2.11.tar.bz2 1627148 BLAKE2B dcf96705f9e3f1b4abaa7e1f107d1154a05500bf1cd07c821e0fe8c4ba7d7f08de0cf126be8c9c8dda3980d85c144318c12ffc8a95d5da4e98c49a6e9c2ee8ef SHA512 5ce76807b53357584bfb4ace5acfdac4db9168ffaf5cdd1e499738eec046c36112bf84a99970f66368063a9baf73bad93af2d439630572f3eba5c9321071172d
91 changes: 91 additions & 0 deletions media-sound/alsa-utils/alsa-utils-1.2.11.ebuild
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

EAPI=8

inherit systemd udev

DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
SRC_URI="https://www.alsa-project.org/files/pub/utils/${P}.tar.bz2"

LICENSE="GPL-2"
SLOT="0.9"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
IUSE="bat doc +libsamplerate ieee1394 +ncurses nls selinux"

DEPEND="
>=media-libs/alsa-lib-${PV}
libsamplerate? ( media-libs/libsamplerate )
ieee1394? ( media-libs/libffado )
ncurses? ( >=sys-libs/ncurses-5.7-r7:= )
bat? ( sci-libs/fftw:= )
"
RDEPEND="
${DEPEND}
selinux? ( sec-policy/selinux-alsa )
"
BDEPEND="
virtual/pkgconfig
doc? ( app-text/xmlto )
"

PATCHES=(
"${FILESDIR}"/${PN}-1.1.8-missing_header.patch
)

src_configure() {
export ac_cv_lib_ffado_ffado_streaming_init=$(usex ieee1394)

local myeconfargs=(
# --disable-alsaconf because it doesn't work with sys-apps/kmod, bug #456214
--disable-alsaconf
--disable-maintainer-mode
--with-asound-state-dir="${EPREFIX}"/var/lib/alsa
--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
--with-udev-rules-dir="${EPREFIX}/$(get_udevdir)"/rules.d
$(use_enable bat)
$(use_enable libsamplerate alsaloop)
$(use_enable ncurses alsamixer)
$(use_enable nls)
$(usev !doc '--disable-xmlto')
)
econf "${myeconfargs[@]}"
}

src_install() {
default
dodoc seq/*/README.*

newinitd "${FILESDIR}"/alsasound.initd-r8 alsasound
newconfd "${FILESDIR}"/alsasound.confd-r4 alsasound

keepdir /var/lib/alsa

# ALSA lib parser.c:1266:(uc_mgr_scan_master_configs) error: could not
# scan directory /usr/share/alsa/ucm: No such file or directory
# alsaucm: unable to obtain card list: No such file or directory
keepdir /usr/share/alsa/ucm

find "${ED}" -type f -name '*.la' -delete || die
}

pkg_postinst() {
udev_reload

if [[ -z ${REPLACING_VERSIONS} ]] && ! systemd_is_booted ; then
elog
elog "To take advantage of the init script, and automate the process of"
elog "saving and restoring sound-card mixer levels you should"
elog "add alsasound to the boot runlevel. You can do this as"
elog "root like so:"
elog "# rc-update add alsasound boot"
ewarn
ewarn "The ALSA core should be built into the kernel or loaded through other"
ewarn "means. There is no longer any modular auto(un)loading in alsa-utils."
fi
}

pkg_postrm() {
udev_reload
}