Removed old ebuilds (release candidates) and orphaned files.

(Portage version: 2.0.51.20-r5)

18 files changed, 1 insertions, 408 deletions

diff --git a/media-video/avidemux/files/2.0.38_rc1_mpegidentify.patch b/media-video/avidemux/files/2.0.38_rc1_mpegidentify.patch
deleted file mode 100644
index 51f196fb3ac9..000000000000
--- a/media-video/avidemux/files/2.0.38_rc1_mpegidentify.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: avidemux/ADM_audio/audio_mpegidentify.cpp
-===================================================================
-RCS file: /cvsroot/avidemux/avidemux/avidemux/ADM_audio/audio_mpegidentify.cpp,v
-retrieving revision 1.4
-diff -u -r1.4 audio_mpegidentify.cpp
---- avidemux/ADM_audio/audio_mpegidentify.cpp	19 Feb 2005 16:07:20 -0000	1.4
-+++ avidemux/ADM_audio/audio_mpegidentify.cpp	20 Feb 2005 15:35:11 -0000
-@@ -33,7 +33,7 @@
- #include "fourcc.h"
- #include "aviaudio.hxx"
- 
--#include "ADM_audio/ADM_mp3info.h"
-+#include "ADM_audio/ADM_mp3info.h" 
- 
-    
- uint8_t mpegAudioIdentify(uint8_t *ptr, uint32_t maxLookUp, WAVHeader *header, uint8_t *tokens)
-@@ -58,9 +58,12 @@
-         if(info.layer==3) header->encoding=WAV_MP3;
-                 else header->encoding=WAV_MP2;
- 
-+        if(tokens)
-+        {
-                 tokens[0]=ptr[offset+1];
-                 tokens[1]=ptr[offset+2]&0xfd;
-                 tokens[2]=ptr[offset+3];
-+        }
- #define DUMPX(x) printf(#x": %d\n",info.x);
-                 DUMPX( level);                    
-                 DUMPX( layer);
-
diff --git a/media-video/avidemux/files/alsa.patch b/media-video/avidemux/files/alsa.patch
deleted file mode 100644
index 49d2625a42d3..000000000000
--- a/media-video/avidemux/files/alsa.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ur avidemux/ADM_audiodevice/ADM_deviceALSA.cpp.org avidemux/ADM_audiodevice/ADM_deviceALSA.cpp
---- avidemux/ADM_audiodevice/ADM_deviceALSA.cpp.org	2003-09-16 12:57:53.000000000 -0500
-+++ avidemux/ADM_audiodevice/ADM_deviceALSA.cpp	2004-01-21 23:10:09.382307080 -0600
-@@ -37,7 +37,11 @@
- #include  "ADM_audiodevice/ADM_deviceoss.h"
- #include  "ADM_audiodevice/ADM_deviceALSA.h"
- 
--
-+#include <alsa/version.h>
-+#if SND_LIB_MAJOR==1
-+#define ALSA_PCM_OLD_HW_PARAMS_API
-+#define ALSA_PCM_NEW_HW_PARAMS_API
-+#endif
- #include <alsa/asoundlib.h>
-  /* Handle for the PCM device */
-     snd_pcm_t *pcm_handle;
diff --git a/media-video/avidemux/files/avidemux-0.9-libxml2.5.7.patch b/media-video/avidemux/files/avidemux-0.9-libxml2.5.7.patch
deleted file mode 100644
index 5f0b02063861..000000000000
--- a/media-video/avidemux/files/avidemux-0.9-libxml2.5.7.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- avidemux-0.9/avidemux/prefs.cpp	2003-02-26 19:56:20.000000000 +0000
-+++ avidemux-0.9.new/avidemux/prefs.cpp	2003-07-19 14:21:24.000000000 +0000
-@@ -53,8 +53,11 @@
- // </prefs_gen>
- 
- #ifdef USE_LIBXML2
-+
-+#ifndef LIBXML_THREAD_ENABLED
- int xmlSaveNoEmptyTags  = 1;      /* save empty tags as <empty></empty> */
- int xmlIndentTreeOutput = 1;      /* try to indent the tree dumps */
-+#endif
- 
- void erase_blank_nodes(xmlNodePtr cur){
-   /* erase all blank-nodes recursive; they deny IndentTreeOutput !!! */
-@@ -126,7 +129,12 @@
- #include "prefs.h"
- 
- preferences::preferences(){
-+#ifdef LIBXML_THREAD_ENABLED
-+   xmlSaveNoEmptyTags;
-+   xmlIndentTreeOutput;
-+#else
- 	;
-+#endif   
- }
- 
- preferences::~preferences(){
diff --git a/media-video/avidemux/files/avidemux-2.0.30_amd64_cpuutil.patch b/media-video/avidemux/files/avidemux-2.0.30_amd64_cpuutil.patch
deleted file mode 100644
index f204d0104398..000000000000
--- a/media-video/avidemux/files/avidemux-2.0.30_amd64_cpuutil.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Index: cputest.c
-===================================================================
-RCS file: adm_lavcodec/i386/cputest.c,v
-retrieving revision 1.4
-diff -u -r1.4 cputest.c
---- cputest.c	12 Oct 2004 18:28:41 -0000	1.4
-+++ cputest.c	19 Oct 2004 17:48:07 -0000
-@@ -27,29 +27,30 @@
- {
-     int rval;
-     int eax, ebx, ecx, edx;
-+    long a,c;
-     
-     __asm__ __volatile__ (
-                           /* See if CPUID instruction is supported ... */
-                           /* ... Get copies of EFLAGS into eax and ecx */
-                           "pushf\n\t"
-                           "pop %0\n\t"
--                          "movl %0, %1\n\t"
-+                          "mov %0, %1\n\t"
-                           
-                           /* ... Toggle the ID bit in one copy and store */
-                           /*     to the EFLAGS reg */
--                          "xorl $0x200000, %0\n\t"
-+                          "xor $0x200000, %0\n\t"
-                           "push %0\n\t"
-                           "popf\n\t"
-                           
-                           /* ... Get the (hopefully modified) EFLAGS */
-                           "pushf\n\t"
-                           "pop %0\n\t"
--                          : "=a" (eax), "=c" (ecx)
-+                          : "=a" (a), "=c" (c)
-                           :
-                           : "cc" 
-                           );
-     
--    if (eax == ecx)
-+    if (a == c)
-         return 0; /* CPUID not supported */
-     
-     cpuid(0, eax, ebx, ecx, edx);
diff --git a/media-video/avidemux/files/avidemux-2.0.30_fixes.patch b/media-video/avidemux/files/avidemux-2.0.30_fixes.patch
deleted file mode 100644
index 0f156d42d579..000000000000
--- a/media-video/avidemux/files/avidemux-2.0.30_fixes.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -aur avidemux-2.0.30/avidemux/ADM_audio/audio_packetizer.cpp /root/downloads/avidemux-2.0.30/avidemux/ADM_audio/audio_packetizer.cpp
---- avidemux-2.0.30/avidemux/ADM_audio/audio_packetizer.cpp	2004-10-13 20:31:57.000000000 +0200
-+++ /root/downloads/avidemux-2.0.30/avidemux/ADM_audio/audio_packetizer.cpp	2004-10-18 12:20:08.846812432 +0200
-@@ -118,7 +118,7 @@
- //
- 	uint32_t count,sample;
- 			sample=_wavheader->frequency/100;			
--			count*=_wavheader->channels;
-+			count=sample*_wavheader->channels;
- 			if(_wavheader->encoding!=WAV_ULAW)
- 			{
- 				count*=2;			
-diff -aur avidemux-2.0.30/avidemux/ADM_memsupport.cpp /root/downloads/avidemux-2.0.30/avidemux/ADM_memsupport.cpp
---- avidemux-2.0.30/avidemux/ADM_memsupport.cpp	2004-10-10 20:36:48.000000000 +0200
-+++ /root/downloads/avidemux-2.0.30/avidemux/ADM_memsupport.cpp	2004-10-18 12:21:59.286023120 +0200
-@@ -76,7 +76,9 @@
- 	uint32_t *backdoor;

- 	uint32_t size,offset;

- 	char	 *c=(char *)ptr;

--	

-+

-+	if(!ptr) return;

-+

- 	backdoor=(uint32_t *)ptr;

- 	backdoor-=2;

- 	

-Only in avidemux-2.0.30: avidemux-2.0.30_audiopacketizer.patch
-diff -aur avidemux-2.0.30/configure.in.in /root/downloads/avidemux-2.0.30/configure.in.in
---- avidemux-2.0.30/configure.in.in	2004-10-15 18:14:34.000000000 +0200
-+++ /root/downloads/avidemux-2.0.30/configure.in.in	2004-10-18 12:22:07.025846488 +0200
-@@ -459,8 +459,8 @@
-   
- dnl _______________/faad_______________
- dnl ____________ faac ?________________
-- AC_CHECK_HEADERS(faac.h,,have_faad=no)
-- AC_CHECK_HEADERS(faacfg.h,,have_faad=no)
-+ AC_CHECK_HEADERS(faac.h,,have_faac=no)
-+ AC_CHECK_HEADERS(faaccfg.h,,have_faac=no)
-  
-  AC_ARG_ENABLE(faac,[  --disable-faac           Force no faac],have_faac=no)
-    
diff --git a/media-video/avidemux/files/avidemux-2.0.32_mpeg_ps_fix.patch b/media-video/avidemux/files/avidemux-2.0.32_mpeg_ps_fix.patch
deleted file mode 100644
index be8e477ee5d2..000000000000
--- a/media-video/avidemux/files/avidemux-2.0.32_mpeg_ps_fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -aurN work/avidemux-2.0.32/avidemux/oplug_mpeg/op_mpegwrite.cpp work.new/avidemux-2.0.32/avidemux/oplug_mpeg/op_mpegwrite.cpp
---- work/avidemux-2.0.32/avidemux/oplug_mpeg/op_mpegwrite.cpp	2004-09-26 13:30:42.000000000 +0200
-+++ work.new/avidemux-2.0.32/avidemux/oplug_mpeg/op_mpegwrite.cpp	2004-10-29 11:22:10.303596416 +0200
-@@ -133,7 +133,7 @@
- 	_audioBuffer=NULL;
- 	_muxer=NULL;
- 	_outputAsPs=1;
--
-+	audioWanted=audioGot=0;
- }
- //_______________________________________
- // Clean up in case we forgot something
diff --git a/media-video/avidemux/files/avidemux-2.0.34-test1_faac.patch b/media-video/avidemux/files/avidemux-2.0.34-test1_faac.patch
deleted file mode 100644
index d52c66068573..000000000000
--- a/media-video/avidemux/files/avidemux-2.0.34-test1_faac.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: audiodeng_buildfilters.cpp
-===================================================================
-RCS file: /cvsroot/avidemux/avidemux/avidemux/ADM_audiofilter/audiodeng_buildfilters.cpp,v
-retrieving revision 1.18
-diff -u -r1.18 audiodeng_buildfilters.cpp
---- audiodeng_buildfilters.cpp	5 Nov 2004 19:36:10 -0000	1.18
-+++ audiodeng_buildfilters.cpp	7 Nov 2004 10:07:00 -0000
-@@ -70,8 +70,8 @@
- #ifdef HAVE_LIBMP3LAME
- 		{"lame","Lame", AUDIOENC_MP3},
- #endif
--#ifdef USE_AAC
--		{"aac","FAAC", AUDIOENC_AAC},
-+#ifdef USE_FAAC
-+		{"aac","FAAC", AUDIOENC_FAAC},
- #endif
- #ifdef USE_VORBIS
- 		{"vorbis","Vorbis", AUDIOENC_VORBIS},
diff --git a/media-video/avidemux/files/avidemux-2.0.38_rc2-aclocal.patch b/media-video/avidemux/files/avidemux-2.0.38_rc2-aclocal.patch
deleted file mode 100644
index 034b9018c229..000000000000
--- a/media-video/avidemux/files/avidemux-2.0.38_rc2-aclocal.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur /home/flame/devel/hacking/avidemux-2.0.38rc2b/admin/cvs.sh admin/cvs.sh
---- /home/flame/devel/hacking/avidemux-2.0.38rc2b/admin/cvs.sh	2004-10-22 10:18:24.000000000 +0200
-+++ admin/cvs.sh	2005-04-18 22:53:39.949443056 +0200
-@@ -58,7 +58,7 @@
- fi
- 
- echo "*** Creating aclocal.m4"
--$ACLOCAL > aclocal.log || exit 1
-+$ACLOCAL -I m4 > aclocal.log || exit 1
- echo "*** Creating configure"
- call_and_fix_autoconf
- 
diff --git a/media-video/avidemux/files/avidemux-2.0.38_rc2-mmx_altivec.patch b/media-video/avidemux/files/avidemux-2.0.38_rc2-mmx_altivec.patch
deleted file mode 100644
index 55893f1bc7e0..000000000000
--- a/media-video/avidemux/files/avidemux-2.0.38_rc2-mmx_altivec.patch
+++ /dev/null
@@ -1,82 +0,0 @@
---- avidemux-2.0.38rc2b/configure.in.in	2005-04-19 12:14:50.903448208 +0200
-+++ avidemux-2.0.38rc2b-mmx/configure.in.in	2005-04-19 12:29:49.831790328 +0200
-@@ -665,20 +665,20 @@
- adm_cpu=`uname -m`;
- dnl reset config.cpu, avoid weird bugs
- echo "CPU type : $adm_cpu"
--use_mmx=0
-+use_mmx=no
- case $adm_cpu in
- 	i386|i486|i586|i686)
--		use_mmx=1
-+		use_mmx=yes
- 		have_little_endian=yes;
- 		AC_DEFINE(CONFIG_X86,1,[FFMPEG])
- 		AC_DEFINE(ARCH_X86,1,[post proc])
- 		LMPG_OPT=-DARCH_X86
- 		have_x86=yes
--		AC_ARG_ENABLE(mmx,[  --disable-mmx           don't use MMX acceleration],use_mmx=0)
--		
--
-+		AC_ARG_ENABLE([mmx],
-+			AC_HELP_STRING([--disable-mmx], [disable MMX acceleration support]),
-+			[ use_mmx=${enableval} ], [ use_mmx=yes ])
- 
--		if test "x$use_mmx" = "x1"; then
-+		if test "x$use_mmx" = "xyes"; then
- 		AC_DEFINE(USE_MMX,1,"Use MMX acceleration")
- 		AC_DEFINE(HAVE_ASM_MMX,1,"Use MMX acceleration")
- 		AC_DEFINE(HAVE_MMX,1,"Use MMX acceleration")
-@@ -746,10 +746,13 @@
- 		dnl we assume to be on linux-ish system here
- 		AC_DEFINE(restrict,__restrict__,[roundup function])
- 		AC_DEFINE(ADM_BIG_ENDIAN,1,[Big endian cpu  sparc or powerpc])
--		AC_DEFINE(ARCH_POWERPC,1,[Enable powerpc optim])		
--		AC_ARG_ENABLE(altivec,[  --enable-altivec           enable  altivec acceleration(ppc)],have_altivec=yes)
-+		AC_DEFINE(ARCH_POWERPC,1,[Enable powerpc optim])
-+		
-+		AC_ARG_ENABLE([altivec],
-+			AC_HELP_STRING([--enable-altivec], [enable altivec acceleration (ppc)]),
-+			[ have_altivec=${enableval} ], [ have_altivec=no ] )
-+		
- 		AC_DEFINE(WORDS_BIGENDIAN,1,[Big endian cpu  sparc or powerpc]);;
--
- 	*)
- 		adm_cpu=`uname -p`;
- 		case $adm_cpu in
-@@ -769,7 +772,9 @@
- 			AC_DEFINE(ADM_BIG_ENDIAN,1,[Big endian cpu  sparc or powerpc])
- 			AC_DEFINE(CONFIG_DARWIN,0,[Say to ffmpeg we are using darwin macOsX])
- 			AC_DEFINE(WORDS_BIGENDIAN,1,[Big endian cpu  sparc or powerpc])
--			AC_ARG_ENABLE(altivec,[  --enable-altivec           enable  altivec acceleration(ppc)],have_altivec=yes)
-+			AC_ARG_ENABLE([altivec],
-+				AC_HELP_STRING([--enable-altivec], [enable altivec acceleration (ppc)]),
-+				[ have_altivec=${enableval} ], [ have_altivec=no ] )
- 			AC_DEFINE(ARCH_POWERPC,1,[Enable powerpc optim])
- 			have_ppc=yes;;
- 			*)
-@@ -847,9 +852,9 @@
- dnl __________ conditional ___________________
- 
- AM_CONDITIONAL(HAVE_NASM, test "x$have_nasm" = "xyes")
--AM_CONDITIONAL(BUILD_MMX, test "x$use_mmx" = "x1")
-+AM_CONDITIONAL(BUILD_MMX, test "x$use_mmx" = "xyes")
- 
--AM_CONDITIONAL(BUILD_MMX_COMPATIBLE, test "x$use_mmx" = "x1" || test "x$have_amd64" = "xyes")
-+AM_CONDITIONAL(BUILD_MMX_COMPATIBLE, test "x$use_mmx" = "xyes" || test "x$have_amd64" = "xyes")
- 
- AM_CONDITIONAL(BUILD_DARWIN, test "x$have_darwin" = "xyes")
- AM_CONDITIONAL(BUILD_PPC, test "x$have_ppc" = "xyes")
-@@ -929,11 +934,7 @@
- echo " FreeType            : $have_freetype"
- echo " locale              : $ADM_LOCALEDIR"
- echo " Little endian cpu   : $have_little_endian"
--if test "x$use_mmx" = "x1"; then
--echo " MMX                 : yes"
--else
--echo " MMX                 : no"
--fi
-+echo " MMX                 : $use_mmx"
- echo " AMD64               : $have_amd64"
- echo " Altivec             : $have_altivec"
- echo " PPC                 : $have_ppc"
diff --git a/media-video/avidemux/files/digest-avidemux-2.0.34_rc1 b/media-video/avidemux/files/digest-avidemux-2.0.34_rc1
deleted file mode 100644
index 3325d471a0b6..000000000000
--- a/media-video/avidemux/files/digest-avidemux-2.0.34_rc1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 327307dfdf3bcb19cd7a06fefea5df35 avidemux-2.0.34-test1.tar.gz 2869582
diff --git a/media-video/avidemux/files/digest-avidemux-2.0.34_rc1-r1 b/media-video/avidemux/files/digest-avidemux-2.0.34_rc1-r1
deleted file mode 100644
index 3325d471a0b6..000000000000
--- a/media-video/avidemux/files/digest-avidemux-2.0.34_rc1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 327307dfdf3bcb19cd7a06fefea5df35 avidemux-2.0.34-test1.tar.gz 2869582
diff --git a/media-video/avidemux/files/digest-avidemux-2.0.34_rc2 b/media-video/avidemux/files/digest-avidemux-2.0.34_rc2
deleted file mode 100644
index 1f1ee822d512..000000000000
--- a/media-video/avidemux/files/digest-avidemux-2.0.34_rc2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 69f0d90f26011e842aeb809a6077770a avidemux-2.0.34-test2.tgz 3012034
diff --git a/media-video/avidemux/files/digest-avidemux-2.0.38_rc1 b/media-video/avidemux/files/digest-avidemux-2.0.38_rc1
deleted file mode 100644
index 739b8629bbab..000000000000
--- a/media-video/avidemux/files/digest-avidemux-2.0.38_rc1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 59f0cfff83a7a04bfadaf51fe35fd225 avidemux-2.0.38rc1.tar.gz 3177994
diff --git a/media-video/avidemux/files/digest-avidemux-2.0.38_rc2-r1 b/media-video/avidemux/files/digest-avidemux-2.0.38_rc2-r1
index f4a99ab3330c..cfddaa4c5d50 100644
--- a/media-video/avidemux/files/digest-avidemux-2.0.38_rc2-r1
+++ b/media-video/avidemux/files/digest-avidemux-2.0.38_rc2-r1
@@ -1,2 +1,2 @@
 MD5 da2cbb46aa50f934f1fed048d274e5ab avidemux-2.0.38rc2b.tar.gz 3451715
-MD5 1bd3fe046e4e278005f6db6215244d4a avidemux-2.0.38_rc2-r1-patches.tar.bz2 9612
+MD5 ed0fae82b67a9c97616af93295a4541d avidemux-patches-1.tar.bz2 10563
diff --git a/media-video/avidemux/files/gcc2.patch b/media-video/avidemux/files/gcc2.patch
deleted file mode 100644
index ca14dead659b..000000000000
--- a/media-video/avidemux/files/gcc2.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-? gcc2.patch
-? synchrolib.lo
-? xx.c
-Index: synchrolib.cc
-===================================================================
-RCS file: 
-/cvsroot/avidemux2/avidemux2/avidemux2/avidemux/mpeg2enc/synchrolib.cc,v
-retrieving revision 1.1.1.1
-diff -u -r1.1.1.1 synchrolib.cc
---- synchrolib.cc	16 Sep 2003 18:02:26 -0000	1.1.1.1
-+++ synchrolib.cc	2 Nov 2003 17:49:00 -0000
-@@ -34,7 +34,7 @@
-  *		  Synchronisation primitives
-  *
-  ********/
--
-+#if 0
- void sync_guard_init( sync_guard_t *guard, int init )
- {
- #ifdef __linux__
-@@ -111,3 +111,12 @@
- 	pthread_cond_broadcast( &sema->raised );
- 	pthread_mutex_unlock( &sema->mutex );
- }
-+#else
-+void mp_semaphore_wait( mp_semaphore_t *sema) {}
-+void mp_semaphore_signal( mp_semaphore_t *sema, int count ) {}
-+void mp_semaphore_set( mp_semaphore_t *sema ) {}
-+void mp_semaphore_init( mp_semaphore_t *sema, int init_count ) {}
-+void sync_guard_init( sync_guard_t *guard, int init ) {}
-+void sync_guard_test( sync_guard_t *guard) {}
-+void sync_guard_update( sync_guard_t *guard, int predicate ) {}
-+#endif
-
-
diff --git a/media-video/avidemux/files/patch_jpeg.diff b/media-video/avidemux/files/patch_jpeg.diff
deleted file mode 100644
index 5e7dc767cdfb..000000000000
--- a/media-video/avidemux/files/patch_jpeg.diff
+++ /dev/null
@@ -1,39 +0,0 @@
-? gmon.out
-? mpeg2enc/xx.c
-Index: Makefile.am
-===================================================================
-RCS file: /cvsroot/avidemux2/avidemux2/avidemux2/avidemux/Makefile.am,v
-retrieving revision 1.1.1.1
-diff -u -r1.1.1.1 Makefile.am
---- Makefile.am	16 Sep 2003 17:57:34 -0000	1.1.1.1
-+++ Makefile.am	28 Sep 2003 15:26:25 -0000
-@@ -19,12 +19,12 @@
-   ../adm_lavcodec/libavcodec.a \
- ./ADM_mpPostProc/libADM_mpPostProc.a  ./ADM_editor/libADM_editor.a \
- ./ADM_library/libADM_library.a ./ADM_audiocodec/libADM_audiocodec.a ./ADM_audio/libADM_audio.a \
--./mpeg2enc/libmpeg2enc.a \
- ./oplug_avi/liboplug_avi.a  ./oplug_mpegFF/liboplug_mpegFF.a  \
- ./ADM_filter/libADM_filter.a \
- ./ADM_video/libADM_video.a   ./ADM_encoder/libADM_encoder.a  \
- ./ADM_codecs/libADM_codecs.a ./ADM_vp32/libADM_vp32.a   ./ADM_audiofilter/libADM_audiofilter.a \
- ./oplug_mpeg/liboplug_mpeg.a ./ADM_gui2/libADM_gui2.a  \
-+./mpeg2enc/libmpeg2enc.a \
- ./ADM_gui/libADM_gui.a ./ADM_inpics/libADM_inpics.a  ./ADM_3gp/libADM_3gp.a ./ADM_h263/libADM_h263.a   \
- ./ADM_nuv/libADM_nuv.a  ./ADM_ogm/libADM_ogm.a ./ADM_audiodevice/libADM_audiodevice.a \
- ./ADM_mpeg2dec/libADM_mpeg2dec.a ./ADM_mpegindexer/libADM_mpegindexer.a   \
-Index: gtk_gui.cpp
-===================================================================
-RCS file: /cvsroot/avidemux2/avidemux2/avidemux2/avidemux/gtk_gui.cpp,v
-retrieving revision 1.5
-diff -u -r1.5 gtk_gui.cpp
---- gtk_gui.cpp	23 Sep 2003 17:02:01 -0000	1.5
-+++ gtk_gui.cpp	28 Sep 2003 15:26:32 -0000
-@@ -14,7 +14,7 @@
-  *   (at your option) any later version.                                   *
-  *                                                                         *
-  ***************************************************************************/
--#define TEST_MP2
-+//#define TEST_MP2
- 
- 
- #include <stdio.h>
diff --git a/media-video/avidemux/files/resize_crash.patch b/media-video/avidemux/files/resize_crash.patch
deleted file mode 100644
index 87c0d668412e..000000000000
--- a/media-video/avidemux/files/resize_crash.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-? DIA_prefs.lo
-? DIA_resize.lo
-Index: DIA_resize.cpp
-===================================================================
-RCS file: /cvsroot/avidemux2/avidemux2/avidemux2/avidemux/ADM_dialog/DIA_resize.cpp,v
-retrieving revision 1.1.1.1
-diff -u -r1.1.1.1 DIA_resize.cpp
---- DIA_resize.cpp	16 Sep 2003 17:58:25 -0000	1.1.1.1
-+++ DIA_resize.cpp	21 Nov 2003 17:29:53 -0000
-@@ -132,15 +132,14 @@
- 				ret=1;
- 				stop=1;
- 				break;
-+		default:			
- 		case GTK_RESPONSE_CANCEL:
- 				stop=1;
- 				break;
- 		case GTK_RESPONSE_APPLY:
- 				drag(NULL,NULL);
- 				break;
--		default:
--				assert(0);
--				break;
-+							
- 		}
- 
- 	}
diff --git a/media-video/avidemux/files/xvid.patch b/media-video/avidemux/files/xvid.patch
deleted file mode 100644
index 8c1dd207483f..000000000000
--- a/media-video/avidemux/files/xvid.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- 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>