summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2008-06-20 23:45:26 +0000
committerAlexis Ballier <aballier@gentoo.org>2008-06-20 23:45:26 +0000
commit9ce6e8446bd40035aaeaca7a8a60e4cbdb5a1362 (patch)
tree8c849f2c47beaccefa5387f47ab08041ccfffe36 /media-sound/gnusound
parentVersion bump. Fix src_install failure on SMP boxes (#225453). (diff)
downloadgentoo-2-9ce6e8446bd40035aaeaca7a8a60e4cbdb5a1362.tar.gz
gentoo-2-9ce6e8446bd40035aaeaca7a8a60e4cbdb5a1362.tar.bz2
gentoo-2-9ce6e8446bd40035aaeaca7a8a60e4cbdb5a1362.zip
include gtk2.12 patch in the tarball, add a patch to build against new ffmpeg headers layout
(Portage version: 2.2_rc1/cvs/Linux 2.6.25.4 x86_64)
Diffstat (limited to 'media-sound/gnusound')
-rw-r--r--media-sound/gnusound/ChangeLog9
-rw-r--r--media-sound/gnusound/files/gnusound-0.7.4-gtk212.patch12
-rw-r--r--media-sound/gnusound/gnusound-0.7.4.ebuild9
3 files changed, 11 insertions, 19 deletions
diff --git a/media-sound/gnusound/ChangeLog b/media-sound/gnusound/ChangeLog
index f7a9be86f57a..daa49f4cc72a 100644
--- a/media-sound/gnusound/ChangeLog
+++ b/media-sound/gnusound/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-sound/gnusound
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gnusound/ChangeLog,v 1.18 2007/09/23 11:40:17 drac Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gnusound/ChangeLog,v 1.19 2008/06/20 23:45:25 aballier Exp $
+
+ 20 Jun 2008; Alexis Ballier <aballier@gentoo.org>
+ -files/gnusound-0.7.4-gtk212.patch, gnusound-0.7.4.ebuild:
+ include gtk2.12 patch in the tarball, add a patch to build against new
+ ffmpeg headers layout
23 Sep 2007; Samuli Suominen <drac@gentoo.org>
+files/gnusound-0.7.4-gtk212.patch, gnusound-0.7.4.ebuild:
diff --git a/media-sound/gnusound/files/gnusound-0.7.4-gtk212.patch b/media-sound/gnusound/files/gnusound-0.7.4-gtk212.patch
deleted file mode 100644
index 656bd95d9568..000000000000
--- a/media-sound/gnusound/files/gnusound-0.7.4-gtk212.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur gnusound-0.7.4.orig/configure.ac gnusound-0.7.4/configure.ac
---- gnusound-0.7.4.orig/configure.ac 2005-07-06 12:56:47.000000000 +0300
-+++ gnusound-0.7.4/configure.ac 2007-09-23 14:34:48.000000000 +0300
-@@ -242,7 +242,7 @@
- if test "x$use_gnome2" = "xyes"; then
- PKG_CHECK_MODULES(GNOME2,libgnomeui-2.0 >= 2.0.0 libglade-2.0 gthread-2.0,
- AC_DEFINE(HAVE_GNOME2,,[use GNOME2])
-- CFLAGS="$CFLAGS -DGNOME_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -rdynamic $GNOME2_CFLAGS"
-+ CFLAGS="$CFLAGS -rdynamic $GNOME2_CFLAGS"
- LIBS="$LIBS -rdynamic $GNOME2_LIBS",
- use_gnome2=no)
- fi
diff --git a/media-sound/gnusound/gnusound-0.7.4.ebuild b/media-sound/gnusound/gnusound-0.7.4.ebuild
index a0f7b8d91bd7..2ee6193d49b1 100644
--- a/media-sound/gnusound/gnusound-0.7.4.ebuild
+++ b/media-sound/gnusound/gnusound-0.7.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gnusound/gnusound-0.7.4.ebuild,v 1.7 2007/09/23 11:40:17 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gnusound/gnusound-0.7.4.ebuild,v 1.8 2008/06/20 23:45:25 aballier Exp $
WANT_ATUOMAKE=1.8
WANT_AUTOCONF=2.5
@@ -10,7 +10,7 @@ inherit toolchain-funcs eutils autotools
IUSE="3dnow alsa audiofile cpudetection flac ffmpeg jack lame libsamplerate mmx
ogg oss sse vorbis"
-PATCHLEVEL="1"
+PATCHLEVEL="2"
M4TARBALL_REV="1"
DESCRIPTION="GNUsound is a sound editor for Linux/x86"
HOMEPAGE="http://gnusound.sourceforge.net/"
@@ -49,7 +49,6 @@ src_unpack() {
EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
cp "${WORKDIR}"/m4/* config/
- epatch "${FILESDIR}"/${P}-gtk212.patch
AT_M4DIR="config" eautoreconf
}
@@ -75,7 +74,7 @@ src_compile() {
${myconf} \
--with-gnome2 \
|| die "Configure failure"
- emake CC=$(tc-getCC) || die "Make failure"
+ emake CC="$(tc-getCC)" || die "Make failure"
}
src_install() {