old

(Portage version: 2.1.6/cvs/Linux 2.6.27.7 i686, RepoMan options: --force)

9 files changed, 0 insertions, 662 deletions

diff --git a/media-video/ffmpeg/files/ffmpeg-0.4.9_p20060302-amr-64bit.patch b/media-video/ffmpeg/files/ffmpeg-0.4.9_p20060302-amr-64bit.patch
deleted file mode 100644
index 540ef94f5f34..000000000000
--- a/media-video/ffmpeg/files/ffmpeg-0.4.9_p20060302-amr-64bit.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --exclude-from=/home/dang/.diffrc -u -ruN ffmpeg-0.4.9-p20060302.orig/libavcodec/amr_float/typedef.h ffmpeg-0.4.9-p20060302/libavcodec/amr_float/typedef.h
---- ffmpeg-0.4.9-p20060302.orig/libavcodec/amr_float/typedef.h	2003-03-26 14:15:42.000000000 -0500
-+++ ffmpeg-0.4.9-p20060302/libavcodec/amr_float/typedef.h	2006-04-19 18:39:20.000000000 -0400
-@@ -16,7 +16,7 @@
- typedef char Word8;

- typedef unsigned char UWord8;

- typedef short Word16;

--typedef long Word32;

-+typedef int Word32;

- typedef float Float32;

- typedef double Float64;

- 

-diff --exclude-from=/home/dang/.diffrc -u -ruN ffmpeg-0.4.9-p20060302.orig/libavcodec/amrwb_float/typedef.h ffmpeg-0.4.9-p20060302/libavcodec/amrwb_float/typedef.h
---- ffmpeg-0.4.9-p20060302.orig/libavcodec/amrwb_float/typedef.h	2003-02-18 00:00:02.000000000 -0500
-+++ ffmpeg-0.4.9-p20060302/libavcodec/amrwb_float/typedef.h	2006-04-19 18:37:30.000000000 -0400
-@@ -11,8 +11,8 @@
- typedef unsigned char UWord8;

- typedef short Word16;

- typedef unsigned short UWord16;

--typedef long Word32;

-+typedef int Word32;

- typedef double Float64;

- typedef float Float32;

- 

--#endif
-\ No newline at end of file
-+#endif

