summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Hildebrand <zypher@gentoo.org>2004-08-29 13:39:08 +0000
committerMarc Hildebrand <zypher@gentoo.org>2004-08-29 13:39:08 +0000
commit92481d7b92e511bb65724df539f66101d22d5780 (patch)
tree5e15fafc578649f9d158f1868c39b3584321de52 /media-video
parentupdate the darn digest (diff)
downloadgentoo-2-92481d7b92e511bb65724df539f66101d22d5780.tar.gz
gentoo-2-92481d7b92e511bb65724df539f66101d22d5780.tar.bz2
gentoo-2-92481d7b92e511bb65724df539f66101d22d5780.zip
added path to compile against xvid-0.9, closes bug #61895
Diffstat (limited to 'media-video')
-rw-r--r--media-video/avidemux/ChangeLog6
-rw-r--r--media-video/avidemux/avidemux-2.0.28.ebuild9
-rw-r--r--media-video/avidemux/files/xvid.patch22
3 files changed, 35 insertions, 2 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/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>