* all macintel patches have been fixed upstream now. Also remove outdated ffmpeg...

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 6d9f98fe3b79f3a0babc336cf2a62948e2cd910f..a7f9d0febe3bcb43833547fc880cfc3cb0627eb9 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -929,10 +929,6 @@ endif
 ifdef HAVE_WINCE
        patch -p 1 < Patches/ffmpeg-svn-wince.patch
 endif
-ifeq ($(HOST),i686-apple-darwin8)
-       (cd $@;patch -p 0 < ../Patches/ffmpeg-svn-mactel.patch)
-endif
-#      (cd $@; patch -p0 < ../Patches/ffmpeg-install.patch)
 
 ffmpeg-$(FFMPEG_VERSION).tar.gz:
        $(WGET) $(FFMPEG_URL)

diff --git a/extras/contrib/src/Patches/ffmpeg-install.patch b/extras/contrib/src/Patches/ffmpeg-install.patch
deleted file mode 100644 (file)
index 7531192..0000000
--- a/extras/contrib/src/Patches/ffmpeg-install.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-Index: configure
-===================================================================
---- configure  (revision 5813)
-+++ configure  (working copy)
-@@ -1552,6 +1552,13 @@
- 
- echo "Creating config.mak and config.h..."
- 
-+if test  "$force_prefix" = yes; then
-+    libdir="${prefix}/lib"
-+    incdir="${prefix}/include/ffmpeg"
-+    mandir="${prefix}/man"
-+    bindir="${prefix}/bin"
-+fi
-+
- date >> config.log
- echo "   $0 $FFMPEG_CONFIGURATION" >> config.log
- echo "# Automatically generated by configure - do not modify!" > config.mak
-Index: common.mak
-===================================================================
---- common.mak (revision 5813)
-+++ common.mak (working copy)
-@@ -21,7 +21,7 @@
-       ln -sf $^ $@
- 
- $(SLIBNAME_WITH_MAJOR): $(SHARED_OBJS)
--      $(CC) $(SHFLAGS) $(LDFLAGS) -o $@ $^ $(EXTRALIBS) $(EXTRAOBJS)
-+      $(CC) $(LDFLAGS) $(SHFLAGS) -o $@ $^ $(EXTRALIBS) $(EXTRAOBJS)
- ifeq ($(CONFIG_MINGW),yes)
-       -lib /machine:i386 /def:$(@:.dll=.def)
- endif
-@@ -60,7 +60,7 @@
- install-libs: $(INSTLIBTARGETS)
- 
- install-lib-shared: $(SLIBNAME)
--      install -d "$(libdir)"
-+      install -d "$(prefix)$(libdir)"
- ifeq ($(CONFIG_MINGW),yes)
-       install $(INSTALLSTRIP) -m 755 $(SLIBNAME) "$(prefix)"
- else
-@@ -73,14 +73,14 @@
- endif
- 
- install-lib-static: $(LIB)
--      install -d "$(libdir)"
--      install -m 644 $(LIB) "$(libdir)"
-+      install -d "$(prefix)$(libdir)"
-+      install -m 644 $(LIB) "$(prefix)$(libdir)"
- 
- install-headers:
--      install -d "$(incdir)"
--      install -d "$(libdir)/pkgconfig"
--      install -m 644 $(addprefix "$(SRC_DIR)"/,$(HEADERS)) "$(incdir)"
--      install -m 644 $(BUILD_ROOT)/lib$(NAME).pc "$(libdir)/pkgconfig"
-+      install -d "$(prefix)$(incdir)"
-+      install -d "$(prefix)$(libdir)/pkgconfig"
-+      install -m 644 $(addprefix "$(SRC_DIR)"/,$(HEADERS)) "$(prefix)$(incdir)"
-+      install -m 644 $(BUILD_ROOT)/lib$(NAME).pc "$(prefix)$(libdir)/pkgconfig"
- 
- uninstall: uninstall-libs uninstall-headers
- 
-@@ -88,15 +88,15 @@
- ifeq ($(CONFIG_MINGW),yes)
-       -rm -f $(prefix)/$(SLIBNAME)
- else
--      -rm -f $(libdir)/$(SLIBNAME_WITH_MAJOR) \
--            $(libdir)/$(SLIBNAME)            \
--            $(libdir)/$(SLIBNAME_WITH_VERSION)
-+      -rm -f $(prefix)$(libdir)/$(SLIBNAME_WITH_MAJOR) \
-+            $(prefix)$(libdir)/$(SLIBNAME)            \
-+            $(prefix)$(libdir)/$(SLIBNAME_WITH_VERSION)
- endif
--      -rm -f $(libdir)/$(LIB)
-+      -rm -f $(prefix)$(libdir)/$(LIB)
- 
- uninstall-headers:
-       rm -f $(addprefix $(incdir)/,$(HEADERS))
--      rm -f $(libdir)/pkgconfig/lib$(NAME).pc
-+      rm -f $(prefix)$(libdir)/pkgconfig/lib$(NAME).pc
- 
- #
- # include dependency files if they exist

