r146 - in unstable/ffmpeg/debian: . patches

[Samuel Hocevar]

Author: sho
Date: 2007-01-24 13:17:44 +0000 (Wed, 24 Jan 2007)
New Revision: 146

Added:
   unstable/ffmpeg/debian/patches/020_mmx_optims.diff
Modified:
   unstable/ffmpeg/debian/changelog
   unstable/ffmpeg/debian/patches/series
Log:
  * debian/patches/020_mmx_optims.diff:
    + New patch, fix FTBFS with DEB_BUILD_OPTIONS=debug.


Modified: unstable/ffmpeg/debian/changelog
===================================================================
--- unstable/ffmpeg/debian/changelog	2007-01-24 11:02:43 UTC (rev 145)
+++ unstable/ffmpeg/debian/changelog	2007-01-24 13:17:44 UTC (rev 146)
@@ -1,5 +1,6 @@
 ffmpeg (0.cvs20060823-5) UNRELEASED; urgency=high
 
+  [ Loïc Minier ]
   * Add myself to Uploaders.
   * Exclude firewire libs from ffmpeg-config under kFreeBSD; based on a patch
     by Petr Salinger; closes: #399701.
@@ -12,6 +13,10 @@
     packet sizes, chunk sizes, and fragment positions; from upstream SVN r7640
     and r7650.
 
+  [ Sam Hocevar ]
+  * debian/patches/020_mmx_optims.diff:
+    + New patch, fix FTBFS with DEB_BUILD_OPTIONS=debug.
+
  -- Loic Minier <lool at dooz.org>  Wed, 24 Jan 2007 12:01:12 +0100
 
 ffmpeg (0.cvs20060823-4) unstable; urgency=high

Added: unstable/ffmpeg/debian/patches/020_mmx_optims.diff
===================================================================
--- unstable/ffmpeg/debian/patches/020_mmx_optims.diff	2007-01-24 11:02:43 UTC (rev 145)
+++ unstable/ffmpeg/debian/patches/020_mmx_optims.diff	2007-01-24 13:17:44 UTC (rev 146)
@@ -0,0 +1,12 @@
+Index: ffmpeg-0.cvs20060724/libavcodec/Makefile
+===================================================================
+--- 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,7 @@
+ 	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
++i386/dsputil_mmx.o: CFLAGS+= -O3 # "-O2" isn't enough, nor is "-O2 -finline-functions -frename-registers" (so long for gcc documentation)
+ ifeq ($(CONFIG_GPL),yes)
+ OBJS += i386/idct_mmx_xvid.o
+ endif

Modified: unstable/ffmpeg/debian/patches/series
===================================================================
--- unstable/ffmpeg/debian/patches/series	2007-01-24 11:02:43 UTC (rev 145)
+++ unstable/ffmpeg/debian/patches/series	2007-01-24 13:17:44 UTC (rev 146)
@@ -6,6 +6,7 @@
 010_ffmpeg-config.diff
 010_shared_library_versioning.diff
 #020_mmx_intrinsics.diff
+020_mmx_optims.diff
 020_mmx_pic_code.diff
 020_disable_snow_mmx_in_pic.diff
 020_really_use_liba52.diff