commit: 5d84c357c6bc3e1a3b3e432fb0018e7340aaa5be Author: Michael Everitt <gentoo <AT> veremit <DOT> xyz> AuthorDate: Mon Apr 20 22:24:10 2020 +0000 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> CommitDate: Wed Apr 22 21:38:17 2020 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=5d84c357
Stdint types fixed upstream in adab355. Missing files patch exists in ::gentoo In-repo version compiles fine: >>> Completed installing media-libs/alsa-lib-1.2.1.2 into >>> /var/tmp/portage/media-libs/alsa-lib-1.2.1.2/image Signed-off-by: Michael Everitt <gentoo <AT> veremit.xyz> Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org> media-libs/alsa-lib/Manifest | 3 - media-libs/alsa-lib/alsa-lib-1.1.4.1.ebuild | 91 ---------- media-libs/alsa-lib/alsa-lib-1.1.5.ebuild | 87 --------- media-libs/alsa-lib/alsa-lib-1.1.6-r1.ebuild | 85 --------- .../alsa-lib/files/alsa-lib-1.1.3-stdint.patch | 29 --- .../files/alsa-lib-1.1.6-missing_files.patch | 196 --------------------- media-libs/alsa-lib/metadata.xml | 14 -- 7 files changed, 505 deletions(-) diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest deleted file mode 100644 index 05d198b..0000000 --- a/media-libs/alsa-lib/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST alsa-lib-1.1.4.1.tar.bz2 974584 BLAKE2B f3221fa55dc11c04f4a1bc3ee90d2a679ca9b8bde65e2801ae5762fa456ef8e45532624efa57bf7d62f82e5c172eaf10f2286f9acace5a47e20123acf5ce04d2 SHA512 7b548c4ee29c4a1230a0edcd5d19219831290f96a214180a6530628acc05278d1348376195287d188f4f44d6be1914391c63994f1b50985c3eee74352da26b0b -DIST alsa-lib-1.1.5.tar.bz2 979225 BLAKE2B 75683b17bfd51c1e54f1a460ed32a170b07eb227bd6b9ee481d123116464f5c16bbb49f29dfc8d08baaf2f69c5333bf71b70c33b5d420c43e56ae4ace76a6ab0 SHA512 c79ceaa1ebfeda2caf41a0495ea31dd2748a11795989aebc341ae13a5c96d21495e4542571d5590e68b2575ceddd6e84059a950ddb78e6c0b9d94861faee4f58 -DIST alsa-lib-1.1.6.tar.bz2 989316 BLAKE2B 2aec62d262148571cc1b93ac8053002b61266951caf8b2855fc65b699ec928672748a21ba11a25e14e752a4a85f68b2f77b5ad6af9b2f1fc5e9de41313ace54a SHA512 00117769a3d5c609019b975188d6e7a07d035bd0461f54c5f291e14667620506f1adb6d61350f78d54648850f31965aae3ab0e697bf9e09c988e2d15bf6b09f0 diff --git a/media-libs/alsa-lib/alsa-lib-1.1.4.1.ebuild b/media-libs/alsa-lib/alsa-lib-1.1.4.1.ebuild deleted file mode 100644 index 42e66a4..0000000 --- a/media-libs/alsa-lib/alsa-lib-1.1.4.1.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# 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 multilib multilib-minimal python-single-r1 - -DESCRIPTION="Advanced Linux Sound Architecture Library" -HOMEPAGE="https://alsa-project.org/"; -SRC_URI="mirror://alsaproject/lib/${P}.tar.bz2" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~x86" -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} )" - -PATCHES=( - "${FILESDIR}"/${PN}-1.1.3-stdint.patch -) - -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 \ - --without-versioned \ - $(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.5.ebuild b/media-libs/alsa-lib/alsa-lib-1.1.5.ebuild deleted file mode 100644 index 346a0a2..0000000 --- a/media-libs/alsa-lib/alsa-lib-1.1.5.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# 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 multilib multilib-minimal python-single-r1 - -DESCRIPTION="Advanced Linux Sound Architecture Library" -HOMEPAGE="https://alsa-project.org/"; -SRC_URI="mirror://alsaproject/lib/${P}.tar.bz2" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~x86" -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 \ - --without-versioned \ - $(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.6-r1.ebuild b/media-libs/alsa-lib/alsa-lib-1.1.6-r1.ebuild deleted file mode 100644 index 3b8ffe5..0000000 --- a/media-libs/alsa-lib/alsa-lib-1.1.6-r1.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python{2_7,3_{4,5,6}} ) - -inherit autotools multilib multilib-minimal python-single-r1 - -DESCRIPTION="Advanced Linux Sound Architecture Library" -HOMEPAGE="https://alsa-project.org/"; -SRC_URI="mirror://alsaproject/lib/${P}.tar.bz2" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 arm ~arm64 ~mips ppc x86" -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}/${P}-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 '') - $(usex elibc_musl --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/files/alsa-lib-1.1.3-stdint.patch b/media-libs/alsa-lib/files/alsa-lib-1.1.3-stdint.patch deleted file mode 100644 index 88b2d33..0000000 --- a/media-libs/alsa-lib/files/alsa-lib-1.1.3-stdint.patch +++ /dev/null @@ -1,29 +0,0 @@ -Use stdlib.h defined types uint8_t, uint16_t, uint32_t and uint64_t -for compatibility with musl libc - ---- alsa-lib-1.1.3.orig/include/pcm.h 2015-02-26 13:34:52.000000000 +0100 -+++ alsa-lib-1.1.3/include/pcm.h 2015-07-28 13:44:32.423885625 +0200 -@@ -29,6 +29,8 @@ - #ifndef __ALSA_PCM_H - #define __ALSA_PCM_H - -+#include <stdint.h> /* uint_ types */ -+ - #ifdef __cplusplus - extern "C" { - #endif -@@ -1063,10 +1065,10 @@ - int snd_pcm_format_physical_width(snd_pcm_format_t format); /* in bits */ - snd_pcm_format_t snd_pcm_build_linear_format(int width, int pwidth, int unsignd, int big_endian); - ssize_t snd_pcm_format_size(snd_pcm_format_t format, size_t samples); --u_int8_t snd_pcm_format_silence(snd_pcm_format_t format); --u_int16_t snd_pcm_format_silence_16(snd_pcm_format_t format); --u_int32_t snd_pcm_format_silence_32(snd_pcm_format_t format); --u_int64_t snd_pcm_format_silence_64(snd_pcm_format_t format); -+uint8_t snd_pcm_format_silence(snd_pcm_format_t format); -+uint16_t snd_pcm_format_silence_16(snd_pcm_format_t format); -+uint32_t snd_pcm_format_silence_32(snd_pcm_format_t format); -+uint64_t snd_pcm_format_silence_64(snd_pcm_format_t format); - int snd_pcm_format_set_silence(snd_pcm_format_t format, void *buf, unsigned int samples); - - snd_pcm_sframes_t snd_pcm_bytes_to_frames(snd_pcm_t *pcm, ssize_t bytes); 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 deleted file mode 100644 index 909a00b..0000000 --- a/media-libs/alsa-lib/files/alsa-lib-1.1.6-missing_files.patch +++ /dev/null @@ -1,196 +0,0 @@ -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 <[email protected]> -+; 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 <[email protected]> -+; 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 <[email protected]> -+; 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")) diff --git a/media-libs/alsa-lib/metadata.xml b/media-libs/alsa-lib/metadata.xml deleted file mode 100644 index 356924f..0000000 --- a/media-libs/alsa-lib/metadata.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="project"> - <email>[email protected]</email> - </maintainer> - <use> - <flag name="alisp">Enable support for ALISP (ALSA LISP) interpreter for advanced features.</flag> - <flag name="thread-safety">thread-safe API functions</flag> - </use> - <upstream> - <remote-id type="cpe">cpe:/a:alsa-project:alsa-lib</remote-id> - </upstream> -</pkgmetadata>
