r1096 - in /hardy/ffmpeg/debian: changelog patches/015_build_imgresample.diff patches/series

[siretart at users.alioth.debian.org]

Author: siretart
Date: Fri Mar 21 12:21:01 2008
New Revision: 1096

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1096
Log:
* reenable 015_build_imgresample patch. Needed for gstreamer-ffmpeg
* Bump epoch because of the strange history of ffmpeg in the past.

Added:
    hardy/ffmpeg/debian/patches/015_build_imgresample.diff
Modified:
    hardy/ffmpeg/debian/changelog
    hardy/ffmpeg/debian/patches/series

Modified: hardy/ffmpeg/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-multimedia/hardy/ffmpeg/debian/changelog?rev=1096&op=diff
==============================================================================
--- hardy/ffmpeg/debian/changelog (original)
+++ hardy/ffmpeg/debian/changelog Fri Mar 21 12:21:01 2008
@@ -1,3 +1,15 @@
+ffmpeg-free (3:0.svn20080206-1~ppa3) hardy; urgency=low
+
+  * reenable 015_build_imgresample patch. Needed for gstreamer-ffmpeg
+
+ -- Reinhard Tartler <siretart at tauware.de>  Fri, 21 Mar 2008 13:20:35 +0100
+
+ffmpeg-free (3:0.svn20080206-1~ppa2) hardy; urgency=low
+
+  * Bump epoch because of the strange history of ffmpeg in the past.
+
+ -- Reinhard Tartler <siretart at tauware.de>  Fri, 21 Mar 2008 09:04:49 +0100
+
 ffmpeg-free (0.svn20080206-1~ppa1) hardy; urgency=low
 
   * THIS IS A PPA PREVIEW UPLOAD. MERGE REGULARILY WITH

Added: hardy/ffmpeg/debian/patches/015_build_imgresample.diff
URL: http://svn.debian.org/wsvn/pkg-multimedia/hardy/ffmpeg/debian/patches/015_build_imgresample.diff?rev=1096&op=file
==============================================================================
--- hardy/ffmpeg/debian/patches/015_build_imgresample.diff (added)
+++ hardy/ffmpeg/debian/patches/015_build_imgresample.diff Fri Mar 21 12:21:01 2008
@@ -1,0 +1,47 @@
+Index: ffmpeg.20080206/libavcodec/Makefile
+===================================================================
+--- ffmpeg.20080206.orig/libavcodec/Makefile	2008-01-28 22:24:09.000000000 +0100
++++ ffmpeg.20080206/libavcodec/Makefile	2008-03-15 23:09:24.000000000 +0100
+@@ -351,9 +351,7 @@
+ 
+ OBJS-$(HAVE_XVMC_ACCEL)                += xvmcvideo.o
+ 
+-ifneq ($(CONFIG_SWSCALER),yes)
+ OBJS += imgresample.o
+-endif
+ 
+ # processor-specific code
+ ifeq ($(HAVE_MMX),yes)
+Index: ffmpeg.20080206/libavcodec/imgconvert.c
+===================================================================
+--- ffmpeg.20080206.orig/libavcodec/imgconvert.c	2008-03-15 22:40:38.000000000 +0100
++++ ffmpeg.20080206/libavcodec/imgconvert.c	2008-03-15 23:09:24.000000000 +0100
+@@ -2324,7 +2324,7 @@
+ }
+ #endif
+ 
+-#ifndef CONFIG_SWSCALER
++#if 1
+ /* XXX: always use linesize. Return -1 if not supported */
+ int img_convert(AVPicture *dst, int dst_pix_fmt,
+                 const AVPicture *src, int src_pix_fmt,
+Index: ffmpeg.20080206/Makefile
+===================================================================
+--- ffmpeg.20080206.orig/Makefile	2008-03-15 23:03:24.000000000 +0100
++++ ffmpeg.20080206/Makefile	2008-03-15 23:10:13.000000000 +0100
+@@ -402,15 +402,6 @@
+ 	@echo
+ 	$(SRC_PATH)/tests/server-regression.sh $(FFSERVER_REFFILE) $(SRC_PATH)/tests/test.conf
+ 
+-ifeq ($(CONFIG_SWSCALER),yes)
+-test-server codectest $(CODEC_TESTS) libavtest: swscale_error
+-swscale_error:
+-	@echo
+-	@echo "This regression test is incompatible with --enable-swscaler."
+-	@echo
+-	@exit 1
+-endif
+-
+ tests/vsynth1/00.pgm: tests/videogen$(EXESUF)
+ 	mkdir -p tests/vsynth1
+ 	$(BUILD_ROOT)/$< 'tests/vsynth1/'

Modified: hardy/ffmpeg/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-multimedia/hardy/ffmpeg/debian/patches/series?rev=1096&op=diff
==============================================================================
--- hardy/ffmpeg/debian/patches/series (original)
+++ hardy/ffmpeg/debian/patches/series Fri Mar 21 12:21:01 2008
@@ -7,6 +7,7 @@
 #020_mmx_intrinsics.diff
 011_link_plugins.diff
 013_strip_unneeded_linker_flags.diff
+015_build_imgresample.diff
 020_mmx_optims.diff
 020_mmx_pic_code.diff
 020_disable_snow_mmx_in_pic.diff