diff --git a/extras/contrib/src/Patches/ffmpeg-svn-mactel.patch b/extras/contrib/src/Patches/ffmpeg-svn-mactel.patch
deleted file mode 100644 (file)
index 6d95265..0000000
--- a/extras/contrib/src/Patches/ffmpeg-svn-mactel.patch
+++ /dev/null
@@ -1,303 +0,0 @@
-Index: libavcodec/i386/dsputil_mmx.c
-===================================================================
-RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/i386/dsputil_mmx.c,v
-retrieving revision 1.109
-diff -u -r1.109 dsputil_mmx.c
---- libavcodec/i386/dsputil_mmx.c      12 Jan 2006 22:43:17 -0000      1.109
-+++ libavcodec/i386/dsputil_mmx.c      26 Jan 2006 22:02:55 -0000
-@@ -52,7 +52,7 @@
- static const uint64_t ff_pb_3F attribute_used __attribute__ ((aligned(8))) = 0x3F3F3F3F3F3F3F3FULL;
- static const uint64_t ff_pb_FC attribute_used __attribute__ ((aligned(8))) = 0xFCFCFCFCFCFCFCFCULL;
- 
--#define JUMPALIGN() __asm __volatile (".balign 8"::)
-+#define JUMPALIGN() __asm __volatile (".p2align 3"::)
- #define MOVQ_ZERO(regd)  __asm __volatile ("pxor %%" #regd ", %%" #regd ::)
- 
- #define MOVQ_WONE(regd) \
-@@ -195,7 +195,7 @@
-     asm volatile(
-         "mov $-128, %%"REG_a"           \n\t"
-         "pxor %%mm7, %%mm7              \n\t"
--        ".balign 16                     \n\t"
-+        ".p2align 4                     \n\t"
-         "1:                             \n\t"
-         "movq (%0), %%mm0               \n\t"
-         "movq (%0, %2), %%mm2           \n\t"
-@@ -223,7 +223,7 @@
-     asm volatile(
-         "pxor %%mm7, %%mm7              \n\t"
-         "mov $-128, %%"REG_a"           \n\t"
--        ".balign 16                     \n\t"
-+        ".p2align 4                     \n\t"
-         "1:                             \n\t"
-         "movq (%0), %%mm0               \n\t"
-         "movq (%1), %%mm2               \n\t"
-@@ -366,7 +366,7 @@
- {
-     __asm __volatile(
-          "lea (%3, %3), %%"REG_a"       \n\t"
--         ".balign 8                     \n\t"
-+         ".p2align 3                    \n\t"
-          "1:                            \n\t"
-          "movd (%1), %%mm0              \n\t"
-          "movd (%1, %3), %%mm1          \n\t"
-@@ -392,7 +392,7 @@
- {
-     __asm __volatile(
-          "lea (%3, %3), %%"REG_a"       \n\t"
--         ".balign 8                     \n\t"
-+         ".p2align 3                    \n\t"
-          "1:                            \n\t"
-          "movq (%1), %%mm0              \n\t"
-          "movq (%1, %3), %%mm1          \n\t"
-@@ -418,7 +418,7 @@
- {
-     __asm __volatile(
-          "lea (%3, %3), %%"REG_a"       \n\t"
--         ".balign 8                     \n\t"
-+         ".p2align 3                    \n\t"
-          "1:                            \n\t"
-          "movq (%1), %%mm0              \n\t"
-          "movq 8(%1), %%mm4             \n\t"
-Index: libavcodec/i386/dsputil_mmx_avg.h
-===================================================================
-RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/i386/dsputil_mmx_avg.h,v
-retrieving revision 1.29
-diff -u -r1.29 dsputil_mmx_avg.h
---- libavcodec/i386/dsputil_mmx_avg.h  12 Jan 2006 22:43:17 -0000      1.29
-+++ libavcodec/i386/dsputil_mmx_avg.h  26 Jan 2006 22:02:55 -0000
-@@ -754,7 +754,7 @@
-         "lea (%3, %3), %%"REG_a"        \n\t"
-         "movq (%1), %%mm0               \n\t"
-         PAVGB" 1(%1), %%mm0             \n\t"
--        ".balign 8                      \n\t"
-+        ".p2align 3                     \n\t"
-         "1:                             \n\t"
-         "movq (%1, %%"REG_a"), %%mm2    \n\t"
-         "movq (%1, %3), %%mm1           \n\t"
-Index: libavcodec/i386/dsputil_mmx_rnd.h
-===================================================================
-RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/i386/dsputil_mmx_rnd.h,v
-retrieving revision 1.22
-diff -u -r1.22 dsputil_mmx_rnd.h
---- libavcodec/i386/dsputil_mmx_rnd.h  12 Jan 2006 22:43:17 -0000      1.22
-+++ libavcodec/i386/dsputil_mmx_rnd.h  26 Jan 2006 22:02:55 -0000
-@@ -28,7 +28,7 @@
-     MOVQ_BFE(mm6);
-     __asm __volatile(
-         "lea    (%3, %3), %%"REG_a"     \n\t"
--        ".balign 8                      \n\t"
-+        ".p2align 3                     \n\t"
-         "1:                             \n\t"
-         "movq   (%1), %%mm0             \n\t"
-         "movq   1(%1), %%mm1            \n\t"
-@@ -69,7 +69,7 @@
-         "movq   %%mm4, (%3)             \n\t"
-         "add    %5, %3                  \n\t"
-         "decl   %0                      \n\t"
--        ".balign 8                      \n\t"
-+        ".p2align 3                     \n\t"
-         "1:                             \n\t"
-         "movq   (%1), %%mm0             \n\t"
-         "movq   (%2), %%mm1             \n\t"
-@@ -110,7 +110,7 @@
-     MOVQ_BFE(mm6);
-     __asm __volatile(
-         "lea        (%3, %3), %%"REG_a" \n\t"
--        ".balign 8                      \n\t"
-+        ".p2align 3                     \n\t"
-         "1:                             \n\t"
-         "movq   (%1), %%mm0             \n\t"
-         "movq   1(%1), %%mm1            \n\t"
-@@ -168,7 +168,7 @@
-         "movq   %%mm5, 8(%3)            \n\t"
-         "add    %5, %3                  \n\t"
-         "decl   %0                      \n\t"
--        ".balign 8                      \n\t"
-+        ".p2align 3                     \n\t"
-         "1:                             \n\t"
-         "movq   (%1), %%mm0             \n\t"
-         "movq   (%2), %%mm1             \n\t"
-@@ -206,7 +206,7 @@
-     __asm __volatile(
-         "lea (%3, %3), %%"REG_a"        \n\t"
-         "movq (%1), %%mm0               \n\t"
--        ".balign 8                      \n\t"
-+        ".p2align 3                     \n\t"
-         "1:                             \n\t"
-         "movq   (%1, %3), %%mm1         \n\t"
-         "movq   (%1, %%"REG_a"),%%mm2   \n\t"
-@@ -246,7 +246,7 @@
-         "paddusw %%mm1, %%mm5           \n\t"
-         "xor    %%"REG_a", %%"REG_a"    \n\t"
-         "add    %3, %1                  \n\t"
--        ".balign 8                      \n\t"
-+        ".p2align 3                     \n\t"
-         "1:                             \n\t"
-         "movq   (%1, %%"REG_a"), %%mm0  \n\t"
-         "movq   1(%1, %%"REG_a"), %%mm2 \n\t"
-@@ -458,7 +458,7 @@
-     __asm __volatile(
-         "lea    (%3, %3), %%"REG_a"     \n\t"
-         "movq   (%1), %%mm0             \n\t"
--        ".balign 8                      \n\t"
-+        ".p2align 3                     \n\t"
-         "1:                             \n\t"
-         "movq   (%1, %3), %%mm1         \n\t"
-         "movq   (%1, %%"REG_a"), %%mm2  \n\t"
-@@ -509,7 +509,7 @@
-         "paddusw %%mm1, %%mm5           \n\t"
-         "xor    %%"REG_a", %%"REG_a"    \n\t"
-         "add    %3, %1                  \n\t"
--        ".balign 8                      \n\t"
-+        ".p2align 3                     \n\t"
-         "1:                             \n\t"
-         "movq   (%1, %%"REG_a"), %%mm0  \n\t"
-         "movq   1(%1, %%"REG_a"), %%mm2 \n\t"
-Index: libavcodec/i386/motion_est_mmx.c
-===================================================================
-RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/i386/motion_est_mmx.c,v
-retrieving revision 1.19
-diff -u -r1.19 motion_est_mmx.c
---- libavcodec/i386/motion_est_mmx.c   12 Jan 2006 22:43:18 -0000      1.19
-+++ libavcodec/i386/motion_est_mmx.c   26 Jan 2006 22:02:55 -0000
-@@ -34,7 +34,7 @@
- {
-     long len= -(stride*h);
-     asm volatile(
--        ".balign 16                     \n\t"
-+        ".p2align 4                     \n\t"
-         "1:                             \n\t"
-         "movq (%1, %%"REG_a"), %%mm0    \n\t"
-         "movq (%2, %%"REG_a"), %%mm2    \n\t"
-@@ -70,7 +70,7 @@
- {
-     long len= -(stride*h);
-     asm volatile(
--        ".balign 16                     \n\t"
-+        ".p2align 4                     \n\t"
-         "1:                             \n\t"
-         "movq (%1, %%"REG_a"), %%mm0    \n\t"
-         "movq (%2, %%"REG_a"), %%mm2    \n\t"
-@@ -92,7 +92,7 @@
- {
-     long len= -(stride*h);
-     asm volatile(
--        ".balign 16                     \n\t"
-+        ".p2align 4                     \n\t"
-         "1:                             \n\t"
-         "movq (%1, %%"REG_a"), %%mm0    \n\t"
-         "movq (%2, %%"REG_a"), %%mm2    \n\t"
-@@ -118,7 +118,7 @@
- { //FIXME reuse src
-     long len= -(stride*h);
-     asm volatile(
--        ".balign 16                     \n\t"
-+        ".p2align 4                     \n\t"
-         "movq "MANGLE(bone)", %%mm5     \n\t"
-         "1:                             \n\t"
-         "movq (%1, %%"REG_a"), %%mm0    \n\t"
-@@ -155,7 +155,7 @@
- {
-     long len= -(stride*h);
-     asm volatile(
--        ".balign 16                     \n\t"
-+        ".p2align 4                     \n\t"
-         "1:                             \n\t"
-         "movq (%1, %%"REG_a"), %%mm0    \n\t"
-         "movq (%2, %%"REG_a"), %%mm1    \n\t"
-@@ -193,7 +193,7 @@
- {
-     long len= -(stride*h);
-     asm volatile(
--        ".balign 16                     \n\t"
-+        ".p2align 4                     \n\t"
-         "1:                             \n\t"
-         "movq (%1, %%"REG_a"), %%mm0    \n\t"
-         "movq (%2, %%"REG_a"), %%mm1    \n\t"
-Index: libavcodec/i386/mpegvideo_mmx.c
-===================================================================
-RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/i386/mpegvideo_mmx.c,v
-retrieving revision 1.37
-diff -u -r1.37 mpegvideo_mmx.c
---- libavcodec/i386/mpegvideo_mmx.c    12 Jan 2006 22:43:18 -0000      1.37
-+++ libavcodec/i386/mpegvideo_mmx.c    26 Jan 2006 22:02:55 -0000
-@@ -66,7 +66,7 @@
-                 "packssdw %%mm5, %%mm5          \n\t"
-                 "psubw %%mm5, %%mm7             \n\t"
-                 "pxor %%mm4, %%mm4              \n\t"
--                ".balign 16                     \n\t"
-+                ".p2align 4                     \n\t"
-                 "1:                             \n\t"
-                 "movq (%0, %3), %%mm0           \n\t"
-                 "movq 8(%0, %3), %%mm1          \n\t"
-@@ -129,7 +129,7 @@
-                 "packssdw %%mm5, %%mm5          \n\t"
-                 "psubw %%mm5, %%mm7             \n\t"
-                 "pxor %%mm4, %%mm4              \n\t"
--                ".balign 16                     \n\t"
-+                ".p2align 4                     \n\t"
-                 "1:                             \n\t"
-                 "movq (%0, %3), %%mm0           \n\t"
-                 "movq 8(%0, %3), %%mm1          \n\t"
-@@ -222,7 +222,7 @@
-                 "packssdw %%mm6, %%mm6          \n\t"
-                 "packssdw %%mm6, %%mm6          \n\t"
-                 "mov %3, %%"REG_a"              \n\t"
--                ".balign 16                     \n\t"
-+                ".p2align 4                     \n\t"
-                 "1:                             \n\t"
-                 "movq (%0, %%"REG_a"), %%mm0    \n\t"
-                 "movq 8(%0, %%"REG_a"), %%mm1   \n\t"
-@@ -285,7 +285,7 @@
-                 "packssdw %%mm6, %%mm6          \n\t"
-                 "packssdw %%mm6, %%mm6          \n\t"
-                 "mov %3, %%"REG_a"              \n\t"
--                ".balign 16                     \n\t"
-+                ".p2align 4                     \n\t"
-                 "1:                             \n\t"
-                 "movq (%0, %%"REG_a"), %%mm0    \n\t"
-                 "movq 8(%0, %%"REG_a"), %%mm1   \n\t"
-@@ -357,7 +357,7 @@
-                 "packssdw %%mm6, %%mm6          \n\t"
-                 "packssdw %%mm6, %%mm6          \n\t"
-                 "mov %3, %%"REG_a"              \n\t"
--                ".balign 16                     \n\t"
-+                ".p2align 4                     \n\t"
-                 "1:                             \n\t"
-                 "movq (%0, %%"REG_a"), %%mm0    \n\t"
-                 "movq 8(%0, %%"REG_a"), %%mm1   \n\t"
-@@ -418,7 +418,7 @@
-                 "packssdw %%mm6, %%mm6          \n\t"
-                 "packssdw %%mm6, %%mm6          \n\t"
-                 "mov %3, %%"REG_a"              \n\t"
--                ".balign 16                     \n\t"
-+                ".p2align 4                     \n\t"
-                 "1:                             \n\t"
-                 "movq (%0, %%"REG_a"), %%mm0    \n\t"
-                 "movq 8(%0, %%"REG_a"), %%mm1   \n\t"
-Index: libavcodec/i386/mpegvideo_mmx_template.c
-===================================================================
-RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/i386/mpegvideo_mmx_template.c,v
-retrieving revision 1.29
-diff -u -r1.29 mpegvideo_mmx_template.c
---- libavcodec/i386/mpegvideo_mmx_template.c   12 Jan 2006 22:43:18 -0000      1.29
-+++ libavcodec/i386/mpegvideo_mmx_template.c   26 Jan 2006 22:02:55 -0000
-@@ -111,7 +111,7 @@
-             "pxor %%mm6, %%mm6                  \n\t"
-             "psubw (%3), %%mm6                  \n\t" // -bias[0]
-             "mov $-128, %%"REG_a"               \n\t"
--            ".balign 16                         \n\t"
-+            ".p2align 4                         \n\t"
-             "1:                                 \n\t"
-             "pxor %%mm1, %%mm1                  \n\t" // 0
-             "movq (%1, %%"REG_a"), %%mm0        \n\t" // block[i]
-@@ -155,7 +155,7 @@
-             "pxor %%mm7, %%mm7                  \n\t" // 0
-             "pxor %%mm4, %%mm4                  \n\t" // 0
-             "mov $-128, %%"REG_a"               \n\t"
--            ".balign 16                         \n\t"
-+            ".p2align 4                         \n\t"
-             "1:                                 \n\t"
-             "pxor %%mm1, %%mm1                  \n\t" // 0
-             "movq (%1, %%"REG_a"), %%mm0        \n\t" // block[i]
\ No newline at end of file