summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2006-03-01 04:45:09 +0000
committerMike Frysinger <vapier@gentoo.org>2006-03-01 04:45:09 +0000
commit0a1a2a42325c487d43b2a1ecfe57d9ff269f3b8c (patch)
treefb17b3869078e1b0bef3dc00a8d1c6472f992b53 /media-libs/alsa-lib
parentVersion bump. (diff)
downloadgentoo-2-0a1a2a42325c487d43b2a1ecfe57d9ff269f3b8c.tar.gz
gentoo-2-0a1a2a42325c487d43b2a1ecfe57d9ff269f3b8c.tar.bz2
gentoo-2-0a1a2a42325c487d43b2a1ecfe57d9ff269f3b8c.zip
Fix building on uClibc #105478 by Rande Knight.
(Portage version: 2.1_pre5-r1)
Diffstat (limited to 'media-libs/alsa-lib')
-rw-r--r--media-libs/alsa-lib/ChangeLog9
-rw-r--r--media-libs/alsa-lib/alsa-lib-1.0.11_rc3.ebuild8
-rw-r--r--media-libs/alsa-lib/files/alsa-lib-1.0.10-no-wordexp-header.patch26
3 files changed, 37 insertions, 6 deletions
diff --git a/media-libs/alsa-lib/ChangeLog b/media-libs/alsa-lib/ChangeLog
index 073d66ecaf71..ff9c7ce79bd5 100644
--- a/media-libs/alsa-lib/ChangeLog
+++ b/media-libs/alsa-lib/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-libs/alsa-lib
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/ChangeLog,v 1.157 2006/02/09 16:22:03 killerfox Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/ChangeLog,v 1.158 2006/03/01 04:45:09 vapier Exp $
+
+ 01 Mar 2006; Mike Frysinger <vapier@gentoo.org>
+ +files/alsa-lib-1.0.10-no-wordexp-header.patch,
+ alsa-lib-1.0.11_rc3.ebuild:
+ Fix building on uClibc #105478 by Rande Knight.
09 Feb 2006; Rene Nussbaumer <killerfox@gentoo.org>
alsa-lib-1.0.11_rc3.ebuild:
diff --git a/media-libs/alsa-lib/alsa-lib-1.0.11_rc3.ebuild b/media-libs/alsa-lib/alsa-lib-1.0.11_rc3.ebuild
index 49587be3a96c..fd3ed7300372 100644
--- a/media-libs/alsa-lib/alsa-lib-1.0.11_rc3.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.0.11_rc3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 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.11_rc3.ebuild,v 1.5 2006/02/09 16:22:03 killerfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/alsa-lib-1.0.11_rc3.ebuild,v 1.6 2006/03/01 04:45:09 vapier Exp $
inherit eutils autotools
@@ -13,7 +13,6 @@ SRC_URI="mirror://alsaproject/lib/${MY_P}.tar.bz2"
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
-
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
IUSE="doc jack"
@@ -26,8 +25,9 @@ PDEPEND="jack? ( >=media-plugins/alsa-jack-1.0.10_rc1 )"
src_unpack() {
unpack ${A}
- cd ${S}
- epatch "${FILESDIR}/${PN}-1.0.10_rc3-hardened.patch"
+ cd "${S}"
+ epatch "${FILESDIR}"/${PN}-1.0.10_rc3-hardened.patch
+ epatch "${FILESDIR}"/${PN}-1.0.10-no-wordexp-header.patch
eautoreconf
}
diff --git a/media-libs/alsa-lib/files/alsa-lib-1.0.10-no-wordexp-header.patch b/media-libs/alsa-lib/files/alsa-lib-1.0.10-no-wordexp-header.patch
new file mode 100644
index 000000000000..377d4e26309e
--- /dev/null
+++ b/media-libs/alsa-lib/files/alsa-lib-1.0.10-no-wordexp-header.patch
@@ -0,0 +1,26 @@
+no longer need wordexp so remove header to fix building on uClibc
+
+Patch by Stefan de Konink
+
+http://bugs.gentoo.org/105478
+
+--- src/alisp/alisp.c
++++ src/alisp/alisp.c
+@@ -30,7 +30,6 @@
+ #include <ctype.h>
+ #include <math.h>
+ #include <err.h>
+-#include <wordexp.h>
+
+ #define alisp_seq_iterator alisp_object
+
+--- src/names.c
++++ src/names.c
+@@ -31,7 +31,6 @@
+ */
+
+ #include <stdarg.h>
+-#include <wordexp.h>
+ #include <dlfcn.h>
+ #include <limits.h>
+ #include <sys/stat.h>