diff --git a/media-video/ffmpeg/files/ffmpeg-0.4.9_p20060302-fbsd-flags.patch b/media-video/ffmpeg/files/ffmpeg-0.4.9_p20060302-fbsd-flags.patch
deleted file mode 100644
index 260449bb4b22..000000000000
--- a/media-video/ffmpeg/files/ffmpeg-0.4.9_p20060302-fbsd-flags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: ffmpeg-0.4.9-p20060302/configure
-===================================================================
---- ffmpeg-0.4.9-p20060302.orig/configure
-+++ ffmpeg-0.4.9-p20060302/configure
-@@ -336,7 +336,7 @@ bktr="yes"
- audio_oss="yes"
- dv1394="no"
- make="gmake"
--CFLAGS="-pthread"
-+CFLAGS="$CFLAGS -pthread"
- LDFLAGS="$LDFLAGS -export-dynamic -pthread"
- ;;
- BSD/OS)
diff --git a/media-video/ffmpeg/files/ffmpeg-0.4.9_p20060530-snow-mmx.patch b/media-video/ffmpeg/files/ffmpeg-0.4.9_p20060530-snow-mmx.patch
deleted file mode 100644
index 92926865bbb4..000000000000
--- a/media-video/ffmpeg/files/ffmpeg-0.4.9_p20060530-snow-mmx.patch
+++ /dev/null
@@ -1,202 +0,0 @@
-Index: libavcodec/i386/snowdsp_mmx.c
-===================================================================
---- libavcodec/i386/snowdsp_mmx.c	(revision 5971)
-+++ libavcodec/i386/snowdsp_mmx.c	(working copy)
-@@ -463,9 +463,9 @@
-         "1:                                          \n\t"
- 
-         "mov %6, %%"REG_a"                           \n\t"
--        "mov %4, %%"REG_b"                           \n\t"
-+        "mov %4, %%"REG_S"                           \n\t"
- 
--        snow_vertical_compose_sse2_load(REG_b,"xmm0","xmm2","xmm4","xmm6")
-+        snow_vertical_compose_sse2_load(REG_S,"xmm0","xmm2","xmm4","xmm6")
-         snow_vertical_compose_sse2_add(REG_a,"xmm0","xmm2","xmm4","xmm6")
-         snow_vertical_compose_sse2_move("xmm0","xmm2","xmm4","xmm6","xmm1","xmm3","xmm5","xmm7")
-         snow_vertical_compose_sse2_sll("1","xmm0","xmm2","xmm4","xmm6")\
-@@ -482,10 +482,10 @@
-         snow_vertical_compose_sse2_sub("xmm0","xmm2","xmm4","xmm6","xmm1","xmm3","xmm5","xmm7")
-         snow_vertical_compose_sse2_store(REG_a,"xmm1","xmm3","xmm5","xmm7")
-         "mov %3, %%"REG_c"                           \n\t"
--        snow_vertical_compose_sse2_load(REG_b,"xmm0","xmm2","xmm4","xmm6")
-+        snow_vertical_compose_sse2_load(REG_S,"xmm0","xmm2","xmm4","xmm6")
-         snow_vertical_compose_sse2_add(REG_c,"xmm1","xmm3","xmm5","xmm7")
-         snow_vertical_compose_sse2_sub("xmm1","xmm3","xmm5","xmm7","xmm0","xmm2","xmm4","xmm6")
--        snow_vertical_compose_sse2_store(REG_b,"xmm0","xmm2","xmm4","xmm6")
-+        snow_vertical_compose_sse2_store(REG_S,"xmm0","xmm2","xmm4","xmm6")
-         "mov %2, %%"REG_a"                           \n\t"
-         snow_vertical_compose_sse2_load(REG_c,"xmm1","xmm3","xmm5","xmm7")
-         snow_vertical_compose_sse2_add(REG_a,"xmm0","xmm2","xmm4","xmm6")
-@@ -495,13 +495,13 @@
-         "pcmpeqd %%xmm1, %%xmm1                      \n\t"
-         "pslld $31, %%xmm1                           \n\t"
-         "psrld $28, %%xmm1                           \n\t"
--        "mov %1, %%"REG_b"                           \n\t"
-+        "mov %1, %%"REG_S"                           \n\t"
- 
-         snow_vertical_compose_sse2_r2r_add("xmm1","xmm1","xmm1","xmm1","xmm0","xmm2","xmm4","xmm6")
-         snow_vertical_compose_sse2_sra("4","xmm0","xmm2","xmm4","xmm6")
-         snow_vertical_compose_sse2_add(REG_c,"xmm0","xmm2","xmm4","xmm6")
-         snow_vertical_compose_sse2_store(REG_c,"xmm0","xmm2","xmm4","xmm6")
--        snow_vertical_compose_sse2_add(REG_b,"xmm0","xmm2","xmm4","xmm6")
-+        snow_vertical_compose_sse2_add(REG_S,"xmm0","xmm2","xmm4","xmm6")
-         snow_vertical_compose_sse2_move("xmm0","xmm2","xmm4","xmm6","xmm1","xmm3","xmm5","xmm7")
-         snow_vertical_compose_sse2_sll("1","xmm0","xmm2","xmm4","xmm6")\
-         snow_vertical_compose_sse2_r2r_add("xmm1","xmm3","xmm5","xmm7","xmm0","xmm2","xmm4","xmm6")
-@@ -515,7 +515,7 @@
-         :"+d"(i)
-         :
-         "m"(b0),"m"(b1),"m"(b2),"m"(b3),"m"(b4),"m"(b5):
--        "%"REG_a"","%"REG_b"","%"REG_c"");
-+        "%"REG_a"","%"REG_S"","%"REG_c"");
- }
- 
- #define snow_vertical_compose_mmx_load_add(op,r,t0,t1,t2,t3)\
-@@ -570,9 +570,9 @@
-         "1:                                          \n\t"
- 
-         "mov %6, %%"REG_a"                           \n\t"
--        "mov %4, %%"REG_b"                           \n\t"
-+        "mov %4, %%"REG_S"                           \n\t"
- 
--        snow_vertical_compose_mmx_load(REG_b,"mm0","mm2","mm4","mm6")
-+        snow_vertical_compose_mmx_load(REG_S,"mm0","mm2","mm4","mm6")
-         snow_vertical_compose_mmx_add(REG_a,"mm0","mm2","mm4","mm6")
-         snow_vertical_compose_mmx_move("mm0","mm2","mm4","mm6","mm1","mm3","mm5","mm7")
-         snow_vertical_compose_mmx_sll("1","mm0","mm2","mm4","mm6")
-@@ -589,10 +589,10 @@
-         snow_vertical_compose_mmx_sub("mm0","mm2","mm4","mm6","mm1","mm3","mm5","mm7")
-         snow_vertical_compose_mmx_store(REG_a,"mm1","mm3","mm5","mm7")
-         "mov %3, %%"REG_c"                           \n\t"
--        snow_vertical_compose_mmx_load(REG_b,"mm0","mm2","mm4","mm6")
-+        snow_vertical_compose_mmx_load(REG_S,"mm0","mm2","mm4","mm6")
-         snow_vertical_compose_mmx_add(REG_c,"mm1","mm3","mm5","mm7")
-         snow_vertical_compose_mmx_sub("mm1","mm3","mm5","mm7","mm0","mm2","mm4","mm6")
--        snow_vertical_compose_mmx_store(REG_b,"mm0","mm2","mm4","mm6")
-+        snow_vertical_compose_mmx_store(REG_S,"mm0","mm2","mm4","mm6")
-         "mov %2, %%"REG_a"                           \n\t"
-         snow_vertical_compose_mmx_load(REG_c,"mm1","mm3","mm5","mm7")
-         snow_vertical_compose_mmx_add(REG_a,"mm0","mm2","mm4","mm6")
-@@ -602,13 +602,13 @@
-         "pcmpeqd %%mm1, %%mm1                        \n\t"
-         "pslld $31, %%mm1                            \n\t"
-         "psrld $28, %%mm1                            \n\t"
--        "mov %1, %%"REG_b"                           \n\t"
-+        "mov %1, %%"REG_S"                           \n\t"
- 
-         snow_vertical_compose_mmx_r2r_add("mm1","mm1","mm1","mm1","mm0","mm2","mm4","mm6")
-         snow_vertical_compose_mmx_sra("4","mm0","mm2","mm4","mm6")
-         snow_vertical_compose_mmx_add(REG_c,"mm0","mm2","mm4","mm6")
-         snow_vertical_compose_mmx_store(REG_c,"mm0","mm2","mm4","mm6")
--        snow_vertical_compose_mmx_add(REG_b,"mm0","mm2","mm4","mm6")
-+        snow_vertical_compose_mmx_add(REG_S,"mm0","mm2","mm4","mm6")
-         snow_vertical_compose_mmx_move("mm0","mm2","mm4","mm6","mm1","mm3","mm5","mm7")
-         snow_vertical_compose_mmx_sll("1","mm0","mm2","mm4","mm6")
-         snow_vertical_compose_mmx_r2r_add("mm1","mm3","mm5","mm7","mm0","mm2","mm4","mm6")
-@@ -622,15 +622,16 @@
-         :"+d"(i)
-         :
-         "m"(b0),"m"(b1),"m"(b2),"m"(b3),"m"(b4),"m"(b5):
--        "%"REG_a"","%"REG_b"","%"REG_c"");
-+        "%"REG_a"","%"REG_S"","%"REG_c"");
- }
- 
- #define snow_inner_add_yblock_sse2_header \
-     DWTELEM * * dst_array = sb->line + src_y;\
-+    long tmp;\
-     asm volatile(\
--             "mov  %6, %%"REG_c"             \n\t"\
--             "mov  %5, %%"REG_b"             \n\t"\
--             "mov  %3, %%"REG_S"             \n\t"\
-+             "mov  %7, %%"REG_c"             \n\t"\
-+             "mov  %6, %2                    \n\t"\
-+             "mov  %4, %%"REG_S"             \n\t"\
-              "pxor %%xmm7, %%xmm7            \n\t" /* 0 */\
-              "pcmpeqd %%xmm3, %%xmm3         \n\t"\
-              "pslld $31, %%xmm3              \n\t"\
-@@ -638,7 +639,7 @@
-              "1:                             \n\t"\
-              "mov %1, %%"REG_D"              \n\t"\
-              "mov (%%"REG_D"), %%"REG_D"     \n\t"\
--             "add %2, %%"REG_D"              \n\t"
-+             "add %3, %%"REG_D"              \n\t"
- 
- #define snow_inner_add_yblock_sse2_start_8(out_reg1, out_reg2, ptr_offset, s_offset)\
-              "mov "PTR_SIZE"*"ptr_offset"(%%"REG_a"), %%"REG_d"; \n\t"\
-@@ -686,23 +687,23 @@
- 
- #define snow_inner_add_yblock_sse2_end_common2\
-              "jnz 1b                         \n\t"\
--             :"+m"(dst8),"+m"(dst_array)\
-+             :"+m"(dst8),"+m"(dst_array),"=&r"(tmp)\
-              :\
-              "rm"((long)(src_x<<2)),"m"(obmc),"a"(block),"m"((long)b_h),"m"((long)src_stride):\
--             "%"REG_b"","%"REG_c"","%"REG_S"","%"REG_D"","%"REG_d"");
-+             "%"REG_c"","%"REG_S"","%"REG_D"","%"REG_d"");
- 
- #define snow_inner_add_yblock_sse2_end_8\
-              "sal $1, %%"REG_c"              \n\t"\
-              "add $"PTR_SIZE"*2, %1          \n\t"\
-              snow_inner_add_yblock_sse2_end_common1\
-              "sar $1, %%"REG_c"              \n\t"\
--             "sub $2, %%"REG_b"              \n\t"\
-+             "sub $2, %2                     \n\t"\
-              snow_inner_add_yblock_sse2_end_common2
- 
- #define snow_inner_add_yblock_sse2_end_16\
-              "add $"PTR_SIZE"*1, %1          \n\t"\
-              snow_inner_add_yblock_sse2_end_common1\
--             "dec %%"REG_b"                  \n\t"\
-+             "dec %2                         \n\t"\
-              snow_inner_add_yblock_sse2_end_common2
- 
- static void inner_add_yblock_bw_8_obmc_16_bh_even_sse2(uint8_t *obmc, const long obmc_stride, uint8_t * * block, int b_w, long b_h,
-@@ -727,7 +728,7 @@
- 
-              "mov %1, %%"REG_D"              \n\t"
-              "mov "PTR_SIZE"(%%"REG_D"), %%"REG_D";\n\t"
--             "add %2, %%"REG_D"              \n\t"
-+             "add %3, %%"REG_D"              \n\t"
- 
-              "movdqa (%%"REG_D"), %%xmm4     \n\t"
-              "movdqa %%xmm5, %%xmm6          \n\t"
-@@ -792,10 +793,11 @@
- 
- #define snow_inner_add_yblock_mmx_header \
-     DWTELEM * * dst_array = sb->line + src_y;\
-+    long tmp;\
-     asm volatile(\
--             "mov  %6, %%"REG_c"             \n\t"\
--             "mov  %5, %%"REG_b"             \n\t"\
--             "mov  %3, %%"REG_S"             \n\t"\
-+             "mov  %7, %%"REG_c"             \n\t"\
-+             "mov  %6, %2                    \n\t"\
-+             "mov  %4, %%"REG_S"             \n\t"\
-              "pxor %%mm7, %%mm7              \n\t" /* 0 */\
-              "pcmpeqd %%mm3, %%mm3           \n\t"\
-              "pslld $31, %%mm3               \n\t"\
-@@ -803,7 +805,7 @@
-              "1:                             \n\t"\
-              "mov %1, %%"REG_D"              \n\t"\
-              "mov (%%"REG_D"), %%"REG_D"     \n\t"\
--             "add %2, %%"REG_D"              \n\t"
-+             "add %3, %%"REG_D"              \n\t"
- 
- #define snow_inner_add_yblock_mmx_start(out_reg1, out_reg2, ptr_offset, s_offset, d_offset)\
-              "mov "PTR_SIZE"*"ptr_offset"(%%"REG_a"), %%"REG_d"; \n\t"\
-@@ -857,12 +859,12 @@
-              "add %%"REG_c", (%%"REG_a")     \n\t"\
-              "add $"PTR_SIZE"*1, %1          \n\t"\
-              "add %%"REG_c", %0              \n\t"\
--             "dec %%"REG_b"                  \n\t"\
-+             "dec %2                         \n\t"\
-              "jnz 1b                         \n\t"\
--             :"+m"(dst8),"+m"(dst_array)\
-+             :"+m"(dst8),"+m"(dst_array),"=&r"(tmp)\
-              :\
-              "rm"((long)(src_x<<2)),"m"(obmc),"a"(block),"m"((long)b_h),"m"((long)src_stride):\
--             "%"REG_b"","%"REG_c"","%"REG_S"","%"REG_D"","%"REG_d"");
-+             "%"REG_c"","%"REG_S"","%"REG_D"","%"REG_d"");
- 
- static void inner_add_yblock_bw_8_obmc_16_mmx(uint8_t *obmc, const long obmc_stride, uint8_t * * block, int b_w, long b_h,
-                       int src_x, int src_y, long src_stride, slice_buffer * sb, int add, uint8_t * dst8){
diff --git a/media-video/ffmpeg/files/ffmpeg-0.4.9_p20080326-hppa.patch b/media-video/ffmpeg/files/ffmpeg-0.4.9_p20080326-hppa.patch
deleted file mode 100644
index 7a8c6fdbbfb5..000000000000
--- a/media-video/ffmpeg/files/ffmpeg-0.4.9_p20080326-hppa.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	2008-10-13 18:38:18.000000000 +0200
-+++ configure	2008-10-13 18:49:15.000000000 +0200
-@@ -1817,7 +1817,7 @@
-     # LIBOBJFLAGS may have already been set in the OS configuration
-     if test -z "$LIBOBJFLAGS" ; then
-         case "$arch" in
--            x86_64|ia64|alpha|sparc*|power*) LIBOBJFLAGS='$(PIC)' ;;
-+            x86_64|ia64|alpha|sparc*|power*|parisc) LIBOBJFLAGS='$(PIC)' ;;
-         esac
-     fi
- fi
diff --git a/media-video/ffmpeg/files/ffmpeg-libdir-pic.patch b/media-video/ffmpeg/files/ffmpeg-libdir-pic.patch
deleted file mode 100644
index 7a0e42d55139..000000000000
--- a/media-video/ffmpeg/files/ffmpeg-libdir-pic.patch
+++ /dev/null
@@ -1,169 +0,0 @@
-Index: configure
-===================================================================
-RCS file: /cvsroot/ffmpeg/ffmpeg/configure,v
-retrieving revision 1.164
-diff -u -b -B -u -r1.164 configure
---- configure	9 Mar 2005 03:04:55 -0000	1.164
-+++ configure	15 Mar 2005 23:40:10 -0000
-@@ -13,6 +13,7 @@
- echo "Standard options:"
- echo "  --help                   print this message"
- echo "  --prefix=PREFIX          install in PREFIX [$prefix]"
-+echo "  --libdir=DIR             install libs in DIR [PREFIX/lib]"
- echo "  --mandir=DIR             man documentation in DIR [PREFIX/man]"
- echo "  --enable-mp3lame         enable mp3 encoding via libmp3lame [default=no]"
- echo "  --enable-ogg             enable ogg support via libogg [default=no]"
-@@ -91,6 +92,7 @@
- 
- # default parameters
- prefix="/usr/local"
-+libdir=""
- mandir=""
- bindir=""
- cross_prefix=""
-@@ -376,6 +378,8 @@
-   case "$opt" in
-   --prefix=*) prefix=`echo $opt | cut -d '=' -f 2`
-   ;;
-+  --libdir=*) libdir=`echo $opt | cut -d '=' -f 2`
-+  ;;
-   --mandir=*) mandir=`echo $opt | cut -d '=' -f 2`
-   ;;
-   --source-path=*) source_path=`echo $opt | cut -d '=' -f 2`
-@@ -1062,6 +1066,10 @@
- bindir="${prefix}/bin"
- fi
- 
-+if test x"$libdir" = x""; then
-+libdir="${prefix}/lib"
-+fi
-+
- if test x"$mandir" = x""; then
- mandir="${prefix}/man"
- fi
-@@ -1138,6 +1146,7 @@
- echo "#define FFMPEG_CONFIGURATION "'"'"$FFMPEG_CONFIGURATION"'"' >> $TMPH
- 
- echo "prefix=$prefix" >> config.mak
-+echo "libdir=$libdir" >> config.mak
- echo "bindir=$bindir" >> config.mak
- echo "mandir=$mandir" >> config.mak
- echo "MAKE=$make" >> config.mak
-Index: libavcodec/Makefile
-===================================================================
-RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/Makefile,v
-retrieving revision 1.177
-diff -u -b -B -u -r1.177 Makefile
---- libavcodec/Makefile	9 Mar 2005 19:46:31 -0000	1.177
-+++ libavcodec/Makefile	15 Mar 2005 23:40:10 -0000
-@@ -302,9 +302,9 @@
- ifeq ($(CONFIG_WIN32),yes)
- 	install $(INSTALLSTRIP) -m 755 $(SLIB) "$(prefix)"
- else
--	install -d $(prefix)/lib
--	install $(INSTALLSTRIP) -m 755 $(SLIB) $(prefix)/lib/libavcodec-$(VERSION).so
--	ln -sf libavcodec-$(VERSION).so $(prefix)/lib/libavcodec.so
-+	install -d $(libdir)
-+	install $(INSTALLSTRIP) -m 755 $(SLIB) $(libdir)/libavcodec-$(VERSION).so
-+	ln -sf libavcodec-$(VERSION).so $(libdir)/libavcodec.so
- 	ldconfig || true
- endif
- ifeq ($(CONFIG_PP),yes)
-@@ -315,7 +315,7 @@
- endif
- 
- installlib: all install-headers
--	install -m 644 $(LIB) "$(prefix)/lib"
-+	install -m 644 $(LIB) "$(libdir)"
- 
- install-headers:
- 	mkdir -p "$(prefix)/include/ffmpeg"
-Index: libavcodec/libpostproc/Makefile
-===================================================================
-RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/libpostproc/Makefile,v
-retrieving revision 1.19
-diff -u -b -B -u -r1.19 Makefile
---- libavcodec/libpostproc/Makefile	4 Feb 2005 03:29:50 -0000	1.19
-+++ libavcodec/libpostproc/Makefile	15 Mar 2005 23:40:11 -0000
-@@ -54,9 +54,9 @@
- ifeq ($(CONFIG_WIN32),yes)
-        install $(INSTALLSTRIP) -m 755 $(SPPLIB) "$(prefix)"
- else
--	install -d $(prefix)/lib
--	install $(INSTALLSTRIP) -m 755 $(SPPLIB) $(prefix)/lib/$(SPPLIB).$(SPPVERSION)
--	ln -sf $(SPPLIB).$(SPPVERSION) $(prefix)/lib/$(SPPLIB)
-+	install -d $(libdir)
-+	install $(INSTALLSTRIP) -m 755 $(SPPLIB) $(libdir)/$(SPPLIB).$(SPPVERSION)
-+	ln -sf $(SPPLIB).$(SPPVERSION) $(libdir)/$(SPPLIB)
- 	ldconfig || true
- endif
- endif
-Index: libavformat/Makefile
-===================================================================
-RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/Makefile,v
-retrieving revision 1.84
-diff -u -b -B -u -r1.84 Makefile
---- libavformat/Makefile	15 Mar 2005 12:37:39 -0000	1.84
-+++ libavformat/Makefile	15 Mar 2005 23:40:11 -0000
-@@ -108,9 +108,9 @@
- ifeq ($(CONFIG_WIN32),yes)
- 	install $(INSTALLSTRIP) -m 755 $(SLIB) "$(prefix)"
- else
--	install -d $(prefix)/lib
--	install $(INSTALLSTRIP) -m 755 $(SLIB) $(prefix)/lib/libavformat-$(VERSION).so
--	ln -sf libavformat-$(VERSION).so $(prefix)/lib/libavformat.so
-+	install -d $(libdir)
-+	install $(INSTALLSTRIP) -m 755 $(SLIB) $(libdir)/libavformat-$(VERSION).so
-+	ln -sf libavformat-$(VERSION).so $(libdir)/libavformat.so
- 	ldconfig || true
- endif
- else
-@@ -118,7 +118,7 @@
- endif
- 
- installlib: all install-headers
--	install -m 644 $(LIB) "$(prefix)/lib"
-+	install -m 644 $(LIB) "$(libdir)"
- 
- install-headers:
- 	mkdir -p "$(prefix)/include/ffmpeg"
-Index: vhook/Makefile
-===================================================================
-RCS file: /cvsroot/ffmpeg/ffmpeg/vhook/Makefile,v
-retrieving revision 1.19
-diff -u -b -B -u -r1.19 Makefile
---- vhook/Makefile	25 Feb 2005 22:22:20 -0000	1.19
-+++ vhook/Makefile	15 Mar 2005 23:40:11 -0000
-@@ -26,8 +26,8 @@
- 	$(CC) -MM $(CFLAGS) $^ 1>.depend
- 
- install:
--	install -d "$(prefix)/lib/vhook"
--	install -m 755 $(HOOKS) "$(prefix)/lib/vhook"
-+	install -d "$(libdir)/vhook"
-+	install -m 755 $(HOOKS) "$(libdir)/vhook"
- 
- imlib2.so: imlib2.o
- 	$(CC) -g -o $@ $(SHFLAGS) $< -lImlib2
---- libavcodec/Makefile.orig	2005-03-18 06:10:21.000000000 +0900
-+++ libavcodec/Makefile	2005-03-18 06:17:04.000000000 +0900
-@@ -7,7 +7,7 @@
- VPATH=$(SRC_PATH)/libavcodec
- 
- # NOTE: -I.. is needed to include config.h
--CFLAGS=$(OPTFLAGS) -DHAVE_AV_CONFIG_H -I.. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
-+CFLAGS=$(OPTFLAGS) $(PIC) -DHAVE_AV_CONFIG_H -I.. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
- 
- OBJS= bitstream.o utils.o mem.o allcodecs.o \
-       mpegvideo.o jrevdct.o jfdctfst.o jfdctint.o\
---- libavformat/Makefile.orig	2005-02-25 00:18:02.000000000 +0900
-+++ libavformat/Makefile	2005-03-18 06:17:22.000000000 +0900
-@@ -6,7 +6,7 @@
- 
- VPATH=$(SRC_PATH)/libavformat
- 
--CFLAGS=$(OPTFLAGS) -I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavcodec -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
-+CFLAGS=$(OPTFLAGS) $(PIC) -I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavcodec -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
- 
- OBJS= utils.o cutils.o os_support.o allformats.o
- PPOBJS=
diff --git a/media-video/ffmpeg/files/ffmpeg-libdir.patch b/media-video/ffmpeg/files/ffmpeg-libdir.patch
deleted file mode 100644
index 20455eb8d3fc..000000000000
--- a/media-video/ffmpeg/files/ffmpeg-libdir.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- configure.old	2006-03-31 15:38:10.000000000 +0200
-+++ configure	2006-03-31 15:41:35.000000000 +0200
-@@ -1810,7 +1810,7 @@
- cat <<EOF >libavutil.pc
- prefix=$prefix
- exec_prefix=\${prefix}
--libdir=\${exec_prefix}/lib
-+libdir=\${exec_prefix}/GENTOOLIBDIR
- includedir=\${prefix}/include
- 
- Name: libavutil
-@@ -1841,7 +1841,7 @@
- cat <<EOF >libavcodec.pc
- prefix=$prefix
- exec_prefix=\${prefix}
--libdir=\${exec_prefix}/lib
-+libdir=\${exec_prefix}/GENTOOLIBDIR
- includedir=\${prefix}/include
- 
- Name: libavcodec
-@@ -1872,7 +1872,7 @@
- cat <<EOF >libavformat.pc
- prefix=$prefix
- exec_prefix=\${prefix}
--libdir=\${exec_prefix}/lib
-+libdir=\${exec_prefix}/GENTOOLIBDIR
- includedir=\${prefix}/include
- 
- Name: libavformat
-@@ -1904,7 +1904,7 @@
- cat <<EOF >libpostproc.pc
- prefix=$prefix
- exec_prefix=\${prefix}
--libdir=\${exec_prefix}/lib
-+libdir=\${exec_prefix}/GENTOOLIBDIR
- includedir=\${prefix}/include
- 
- Name: libpostproc
diff --git a/media-video/ffmpeg/files/ffmpeg-shared-gcc4.patch b/media-video/ffmpeg/files/ffmpeg-shared-gcc4.patch
deleted file mode 100644
index d8ad85de367f..000000000000
--- a/media-video/ffmpeg/files/ffmpeg-shared-gcc4.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- ffmpeg-0.4.9-p20051216-shared/libavcodec/i386/dsputil_mmx.c.orig	2006-01-14 13:13:04.000000000 +0100
-+++ ffmpeg-0.4.9-p20051216-shared/libavcodec/i386/dsputil_mmx.c	2006-01-14 13:06:59.000000000 +0100
-@@ -619,10 +619,22 @@
- 
- static inline void transpose4x4(uint8_t *dst, uint8_t *src, int dst_stride, int src_stride){
-     asm volatile( //FIXME could save 1 instruction if done as 8x4 ...
--        "movd  %4, %%mm0		\n\t"
--        "movd  %5, %%mm1		\n\t"
--        "movd  %6, %%mm2		\n\t"
--        "movd  %7, %%mm3		\n\t"
-+        "movd  %0, %%mm0		\n\t"
-+        "movd  %1, %%mm1		\n\t"
-+        "movd  %2, %%mm2		\n\t"
-+        
-+        :
-+        :  "m" (*(uint32_t*)(src + 0*src_stride)),
-+           "m" (*(uint32_t*)(src + 1*src_stride)),
-+           "m" (*(uint32_t*)(src + 2*src_stride))
-+    );
-+    asm volatile( //FIXME could save 1 instruction if done as 8x4 ...
-+        "movd  %0, %%mm3		\n\t"
-+        
-+        :
-+        :  "m" (*(uint32_t*)(src + 3*src_stride))
-+    );
-+    asm volatile( //FIXME could save 1 instruction if done as 8x4 ...
-         "punpcklbw %%mm1, %%mm0		\n\t"
-         "punpcklbw %%mm3, %%mm2		\n\t"
-         "movq %%mm0, %%mm1		\n\t"
-@@ -639,10 +651,6 @@
-           "=m" (*(uint32_t*)(dst + 1*dst_stride)),
-           "=m" (*(uint32_t*)(dst + 2*dst_stride)),
-           "=m" (*(uint32_t*)(dst + 3*dst_stride))
--        :  "m" (*(uint32_t*)(src + 0*src_stride)),
--           "m" (*(uint32_t*)(src + 1*src_stride)),
--           "m" (*(uint32_t*)(src + 2*src_stride)),
--           "m" (*(uint32_t*)(src + 3*src_stride))
-     );
- }
- 
diff --git a/media-video/ffmpeg/files/ffmpeg-soname-symlink.patch b/media-video/ffmpeg/files/ffmpeg-soname-symlink.patch
deleted file mode 100644
index 9fd77137b1a0..000000000000
--- a/media-video/ffmpeg/files/ffmpeg-soname-symlink.patch
+++ /dev/null
@@ -1,146 +0,0 @@
-Index: configure
-===================================================================
-RCS file: /cvsroot/ffmpeg/ffmpeg/configure,v
-retrieving revision 1.219
-diff -u -r1.219 configure
---- configure	11 Dec 2005 00:45:33 -0000	1.219
-+++ configure	13 Dec 2005 16:16:02 -0000
-@@ -215,12 +215,12 @@
- dlfcn="no"
- dlopen="no"
- mpegaudio_hp="yes"
--SHFLAGS='-shared -Wl,-soname,$@.$(LIBVERSION)'
-+SHFLAGS='-shared -Wl,-soname,$@.$(LIBMAJOR)'
- netserver="no"
- need_inet_aton="no"
- ffserver="yes"
- ffplay="yes"
--LIBOBJFLAGS=""
-+LIBOBJFLAGS='$(PIC)'
- LDFLAGS=-Wl,--warn-common
- FFSLDFLAGS=-Wl,-E
- LDCONFIG="ldconfig"
-@@ -228,6 +228,8 @@
- LIBSUF=".a"
- SLIBPREF="lib"
- SLIBSUF=".so"
-+SLIBNAME_WITH_VERSION='$(SLIBPREF)$(NAME)$(SLIBSUF).$(LIBVERSION)'
-+SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(NAME)$(SLIBSUF).$(LIBMAJOR)'
- EXESUF=""
- BUILDSUF=""
- amr_nb="no"
-@@ -339,6 +341,8 @@
- installstrip=""
- LDFLAGS="-Wl,-dynamic,-search_paths_first"
- SLIBSUF=".dylib"
-+SLIBNAME_WITH_VERSION='$(SLIBPREF)$(NAME).$(LIBVERSION)$(SLIBSUF)'
-+SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(NAME).$(LIBMAJOR)$(SLIBSUF)'
- FFSLDFLAGS=-Wl,-bind_at_load
- ;;
- MINGW32*)
-@@ -1465,6 +1467,8 @@
-   echo "LAVFVERSION=$lavf_version" >> config.mak
-   echo "LAVUMAJOR=${lavu_version/.*/}" >> config.mak
-   echo "LAVUVERSION=$lavu_version" >> config.mak
-+  echo "SLIBNAME_WITH_VERSION=${SLIBNAME_WITH_VERSION}" >> config.mak
-+  echo "SLIBNAME_WITH_MAJOR=${SLIBNAME_WITH_MAJOR}" >> config.mak
- fi
- echo "EXTRALIBS=$extralibs" >> config.mak
- version=`grep '#define FFMPEG_VERSION ' "$source_path/libavcodec/avcodec.h" |
-Index: libavcodec/Makefile
-===================================================================
-RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/Makefile,v
-retrieving revision 1.215
-diff -u -r1.215 Makefile
---- libavcodec/Makefile	10 Dec 2005 17:14:23 -0000	1.215
-+++ libavcodec/Makefile	13 Dec 2005 16:16:03 -0000
-@@ -488,14 +488,20 @@
- 	$(CC) -o $@ $^ $(LIBAVUTIL) -lm
- 
- ifeq ($(BUILD_SHARED),yes)
--LIBVERSION=$(LAVCMAJOR)
-+LIBVERSION=$(LAVCVERSION)
-+LIBMAJOR=$(LAVCMAJOR)
-+NAME=avcodec
- install: all install-headers
- ifeq ($(CONFIG_WIN32),yes)
- 	install $(INSTALLSTRIP) -m 755 $(SLIBNAME) "$(prefix)"
- else
- 	install -d $(libdir)
--	install $(INSTALLSTRIP) -m 755 $(SLIBNAME) $(libdir)/libavcodec-$(VERSION)$(SLIBSUF)
--	ln -sf libavcodec-$(VERSION)$(SLIBSUF) $(libdir)/libavcodec$(SLIBSUF)
-+	install $(INSTALLSTRIP) -m 755 $(SLIBNAME) \
-+		$(libdir)/$(SLIBNAME_WITH_VERSION)
-+	ln -sf $(SLIBNAME_WITH_VERSION) \
-+		$(libdir)/$(SLIBNAME_WITH_MAJOR)
-+	ln -sf $(SLIBNAME_WITH_VERSION) \
-+		$(libdir)/$(SLIBNAME)
- 	$(LDCONFIG) || true
- endif
- ifeq ($(CONFIG_PP),yes)
-Index: libavformat/Makefile
-===================================================================
-RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/Makefile,v
-retrieving revision 1.103
-diff -u -r1.103 Makefile
---- libavformat/Makefile	10 Dec 2005 17:14:23 -0000	1.103
-+++ libavformat/Makefile	13 Dec 2005 16:16:03 -0000
-@@ -80,7 +80,9 @@
- 
- LIB= $(LIBPREF)avformat$(LIBSUF)
- ifeq ($(BUILD_SHARED),yes)
--LIBVERSION=$(LAVFMAJOR)
-+LIBVERSION=$(LAVFVERSION)
-+LIBMAJOR=$(LAVFMAJOR)
-+NAME=avformat
- SLIBNAME= $(SLIBPREF)avformat$(SLIBSUF)
- AVCLIBS+=-lavcodec$(BUILDSUF) -L../libavcodec -lavutil$(BUILDSUF) -L../libavutil
- ifeq ($(CONFIG_DARWIN),yes)
-@@ -114,8 +116,12 @@
- 	install $(INSTALLSTRIP) -m 755 $(SLIBNAME) "$(prefix)"
- else
- 	install -d $(libdir)
--	install $(INSTALLSTRIP) -m 755 $(SLIBNAME) $(libdir)/$(SLIBPREF)avformat-$(VERSION)$(SLIBSUF)
--	ln -sf $(SLIBPREF)avformat-$(VERSION)$(SLIBSUF) $(libdir)/$(SLIBNAME)
-+	install $(INSTALLSTRIP) -m 755 $(SLIBNAME) \
-+		$(libdir)/$(SLIBNAME_WITH_VERSION)
-+	ln -sf $(SLIBNAME_WITH_VERSION) \
-+		$(libdir)/$(SLIBNAME_WITH_MAJOR)
-+	ln -sf $(SLIBNAME_WITH_VERSION) \
-+		$(libdir)/$(SLIBNAME)
- 	$(LDCONFIG) || true
- endif
- else
-Index: libavutil/Makefile
-===================================================================
-RCS file: /cvsroot/ffmpeg/ffmpeg/libavutil/Makefile,v
-retrieving revision 1.5
-diff -u -r1.5 Makefile
---- libavutil/Makefile	10 Dec 2005 17:14:24 -0000	1.5
-+++ libavutil/Makefile	13 Dec 2005 16:16:05 -0000
-@@ -22,7 +22,9 @@
- 
- LIB= $(LIBPREF)avutil$(LIBSUF)
- ifeq ($(BUILD_SHARED),yes)
--LIBVERSION=$(LAVUMAJOR)
-+LIBVERSION=$(LAVUVERSION)
-+LIBMAJOR=$(LAVUMAJOR)
-+NAME=avutil
- SLIBNAME= $(SLIBPREF)avutil$(SLIBSUF)
- ifeq ($(CONFIG_DARWIN),yes)
- SHFLAGS += -Wl,-install_name,$(libdir)/$(SLIBNAME),-current_version,$(SPPVERSION),-compatibility_version,$(SPPVERSION)
-@@ -65,8 +67,12 @@
- 	install $(INSTALLSTRIP) -m 755 $(SLIBNAME) "$(prefix)"
- else
- 	install -d $(libdir)
--	install $(INSTALLSTRIP) -m 755 $(SLIBNAME) $(libdir)/libavutil-$(VERSION)$(SLIBSUF)
--	ln -sf libavutil-$(VERSION)$(SLIBSUF) $(libdir)/$(SLIBNAME)
-+	install $(INSTALLSTRIP) -m 755 $(SLIBNAME) \
-+		$(libdir)/$(SLIBNAME_WITH_VERSION)
-+	ln -sf $(SLIBNAME_WITH_VERSION) \
-+		$(libdir)/$(SLIBNAME_WITH_MAJOR)
-+	ln -sf $(SLIBNAME_WITH_VERSION) \
-+		$(libdir)/$(SLIBNAME)
- 	$(LDCONFIG) || true
- endif
- else
diff --git a/media-video/ffmpeg/files/ffmpeg-unknown-options.patch b/media-video/ffmpeg/files/ffmpeg-unknown-options.patch
deleted file mode 100644
index ca02e9b7893d..000000000000
--- a/media-video/ffmpeg/files/ffmpeg-unknown-options.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: configure
-===================================================================
-RCS file: /cvsroot/ffmpeg/ffmpeg/configure,v
-retrieving revision 1.215
-diff -u -r1.215 configure
---- configure	22 Oct 2005 19:17:39 -0000	1.215
-+++ configure	20 Nov 2005 17:07:53 -0000
-@@ -580,8 +580,6 @@
-   ;;
-   *)
-   echo "Unknown option \"$opt\"."
--  echo "See $0 --help for available options."
--  exit 1
-   ;;
-   esac
- done