added path to compile against xvid-0.9, closes bug #61895

4 files changed, 49 insertions, 15 deletions

diff --git a/media-video/avidemux/ChangeLog b/media-video/avidemux/ChangeLog
index 4294ec401597..97ff470648a7 100644
--- a/media-video/avidemux/ChangeLog
+++ b/media-video/avidemux/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/avidemux
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.51 2004/08/26 08:42:53 zypher Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.52 2004/08/29 13:39:08 zypher Exp $
+
+  29 Aug 2004; Marc Hildebrand <zypher@gentoo.org> avidemux-2.0.28.ebuild:
+  Added xvid-(0.9)-patch.
+  Closes bug #61895
 
   26 Aug 2004; Marc Hildebrand <zypher@gentoo.org> avidemux-2.0.28.ebuild:
   Added "-fforce-addr" to the list of filtered flags.
diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index cacf09127d64..b873b0e25472 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -1,21 +1,22 @@
+MD5 a996e589c7f80802c16710bfae16bc0b ChangeLog 9819
+MD5 fb1ae32deef56797d4ace9065f00fa4a avidemux-2.0.28.ebuild 2323
 MD5 4c24428398acd26c384e724f5e2cd71a avidemux-2.0.24.ebuild 2482
-MD5 93a16b7e11776631ce07d332a22fbffc avidemux-2.0.26.ebuild 2197
-MD5 9e993cedff172ce0f61353b3b635def3 avidemux-2.0.28.ebuild 2208
-MD5 7256a686e0dbef20b41142c8741b56e8 avidemux-2.0.20.ebuild 2294
-MD5 28fc7992bf2dc4eb0ac6c27739b6b30b ChangeLog 9697
+MD5 a4e7880f69cf02398a2dc82d928a6584 avidemux-2.0.18.ebuild 2445
 MD5 eba326432d26a3e8eb926c52124bbb9c metadata.xml 257
 MD5 0a839c0d95bd12ca890310c77e6eb5b7 avidemux-2.0.22.ebuild 2321
-MD5 a4e7880f69cf02398a2dc82d928a6584 avidemux-2.0.18.ebuild 2445
+MD5 7256a686e0dbef20b41142c8741b56e8 avidemux-2.0.20.ebuild 2294
+MD5 93a16b7e11776631ce07d332a22fbffc avidemux-2.0.26.ebuild 2197
 MD5 11648f5ec6649662e9fb3182267612fe avidemux-0.9-r1.ebuild 2021
-MD5 09aa754d6dec1bcd2694695ed63b45a4 files/avidemux-0.9-libxml2.5.7.patch 717
-MD5 6be6f74f2af672e3571d3a450af4aeb3 files/digest-avidemux-0.9-r1 62
-MD5 7f9945862f4c68c59549897fe020eb2c files/digest-avidemux-2.0.18 68
-MD5 41d1cf2e682c0023c0c445822c13c7ad files/digest-avidemux-2.0.20 68
-MD5 fabe25010e336c02fff55054b90bde1b files/digest-avidemux-2.0.22 68
-MD5 03b785183df3226642178240a15f5a25 files/digest-avidemux-2.0.24 68
-MD5 ed8344c0d166e56f3f15948d7488abbb files/digest-avidemux-2.0.26 68
 MD5 612882d7351307d06e2ba0ff8a1e6c90 files/digest-avidemux-2.0.28 68
-MD5 c8b0002f8b446ffe1d4ae7e2440caf7f files/resize_crash.patch 618
+MD5 03b785183df3226642178240a15f5a25 files/digest-avidemux-2.0.24 68
 MD5 17fbb9e32a12d47d86a3f135c74da118 files/patch_jpeg.diff 1819
+MD5 c8b0002f8b446ffe1d4ae7e2440caf7f files/resize_crash.patch 618
 MD5 bc99c120921cdbc84402a1ac014f0786 files/gcc2.patch 1044
+MD5 6be6f74f2af672e3571d3a450af4aeb3 files/digest-avidemux-0.9-r1 62
+MD5 a425235d45d2628fb39a2d5e336585be files/xvid.patch 672
+MD5 41d1cf2e682c0023c0c445822c13c7ad files/digest-avidemux-2.0.20 68
+MD5 09aa754d6dec1bcd2694695ed63b45a4 files/avidemux-0.9-libxml2.5.7.patch 717
 MD5 c235b3c2a9d464d8729ec6698895866e files/alsa.patch 607
+MD5 7f9945862f4c68c59549897fe020eb2c files/digest-avidemux-2.0.18 68
+MD5 fabe25010e336c02fff55054b90bde1b files/digest-avidemux-2.0.22 68
+MD5 ed8344c0d166e56f3f15948d7488abbb files/digest-avidemux-2.0.26 68
diff --git a/media-video/avidemux/avidemux-2.0.28.ebuild b/media-video/avidemux/avidemux-2.0.28.ebuild
index 22b1f05e2a04..8766076bbfcb 100644
--- a/media-video/avidemux/avidemux-2.0.28.ebuild
+++ b/media-video/avidemux/avidemux-2.0.28.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.0.28.ebuild,v 1.2 2004/08/26 08:42:53 zypher Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.0.28.ebuild,v 1.3 2004/08/29 13:39:08 zypher Exp $
 
 inherit eutils flag-o-matic
 
@@ -38,6 +38,13 @@ filter-flags "-funroll-loops"
 filter-flags "-funroll-all-loops"
 filter-flags "-fforce-addr"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	has_version ">=media-libs/xvid-1.0.0" || \
+	epatch ${FILESDIR}/xvid.patch
+}
+
 src_compile() {
 	local myconf
 	myconf="--with-gnu-ld --disable-warnings"
diff --git a/media-video/avidemux/files/xvid.patch b/media-video/avidemux/files/xvid.patch
new file mode 100644
index 000000000000..8c1dd207483f
--- /dev/null
+++ b/media-video/avidemux/files/xvid.patch
@@ -0,0 +1,22 @@
+--- avidemux/ADM_encoder/adm_encxvid.cpp.orig	2004-08-29 02:29:31.000000000 -0500
++++ avidemux/ADM_encoder/adm_encxvid.cpp	2004-08-29 02:29:52.000000000 -0500
+@@ -41,6 +41,8 @@
+ };
+ #include "ADM_gui/GUI_xvidparam.h"
+ 
++#include <ADM_assert.h>
++
+ static vbr_control_t vbrstate;
+ #define aprintf printf
+ //static char *XvidInternal2pass_statfile=(const char *)"/tmp/xvid_int2pass.txt";
+--- avidemux/ADM_dialog/DIA_xvid.cpp.orig	2004-08-29 02:28:53.000000000 -0500
++++ avidemux/ADM_dialog/DIA_xvid.cpp	2004-08-29 02:29:08.000000000 -0500
+@@ -1,7 +1,7 @@
+ #include <config.h>
+ #include "ADM_lavcodec.h"
+ 
+-
++#include <ADM_assert.h>
+ 
+ #include <string.h>
+ #include <stdio.h>