summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2006-11-17 23:49:00 +0000
committerAlexis Ballier <aballier@gentoo.org>2006-11-17 23:49:00 +0000
commit59def91434cf71718a67ce3ca4452ea424f6b291 (patch)
tree3a7ab630cc5d8acffed9267d5690063d1b3f7a02 /media-sound/vorbis-tools
parentdrop gnome useflag for gnome-1.x removal (diff)
downloadgentoo-2-59def91434cf71718a67ce3ca4452ea424f6b291.tar.gz
gentoo-2-59def91434cf71718a67ce3ca4452ea424f6b291.tar.bz2
gentoo-2-59def91434cf71718a67ce3ca4452ea424f6b291.zip
Add patches from Josh Coalson to be able to build with flac 1.1.3
(Portage version: 2.1.2_rc1-r7)
Diffstat (limited to 'media-sound/vorbis-tools')
-rw-r--r--media-sound/vorbis-tools/ChangeLog6
-rw-r--r--media-sound/vorbis-tools/files/digest-vorbis-tools-1.0-r22
-rw-r--r--media-sound/vorbis-tools/files/digest-vorbis-tools-1.1.1-r33
-rw-r--r--media-sound/vorbis-tools/vorbis-tools-1.1.1-r3.ebuild16
4 files changed, 22 insertions, 5 deletions
diff --git a/media-sound/vorbis-tools/ChangeLog b/media-sound/vorbis-tools/ChangeLog
index f301f0860330..61c869e7d6f9 100644
--- a/media-sound/vorbis-tools/ChangeLog
+++ b/media-sound/vorbis-tools/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-sound/vorbis-tools
# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/vorbis-tools/ChangeLog,v 1.44 2006/11/15 21:57:56 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/vorbis-tools/ChangeLog,v 1.45 2006/11/17 23:49:00 aballier Exp $
+
+ 17 Nov 2006; Alexis Ballier <aballier@gentoo.org>
+ vorbis-tools-1.1.1-r3.ebuild:
+ Add patches from Josh Coalson to be able to build with flac 1.1.3
*vorbis-tools-1.1.1-r3 (15 Nov 2006)
diff --git a/media-sound/vorbis-tools/files/digest-vorbis-tools-1.0-r2 b/media-sound/vorbis-tools/files/digest-vorbis-tools-1.0-r2
index e389e42a2bed..b23be476cab8 100644
--- a/media-sound/vorbis-tools/files/digest-vorbis-tools-1.0-r2
+++ b/media-sound/vorbis-tools/files/digest-vorbis-tools-1.0-r2
@@ -1 +1,3 @@
MD5 c0a9fee54835e9c5b32d1f42c02964c9 vorbis-tools-1.0.tar.gz 425404
+RMD160 2f3874699be904fdf64c6edf09e21ccb8f0eee28 vorbis-tools-1.0.tar.gz 425404
+SHA256 38a8c76ffc63f491fbbae839f659845e596cde5c3c0c46a7000640b4fc12338f vorbis-tools-1.0.tar.gz 425404
diff --git a/media-sound/vorbis-tools/files/digest-vorbis-tools-1.1.1-r3 b/media-sound/vorbis-tools/files/digest-vorbis-tools-1.1.1-r3
index 6e41b3b90627..549f8539ab4c 100644
--- a/media-sound/vorbis-tools/files/digest-vorbis-tools-1.1.1-r3
+++ b/media-sound/vorbis-tools/files/digest-vorbis-tools-1.1.1-r3
@@ -1,3 +1,6 @@
+MD5 fc64bbc3738e51d8f4bfa1c66c5ca01f vorbis-tools-1.1.1+flac-1.1.3.tar.bz2 4119
+RMD160 8da2d4bd0f65681dbbb5e71c94ca7419633dde60 vorbis-tools-1.1.1+flac-1.1.3.tar.bz2 4119
+SHA256 2a5f74087c10f33b0891c41b71c6c51bda21e017287dd2190019cc4546645646 vorbis-tools-1.1.1+flac-1.1.3.tar.bz2 4119
MD5 47845fd76f5f2354a3619c4097575487 vorbis-tools-1.1.1.tar.gz 948837
RMD160 ed38929b8a81f833f726e489e55e9f62d5ed69ec vorbis-tools-1.1.1.tar.gz 948837
SHA256 617b4aa69e600c215b34fa3fd5764bc1d9d205d9d7d9fe7812bde7ec956fcaad vorbis-tools-1.1.1.tar.gz 948837
diff --git a/media-sound/vorbis-tools/vorbis-tools-1.1.1-r3.ebuild b/media-sound/vorbis-tools/vorbis-tools-1.1.1-r3.ebuild
index 50ef22569210..32771495e1b5 100644
--- a/media-sound/vorbis-tools/vorbis-tools-1.1.1-r3.ebuild
+++ b/media-sound/vorbis-tools/vorbis-tools-1.1.1-r3.ebuild
@@ -1,14 +1,18 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/vorbis-tools/vorbis-tools-1.1.1-r3.ebuild,v 1.1 2006/11/15 21:57:56 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/vorbis-tools/vorbis-tools-1.1.1-r3.ebuild,v 1.2 2006/11/17 23:49:00 aballier Exp $
IUSE="nls flac speex"
-inherit eutils toolchain-funcs flag-o-matic
+WANT_AUTOCONF=2.5
+WANT_AUTOMAKE=1.9
+
+inherit eutils toolchain-funcs flag-o-matic autotools
DESCRIPTION="tools for using the Ogg Vorbis sound file format"
HOMEPAGE="http://www.vorbis.com/"
-SRC_URI="http://downloads.xiph.org/releases/vorbis/${P}.tar.gz"
+SRC_URI="http://downloads.xiph.org/releases/vorbis/${P}.tar.gz
+ mirror://gentoo/${P}+flac-1.1.3.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
@@ -18,7 +22,7 @@ RDEPEND=">=media-libs/libvorbis-1.1.0
>=media-libs/libao-0.8.2
>=net-misc/curl-7.9
speex? ( media-libs/speex )
- flac? ( ~media-libs/flac-1.1.2 )"
+ flac? ( media-libs/flac )"
DEPEND="${RDEPEND}
nls? ( sys-devel/gettext )"
@@ -35,6 +39,10 @@ src_unpack() {
unpack ${A}
cd "${S}"
epatch "${FILESDIR}/${P}-utf8.patch"
+ epatch "${WORKDIR}/${P}+flac-1.1.3-1.patch"
+ epatch "${WORKDIR}/${P}+flac-1.1.3-2.patch"
+ epatch "${WORKDIR}/${P}+flac-1.1.3-3.patch"
+ AT_M4DIR="m4" eautoreconf
}
src_compile() {