summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2011-05-16 20:30:53 +0000
committerAlexis Ballier <aballier@gentoo.org>2011-05-16 20:30:53 +0000
commit89ba58aba8a9371cfa80bb319246dd5cf92bd715 (patch)
tree2214765517d6fe1c0d910ea419c3a7cf08ba6175 /media-video
parentVersion bump #366991 by Alec Moskvin. (diff)
downloadgentoo-2-89ba58aba8a9371cfa80bb319246dd5cf92bd715.tar.gz
gentoo-2-89ba58aba8a9371cfa80bb319246dd5cf92bd715.tar.bz2
gentoo-2-89ba58aba8a9371cfa80bb319246dd5cf92bd715.zip
avoid running wx-config if wxwidgets isnt requested and fix build, again, with ffmpeg git
(Portage version: 2.2.0_alpha33/cvs/Linux x86_64)
Diffstat (limited to 'media-video')
-rw-r--r--media-video/gpac/ChangeLog6
-rw-r--r--media-video/gpac/gpac-0.4.5-r4.ebuild5
2 files changed, 8 insertions, 3 deletions
diff --git a/media-video/gpac/ChangeLog b/media-video/gpac/ChangeLog
index cc3887f31ac7..8eccf12a4d1f 100644
--- a/media-video/gpac/ChangeLog
+++ b/media-video/gpac/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-video/gpac
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/ChangeLog,v 1.88 2011/04/20 17:35:07 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/ChangeLog,v 1.89 2011/05/16 20:30:53 aballier Exp $
+
+ 16 May 2011; Alexis Ballier <aballier@gentoo.org> gpac-0.4.5-r4.ebuild:
+ avoid running wx-config if wxwidgets isnt requested and fix build, again,
+ with ffmpeg git
20 Apr 2011; Alexis Ballier <aballier@gentoo.org> gpac-0.4.5-r4.ebuild:
fix build with latest ffmpeg
diff --git a/media-video/gpac/gpac-0.4.5-r4.ebuild b/media-video/gpac/gpac-0.4.5-r4.ebuild
index 78179e3fe8fd..870119582658 100644
--- a/media-video/gpac/gpac-0.4.5-r4.ebuild
+++ b/media-video/gpac/gpac-0.4.5-r4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/gpac-0.4.5-r4.ebuild,v 1.6 2011/04/20 17:35:07 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gpac/gpac-0.4.5-r4.ebuild,v 1.7 2011/05/16 20:30:53 aballier Exp $
inherit eutils wxwidgets flag-o-matic multilib toolchain-funcs
@@ -8,7 +8,7 @@ DESCRIPTION="GPAC is an implementation of the MPEG-4 Systems standard developed
HOMEPAGE="http://gpac.sourceforge.net/"
NBV="610"
WBV="600"
-PATCHLEVEL="7"
+PATCHLEVEL="8"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
mirror://gentoo/${P}-patches-${PATCHLEVEL}.tar.bz2"
@@ -80,6 +80,7 @@ src_unpack() {
need-wxwidgets unicode
sed -i -e "s:wx-config:${WX_CONFIG}:g" configure
else
+ sed -i -e "s:wx-config:false:g" configure
sed -i -e 's:^has_wx="yes:has_wx="no:' configure
fi