Version bumped.

8 files changed, 69 insertions, 14 deletions

diff --git a/media-video/avidemux/ChangeLog b/media-video/avidemux/ChangeLog
index 321031343474..0029e7b7a241 100644
--- a/media-video/avidemux/ChangeLog
+++ b/media-video/avidemux/ChangeLog
@@ -1,13 +1,21 @@
 # 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.6 2003/01/09 22:46:47 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.7 2003/01/20 22:19:39 mholzer Exp $
+
+*avidemux-0.9-pre30 (20 Jan 2003)
+
+  20 Jan 2003; Martin Holzer <mholzer@gentoo.org> avidemux-0.9_pre30.ebuild
+  files/digest-avidemux-0.9_pre30 files/ASM_vidDeintAsm.cpp.diff.gz 
+  files/gui_filter.diff.gz ChangeLog : 
+  Version bumped. Thx for ebuild to marc.hildebrand@t-online.de submitted in 
+  #14174.
 
 *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
+  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 d1abb0122427..fc4c1898990b 100644
--- a/media-video/avidemux/avidemux-0.9_pre26.ebuild
+++ b/media-video/avidemux/avidemux-0.9_pre26.ebuild
@@ -1,6 +1,8 @@
 # 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.2 2003/01/09 22:46:47 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-0.9_pre26.ebuild,v 1.3 2003/01/20 22:19:39 mholzer Exp $
+
+inherit eutils
 
 MY_P="${P/_/}"
 DESCRIPTION="Great Video editing/encoding tool"
@@ -25,8 +27,9 @@ DEPEND="virtual/x11
 	>=media-video/mjpegtools-1.6.0-r3"
 
 src_unpack() {
-	unpack ${MY_P}.tgz || die
-	gunzip -c ${FILESDIR}/ADM_vidFont.cpp.diff.gz | patch ${S}/avidemux/ADM_video/ADM_vidFont.cpp || die
+	unpack ${A} 
+	cd ${S}
+	epatch ${FILESDIR}/ADM_vidFont.cpp.diff.gz
 }
 
 src_compile() {
diff --git a/media-video/avidemux/avidemux-0.9_pre28.ebuild b/media-video/avidemux/avidemux-0.9_pre28.ebuild
index ab2e9d569826..febefdcb66c3 100644
--- a/media-video/avidemux/avidemux-0.9_pre28.ebuild
+++ b/media-video/avidemux/avidemux-0.9_pre28.ebuild
@@ -1,6 +1,8 @@
 # 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.2 2003/01/09 22:46:47 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-0.9_pre28.ebuild,v 1.3 2003/01/20 22:19:39 mholzer Exp $
+
+inherit eutils
 
 MY_P="${P/_/}"
 DESCRIPTION="Great Video editing/encoding tool"
@@ -27,21 +29,16 @@ 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
+	epatch ${FILESDIR}/ADM_vidVlad.cpp.diff.gz
 
 }
 
 
 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"`"
 
 	econf --disable-warnings
-	#make || die
 	emake || die
+
 }
 
 src_install() {
diff --git a/media-video/avidemux/avidemux-0.9_pre30.ebuild b/media-video/avidemux/avidemux-0.9_pre30.ebuild
new file mode 100644
index 000000000000..00a4fee776f3
--- /dev/null
+++ b/media-video/avidemux/avidemux-0.9_pre30.ebuild
@@ -0,0 +1,46 @@
+# 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_pre30.ebuild,v 1.1 2003/01/20 22:19:39 mholzer Exp $
+
+inherit eutils
+
+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"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86"
+
+S="${WORKDIR}/${MY_P}"
+
+DEPEND="virtual/x11
+	>=media-sound/mad-0.14.2b-r2
+	>=media-sound/lame-3.93.1
+	<=media-sound/esound-0.2.29
+	>=media-libs/libmpeg3-1.5-r1
+	>=media-libs/a52dec-0.7.4
+	>=media-libs/divx4linux-20020418-r1
+	>=x11-libs/gtk+-1.2.10-r9
+	>=media-video/mjpegtools-1.6.0-r5"
+
+src_unpack() {
+
+	unpack ${A}
+	cd ${S}
+	ls -la
+	epatch ${FILESDIR}/ASM_vidDeintAsm.cpp.diff.gz 
+	epatch ${FILESDIR}/gui_filter.diff.gz 
+
+}
+
+src_compile() {
+	econf --disable-warnings
+	emake || die
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+	dodoc AUTHORS ChangeLog History README TODO
+}
diff --git a/media-video/avidemux/files/ADM_vidFont.cpp.diff.gz b/media-video/avidemux/files/ADM_vidFont.cpp.diff.gz
index 1535aa5363b2..2e0c1edef1a6 100644
--- a/media-video/avidemux/files/ADM_vidFont.cpp.diff.gz
+++ b/media-video/avidemux/files/ADM_vidFont.cpp.diff.gz
diff --git a/media-video/avidemux/files/ASM_vidDeintAsm.cpp.diff.gz b/media-video/avidemux/files/ASM_vidDeintAsm.cpp.diff.gz
new file mode 100644
index 000000000000..52a66c058d80
--- /dev/null
+++ b/media-video/avidemux/files/ASM_vidDeintAsm.cpp.diff.gz
diff --git a/media-video/avidemux/files/digest-avidemux-0.9_pre30 b/media-video/avidemux/files/digest-avidemux-0.9_pre30
new file mode 100644
index 000000000000..69de312fbb86
--- /dev/null
+++ b/media-video/avidemux/files/digest-avidemux-0.9_pre30
@@ -0,0 +1 @@
+MD5 8a267259d4605a4bf15103f042d90de1 avidemux-0.9pre30.tgz 1635067
diff --git a/media-video/avidemux/files/gui_filter.diff.gz b/media-video/avidemux/files/gui_filter.diff.gz
new file mode 100644
index 000000000000..a4521863efd6
--- /dev/null
+++ b/media-video/avidemux/files/gui_filter.diff.gz