r5 - in unstable/ffmpeg/debian: . patches

[Samuel Hocevar]

Author: sho
Date: 2006-03-30 08:44:19 +0000 (Thu, 30 Mar 2006)
New Revision: 5

Added:
   unstable/ffmpeg/debian/patches/020_disable_snow_mmx_in_pic.diff
Modified:
   unstable/ffmpeg/debian/README.Debian
   unstable/ffmpeg/debian/changelog
   unstable/ffmpeg/debian/patches/series
   unstable/ffmpeg/debian/rules
Log:
  * debian/rules:
    + Manually reinstall dsputil.h.

  * debian/README.Debian:
    + Removed mention of --plugin-libs.
    + Added a note about the unofficial packages (Closes: #306752).

  * 020_disable_snow_mmx_in_pic.diff: (new patch) disable MMX acceleration in
    the Snow encoder in PIC mode.


Modified: unstable/ffmpeg/debian/README.Debian
===================================================================
--- unstable/ffmpeg/debian/README.Debian	2006-03-30 08:41:04 UTC (rev 4)
+++ unstable/ffmpeg/debian/README.Debian	2006-03-30 08:44:19 UTC (rev 5)
@@ -17,9 +17,7 @@
 
    gcc code.o -o code `ffmpeg-config --libs avcodec` -lotherlibs
 
- Accepted arguments for --libs are "avcodec", "avformat" and "postproc". If
-you are linking a plugin for an application with one of these libraries, use
-the --plugin-libs flag instead of --libs.
+ Accepted arguments for --libs are "avcodec", "avformat" and "postproc".
 
 
 Summary of the patent issues with ffmpeg
@@ -38,4 +36,20 @@
 libavformat. See more details in the patents.txt file.
 
 
- -- Sam Hocevar <sam at zoy.org>  Fri, 16 Jul 2004 12:47:27 +0200
+Differences with unofficial ffmpeg packages
+===========================================
+
+   There are popular unofficial ffmpeg packages at the following URL:
+
+     ftp://ftp.nerim.net/debian-marillat/index.html
+
+   I have nothing to do with these packages and it would be very tedious
+for me to track their changes. Given that my official packages use a
+Debian-specific naming scheme for libraries, you should be able to
+install at least the shared library packages together.
+
+   Before submitting a bug report, please make sure it is related to the
+Debian packages and not those unofficial packages.
+
+
+ -- Sam Hocevar <sam at zoy.org>  Thu, 30 Mar 2006 10:23:16 +0200

Modified: unstable/ffmpeg/debian/changelog
===================================================================
--- unstable/ffmpeg/debian/changelog	2006-03-30 08:41:04 UTC (rev 4)
+++ unstable/ffmpeg/debian/changelog	2006-03-30 08:44:19 UTC (rev 5)
@@ -2,14 +2,22 @@
 
   * New CVS snapshot.
   * Upstream fixed a double free in img.c (Closes: #351455).
-  * Upstream fixed the libvorbisenc dependency to libavcodec.pc
+  * Upstream fixed the libvorbisenc dependency in libavcodec.pc
     (Closes: #357352).
 
   * debian/rules:
     + Activated threading support (Closes: #335677).
+    + Manually reinstall dsputil.h.
 
- -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Wed, 29 Mar 2006 20:36:41 +0200
+  * debian/README.Debian:
+    + Removed mention of --plugin-libs.
+    + Added a note about the unofficial packages (Closes: #306752).
 
+  * 020_disable_snow_mmx_in_pic.diff: (new patch) disable MMX acceleration in
+    the Snow encoder in PIC mode.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Thu, 30 Mar 2006 10:41:17 +0200
+
 ffmpeg (0.cvs20060306-3) unstable; urgency=low
 
   * Switched patch system to quilt.

Added: unstable/ffmpeg/debian/patches/020_disable_snow_mmx_in_pic.diff
===================================================================
--- unstable/ffmpeg/debian/patches/020_disable_snow_mmx_in_pic.diff	2006-03-30 08:41:04 UTC (rev 4)
+++ unstable/ffmpeg/debian/patches/020_disable_snow_mmx_in_pic.diff	2006-03-30 08:44:19 UTC (rev 5)
@@ -0,0 +1,30 @@
+Index: ffmpeg-0.cvs20060329/libavcodec/i386/dsputil_mmx.c
+===================================================================
+--- ffmpeg-0.cvs20060329.orig/libavcodec/i386/dsputil_mmx.c	2006-03-29 21:32:19.000000000 +0200
++++ ffmpeg-0.cvs20060329/libavcodec/i386/dsputil_mmx.c	2006-03-29 21:32:26.000000000 +0200
+@@ -2972,7 +2972,7 @@
+             c->avg_h264_chroma_pixels_tab[1]= avg_h264_chroma_mc4_3dnow;
+         }
+ 
+-#ifdef CONFIG_SNOW_ENCODER
++#if defined(CONFIG_SNOW_ENCODER) && (defined(ARCH_X86_64) || !defined(PIC))
+         if(mm_flags & MM_SSE2){
+             c->horizontal_compose97i = ff_snow_horizontal_compose97i_sse2;
+             c->vertical_compose97i = ff_snow_vertical_compose97i_sse2;
+Index: ffmpeg-0.cvs20060329/libavcodec/i386/snowdsp_mmx.c
+===================================================================
+--- ffmpeg-0.cvs20060329.orig/libavcodec/i386/snowdsp_mmx.c	2006-03-27 14:51:18.000000000 +0200
++++ ffmpeg-0.cvs20060329/libavcodec/i386/snowdsp_mmx.c	2006-03-29 21:34:16.000000000 +0200
+@@ -21,6 +21,7 @@
+ #include "../snow.h"
+ #include "mmx.h"
+ 
++#if defined(ARCH_X86_64) || !defined(PIC)
+ void ff_snow_horizontal_compose97i_sse2(DWTELEM *b, int width){
+     const int w2= (width+1)>>1;
+     // SSE2 code runs faster with pointers aligned on a 32-byte boundary.
+@@ -915,3 +916,4 @@
+     else
+         ff_snow_inner_add_yblock(obmc, obmc_stride, block, b_w, b_h, src_x,src_y, src_stride, sb, add, dst8);
+ }
++#endif

Modified: unstable/ffmpeg/debian/patches/series
===================================================================
--- unstable/ffmpeg/debian/patches/series	2006-03-30 08:41:04 UTC (rev 4)
+++ unstable/ffmpeg/debian/patches/series	2006-03-30 08:44:19 UTC (rev 5)
@@ -5,3 +5,4 @@
 010_shared_library_versioning.diff -p1
 020_mmx_intrinsics.diff -p1
 020_mmx_pic_code.diff -p1
+020_disable_snow_mmx_in_pic.diff -p1

Modified: unstable/ffmpeg/debian/rules
===================================================================
--- unstable/ffmpeg/debian/rules	2006-03-30 08:41:04 UTC (rev 4)
+++ unstable/ffmpeg/debian/rules	2006-03-30 08:44:19 UTC (rev 5)
@@ -123,6 +123,7 @@
 	dh_installdirs -ptmp usr/share/doc/ffmpeg/html etc usr/include/ffmpeg usr/lib usr/bin usr/share/man/man1 usr/include/postproc
 
 	$(MAKE) install DESTDIR=`pwd`/debian/tmp/ mandir=`pwd`/debian/tmp/usr/share/man
+	cp libavcodec/dsputil.h debian/tmp/usr/include/ffmpeg
 	cp libavcodec/libpostproc/libpostproc.a debian/tmp/usr/lib
 	cp libavcodec/libpostproc/postprocess.h debian/tmp/usr/include/postproc
 	cp libpostproc.pc debian/tmp/usr/lib/pkgconfig/