Including now fix to compile with -O3

5 files changed, 18 insertions, 8 deletions

diff --git a/media-video/avidemux/ChangeLog b/media-video/avidemux/ChangeLog
index a78e864b7c0b..321031343474 100644
--- a/media-video/avidemux/ChangeLog
+++ b/media-video/avidemux/ChangeLog
@@ -1,12 +1,13 @@
 # ChangeLog for media-video/avidemux
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.5 2003/01/09 12:58:33 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.6 2003/01/09 22:46:47 mholzer Exp $
 
 *avidemux-0.9-pre28 (09 Jan 2003)
 
   09 Jan 2003; Martin Holzer <mholzer@gentoo.org> avidemux-0.9_pre28.ebuild
   files/digest-avidemux-0.9_pre28 ChangeLog :
   Version bumped. Thx for ebuild to marc.hildebrand@t-online.de submitted in #13300
+  Including now fix to compile with -O3
 
 *avidemux-0.9-pre26 (08 Jan 2003)
 
diff --git a/media-video/avidemux/avidemux-0.9_pre26.ebuild b/media-video/avidemux/avidemux-0.9_pre26.ebuild
index 134ac537a485..d1abb0122427 100644
--- a/media-video/avidemux/avidemux-0.9_pre26.ebuild
+++ b/media-video/avidemux/avidemux-0.9_pre26.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-0.9_pre26.ebuild,v 1.1 2003/01/08 19:10:03 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-0.9_pre26.ebuild,v 1.2 2003/01/09 22:46:47 mholzer Exp $
 
 MY_P="${P/_/}"
 DESCRIPTION="Great Video editing/encoding tool"
 HOMEPAGE="http://fixounet.free.fr/avidemux/"
-SRC_URI="http://fixounet.free.fr/avidemux/${MY_P}.tgz
-	 http://fixounet.free.fr/avidemux/ADM_vidFont.cpp.diff.gz"
+SRC_URI="http://fixounet.free.fr/avidemux/${MY_P}.tgz"
 
 SLOT="0"
 LICENSE="GPL-2"
@@ -27,7 +26,7 @@ DEPEND="virtual/x11
 
 src_unpack() {
 	unpack ${MY_P}.tgz || die
-	gunzip -c ${DISTDIR}/ADM_vidFont.cpp.diff.gz | patch ${S}/avidemux/ADM_video/ADM_vidFont.cpp || die
+	gunzip -c ${FILESDIR}/ADM_vidFont.cpp.diff.gz | patch ${S}/avidemux/ADM_video/ADM_vidFont.cpp || die
 }
 
 src_compile() {
diff --git a/media-video/avidemux/avidemux-0.9_pre28.ebuild b/media-video/avidemux/avidemux-0.9_pre28.ebuild
index 3938b13231f8..ab2e9d569826 100644
--- a/media-video/avidemux/avidemux-0.9_pre28.ebuild
+++ b/media-video/avidemux/avidemux-0.9_pre28.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-0.9_pre28.ebuild,v 1.1 2003/01/09 12:58:33 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-0.9_pre28.ebuild,v 1.2 2003/01/09 22:46:47 mholzer Exp $
 
 MY_P="${P/_/}"
 DESCRIPTION="Great Video editing/encoding tool"
@@ -23,11 +23,21 @@ DEPEND="virtual/x11
 	>=x11-libs/gtk+-1.2.10-r9
 	>=media-video/mjpegtools-1.6.0-r5"
 
+src_unpack() {
+
+	unpack ${A}
+	cd ${S}
+	gunzip -c ${FILESDIR}/ADM_vidVlad.cpp.diff.gz | patch ${S}/avidemux/ADM_video/ADM_vidVlad.cpp || die
+	#ls -la avidemux/ADM_video/ADM_vidVlad.cpp
+	#patch -p1 < ${FILESDIR}/${PV}.patch
+
+}
+
 
 src_compile() {
 	#Doesn't like more than -O2
-	CFLAGS="`echo ${CFLAGS} | sed "s/ -O[3-9]/ -O2/g"`"
-	CXXFLAGS="`echo ${CXXFLAGS} | sed "s/ -O[3-9]/ -O2/g"`"
+	#CFLAGS="`echo ${CFLAGS} | sed "s/ -O[3-9]/ -O2/g"`"
+	#CXXFLAGS="`echo ${CXXFLAGS} | sed "s/ -O[3-9]/ -O2/g"`"
 
 	econf --disable-warnings
 	#make || die
diff --git a/media-video/avidemux/files/ADM_vidFont.cpp.diff.gz b/media-video/avidemux/files/ADM_vidFont.cpp.diff.gz
new file mode 100644
index 000000000000..1535aa5363b2
--- /dev/null
+++ b/media-video/avidemux/files/ADM_vidFont.cpp.diff.gz
diff --git a/media-video/avidemux/files/ADM_vidVlad.cpp.diff.gz b/media-video/avidemux/files/ADM_vidVlad.cpp.diff.gz
new file mode 100644
index 000000000000..ebf5eba908a1
--- /dev/null
+++ b/media-video/avidemux/files/ADM_vidVlad.cpp.diff.gz