7 files changed, 41 insertions, 67 deletions

diff --git a/multimedia/transcode/files/patch-contrib:subrip:Makefile b/multimedia/transcode/files/patch-contrib:subrip:Makefile
deleted file mode 100644
index d2b86dae318a..000000000000
--- a/multimedia/transcode/files/patch-contrib:subrip:Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
---- contrib/subrip/Makefile.orig	Mon Jun  9 13:09:32 2003
-+++ contrib/subrip/Makefile	Mon Jun  9 13:09:39 2003
-@@ -8,8 +8,8 @@
- INCLUDES :=
- 
- ### enable ppm support ###
--DEFINES  += -D_HAVE_LIB_PPM_
--LIBS     += -lppm
-+#DEFINES  += -D_HAVE_LIB_PPM_
-+#LIBS     += -lppm
- 
- ### enable zlib support ###
- DEFINES += -D_HAVE_ZLIB_
-
diff --git a/multimedia/transcode/files/patch-ffmpeg:libavcodec:i386:dsputil_mmx.c b/multimedia/transcode/files/patch-ffmpeg:libavcodec:i386:dsputil_mmx.c
deleted file mode 100644
index 4ad4f716a2e1..000000000000
--- a/multimedia/transcode/files/patch-ffmpeg:libavcodec:i386:dsputil_mmx.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- ffmpeg/libavcodec/i386/dsputil_mmx.c.orig	Wed Nov 17 17:30:15 2004
-+++ ffmpeg/libavcodec/i386/dsputil_mmx.c	Wed Nov 17 17:30:33 2004
-@@ -31,8 +31,8 @@
- static const uint64_t mm_wone __attribute__ ((aligned(8))) = 0x0001000100010001ULL;
- static const uint64_t mm_wtwo __attribute__ ((aligned(8))) = 0x0002000200020002ULL;
- 
--static const uint64_t ff_pw_20 __attribute__ ((aligned(8))) = 0x0014001400140014ULL;
--static const uint64_t ff_pw_3  __attribute__ ((aligned(8))) = 0x0003000300030003ULL;
-+static const uint64_t ff_pw_20 __attribute__ ((aligned(8), used)) = 0x0014001400140014ULL;
-+static const uint64_t ff_pw_3  __attribute__ ((aligned(8), used)) = 0x0003000300030003ULL;
- static const uint64_t ff_pw_16 __attribute__ ((aligned(8))) = 0x0010001000100010ULL;
- static const uint64_t ff_pw_15 __attribute__ ((aligned(8))) = 0x000F000F000F000FULL;
-
diff --git a/multimedia/transcode/files/patch-ffmpeg:libavcodec:i386:motion_est_mmx.c b/multimedia/transcode/files/patch-ffmpeg:libavcodec:i386:motion_est_mmx.c
deleted file mode 100644
index 40309131718a..000000000000
--- a/multimedia/transcode/files/patch-ffmpeg:libavcodec:i386:motion_est_mmx.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- ffmpeg/libavcodec/i386/motion_est_mmx.c.orig	Wed Nov 17 17:31:38 2004
-+++ ffmpeg/libavcodec/i386/motion_est_mmx.c	Wed Nov 17 17:31:47 2004
-@@ -26,7 +26,7 @@
- 0x0002000200020002ULL,
- };
- 
--static __attribute__ ((aligned(8), unused)) uint64_t bone= 0x0101010101010101LL;
-+static __attribute__ ((aligned(8), used)) uint64_t bone= 0x0101010101010101LL;
- 
- static inline void sad8_mmx(uint8_t *blk1, uint8_t *blk2, int stride, int h)
- {
-
diff --git a/multimedia/transcode/files/patch-ffmpeg:libavcodec:i386:simple_idct_mmx.c b/multimedia/transcode/files/patch-ffmpeg:libavcodec:i386:simple_idct_mmx.c
deleted file mode 100644
index 6001e63cec67..000000000000
--- a/multimedia/transcode/files/patch-ffmpeg:libavcodec:i386:simple_idct_mmx.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- ffmpeg/libavcodec/i386/simple_idct_mmx.c.orig	Wed Nov 17 17:32:21 2004
-+++ ffmpeg/libavcodec/i386/simple_idct_mmx.c	Wed Nov 17 17:32:37 2004
-@@ -45,8 +45,8 @@
- #define ROW_SHIFT 11
- #define COL_SHIFT 20 // 6
- 
--static const uint64_t __attribute__((aligned(8))) wm1010= 0xFFFF0000FFFF0000ULL;
--static const uint64_t __attribute__((aligned(8))) d40000= 0x0000000000040000ULL;
-+static const uint64_t __attribute__((aligned(8), used)) wm1010= 0xFFFF0000FFFF0000ULL;
-+static const uint64_t __attribute__((aligned(8), used)) d40000= 0x0000000000040000ULL;
- 
- static const int16_t __attribute__((aligned(8))) coeffs[]= {
- 	1<<(ROW_SHIFT-1), 0, 1<<(ROW_SHIFT-1), 0,
-
-
diff --git a/multimedia/transcode/files/patch-filter:subtitles:frame_list.c b/multimedia/transcode/files/patch-filter:subtitles:frame_list.c
deleted file mode 100644
index f78ab71331ad..000000000000
--- a/multimedia/transcode/files/patch-filter:subtitles:frame_list.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- filter/subtitler/frame_list.c.orig	Thu Feb 26 17:30:59 2004
-+++ filter/subtitler/frame_list.c	Thu Feb 26 17:36:19 2004
-@@ -33,8 +33,8 @@
- 
- char *strsave(char *s) /*save char array s somewhere*/
- {
--char *p, *malloc();
--if(p = malloc( strlen(s) +  1) ) strcpy(p, s);
-+char *p;
-+if(p = (char *)malloc( strlen(s) +  1) ) strcpy(p, s);
- return(p);
- }
- 
diff --git a/multimedia/transcode/files/patch-filter_Makefile.in b/multimedia/transcode/files/patch-filter_Makefile.in
new file mode 100644
index 000000000000..c968fea50b05
--- /dev/null
+++ b/multimedia/transcode/files/patch-filter_Makefile.in
@@ -0,0 +1,30 @@
+--- filter/Makefile.in.orig
++++ filter/Makefile.in	Sat Feb 19 21:30:33 2005
+@@ -335,7 +335,7 @@
+ 	uninstall-recursive
+ ETAGS = etags
+ CTAGS = ctags
+-DIST_SUBDIRS = pp divxkey extsub resample test yuvdenoise ivtc \
++DIST_SUBDIRS = divxkey extsub resample test yuvdenoise ivtc \
+ 	tomsmocomp preview subtitler
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ A52_CFLAGS = @A52_CFLAGS@
+@@ -835,7 +835,6 @@
+ 
+ @HAVE_FREETYPE2_TRUE@@HAVE_LIBICONV_TRUE@@HAVE_LIBXPM_TRUE@@HAVE_XAW_SIMPLE_TRUE@ADD2 = subtitler
+ @HAVE_X11_FALSE@SUBDIRS = \
+-@HAVE_X11_FALSE@	pp \
+ @HAVE_X11_FALSE@	divxkey \
+ @HAVE_X11_FALSE@	extsub \
+ @HAVE_X11_FALSE@	resample \
+@@ -845,7 +844,6 @@
+ @HAVE_X11_FALSE@	$(F_TOMSMOCOMP)
+ 
+ @HAVE_X11_TRUE@SUBDIRS = \
+-@HAVE_X11_TRUE@	pp \
+ @HAVE_X11_TRUE@	divxkey \
+ @HAVE_X11_TRUE@	extsub \
+ @HAVE_X11_TRUE@	resample \
+--- transcode-1.0.0beta2.diff ends here ---
+
+
diff --git a/multimedia/transcode/files/patch-libvo_yuv2rgv.c b/multimedia/transcode/files/patch-libvo_yuv2rgv.c
new file mode 100644
index 000000000000..482b1c657f9f
--- /dev/null
+++ b/multimedia/transcode/files/patch-libvo_yuv2rgv.c
@@ -0,0 +1,11 @@
+--- libvo/yuv2rgb.c.orig	Wed Feb 23 05:08:14 2005
++++ libvo/yuv2rgb.c	Wed Feb 23 05:09:12 2005
+@@ -71,7 +71,7 @@
+ void yuv2rgb_init (int bpp, int mode) 
+ {
+     yuv2rgb = NULL;
+-#if defined(ARCH_X86) || defined(ARCH_X86_64)
++#if defined(ARCH_X86)
+     if ((yuv2rgb == NULL) && (vo_mm_accel & MM_ACCEL_X86_MMXEXT)) {
+ 	yuv2rgb = yuv2rgb_init_mmxext (bpp, mode);
+ 	if (yuv2rgb != NULL)