r1234 - in /unstable/ffmpeg/debian: ./ changelog patches/015_dont_provide_img_convert_in_avcodec_h.diff patches/015_reenable-img_convert.diff patches/series

Tue Jun 3 21:13:49 UTC 2008

Author: siretart
Date: Tue Jun  3 21:13:49 2008
New Revision: 1234

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1234
Log:
* new patch: 015_reenable-img_convert.diff.  Unlike previous version of this
  patch, this uses a more lightweight approach. With building imgresample, a
  few symbol clashes occur with libswscale. We therefore strip off symbols
  that are already provided by libswscale. (Closes: #483960).

Added:
    unstable/ffmpeg/debian/patches/015_reenable-img_convert.diff
Removed:
    unstable/ffmpeg/debian/patches/015_dont_provide_img_convert_in_avcodec_h.diff
Modified:
    unstable/ffmpeg/debian/   (props changed)
    unstable/ffmpeg/debian/changelog
    unstable/ffmpeg/debian/patches/series

Propchange: unstable/ffmpeg/debian/
------------------------------------------------------------------------------

--- bzr:file-ids (original)
+++ bzr:file-ids Tue Jun  3 21:13:49 2008
@@ -1,0 +1,1 @@
+patches/015_reenable-img_convert.diff	015_reenableimgresam-20080603151101-5xfer1f3rojms8o0-1

Propchange: unstable/ffmpeg/debian/
------------------------------------------------------------------------------
--- bzr:revision-id:v3-single1-dW5zdGFibGUvZmZtcGVnL2RlYmlhbg.. (original)
+++ bzr:revision-id:v3-single1-dW5zdGFibGUvZmZtcGVnL2RlYmlhbg.. Tue Jun  3 21:13:49 2008
@@ -4,3 +4,4 @@
 28 siretart at tauware.de-20080603194444-ar6pe875mdx4bay7
 29 siretart at tauware.de-20080603195133-14hlasp8shso9edw
 30 siretart at tauware.de-20080603195421-11yj4yxn9h2423uh
+31 siretart at tauware.de-20080603210858-4ai5h4ys6pn0ong2

Propchange: unstable/ffmpeg/debian/
------------------------------------------------------------------------------
--- bzr:revision-info (original)
+++ bzr:revision-info Tue Jun  3 21:13:49 2008
@@ -1,4 +1,4 @@
-timestamp: 2008-06-03 21:54:21.006999969 +0200
+timestamp: 2008-06-03 23:08:58.484999895 +0200
 committer: Reinhard Tartler <siretart at tauware.de>
 properties: 
-	branch-nick: debian
+	branch-nick: patch.cleanup

Modified: unstable/ffmpeg/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg/debian/changelog?rev=1234&op=diff
==============================================================================
--- unstable/ffmpeg/debian/changelog (original)
+++ unstable/ffmpeg/debian/changelog Tue Jun  3 21:13:49 2008
@@ -20,10 +20,10 @@
   * new patch: 010_revert_r10648_disable_mfspr_emulation.diff. Commit r11569
     introduces an mfspr-based AltiVec detection code, which will break on
     machines not having altivec. (Related to: #482717)
-  * new patch: 015_dont_provide_img_convert_in_avcodec_h.diff. Since we build
-    with CONFIG_SWSCALER, we don't have img_convert in libavcodec.so.
-    So there is indeed no point in having that interface in the header file for the
-    debian package. (Closes: #483960).
+  * new patch: 015_reenable-img_convert.diff.  Unlike previous version of this
+    patch, this uses a more lightweight approach. With building imgresample, a
+    few symbol clashes occur with libswscale. We therefore strip off symbols
+    that are already provided by libswscale. (Closes: #483960).
   * remove 011_link_plugins.diff. It is completely unnecessary now.
   * refactor quilt usage: use /usr/share/quilt/quilt.make.
   * support building in paralell. make snippet taken from the qemu package.

Added: unstable/ffmpeg/debian/patches/015_reenable-img_convert.diff
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg/debian/patches/015_reenable-img_convert.diff?rev=1234&op=file
==============================================================================
--- unstable/ffmpeg/debian/patches/015_reenable-img_convert.diff (added)
+++ unstable/ffmpeg/debian/patches/015_reenable-img_convert.diff Tue Jun  3 21:13:49 2008
@@ -1,0 +1,58 @@
+This patch reenables build imgressample. Unlike previous version of this
+patch, this uses a more lightweight approach.
+
+With building imgresample, a few symbol clashes occur with libswscale. We
+therefore strip off symbols that are already provided by libswscale.
+
+References:
+
+<http://permalink.gmane.org/gmane.comp.video.ffmpeg.devel/69238>
+http://svn.mandriva.com/cgi-bin/viewvc.cgi/packages/cooker/ffmpeg/current/SOURCES/ffmpeg-reenable-imgresample.patch?revision=207573&view=markup
+
+--- a/libavcodec/Makefile
++++ b/libavcodec/Makefile
+@@ -351,9 +351,7 @@ OBJS-$(HAVE_W32THREADS)                +
+ 
+ OBJS-$(HAVE_XVMC_ACCEL)                += xvmcvideo.o
+ 
+-ifneq ($(CONFIG_SWSCALER),yes)
+ OBJS += imgresample.o
+-endif
+ 
+ # processor-specific code
+ ifeq ($(HAVE_MMX),yes)
+--- a/libavcodec/imgconvert.c
++++ b/libavcodec/imgconvert.c
+@@ -2324,7 +2324,7 @@ int img_pad(AVPicture *dst, const AVPict
+ }
+ #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,
+--- a/libavcodec/imgresample.c
++++ b/libavcodec/imgresample.c
+@@ -512,6 +512,12 @@ void img_resample_close(ImgReSampleConte
+     av_free(s);
+ }
+ 
++/*
++ * the following symbols are provided by libswscale. Disable them in
++ * libavcodec so that applications can actually link against both
++ * avcodec and libswscale.
++ */
++#if 0
+ struct SwsContext *sws_getContext(int srcW, int srcH, int srcFormat,
+                                   int dstW, int dstH, int dstFormat,
+                                   int flags, SwsFilter *srcFilter,
+@@ -688,7 +694,7 @@ the_end:
+     av_free(buf2);
+     return res;
+ }
+-
++#endif
+ 
+ #ifdef TEST
+ #include <stdio.h>

Modified: unstable/ffmpeg/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg/debian/patches/series?rev=1234&op=diff
==============================================================================
--- unstable/ffmpeg/debian/patches/series (original)
+++ unstable/ffmpeg/debian/patches/series Tue Jun  3 21:13:49 2008
@@ -3,6 +3,6 @@
 010_ffmpeg-config.diff
 010_revert_r10648_disable_mfspr_emulation.diff
 013_strip_unneeded_linker_flags.diff
-015_dont_provide_img_convert_in_avcodec_h.diff
+015_reenable-img_convert.diff
 020_fix_libswscale_pic_code
 300_c++_compliant_headers.diff


