From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 3BA451384B4 for ; Wed, 25 Nov 2015 00:54:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D398921C11E; Wed, 25 Nov 2015 00:54:22 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5EBFF21C11E for ; Wed, 25 Nov 2015 00:54:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B78CC340634 for ; Wed, 25 Nov 2015 00:54:19 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9D4CF99D for ; Wed, 25 Nov 2015 00:54:14 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: <1448413263.b734a22c5afc83ded511acf3019d969de8200282.blueness@gentoo> Subject: [gentoo-commits] proj/musl:master commit in: media-libs/alsa-lib/, media-libs/alsa-lib/files/ X-VCS-Repository: proj/musl X-VCS-Files: media-libs/alsa-lib/Manifest media-libs/alsa-lib/alsa-lib-1.0.27.1-r99.ebuild media-libs/alsa-lib/files/alsa-lib-1.0.25-pcm-h.patch media-libs/alsa-lib/files/alsa-lib-1.0.27.1-musl.patch media-libs/alsa-lib/files/alsa-lib-1.0.27.1-rewind.patch media-libs/alsa-lib/files/alsa-lib-1.0.27.2-portable-mutex.patch media-libs/alsa-lib/metadata.xml X-VCS-Directories: media-libs/alsa-lib/ media-libs/alsa-lib/files/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: b734a22c5afc83ded511acf3019d969de8200282 X-VCS-Branch: master Date: Wed, 25 Nov 2015 00:54:14 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 6a54d258-563e-40d0-b13a-de9220c4a289 X-Archives-Hash: 252f697d22d2f0c4b9d22a2538295b8c commit: b734a22c5afc83ded511acf3019d969de8200282 Author: Anthony G. Basile gentoo org> AuthorDate: Wed Nov 25 01:01:03 2015 +0000 Commit: Anthony G. Basile gentoo 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 - /** - * \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 -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 -Signed-off-by: Jaroslav Kysela ---- - 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 @@ - - - - alsa - - alsa-bugs@gentoo.org - - - Enable support for ALISP (ALSA LISP) interpreter for advanced features. - - - cpe:/a:alsa-project:alsa-lib - -