r3 - unstable/ffmpeg/debian/patches

Samuel Hocevar sho at alioth.debian.org
Wed Mar 14 14:13:16 CET 2007 

Author: sho
Date: 2006-03-29 19:13:39 +0000 (Wed, 29 Mar 2006)
New Revision: 3

Modified:
   unstable/ffmpeg/debian/patches/005_altivec_flags.diff
   unstable/ffmpeg/debian/patches/005_m68k_workaround.diff
   unstable/ffmpeg/debian/patches/005_runtime_cpudetect.diff
   unstable/ffmpeg/debian/patches/010_ffmpeg-config.diff
   unstable/ffmpeg/debian/patches/010_shared_library_versioning.diff
   unstable/ffmpeg/debian/patches/020_mmx_intrinsics.diff
   unstable/ffmpeg/debian/patches/020_mmx_pic_code.diff
Log:
  * Refreshed all patches.


Modified: unstable/ffmpeg/debian/patches/005_altivec_flags.diff
===================================================================
--- unstable/ffmpeg/debian/patches/005_altivec_flags.diff	2006-03-29 19:04:11 UTC (rev 2)
+++ unstable/ffmpeg/debian/patches/005_altivec_flags.diff	2006-03-29 19:13:39 UTC (rev 3)
@@ -1,6 +1,8 @@
---- ffmpeg-0.cvs20060306.orig/configure
-+++ ffmpeg-0.cvs20060306/configure
-@@ -847,7 +847,8 @@
+Index: ffmpeg-0.cvs20060329/configure
+===================================================================
+--- ffmpeg-0.cvs20060329.orig/configure	2006-03-29 21:10:33.000000000 +0200
++++ ffmpeg-0.cvs20060329/configure	2006-03-29 21:10:36.000000000 +0200
+@@ -846,7 +846,8 @@
          if test -n "`$cc -v 2>&1 | grep version | grep Apple`"; then
              CFLAGS="$CFLAGS -faltivec"
          else

Modified: unstable/ffmpeg/debian/patches/005_m68k_workaround.diff
===================================================================
--- unstable/ffmpeg/debian/patches/005_m68k_workaround.diff	2006-03-29 19:04:11 UTC (rev 2)
+++ unstable/ffmpeg/debian/patches/005_m68k_workaround.diff	2006-03-29 19:13:39 UTC (rev 3)
@@ -1,6 +1,8 @@
---- ffmpeg-0.cvs20060306.orig/configure
-+++ ffmpeg-0.cvs20060306/configure
-@@ -1283,6 +1284,8 @@
+Index: ffmpeg-0.cvs20060329/configure
+===================================================================
+--- ffmpeg-0.cvs20060329.orig/configure	2006-03-29 21:10:23.000000000 +0200
++++ ffmpeg-0.cvs20060329/configure	2006-03-29 21:10:33.000000000 +0200
+@@ -1296,6 +1296,8 @@
      if test -n "`$cc -v 2>&1 | grep xlc`"; then
          CFLAGS="$CFLAGS -O5"
          LDFLAGS="$LDFLAGS -O5"

Modified: unstable/ffmpeg/debian/patches/005_runtime_cpudetect.diff
===================================================================
--- unstable/ffmpeg/debian/patches/005_runtime_cpudetect.diff	2006-03-29 19:04:11 UTC (rev 2)
+++ unstable/ffmpeg/debian/patches/005_runtime_cpudetect.diff	2006-03-29 19:13:39 UTC (rev 3)
@@ -1,6 +1,8 @@
---- ffmpeg-0.cvs20060306.orig/configure
-+++ ffmpeg-0.cvs20060306/configure
-@@ -1527,6 +1530,9 @@
+Index: ffmpeg-0.cvs20060329/configure
+===================================================================
+--- ffmpeg-0.cvs20060329.orig/configure	2006-03-29 21:10:36.000000000 +0200
++++ ffmpeg-0.cvs20060329/configure	2006-03-29 21:10:39.000000000 +0200
+@@ -1548,6 +1548,9 @@
      echo "#undef HAVE_ALTIVEC_H" >> $TMPH
    fi
  fi

Modified: unstable/ffmpeg/debian/patches/010_ffmpeg-config.diff
===================================================================
--- unstable/ffmpeg/debian/patches/010_ffmpeg-config.diff	2006-03-29 19:04:11 UTC (rev 2)
+++ unstable/ffmpeg/debian/patches/010_ffmpeg-config.diff	2006-03-29 19:13:39 UTC (rev 3)
@@ -1,5 +1,7 @@
---- ffmpeg-0.cvs20060306.orig/ffmpeg-config.in
-+++ ffmpeg-0.cvs20060306/ffmpeg-config.in
+Index: ffmpeg-0.cvs20060329/ffmpeg-config.in
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ ffmpeg-0.cvs20060329/ffmpeg-config.in	2006-03-29 21:10:41.000000000 +0200
 @@ -0,0 +1,92 @@
 +#!/bin/sh
 +
@@ -93,8 +95,10 @@
 +if test "$echo_version" = "yes"; then
 +    echo $version
 +fi
---- ffmpeg-0.cvs20060306.orig/ffmpeg-config.1
-+++ ffmpeg-0.cvs20060306/ffmpeg-config.1
+Index: ffmpeg-0.cvs20060329/ffmpeg-config.1
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ ffmpeg-0.cvs20060329/ffmpeg-config.1	2006-03-29 21:10:41.000000000 +0200
 @@ -0,0 +1,52 @@
 +.TH ffmpeg-config 1 "2004-07-16" "ffmpeg"
 +.SH NAME

Modified: unstable/ffmpeg/debian/patches/010_shared_library_versioning.diff
===================================================================
--- unstable/ffmpeg/debian/patches/010_shared_library_versioning.diff	2006-03-29 19:04:11 UTC (rev 2)
+++ unstable/ffmpeg/debian/patches/010_shared_library_versioning.diff	2006-03-29 19:13:39 UTC (rev 3)
@@ -1,6 +1,8 @@
---- ffmpeg-0.cvs20060306.orig/configure
-+++ ffmpeg-0.cvs20060306/configure
-@@ -1569,10 +1575,10 @@
+Index: ffmpeg-0.cvs20060329/configure
+===================================================================
+--- ffmpeg-0.cvs20060329.orig/configure	2006-03-29 21:10:39.000000000 +0200
++++ ffmpeg-0.cvs20060329/configure	2006-03-29 21:10:44.000000000 +0200
+@@ -1593,10 +1593,10 @@
    echo "#define HAVE_VHOOK 1" >> $TMPH
  fi
  
@@ -15,8 +17,10 @@
  
  
  
---- ffmpeg-0.cvs20060306.orig/libavutil/avutil.h
-+++ ffmpeg-0.cvs20060306/libavutil/avutil.h
+Index: ffmpeg-0.cvs20060329/libavutil/avutil.h
+===================================================================
+--- ffmpeg-0.cvs20060329.orig/libavutil/avutil.h	2006-03-29 21:10:12.000000000 +0200
++++ ffmpeg-0.cvs20060329/libavutil/avutil.h	2006-03-29 21:10:44.000000000 +0200
 @@ -15,7 +15,7 @@
  #define AV_TOSTRING(s) #s
  
@@ -26,19 +30,23 @@
  #define LIBAVUTIL_BUILD         LIBAVUTIL_VERSION_INT
  
  #define LIBAVUTIL_IDENT         "Lavu" AV_STRINGIFY(LIBAVUTIL_VERSION)
---- ffmpeg-0.cvs20060306.orig/libavcodec/avcodec.h
-+++ ffmpeg-0.cvs20060306/libavcodec/avcodec.h
+Index: ffmpeg-0.cvs20060329/libavcodec/avcodec.h
+===================================================================
+--- ffmpeg-0.cvs20060329.orig/libavcodec/avcodec.h	2006-03-29 21:10:12.000000000 +0200
++++ ffmpeg-0.cvs20060329/libavcodec/avcodec.h	2006-03-29 21:10:44.000000000 +0200
 @@ -22,7 +22,7 @@
  #define AV_TOSTRING(s) #s
  
- #define LIBAVCODEC_VERSION_INT  ((51<<16)+(7<<8)+0)
--#define LIBAVCODEC_VERSION      51.7.0
-+#define LIBAVCODEC_VERSION      0d.51.7.0
+ #define LIBAVCODEC_VERSION_INT  ((51<<16)+(8<<8)+0)
+-#define LIBAVCODEC_VERSION      51.8.0
++#define LIBAVCODEC_VERSION      0d.51.8.0
  #define LIBAVCODEC_BUILD        LIBAVCODEC_VERSION_INT
  
  #define LIBAVCODEC_IDENT        "Lavc" AV_STRINGIFY(LIBAVCODEC_VERSION)
---- ffmpeg-0.cvs20060306.orig/libavcodec/libpostproc/postprocess.h
-+++ ffmpeg-0.cvs20060306/libavcodec/libpostproc/postprocess.h
+Index: ffmpeg-0.cvs20060329/libavcodec/libpostproc/postprocess.h
+===================================================================
+--- ffmpeg-0.cvs20060329.orig/libavcodec/libpostproc/postprocess.h	2006-03-29 21:10:12.000000000 +0200
++++ ffmpeg-0.cvs20060329/libavcodec/libpostproc/postprocess.h	2006-03-29 21:10:44.000000000 +0200
 @@ -30,7 +30,7 @@
  #endif
  
@@ -48,19 +56,23 @@
  #define LIBPOSTPROC_BUILD       LIBPOSTPROC_VERSION_INT
  
  #define LIBPOSTPROC_IDENT       "postproc" AV_STRINGIFY(LIBPOSTPROC_VERSION)
---- ffmpeg-0.cvs20060306.orig/libavformat/avformat.h
-+++ ffmpeg-0.cvs20060306/libavformat/avformat.h
+Index: ffmpeg-0.cvs20060329/libavformat/avformat.h
+===================================================================
+--- ffmpeg-0.cvs20060329.orig/libavformat/avformat.h	2006-03-29 21:10:12.000000000 +0200
++++ ffmpeg-0.cvs20060329/libavformat/avformat.h	2006-03-29 21:10:44.000000000 +0200
 @@ -6,7 +6,7 @@
  #endif
  
- #define LIBAVFORMAT_VERSION_INT ((50<<16)+(3<<8)+0)
--#define LIBAVFORMAT_VERSION     50.3.0
-+#define LIBAVFORMAT_VERSION     0d.50.3.0
+ #define LIBAVFORMAT_VERSION_INT ((50<<16)+(4<<8)+0)
+-#define LIBAVFORMAT_VERSION     50.4.0
++#define LIBAVFORMAT_VERSION     0d.50.4.0
  #define LIBAVFORMAT_BUILD       LIBAVFORMAT_VERSION_INT
  
  #define LIBAVFORMAT_IDENT       "Lavf" AV_STRINGIFY(LIBAVFORMAT_VERSION)
---- ffmpeg-0.cvs20060306.orig/common.mak
-+++ ffmpeg-0.cvs20060306/common.mak
+Index: ffmpeg-0.cvs20060329/common.mak
+===================================================================
+--- ffmpeg-0.cvs20060329.orig/common.mak	2006-03-29 21:10:12.000000000 +0200
++++ ffmpeg-0.cvs20060329/common.mak	2006-03-29 21:10:44.000000000 +0200
 @@ -79,7 +79,7 @@
  		$(libdir)/$(SLIBNAME_WITH_VERSION)
  	ln -sf $(SLIBNAME_WITH_VERSION) \

Modified: unstable/ffmpeg/debian/patches/020_mmx_intrinsics.diff
===================================================================
--- unstable/ffmpeg/debian/patches/020_mmx_intrinsics.diff	2006-03-29 19:04:11 UTC (rev 2)
+++ unstable/ffmpeg/debian/patches/020_mmx_intrinsics.diff	2006-03-29 19:13:39 UTC (rev 3)
@@ -1,16 +1,20 @@
---- ffmpeg-0.cvs20060306.orig/libavcodec/Makefile
-+++ ffmpeg-0.cvs20060306/libavcodec/Makefile
-@@ -331,6 +331,8 @@
+Index: ffmpeg-0.cvs20060329/libavcodec/Makefile
+===================================================================
+--- ffmpeg-0.cvs20060329.orig/libavcodec/Makefile	2006-03-29 21:10:12.000000000 +0200
++++ ffmpeg-0.cvs20060329/libavcodec/Makefile	2006-03-29 21:10:47.000000000 +0200
+@@ -339,6 +339,8 @@
  	i386/idct_mmx.o i386/motion_est_mmx.o \
  	i386/simple_idct_mmx.o i386/fft_sse.o i386/vp3dsp_mmx.o \
- 	i386/vp3dsp_sse2.o
+ 	i386/vp3dsp_sse2.o i386/fft_3dn.o i386/fft_3dn2.o i386/snowdsp_mmx.o
 +i386/dsputil_mmx.o: CFLAGS+= -mmmx
 +depend: CFLAGS+= -mmmx
  ifeq ($(CONFIG_GPL),yes)
  OBJS += i386/idct_mmx_xvid.o
  endif
---- ffmpeg-0.cvs20060306.orig/libavcodec/i386/dsputil_mmx.c
-+++ ffmpeg-0.cvs20060306/libavcodec/i386/dsputil_mmx.c
+Index: ffmpeg-0.cvs20060329/libavcodec/i386/dsputil_mmx.c
+===================================================================
+--- ffmpeg-0.cvs20060329.orig/libavcodec/i386/dsputil_mmx.c	2006-03-29 21:10:12.000000000 +0200
++++ ffmpeg-0.cvs20060329/libavcodec/i386/dsputil_mmx.c	2006-03-29 21:10:47.000000000 +0200
 @@ -25,6 +25,8 @@
  #include "../mpegvideo.h"
  #include "mmx.h"

Modified: unstable/ffmpeg/debian/patches/020_mmx_pic_code.diff
===================================================================
--- unstable/ffmpeg/debian/patches/020_mmx_pic_code.diff	2006-03-29 19:04:11 UTC (rev 2)
+++ unstable/ffmpeg/debian/patches/020_mmx_pic_code.diff	2006-03-29 19:13:39 UTC (rev 3)
@@ -1,5 +1,7 @@
---- ffmpeg-0.cvs20060306.orig/libavcodec/i386/mpegvideo_mmx_template.c
-+++ ffmpeg-0.cvs20060306/libavcodec/i386/mpegvideo_mmx_template.c
+Index: ffmpeg-0.cvs20060329/libavcodec/i386/mpegvideo_mmx_template.c
+===================================================================
+--- ffmpeg-0.cvs20060329.orig/libavcodec/i386/mpegvideo_mmx_template.c	2006-03-29 21:10:11.000000000 +0200
++++ ffmpeg-0.cvs20060329/libavcodec/i386/mpegvideo_mmx_template.c	2006-03-29 21:10:49.000000000 +0200
 @@ -107,7 +107,12 @@
              SPREADW(%%mm3)
              "pxor %%mm7, %%mm7                  \n\t" // 0
@@ -59,8 +61,10 @@
                "r" (inv_zigzag_direct16+64), "r" (temp_block+64)
          );
          // note the asm is split cuz gcc doesnt like that many operands ...
---- ffmpeg-0.cvs20060306.orig/libavcodec/libpostproc/postprocess_template.c
-+++ ffmpeg-0.cvs20060306/libavcodec/libpostproc/postprocess_template.c
+Index: ffmpeg-0.cvs20060329/libavcodec/libpostproc/postprocess_template.c
+===================================================================
+--- ffmpeg-0.cvs20060329.orig/libavcodec/libpostproc/postprocess_template.c	2006-03-29 21:10:11.000000000 +0200
++++ ffmpeg-0.cvs20060329/libavcodec/libpostproc/postprocess_template.c	2006-03-29 21:10:49.000000000 +0200
 @@ -33,9 +33,11 @@
  #  define ALIGN_MASK "$0xFFFFFFFFFFFFFFF8"
  #else

More information about the Pkg-multimedia-commits mailing list