summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Pielmeier <billie@gentoo.org>2013-05-02 16:35:04 +0000
committerDaniel Pielmeier <billie@gentoo.org>2013-05-02 16:35:04 +0000
commit83a3a001884bb7a115e1121fed6a16fb00f97f3a (patch)
treeb32e369a706007dfea5807ad189c0a37e783dc14 /media-sound
parentAdd second patch needed for automake-1.13, bug 467626 (diff)
downloadgentoo-2-83a3a001884bb7a115e1121fed6a16fb00f97f3a.tar.gz
gentoo-2-83a3a001884bb7a115e1121fed6a16fb00f97f3a.tar.bz2
gentoo-2-83a3a001884bb7a115e1121fed6a16fb00f97f3a.zip
Fix building with automake-1.13. Thanks to Ulenrich in bug #468214.
(Portage version: 2.1.11.62/cvs/Linux i686, signed Manifest commit with key 215AD14D)
Diffstat (limited to 'media-sound')
-rw-r--r--media-sound/aqualung/ChangeLog7
-rw-r--r--media-sound/aqualung/aqualung-0.9_beta11-r2.ebuild5
-rw-r--r--media-sound/aqualung/files/aqualung-0.9_beta11-automake-1.13.patch15
3 files changed, 24 insertions, 3 deletions
diff --git a/media-sound/aqualung/ChangeLog b/media-sound/aqualung/ChangeLog
index 3d2b9be96832..84a6e4771c6f 100644
--- a/media-sound/aqualung/ChangeLog
+++ b/media-sound/aqualung/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-sound/aqualung
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/aqualung/ChangeLog,v 1.28 2013/01/20 10:05:03 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/aqualung/ChangeLog,v 1.29 2013/05/02 16:35:04 billie Exp $
+
+ 02 May 2013; Daniel Pielmeier <billie@gentoo.org>
+ aqualung-0.9_beta11-r2.ebuild,
+ +files/aqualung-0.9_beta11-automake-1.13.patch:
+ Fix building with automake-1.13. Thanks to Ulenrich in bug #468214.
20 Jan 2013; Daniel Pielmeier <billie@gentoo.org>
aqualung-0.9_beta11-r1.ebuild, aqualung-0.9_beta11-r2.ebuild:
diff --git a/media-sound/aqualung/aqualung-0.9_beta11-r2.ebuild b/media-sound/aqualung/aqualung-0.9_beta11-r2.ebuild
index a4fe99b2d944..78ce1cf38cf6 100644
--- a/media-sound/aqualung/aqualung-0.9_beta11-r2.ebuild
+++ b/media-sound/aqualung/aqualung-0.9_beta11-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/aqualung/aqualung-0.9_beta11-r2.ebuild,v 1.2 2013/01/20 10:05:03 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/aqualung/aqualung-0.9_beta11-r2.ebuild,v 1.3 2013/05/02 16:35:04 billie Exp $
EAPI=5
@@ -51,7 +51,8 @@ S=${WORKDIR}/${PN}-${MY_PV}
src_prepare() {
epatch "${FILESDIR}"/${P}-use_lrdf_cflags.patch \
"${FILESDIR}"/${P}-ffmpeg.patch \
- "${FILESDIR}"/${P}-libavformat54.patch
+ "${FILESDIR}"/${P}-libavformat54.patch \
+ "${FILESDIR}"/${P}-automake-1.13.patch
sed -i \
-e 's:$(pkgdatadir)/doc:/usr/share/doc/${PF}:' \
doc/Makefile.am || die
diff --git a/media-sound/aqualung/files/aqualung-0.9_beta11-automake-1.13.patch b/media-sound/aqualung/files/aqualung-0.9_beta11-automake-1.13.patch
new file mode 100644
index 000000000000..bd8d45919793
--- /dev/null
+++ b/media-sound/aqualung/files/aqualung-0.9_beta11-automake-1.13.patch
@@ -0,0 +1,15 @@
+--- aqualung-0.9beta11/configure.ac.old 2013-05-02 18:20:45.918789345 +0200
++++ aqualung-0.9beta11/configure.ac 2013-05-02 18:21:51.471466816 +0200
+@@ -1,9 +1,9 @@
+ # Process this file with autoconf to produce a configure script.
+
+-AC_INIT(aqualung, 0.9beta11, http://aqualung.factorial.hu/mantis)
+-AM_INIT_AUTOMAKE(aqualung, 0.9beta11)
++AC_INIT([aqualung],0.9beta11,[http://aqualung.factorial.hu/mantis])
++AM_INIT_AUTOMAKE
+ AC_CONFIG_SRCDIR([src/core.c])
+-AM_CONFIG_HEADER([config.h])
++AC_CONFIG_HEADERS([config.h])
+
+
+