* [gentoo-commits] proj/musl:master commit in: media-libs/alsa-lib/, media-libs/alsa-lib/files/
@ 2015-11-25 0:54 Anthony G. Basile
0 siblings, 0 replies; 4+ messages in thread
From: Anthony G. Basile @ 2015-11-25 0:54 UTC (permalink / raw
To: gentoo-commits
commit: b734a22c5afc83ded511acf3019d969de8200282
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 25 01:01:03 2015 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Wed Nov 25 01:01:03 2015 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=b734a22c
media-libs/alsa-lib: in tree version works.
media-libs/alsa-lib/Manifest | 7 --
media-libs/alsa-lib/alsa-lib-1.0.27.1-r99.ebuild | 79 ----------------------
.../alsa-lib/files/alsa-lib-1.0.25-pcm-h.patch | 27 --------
.../alsa-lib/files/alsa-lib-1.0.27.1-musl.patch | 24 -------
.../alsa-lib/files/alsa-lib-1.0.27.1-rewind.patch | 40 -----------
.../files/alsa-lib-1.0.27.2-portable-mutex.patch | 35 ----------
media-libs/alsa-lib/metadata.xml | 14 ----
7 files changed, 226 deletions(-)
diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
deleted file mode 100644
index 0dcd29d..0000000
--- a/media-libs/alsa-lib/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX alsa-lib-1.0.25-pcm-h.patch 1177 SHA256 e6525c81b77f5b5ba48ce2ba16be2622f54a7090e1268be5f5198e2490c9cf45 SHA512 de62a1a1bfed51fc0482a145ed5fce7451b314a84a8c616f2af5f5e1f033da78f2a7800dc0b0921022d934efba110598a9d98d846c71b7861f2867c04093def2 WHIRLPOOL 395ccc8faa5bc59cee8f442224ddee9d1908c24918fd1bdfdd041454eaead4ba1f3e0895bf6d55f1ccbd92378bdc08e6681040ea01c713413aacbf500e008000
-AUX alsa-lib-1.0.27.1-musl.patch 965 SHA256 f0f7079e38691bbb65418b097c4c66de2837237d33f0873b2403eca9145b7489 SHA512 6cee79a298214c3a541cb5f523ed44957b169b8bef14d47792cc1f17b0887ae59018097e150c602fef4e70e486da983d495499916691dd7e5e0b512c6e194051 WHIRLPOOL 52767ab59ea59a127fac6470c6b0a843bcba9389b5b34ba5133f91f1b5d70e7b06846e9ae1d4ca73791a98cdc4be17ee6948ae0ea51d80733b69567fd93c532d
-AUX alsa-lib-1.0.27.1-rewind.patch 1514 SHA256 b13b1758f1d54cae12510ccfc29ae3ccca0ab8e7ff97798d1de834a30f252fea SHA512 67b38120d4d8be74fecf55af639fb1a3c9c118f1f0b1c55eee81b65693d1fee753c02eea6cabdd0273299d0c6af6e155a91e88efb900040c3069901fc8b2774e WHIRLPOOL fc6adbb7f833efaabfd40f3a4b76f27d1f5a7afdd02ca2b405a91ebf3f483fa03078710223116e0e1f1f2e273c8e26df9a5d5747db247b3bbbb617f9ff893cfc
-AUX alsa-lib-1.0.27.2-portable-mutex.patch 894 SHA256 a26d381704f336fef02de6d8413434c56b6cc1401f30d66c10f5602cfd4ec523 SHA512 e4fa707e714fe61628da3cb42adf9c69edfdde48ea034dd72ec34def26b9918f61000ab2343cffe97a55c275a3db0c8b0e7173bfc4c64a5eb74b1887ff4126dc WHIRLPOOL 2b611d0737b9e57fe8a3f089e2ea81ee69e923c8168e17758565601cb94d31616908496fa4073cb0bd8687e8ef2b0fa303f52404469b64f4844c96a8962e1958
-DIST alsa-lib-1.0.27.1.tar.bz2 906234 SHA256 690e07a3ef6270d40ed2130638dba3c18395aae8db4a109bcc473643ce29a03b SHA512 546a52c5c23d51e3a49a36565c0bdda98efc3bbe8ba217c72cfb6986b0e1a6104a3040bc223a74966139416ce39709421a3131f3edb29362a3f949b0ae939909 WHIRLPOOL 485a5b260edc208776ca553d13065d242f1266e38b25dab252596fc8d4c9c3482d11fd3e472c7c96c97b396718a715ca12f36c76635bd069ebe09edc6815693f
-EBUILD alsa-lib-1.0.27.1-r99.ebuild 1953 SHA256 4ea3f30026bc63720345cd2a8b0c1553c06d58e253675bb37df59155601e852d SHA512 25fea6eeba3366a639eda1cd1c6d8ac51d2545553c3454ccb4ddeea17928236a47a830877b641091cb019670ca33d219867bc67b6a64018b17f571dacff9f563 WHIRLPOOL 46c3c5ed70df92ed41e1c4af461a468b632402d7947d429ef30b326cd22c4af81e6397b349be8c551e05fc097be1bc4262b31e7274340612a2db56ef6c7534d1
-MISC metadata.xml 443 SHA256 2c3e6e0b3b3cfb7d4cd1b35cb092bc3e0fb60688f7aaedc29133408d00437fba SHA512 ba3c80c882e081177bf371ebd8d8fa3696f0cdd8c214333f4a5515e7d2997884ffddb56559ce51e818fdf8516af0529eaed01e6048f582feddc701d9f27bdb30 WHIRLPOOL 8537995f235dbfaf3c242868af177df5199762de1842f0f7085388dbe86e7821ffe137bb3ea6591d45a36bed5499128e7724a8675bff124b676994e723062a2b
diff --git a/media-libs/alsa-lib/alsa-lib-1.0.27.1-r99.ebuild b/media-libs/alsa-lib/alsa-lib-1.0.27.1-r99.ebuild
deleted file mode 100644
index 0967bf4..0000000
--- a/media-libs/alsa-lib/alsa-lib-1.0.27.1-r99.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/alsa-lib-1.0.27.1.ebuild,v 1.15 2013/09/01 18:36:03 ago Exp $
-
-EAPI=5
-
-# no support for python3_2 or above yet wrt #471326
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils multilib 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="amd64 arm ~mips ppc x86"
-IUSE="doc debug alisp python"
-
-RDEPEND="python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
- doc? ( >=app-doc/doxygen-1.2.6 )"
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- find . -name Makefile.am -exec sed -i -e '/CFLAGS/s:-g -O2::' {} + || die
- # force use of correct python-config wrt #478802
- if [[ ${ABI} == ${DEFAULT_ABI} ]]; then
- use python && { sed -i -e "s:python-config:$EPYTHON-config:" configure.in || die; }
- fi
- epatch "${FILESDIR}"/${P}-rewind.patch #477282
- epatch "${FILESDIR}"/${P}-musl.patch
- epatch "${FILESDIR}"/${PN}-1.0.25-pcm-h.patch
- epatch "${FILESDIR}"/${PN}-1.0.27.2-portable-mutex.patch
- epatch_user
- eautoreconf
-}
-
-src_configure() {
- local myconf
- 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) \
- $(use_enable python) \
- ${myconf}
-}
-
-src_compile() {
- emake
-
- if use doc; then
- emake doc
- fgrep -Zrl "${S}" doc/doxygen/html | \
- xargs -0 sed -i -e "s:${S}::"
- fi
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- if use doc; then
- dohtml -r doc/doxygen/html/.
- fi
- 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.25-pcm-h.patch b/media-libs/alsa-lib/files/alsa-lib-1.0.25-pcm-h.patch
deleted file mode 100644
index 7d6dc13..0000000
--- a/media-libs/alsa-lib/files/alsa-lib-1.0.25-pcm-h.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-taken from sabotage linux
-
---- alsa-lib-1.0.25/include/pcm.h
-+++ alsa-lib-1.0.25.patched/include/pcm.h
-@@ -33,6 +33,7 @@
- extern "C" {
- #endif
-
-+#include <stdint.h>
- /**
- * \defgroup PCM PCM Interface
- * See the \ref pcm page for more details.
-@@ -941,10 +942,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.0.27.1-musl.patch b/media-libs/alsa-lib/files/alsa-lib-1.0.27.1-musl.patch
deleted file mode 100644
index 0521fe0..0000000
--- a/media-libs/alsa-lib/files/alsa-lib-1.0.27.1-musl.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ur a/alsa-lib-1.0.27.1/configure.in b/alsa-lib-1.0.27.1/configure.in
---- a/alsa-lib-1.0.27.1/configure.in 2013-05-21 08:48:28.000000000 +0000
-+++ b/alsa-lib-1.0.27.1/configure.in 2014-02-16 21:04:29.833236371 +0000
-@@ -64,7 +64,7 @@
-
- dnl Checks for library functions.
- AC_PROG_GCC_TRADITIONAL
--AC_CHECK_FUNC([hsearch_r], [HAVE_HSEARCH_R=yes])
-+AC_CHECK_FUNC([hsearch], [HAVE_HSEARCH_R=yes])
- AM_CONDITIONAL([ALSA_HSEARCH_R], [test "x$HAVE_HSEARCH_R" != xyes])
- AC_CHECK_FUNCS([uselocale])
-
-diff -ur a/alsa-lib-1.0.27.1/include/global.h b/alsa-lib-1.0.27.1/include/global.h
---- a/alsa-lib-1.0.27.1/include/global.h 2013-05-21 08:48:28.000000000 +0000
-+++ b/alsa-lib-1.0.27.1/include/global.h 2014-02-16 20:08:10.954478169 +0000
-@@ -133,7 +133,7 @@
-
- int snd_user_file(const char *file, char **result);
-
--#if !defined(_POSIX_C_SOURCE) && !defined(_POSIX_SOURCE)
-+#if 0
- struct timeval {
- time_t tv_sec; /* seconds */
- long tv_usec; /* microseconds */
diff --git a/media-libs/alsa-lib/files/alsa-lib-1.0.27.1-rewind.patch b/media-libs/alsa-lib/files/alsa-lib-1.0.27.1-rewind.patch
deleted file mode 100644
index f585645..0000000
--- a/media-libs/alsa-lib/files/alsa-lib-1.0.27.1-rewind.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From f2d39afe6139ab16aa2aeea0f51f32db79ab1262 Mon Sep 17 00:00:00 2001
-From: David Henningsson <david.henningsson@canonical.com>
-Date: Thu, 30 May 2013 12:26:34 +0200
-Subject: [PATCH] pcm_plugin: Fix return value of snd_pcm_rewind
-
-In case the rewind did not rewind as much as expected, e g due to
-time delay between the latest avail update and the rewind, we must
-properly account for that in the plugin layer.
-
-Otherwise, the plugin's appl ptr and the hw's appl ptr become
-unsynchronised, which is very bad, especially in mmap_shadow plugins,
-e g, this could cause the overlapping memcpy in the softvol plugin
-as seen here:
-https://bugs.freedesktop.org/show_bug.cgi?id=64299
-
-Signed-off-by: David Henningsson <david.henningsson@canonical.com>
-Signed-off-by: Jaroslav Kysela <perex@perex.cz>
----
- src/pcm/pcm_plugin.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/pcm/pcm_plugin.c b/src/pcm/pcm_plugin.c
-index 96218a8..17157e8 100644
---- a/src/pcm/pcm_plugin.c
-+++ b/src/pcm/pcm_plugin.c
-@@ -219,9 +219,9 @@ static snd_pcm_sframes_t snd_pcm_plugin_rewind(snd_pcm_t *pcm, snd_pcm_uframes_t
- snd_atomic_write_end(&plugin->watom);
- return sframes;
- }
-- snd_pcm_mmap_appl_backward(pcm, (snd_pcm_uframes_t) frames);
-+ snd_pcm_mmap_appl_backward(pcm, (snd_pcm_uframes_t) sframes);
- snd_atomic_write_end(&plugin->watom);
-- return (snd_pcm_sframes_t) frames;
-+ return (snd_pcm_sframes_t) sframes;
- }
-
- static snd_pcm_sframes_t snd_pcm_plugin_forwardable(snd_pcm_t *pcm)
---
-1.7.11.7
-
diff --git a/media-libs/alsa-lib/files/alsa-lib-1.0.27.2-portable-mutex.patch b/media-libs/alsa-lib/files/alsa-lib-1.0.27.2-portable-mutex.patch
deleted file mode 100644
index c4f90d2..0000000
--- a/media-libs/alsa-lib/files/alsa-lib-1.0.27.2-portable-mutex.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-taken from sabotage linux
-
---- alsa-lib-1.0.27.2.orig/src/conf.c
-+++ alsa-lib-1.0.27.2/src/conf.c
-@@ -427,8 +427,8 @@
- #ifndef DOC_HIDDEN
-
- #ifdef HAVE_LIBPTHREAD
--static pthread_mutex_t snd_config_update_mutex =
-- PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
-+static pthread_mutex_t snd_config_update_mutex;
-+static pthread_once_t snd_config_update_mutex_once = PTHREAD_ONCE_INIT;
- #endif
-
- struct _snd_config {
-@@ -472,8 +472,19 @@
-
- #ifdef HAVE_LIBPTHREAD
-
-+static void snd_config_init_mutex(void)
-+{
-+ pthread_mutexattr_t attr;
-+
-+ pthread_mutexattr_init(&attr);
-+ pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
-+ pthread_mutex_init(&snd_config_update_mutex, &attr);
-+ pthread_mutexattr_destroy(&attr);
-+}
-+
- static inline void snd_config_lock(void)
- {
-+ pthread_once(&snd_config_update_mutex_once, snd_config_init_mutex);
- pthread_mutex_lock(&snd_config_update_mutex);
- }
-
diff --git a/media-libs/alsa-lib/metadata.xml b/media-libs/alsa-lib/metadata.xml
deleted file mode 100644
index 0ea67ae..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>
- <herd>alsa</herd>
- <maintainer>
- <email>alsa-bugs@gentoo.org</email>
- </maintainer>
- <use>
- <flag name="alisp">Enable support for ALISP (ALSA LISP) interpreter for advanced features.</flag>
- </use>
- <upstream>
- <remote-id type="cpe">cpe:/a:alsa-project:alsa-lib</remote-id>
- </upstream>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/musl:master commit in: media-libs/alsa-lib/, media-libs/alsa-lib/files/
@ 2016-12-22 23:25 Aric Belsito
0 siblings, 0 replies; 4+ messages in thread
From: Aric Belsito @ 2016-12-22 23:25 UTC (permalink / raw
To: gentoo-commits
commit: e0d8fc262719125c62dc8dba0131dba3e0d355d4
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Thu Dec 22 23:24:52 2016 +0000
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Thu Dec 22 23:24:52 2016 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=e0d8fc26
media-libs/alsa-lib: Add most recent version
Fails to compile because PATH_MAX is undeclared.
media-libs/alsa-lib/Manifest | 4 +
media-libs/alsa-lib/alsa-lib-1.1.3.ebuild | 93 ++++++++++++++++++++++
.../files/alsa-lib-1.1.3-missing-limits.patch | 11 +++
media-libs/alsa-lib/metadata.xml | 13 +++
4 files changed, 121 insertions(+)
diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
new file mode 100644
index 0000000..54af2dd
--- /dev/null
+++ b/media-libs/alsa-lib/Manifest
@@ -0,0 +1,4 @@
+AUX alsa-lib-1.1.3-missing-limits.patch 438 SHA256 0209a6a218550f4c5edafef92daec6f04e402d554d37c70e9a8b77997aaaef03 SHA512 cac154be8e27cac5c36e04f7b3df881234e6497bf49c777962a82176fcc745ec7c4f0cdd71a55c390bf415808ae76b3d5e7b383a9f59d00a0cfb5148b5653552 WHIRLPOOL d790cd8469769c53896b188950c8ec474a0ebae5765d1953a5d4c9344d061667dae48341af7368e6d198d1749e9f506440298f991c179a7b4838a1787d283f6d
+DIST alsa-lib-1.1.3.tar.bz2 962001 SHA256 71282502184c592c1a008e256c22ed0ba5728ca65e05273ceb480c70f515969c SHA512 f5dbe2375a8c66af14378314a5238284d4ed63dfc86a750c0c6e8f6cdb6b1ea2d8ef26f870b5d152dc0b77d9b40821cab523f6734902b91583beb08e28c66850 WHIRLPOOL f33871789a7cc06a9db83fd659abdfeb7940d61a24ad7c71866f843d8c0c29eaf0e0770a2034dee2526c96835935b88c2fe882184c86528c98e7d4901f94b27d
+EBUILD alsa-lib-1.1.3.ebuild 2309 SHA256 9b128b3ffd95a16796305ff68440ec80ee87c99dc15fc7d180edd098bd0f72ba SHA512 f890e5ae7dde1d915aaa5524eeb6034aee0270bf2df388b9792352541cdd7b0312cafb20b3fea4850e7773644dcb6a26915a0acfa52fe3b4488ee6b6a3c6b442 WHIRLPOOL 334a39d5f9b3dce527a35b8b06bf93c7565105653a3b02c3f6a632657a08a05fff9dcbfcdcee24c45b6b76c211da06645b8bd6a00faafe119910ad538aaf2cc2
+MISC metadata.xml 438 SHA256 f2bec88238bb4a607fc2bb215e5967996ddb2f4bbcfa4692934c387db292db92 SHA512 1e3a7f5a2f9ea84793ec938eb657fcbd6d5748f1cb055d085c638e30d1b5c1154a9dc0026d6e3592de074125c17926a4429757844f7d02b960f4a9a8d94a0433 WHIRLPOOL e1c1cdc7aa789e26c847575bf1d5b64c62ca652254cd54068cf1b2e5580d5512ec31157ccd9c524dcbf654f401779a93dde9f9ca7481b69083db41c70fe247e7
diff --git a/media-libs/alsa-lib/alsa-lib-1.1.3.ebuild b/media-libs/alsa-lib/alsa-lib-1.1.3.ebuild
new file mode 100644
index 0000000..317b317
--- /dev/null
+++ b/media-libs/alsa-lib/alsa-lib-1.1.3.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="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} )"
+
+PATCHES=( "${FILESDIR}"/${P}-missing-limits.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 \
+ $(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/files/alsa-lib-1.1.3-missing-limits.patch b/media-libs/alsa-lib/files/alsa-lib-1.1.3-missing-limits.patch
new file mode 100644
index 0000000..09ba400
--- /dev/null
+++ b/media-libs/alsa-lib/files/alsa-lib-1.1.3-missing-limits.patch
@@ -0,0 +1,11 @@
+diff -Naur alsa-lib-1.1.3.orig/src/ucm/parser.c alsa-lib-1.1.3/src/ucm/parser.c
+--- alsa-lib-1.1.3.orig/src/ucm/parser.c 2016-12-22 15:21:20.756308973 -0800
++++ alsa-lib-1.1.3/src/ucm/parser.c 2016-12-22 15:21:51.996612346 -0800
+@@ -32,6 +32,7 @@
+
+ #include "ucm_local.h"
+ #include <dirent.h>
++#include <limits.h>
+
+ /** The name of the environment variable containing the UCM directory */
+ #define ALSA_CONFIG_UCM_VAR "ALSA_CONFIG_UCM"
diff --git a/media-libs/alsa-lib/metadata.xml b/media-libs/alsa-lib/metadata.xml
new file mode 100644
index 0000000..d1e2102
--- /dev/null
+++ b/media-libs/alsa-lib/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>alsa-bugs@gentoo.org</email>
+ </maintainer>
+ <use>
+ <flag name="alisp">Enable support for ALISP (ALSA LISP) interpreter for advanced features.</flag>
+ </use>
+ <upstream>
+ <remote-id type="cpe">cpe:/a:alsa-project:alsa-lib</remote-id>
+ </upstream>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/musl:master commit in: media-libs/alsa-lib/, media-libs/alsa-lib/files/
@ 2017-05-18 16:43 Aric Belsito
0 siblings, 0 replies; 4+ messages in thread
From: Aric Belsito @ 2017-05-18 16:43 UTC (permalink / raw
To: gentoo-commits
commit: 6d829ba2cd73a073d23e9bcd3caa3ed04f9ab92a
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Thu May 18 16:43:06 2017 +0000
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Thu May 18 16:43:06 2017 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=6d829ba2
media-libs/alsa-lib: remove unneccessary patch
media-libs/alsa-lib/Manifest | 3 +--
media-libs/alsa-lib/alsa-lib-1.1.4.ebuild | 1 -
media-libs/alsa-lib/files/alsa-lib-1.1.3-missing-limits.patch | 11 -----------
3 files changed, 1 insertion(+), 14 deletions(-)
diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index e125259..374eb16 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -1,5 +1,4 @@
-AUX alsa-lib-1.1.3-missing-limits.patch 438 SHA256 0209a6a218550f4c5edafef92daec6f04e402d554d37c70e9a8b77997aaaef03 SHA512 cac154be8e27cac5c36e04f7b3df881234e6497bf49c777962a82176fcc745ec7c4f0cdd71a55c390bf415808ae76b3d5e7b383a9f59d00a0cfb5148b5653552 WHIRLPOOL d790cd8469769c53896b188950c8ec474a0ebae5765d1953a5d4c9344d061667dae48341af7368e6d198d1749e9f506440298f991c179a7b4838a1787d283f6d
AUX alsa-lib-1.1.3-stdint.patch 1322 SHA256 a0ef37c76bcd4936086465faf79c0bb5e41388bda668068e9dd105085c16edd2 SHA512 5f518c1096c64d0a10c5f26ab703d588bd27a6bcd8b9e833ece7dd3f459fb942e16b32c2a1a38f435c7519dd730325e69316af829a03c640c5d2435e456c86bd WHIRLPOOL 3eb786187b720240911d8e10af9805cbb09353eb9dae02bbcad9668c33ef34f855ebc2883a1b33d8ff1b2c8e6def8654e76b2e3173466809cbbb75f5c3440a6b
DIST alsa-lib-1.1.4.tar.bz2 973825 SHA256 82f50a09487079755d93e4c9384912196995bade6280bce9bfdcabf094bfb515 SHA512 8dfc5cc8872138b9e7e234934e317d797e100ac99dac86a2a2e4bdcc0d49e8a05b4089b98341051b407750bed93c2713fae5218318e5ce6cc7db2801165a1c10 WHIRLPOOL 74eb6742d93b6f2988ea9f583623edd985897db278e5dcac6916b3e9b772f16db326feb37b81a191405cc43ec2a55d313e74293ccbb43281b15f3056bd8f623f
-EBUILD alsa-lib-1.1.4.ebuild 2374 SHA256 cef2a9339fd1e34a8c1594853087dbf95f7e970a3f3193ef99d3004480ef5c49 SHA512 e0e4305053e8cf1c61153423f620c5f4782a1f816101e9cc8ab170fdacda7eef9e53cc13a76a2317fa18c27b09092bed0112f0cf9cfd089c50af0ec6dc795b23 WHIRLPOOL 921f1b6f5f6b26cea96139cdf0b79410ad57c37f41e1af802ea850e692546c0f7ef07ff515cfd6fd6067c569806e52ef2c101bec39e074199d576976825f4dc7
+EBUILD alsa-lib-1.1.4.ebuild 2326 SHA256 78af4e452a502d43dc3b0a844429ad63a049a5cdf801d94a2545297f26be83e9 SHA512 cd5f8253b0d54acb8400ea22c0912fde6202434e5a5660d51eea92dca0172af1bbfc328bff826f2a357f085ee48e4e7d8bda73638f0bcf95539e0dafd21bb4f0 WHIRLPOOL 4d0931f4e2b674c8c68113434e7a960c632a7b1b031146124111e5f25ab02e996f5e631c6de375d6715aafd36d46a7a0eae6488b86bdd8563d5c690597ed5741
MISC metadata.xml 438 SHA256 f2bec88238bb4a607fc2bb215e5967996ddb2f4bbcfa4692934c387db292db92 SHA512 1e3a7f5a2f9ea84793ec938eb657fcbd6d5748f1cb055d085c638e30d1b5c1154a9dc0026d6e3592de074125c17926a4429757844f7d02b960f4a9a8d94a0433 WHIRLPOOL e1c1cdc7aa789e26c847575bf1d5b64c62ca652254cd54068cf1b2e5580d5512ec31157ccd9c524dcbf654f401779a93dde9f9ca7481b69083db41c70fe247e7
diff --git a/media-libs/alsa-lib/alsa-lib-1.1.4.ebuild b/media-libs/alsa-lib/alsa-lib-1.1.4.ebuild
index daa89a4..ff90158 100644
--- a/media-libs/alsa-lib/alsa-lib-1.1.4.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.1.4.ebuild
@@ -28,7 +28,6 @@ DEPEND="${RDEPEND}
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
PATCHES=(
- "${FILESDIR}"/${PN}-1.1.3-missing-limits.patch
"${FILESDIR}"/${PN}-1.1.3-stdint.patch
)
diff --git a/media-libs/alsa-lib/files/alsa-lib-1.1.3-missing-limits.patch b/media-libs/alsa-lib/files/alsa-lib-1.1.3-missing-limits.patch
deleted file mode 100644
index 09ba400..0000000
--- a/media-libs/alsa-lib/files/alsa-lib-1.1.3-missing-limits.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur alsa-lib-1.1.3.orig/src/ucm/parser.c alsa-lib-1.1.3/src/ucm/parser.c
---- alsa-lib-1.1.3.orig/src/ucm/parser.c 2016-12-22 15:21:20.756308973 -0800
-+++ alsa-lib-1.1.3/src/ucm/parser.c 2016-12-22 15:21:51.996612346 -0800
-@@ -32,6 +32,7 @@
-
- #include "ucm_local.h"
- #include <dirent.h>
-+#include <limits.h>
-
- /** The name of the environment variable containing the UCM directory */
- #define ALSA_CONFIG_UCM_VAR "ALSA_CONFIG_UCM"
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/musl:master commit in: media-libs/alsa-lib/, media-libs/alsa-lib/files/
@ 2020-04-22 21:40 Anthony G. Basile
0 siblings, 0 replies; 4+ messages in thread
From: Anthony G. Basile @ 2020-04-22 21:40 UTC (permalink / raw
To: gentoo-commits
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 <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"))
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>alsa-bugs@gentoo.org</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>
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-04-22 21:40 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-05-18 16:43 [gentoo-commits] proj/musl:master commit in: media-libs/alsa-lib/, media-libs/alsa-lib/files/ Aric Belsito
-- strict thread matches above, loose matches on Subject: below --
2020-04-22 21:40 Anthony G. Basile
2016-12-22 23:25 Aric Belsito
2015-11-25 0:54 Anthony G. Basile
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox