r65 - in unstable/ffmpeg/debian: . patches

Sam Hocevar sho at alioth.debian.org
Wed Mar 14 14:19:37 CET 2007


Author: sho
Date: 2006-07-25 09:33:37 +0000 (Tue, 25 Jul 2006)
New Revision: 65

Modified:
   unstable/ffmpeg/debian/changelog
   unstable/ffmpeg/debian/control
   unstable/ffmpeg/debian/libavcodec-dev.install
   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_shared_library_versioning.diff
   unstable/ffmpeg/debian/patches/020_disable_snow_mmx_in_pic.diff
   unstable/ffmpeg/debian/patches/020_mmx_intrinsics.diff
   unstable/ffmpeg/debian/patches/020_mmx_pic_code.diff
   unstable/ffmpeg/debian/patches/series
   unstable/ffmpeg/debian/rules
Log:
ffmpeg (0.cvs20060724-1) UNRELEASED; urgency=low

  * New SVN snapshot (Closes: #368904).
  * debian/control:
    + Set policy to 3.7.2.
    + Do not build 1394 support on GNU/kFreeBSD or Hurd. Patch courtesy of
      Petr Salinger (Closes: #372290).
  * debian/rules:
    + Minor cleanup.
    + Removed --enable-theora, upstream dropped that option.

  * debian/patches/020_mmx_intrinsics.diff:
    + Disabled intrinsics workaround because it is no longer necessary and it
      causes trouble with some codecs such as H264 (Closes: #373765).


Modified: unstable/ffmpeg/debian/changelog
===================================================================
--- unstable/ffmpeg/debian/changelog	2006-07-12 09:58:42 UTC (rev 64)
+++ unstable/ffmpeg/debian/changelog	2006-07-25 09:33:37 UTC (rev 65)
@@ -1,13 +1,20 @@
-ffmpeg (0.cvs20060625-1) UNRELEASED; urgency=low
+ffmpeg (0.cvs20060724-1) UNRELEASED; urgency=low
 
-  * New SVN snapshot.
+  * New SVN snapshot (Closes: #368904).
   * debian/control:
     + Set policy to 3.7.2.
+    + Do not build 1394 support on GNU/kFreeBSD or Hurd. Patch courtesy of
+      Petr Salinger (Closes: #372290).
   * debian/rules:
     + Minor cleanup.
+    + Removed --enable-theora, upstream dropped that option.
 
- -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Sun, 25 Jun 2006 20:20:38 +0200
+  * debian/patches/020_mmx_intrinsics.diff:
+    + Disabled intrinsics workaround because it is no longer necessary and it
+      causes trouble with some codecs such as H264 (Closes: #373765).
 
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Mon, 24 Jul 2006 17:15:56 +0200
+
 ffmpeg (0.cvs20060329-4) unstable; urgency=low
 
   * debian/control:

Modified: unstable/ffmpeg/debian/control
===================================================================
--- unstable/ffmpeg/debian/control	2006-07-12 09:58:42 UTC (rev 64)
+++ unstable/ffmpeg/debian/control	2006-07-25 09:33:37 UTC (rev 65)
@@ -2,7 +2,7 @@
 Section: libs
 Priority: optional
 Maintainer: Sam Hocevar (Debian packages) <sam+deb at zoy.org>
-Build-Depends: debhelper (>= 4.0), quilt, libogg-dev, libvorbis-dev, liba52-dev, libdts-dev, zlib1g-dev, libsdl1.2-dev, libfreetype6-dev, libimlib2-dev, texi2html, libraw1394-dev, libdc1394-13-dev, libtheora-dev (>> 0.0.0.alpha4), libgsm1-dev
+Build-Depends: debhelper (>= 4.0), quilt, libogg-dev, libvorbis-dev, liba52-dev, libdts-dev, zlib1g-dev, libsdl1.2-dev, libfreetype6-dev, libimlib2-dev, texi2html, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libdc1394-13-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libtheora-dev (>> 0.0.0.alpha4), libgsm1-dev
 Standards-Version: 3.7.2
 
 Package: ffmpeg
@@ -50,7 +50,7 @@
 Package: libavcodec-dev
 Section: libdevel
 Architecture: any
-Depends: libavcodec0d (= ${Source-Version}), libvorbis-dev, libogg-dev, libdts-dev, liba52-dev, zlib1g-dev, libraw1394-dev, libdc1394-13-dev, libtheora-dev (>> 0.0.0.alpha4), libgsm1-dev, ${shlibs:Depends}
+Depends: libavcodec0d (= ${Source-Version}), libvorbis-dev, libogg-dev, libdts-dev, liba52-dev, zlib1g-dev, ${lib1394-dev}, libtheora-dev (>> 0.0.0.alpha4), libgsm1-dev, ${shlibs:Depends}
 Conflicts: libavformat-dev (<< 0.cvs20060329-4)
 Replaces: libavformat-dev (<< 0.cvs20060329-4)
 Description: development files for libavcodec

Modified: unstable/ffmpeg/debian/libavcodec-dev.install
===================================================================
--- unstable/ffmpeg/debian/libavcodec-dev.install	2006-07-12 09:58:42 UTC (rev 64)
+++ unstable/ffmpeg/debian/libavcodec-dev.install	2006-07-25 09:33:37 UTC (rev 65)
@@ -2,11 +2,14 @@
 usr/share/man/man1/ffmpeg-config.1
 usr/lib/pkgconfig/libavutil.pc
 usr/include/ffmpeg/avutil.h
+usr/include/ffmpeg/adler32.h
 usr/include/ffmpeg/common.h
+usr/include/ffmpeg/integer.h
+usr/include/ffmpeg/intfloat_readwrite.h
+usr/include/ffmpeg/log.h
 usr/include/ffmpeg/mathematics.h
+usr/include/ffmpeg/md5.h
 usr/include/ffmpeg/rational.h
-usr/include/ffmpeg/integer.h
-usr/include/ffmpeg/intfloat_readwrite.h
 usr/lib/libavutil.a
 usr/lib/libavutil.so
 usr/lib/pkgconfig/libavcodec.pc

Modified: unstable/ffmpeg/debian/patches/005_altivec_flags.diff
===================================================================
--- unstable/ffmpeg/debian/patches/005_altivec_flags.diff	2006-07-12 09:58:42 UTC (rev 64)
+++ unstable/ffmpeg/debian/patches/005_altivec_flags.diff	2006-07-25 09:33:37 UTC (rev 65)
@@ -1,8 +1,8 @@
-Index: ffmpeg-0.cvs20060625/configure
+Index: ffmpeg-0.cvs20060724/configure
 ===================================================================
---- ffmpeg-0.cvs20060625.orig/configure	2006-06-25 20:22:21.000000000 +0200
-+++ ffmpeg-0.cvs20060625/configure	2006-06-25 20:22:26.000000000 +0200
-@@ -1041,7 +1041,8 @@
+--- ffmpeg-0.cvs20060724.orig/configure	2006-07-24 17:20:01.000000000 +0200
++++ ffmpeg-0.cvs20060724/configure	2006-07-24 17:20:05.000000000 +0200
+@@ -1132,7 +1132,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-07-12 09:58:42 UTC (rev 64)
+++ unstable/ffmpeg/debian/patches/005_m68k_workaround.diff	2006-07-25 09:33:37 UTC (rev 65)
@@ -1,8 +1,8 @@
-Index: ffmpeg-0.cvs20060625/configure
+Index: ffmpeg-0.cvs20060724/configure
 ===================================================================
---- ffmpeg-0.cvs20060625.orig/configure	2006-06-25 19:57:15.000000000 +0200
-+++ ffmpeg-0.cvs20060625/configure	2006-06-25 20:22:21.000000000 +0200
-@@ -1391,6 +1391,8 @@
+--- ffmpeg-0.cvs20060724.orig/configure	2006-07-24 17:11:24.000000000 +0200
++++ ffmpeg-0.cvs20060724/configure	2006-07-24 17:20:01.000000000 +0200
+@@ -1458,6 +1458,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-07-12 09:58:42 UTC (rev 64)
+++ unstable/ffmpeg/debian/patches/005_runtime_cpudetect.diff	2006-07-25 09:33:37 UTC (rev 65)
@@ -1,8 +1,8 @@
-Index: ffmpeg-0.cvs20060625/configure
+Index: ffmpeg-0.cvs20060724/configure
 ===================================================================
---- ffmpeg-0.cvs20060625.orig/configure	2006-06-25 20:22:26.000000000 +0200
-+++ ffmpeg-0.cvs20060625/configure	2006-06-25 20:22:29.000000000 +0200
-@@ -1641,6 +1641,9 @@
+--- ffmpeg-0.cvs20060724.orig/configure	2006-07-24 17:20:05.000000000 +0200
++++ ffmpeg-0.cvs20060724/configure	2006-07-24 17:20:09.000000000 +0200
+@@ -1698,6 +1698,9 @@
      echo "#undef HAVE_ALTIVEC_H" >> $TMPH
    fi
  fi
@@ -10,5 +10,5 @@
 +  echo "#define RUNTIME_CPUDETECT 1" >> $TMPH
 +fi
  if test "$gprof" = "yes" ; then
-   echo "TARGET_GPROF=yes" >> config.mak
    echo "#define HAVE_GPROF 1" >> $TMPH
+ fi

Modified: unstable/ffmpeg/debian/patches/010_shared_library_versioning.diff
===================================================================
--- unstable/ffmpeg/debian/patches/010_shared_library_versioning.diff	2006-07-12 09:58:42 UTC (rev 64)
+++ unstable/ffmpeg/debian/patches/010_shared_library_versioning.diff	2006-07-25 09:33:37 UTC (rev 65)
@@ -1,8 +1,8 @@
-Index: ffmpeg-0.cvs20060625/configure
+Index: ffmpeg-0.cvs20060724/configure
 ===================================================================
---- ffmpeg-0.cvs20060625.orig/configure	2006-06-25 20:22:29.000000000 +0200
-+++ ffmpeg-0.cvs20060625/configure	2006-06-25 20:23:15.000000000 +0200
-@@ -1685,10 +1685,10 @@
+--- ffmpeg-0.cvs20060724.orig/configure	2006-07-24 17:20:09.000000000 +0200
++++ ffmpeg-0.cvs20060724/configure	2006-07-24 17:20:19.000000000 +0200
+@@ -1741,10 +1741,10 @@
    echo "#define HAVE_VHOOK 1" >> $TMPH
  fi
  
@@ -17,10 +17,10 @@
  
  
  
-Index: ffmpeg-0.cvs20060625/libavutil/avutil.h
+Index: ffmpeg-0.cvs20060724/libavutil/avutil.h
 ===================================================================
---- ffmpeg-0.cvs20060625.orig/libavutil/avutil.h	2006-06-11 14:17:32.000000000 +0200
-+++ ffmpeg-0.cvs20060625/libavutil/avutil.h	2006-06-25 20:22:40.000000000 +0200
+--- ffmpeg-0.cvs20060724.orig/libavutil/avutil.h	2006-07-24 17:11:16.000000000 +0200
++++ ffmpeg-0.cvs20060724/libavutil/avutil.h	2006-07-24 17:20:19.000000000 +0200
 @@ -15,7 +15,7 @@
  #define AV_TOSTRING(s) #s
  
@@ -30,49 +30,49 @@
  #define LIBAVUTIL_BUILD         LIBAVUTIL_VERSION_INT
  
  #define LIBAVUTIL_IDENT         "Lavu" AV_STRINGIFY(LIBAVUTIL_VERSION)
-Index: ffmpeg-0.cvs20060625/libavcodec/avcodec.h
+Index: ffmpeg-0.cvs20060724/libavcodec/avcodec.h
 ===================================================================
---- ffmpeg-0.cvs20060625.orig/libavcodec/avcodec.h	2006-06-25 19:57:13.000000000 +0200
-+++ ffmpeg-0.cvs20060625/libavcodec/avcodec.h	2006-06-25 20:23:37.000000000 +0200
+--- ffmpeg-0.cvs20060724.orig/libavcodec/avcodec.h	2006-07-24 17:11:20.000000000 +0200
++++ ffmpeg-0.cvs20060724/libavcodec/avcodec.h	2006-07-24 17:20:51.000000000 +0200
 @@ -18,7 +18,7 @@
  #define AV_TOSTRING(s) #s
  
- #define LIBAVCODEC_VERSION_INT  ((51<<16)+(9<<8)+0)
--#define LIBAVCODEC_VERSION      51.9.0
-+#define LIBAVCODEC_VERSION      0d.51.9.0
+ #define LIBAVCODEC_VERSION_INT  ((51<<16)+(10<<8)+0)
+-#define LIBAVCODEC_VERSION      51.10.0
++#define LIBAVCODEC_VERSION      0d.51.10.0
  #define LIBAVCODEC_BUILD        LIBAVCODEC_VERSION_INT
  
  #define LIBAVCODEC_IDENT        "Lavc" AV_STRINGIFY(LIBAVCODEC_VERSION)
-Index: ffmpeg-0.cvs20060625/libavformat/avformat.h
+Index: ffmpeg-0.cvs20060724/libavformat/avformat.h
 ===================================================================
---- ffmpeg-0.cvs20060625.orig/libavformat/avformat.h	2006-06-25 19:57:15.000000000 +0200
-+++ ffmpeg-0.cvs20060625/libavformat/avformat.h	2006-06-25 20:22:40.000000000 +0200
+--- ffmpeg-0.cvs20060724.orig/libavformat/avformat.h	2006-07-24 17:11:24.000000000 +0200
++++ ffmpeg-0.cvs20060724/libavformat/avformat.h	2006-07-24 17:21:07.000000000 +0200
 @@ -6,7 +6,7 @@
  #endif
  
- #define LIBAVFORMAT_VERSION_INT ((50<<16)+(4<<8)+0)
--#define LIBAVFORMAT_VERSION     50.4.0
-+#define LIBAVFORMAT_VERSION     0d.50.4.0
+ #define LIBAVFORMAT_VERSION_INT ((50<<16)+(5<<8)+0)
+-#define LIBAVFORMAT_VERSION     50.5.0
++#define LIBAVFORMAT_VERSION     0d.50.5.0
  #define LIBAVFORMAT_BUILD       LIBAVFORMAT_VERSION_INT
  
  #define LIBAVFORMAT_IDENT       "Lavf" AV_STRINGIFY(LIBAVFORMAT_VERSION)
-Index: ffmpeg-0.cvs20060625/common.mak
+Index: ffmpeg-0.cvs20060724/common.mak
 ===================================================================
---- ffmpeg-0.cvs20060625.orig/common.mak	2006-06-11 14:17:42.000000000 +0200
-+++ ffmpeg-0.cvs20060625/common.mak	2006-06-25 20:22:40.000000000 +0200
-@@ -83,7 +83,7 @@
- 		$(libdir)/$(SLIBNAME_WITH_VERSION)
+--- ffmpeg-0.cvs20060724.orig/common.mak	2006-07-24 17:11:24.000000000 +0200
++++ ffmpeg-0.cvs20060724/common.mak	2006-07-24 17:21:35.000000000 +0200
+@@ -68,7 +68,7 @@
+ 		$(shlibdir)/$(SLIBNAME_WITH_VERSION)
  	ln -sf $(SLIBNAME_WITH_VERSION) \
- 		$(libdir)/$(SLIBNAME_WITH_MAJOR)
+ 		$(shlibdir)/$(SLIBNAME_WITH_MAJOR)
 -	ln -sf $(SLIBNAME_WITH_VERSION) \
 +	ln -sf $(SLIBNAME_WITH_MAJOR) \
- 		$(libdir)/$(SLIBNAME)
+ 		$(shlibdir)/$(SLIBNAME)
  endif
  
-Index: ffmpeg-0.cvs20060625/libpostproc/postprocess.h
+Index: ffmpeg-0.cvs20060724/libpostproc/postprocess.h
 ===================================================================
---- ffmpeg-0.cvs20060625.orig/libpostproc/postprocess.h	2006-06-25 20:23:55.000000000 +0200
-+++ ffmpeg-0.cvs20060625/libpostproc/postprocess.h	2006-06-25 20:24:16.000000000 +0200
+--- ffmpeg-0.cvs20060724.orig/libpostproc/postprocess.h	2006-06-11 14:17:36.000000000 +0200
++++ ffmpeg-0.cvs20060724/libpostproc/postprocess.h	2006-07-24 17:20:19.000000000 +0200
 @@ -30,7 +30,7 @@
  #endif
  

Modified: unstable/ffmpeg/debian/patches/020_disable_snow_mmx_in_pic.diff
===================================================================
--- unstable/ffmpeg/debian/patches/020_disable_snow_mmx_in_pic.diff	2006-07-12 09:58:42 UTC (rev 64)
+++ unstable/ffmpeg/debian/patches/020_disable_snow_mmx_in_pic.diff	2006-07-25 09:33:37 UTC (rev 65)
@@ -1,8 +1,8 @@
-Index: ffmpeg-0.cvs20060625/libavcodec/i386/dsputil_mmx.c
+Index: ffmpeg-0.cvs20060724/libavcodec/i386/dsputil_mmx.c
 ===================================================================
---- ffmpeg-0.cvs20060625.orig/libavcodec/i386/dsputil_mmx.c	2006-06-25 20:24:21.000000000 +0200
-+++ ffmpeg-0.cvs20060625/libavcodec/i386/dsputil_mmx.c	2006-06-25 20:25:04.000000000 +0200
-@@ -3092,7 +3092,7 @@
+--- ffmpeg-0.cvs20060724.orig/libavcodec/i386/dsputil_mmx.c	2006-07-24 17:22:05.000000000 +0200
++++ ffmpeg-0.cvs20060724/libavcodec/i386/dsputil_mmx.c	2006-07-24 17:22:11.000000000 +0200
+@@ -3095,7 +3095,7 @@
              c->avg_h264_chroma_pixels_tab[1]= avg_h264_chroma_mc4_3dnow;
          }
  
@@ -11,13 +11,13 @@
          if(mm_flags & MM_SSE2){
              c->horizontal_compose97i = ff_snow_horizontal_compose97i_sse2;
              c->vertical_compose97i = ff_snow_vertical_compose97i_sse2;
-Index: ffmpeg-0.cvs20060625/libavcodec/i386/snowdsp_mmx.c
+Index: ffmpeg-0.cvs20060724/libavcodec/i386/snowdsp_mmx.c
 ===================================================================
---- ffmpeg-0.cvs20060625.orig/libavcodec/i386/snowdsp_mmx.c	2006-06-11 14:17:33.000000000 +0200
-+++ ffmpeg-0.cvs20060625/libavcodec/i386/snowdsp_mmx.c	2006-06-25 20:25:04.000000000 +0200
+--- ffmpeg-0.cvs20060724.orig/libavcodec/i386/snowdsp_mmx.c	2006-07-24 17:11:17.000000000 +0200
++++ ffmpeg-0.cvs20060724/libavcodec/i386/snowdsp_mmx.c	2006-07-24 17:22:11.000000000 +0200
 @@ -21,6 +21,7 @@
  #include "../snow.h"
- #include "mmx.h"
+ #include "x86_cpu.h"
  
 +#if defined(ARCH_X86_64) || !defined(PIC)
  void ff_snow_horizontal_compose97i_sse2(DWTELEM *b, int width){

Modified: unstable/ffmpeg/debian/patches/020_mmx_intrinsics.diff
===================================================================
--- unstable/ffmpeg/debian/patches/020_mmx_intrinsics.diff	2006-07-12 09:58:42 UTC (rev 64)
+++ unstable/ffmpeg/debian/patches/020_mmx_intrinsics.diff	2006-07-25 09:33:37 UTC (rev 65)
@@ -1,8 +1,8 @@
-Index: ffmpeg-0.cvs20060625/libavcodec/Makefile
+Index: ffmpeg-0.cvs20060724/libavcodec/Makefile
 ===================================================================
---- ffmpeg-0.cvs20060625.orig/libavcodec/Makefile	2006-06-25 19:57:13.000000000 +0200
-+++ ffmpeg-0.cvs20060625/libavcodec/Makefile	2006-06-25 20:24:21.000000000 +0200
-@@ -347,6 +347,8 @@
+--- ffmpeg-0.cvs20060724.orig/libavcodec/Makefile	2006-07-24 17:11:20.000000000 +0200
++++ ffmpeg-0.cvs20060724/libavcodec/Makefile	2006-07-24 17:22:05.000000000 +0200
+@@ -285,6 +285,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/fft_3dn.o i386/fft_3dn2.o i386/snowdsp_mmx.o
@@ -11,12 +11,12 @@
  ifeq ($(CONFIG_GPL),yes)
  OBJS += i386/idct_mmx_xvid.o
  endif
-Index: ffmpeg-0.cvs20060625/libavcodec/i386/dsputil_mmx.c
+Index: ffmpeg-0.cvs20060724/libavcodec/i386/dsputil_mmx.c
 ===================================================================
---- ffmpeg-0.cvs20060625.orig/libavcodec/i386/dsputil_mmx.c	2006-06-11 14:17:33.000000000 +0200
-+++ ffmpeg-0.cvs20060625/libavcodec/i386/dsputil_mmx.c	2006-06-25 20:24:21.000000000 +0200
-@@ -25,6 +25,8 @@
- #include "../mpegvideo.h"
+--- ffmpeg-0.cvs20060724.orig/libavcodec/i386/dsputil_mmx.c	2006-07-24 17:11:16.000000000 +0200
++++ ffmpeg-0.cvs20060724/libavcodec/i386/dsputil_mmx.c	2006-07-24 17:22:05.000000000 +0200
+@@ -26,6 +26,8 @@
+ #include "x86_cpu.h"
  #include "mmx.h"
  
 +#include <mmintrin.h>
@@ -24,7 +24,7 @@
  //#undef NDEBUG
  //#include <assert.h>
  
-@@ -618,32 +620,22 @@
+@@ -624,32 +626,22 @@
  }
  
  static inline void transpose4x4(uint8_t *dst, uint8_t *src, int dst_stride, int src_stride){

Modified: unstable/ffmpeg/debian/patches/020_mmx_pic_code.diff
===================================================================
--- unstable/ffmpeg/debian/patches/020_mmx_pic_code.diff	2006-07-12 09:58:42 UTC (rev 64)
+++ unstable/ffmpeg/debian/patches/020_mmx_pic_code.diff	2006-07-25 09:33:37 UTC (rev 65)
@@ -1,8 +1,8 @@
-Index: ffmpeg-0.cvs20060625/libavcodec/i386/mpegvideo_mmx_template.c
+Index: ffmpeg-0.cvs20060724/libavcodec/i386/mpegvideo_mmx_template.c
 ===================================================================
---- ffmpeg-0.cvs20060625.orig/libavcodec/i386/mpegvideo_mmx_template.c	2006-06-11 14:17:33.000000000 +0200
-+++ ffmpeg-0.cvs20060625/libavcodec/i386/mpegvideo_mmx_template.c	2006-06-25 20:24:47.000000000 +0200
-@@ -107,7 +107,12 @@
+--- ffmpeg-0.cvs20060724.orig/libavcodec/i386/mpegvideo_mmx_template.c	2006-07-24 17:11:17.000000000 +0200
++++ ffmpeg-0.cvs20060724/libavcodec/i386/mpegvideo_mmx_template.c	2006-07-24 17:22:08.000000000 +0200
+@@ -108,7 +108,12 @@
              SPREADW(%%mm3)
              "pxor %%mm7, %%mm7                  \n\t" // 0
              "pxor %%mm4, %%mm4                  \n\t" // 0
@@ -15,7 +15,7 @@
              "pxor %%mm6, %%mm6                  \n\t"
              "psubw (%3), %%mm6                  \n\t" // -bias[0]
              "mov $-128, %%"REG_a"               \n\t"
-@@ -135,7 +140,11 @@
+@@ -136,7 +141,11 @@
              "movd %%mm3, %%"REG_a"              \n\t"
              "movzb %%al, %%"REG_a"              \n\t" // last_non_zero_p1
              : "+a" (last_non_zero_p1)
@@ -27,7 +27,7 @@
                "r" (inv_zigzag_direct16+64), "r" (temp_block+64)
          );
          // note the asm is split cuz gcc doesnt like that many operands ...
-@@ -149,6 +158,7 @@
+@@ -150,6 +159,7 @@
          : "g" (s->max_qcoeff)
          );
      }else{ // FMT_H263
@@ -35,7 +35,7 @@
          asm volatile(
              "movd %%"REG_a", %%mm3              \n\t" // last_non_zero_p1
              SPREADW(%%mm3)
-@@ -164,7 +174,13 @@
+@@ -165,7 +175,13 @@
              "psubw %%mm1, %%mm0                 \n\t" // ABS(block[i])
              "movq (%3, %%"REG_a"), %%mm6        \n\t" // bias[0]
              "paddusw %%mm6, %%mm0               \n\t" // ABS(block[i]) + bias[0]
@@ -49,7 +49,7 @@
              "pmulhw %%mm5, %%mm0                \n\t" // (ABS(block[i])*qmat[0] + bias[0]*qmat[0])>>16
              "por %%mm0, %%mm4                   \n\t"
              "pxor %%mm1, %%mm0                  \n\t"
-@@ -181,7 +197,11 @@
+@@ -182,7 +198,11 @@
              "movd %%mm3, %%"REG_a"              \n\t"
              "movzb %%al, %%"REG_a"              \n\t" // last_non_zero_p1
              : "+a" (last_non_zero_p1)
@@ -61,10 +61,10 @@
                "r" (inv_zigzag_direct16+64), "r" (temp_block+64)
          );
          // note the asm is split cuz gcc doesnt like that many operands ...
-Index: ffmpeg-0.cvs20060625/libpostproc/postprocess_template.c
+Index: ffmpeg-0.cvs20060724/libpostproc/postprocess_template.c
 ===================================================================
---- ffmpeg-0.cvs20060625.orig/libpostproc/postprocess_template.c	2006-06-11 14:17:36.000000000 +0200
-+++ ffmpeg-0.cvs20060625/libpostproc/postprocess_template.c	2006-06-25 20:24:47.000000000 +0200
+--- ffmpeg-0.cvs20060724.orig/libpostproc/postprocess_template.c	2006-06-11 14:17:36.000000000 +0200
++++ ffmpeg-0.cvs20060724/libpostproc/postprocess_template.c	2006-07-24 17:22:08.000000000 +0200
 @@ -33,9 +33,11 @@
  #  define ALIGN_MASK "$0xFFFFFFFFFFFFFFF8"
  #else

Modified: unstable/ffmpeg/debian/patches/series
===================================================================
--- unstable/ffmpeg/debian/patches/series	2006-07-12 09:58:42 UTC (rev 64)
+++ unstable/ffmpeg/debian/patches/series	2006-07-25 09:33:37 UTC (rev 65)
@@ -3,6 +3,6 @@
 005_runtime_cpudetect.diff 
 010_ffmpeg-config.diff 
 010_shared_library_versioning.diff 
-020_mmx_intrinsics.diff 
+#020_mmx_intrinsics.diff 
 020_mmx_pic_code.diff 
 020_disable_snow_mmx_in_pic.diff 

Modified: unstable/ffmpeg/debian/rules
===================================================================
--- unstable/ffmpeg/debian/rules	2006-07-12 09:58:42 UTC (rev 64)
+++ unstable/ffmpeg/debian/rules	2006-07-25 09:33:37 UTC (rev 65)
@@ -5,7 +5,15 @@
 export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
 confflags += --enable-gpl --enable-pp --enable-pthreads
-confflags += --enable-vorbis --enable-libogg --enable-theora --enable-a52 --enable-dts --enable-dc1394 --enable-libgsm
+confflags += --enable-vorbis --enable-libogg --enable-a52 --enable-dts --enable-libgsm
+
+ifneq (,$(findstring linux,$(DEB_HOST_GNU_TYPE)))
+  confflags += --enable-dc1394
+  lib1394-dev = libraw1394-dev libdc1394-13-dev
+else
+  lib1394-dev =
+endif
+
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
   confflags += --enable-debug
 else
@@ -166,7 +174,7 @@
 	dh_makeshlibs
 	dh_installdeb
 	dh_shlibdeps
-	dh_gencontrol
+	dh_gencontrol -Vlib1394-dev=$(lib1394-dev)
 	dh_md5sums
 	dh_builddeb
 




More information about the Pkg-multimedia-commits mailing list