r1211 - in /unstable/ffmpeg/debian: changelog patches/005_m68k_workaround.diff patches/006_mips_pthreads.diff patches/013_strip_unneeded_linker_flags.diff patches/020_fix_sws_scale_crash patches/series

[siretart at users.alioth.debian.org]

Author: siretart
Date: Thu May 29 14:19:00 2008
New Revision: 1211

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1211
Log:
remove first round of patches as per discussion with upstream.

Removed:
    unstable/ffmpeg/debian/patches/005_m68k_workaround.diff
    unstable/ffmpeg/debian/patches/006_mips_pthreads.diff
    unstable/ffmpeg/debian/patches/020_fix_sws_scale_crash
Modified:
    unstable/ffmpeg/debian/changelog
    unstable/ffmpeg/debian/patches/013_strip_unneeded_linker_flags.diff
    unstable/ffmpeg/debian/patches/series

Modified: unstable/ffmpeg/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg/debian/changelog?rev=1211&op=diff
==============================================================================
--- unstable/ffmpeg/debian/changelog (original)
+++ unstable/ffmpeg/debian/changelog Thu May 29 14:19:00 2008
@@ -1,10 +1,20 @@
-ffmpeg-free (0.svn20080206-8) unstable; urgency=low
+ffmpeg-free (0.svn20080206-8) UNRELEASED; urgency=low
+
+  [ Fabian Greffrath ]
 
   * debian/control:
     + Added Conflicts and Replaces on libavutil-dev (<< 0.svn20080206-7)
       to libavcodec-dev (Closes: #483548).
 
- -- Fabian Greffrath <fabian at debian-unofficial.org>  Wed, 29 May 2008 14:02:26 +0200
+  [ Reinhard Tartler ]
+
+  * remove patches from the debian package as disussed with upstream:
+    - 005_m68k_workaround.diff: works around bugs in gcc for m68k.
+    - 006_mips_pthreads.diff: *should* be fixed in debian's gcc
+    - 020_fix_sws_scale_crash: patch has been rejected upstream:
+      http://lists.mplayerhq.hu/pipermail/ffmpeg-devel/2008-May/047846.html
+
+ -- Reinhard Tartler <siretart at tauware.de>  Thu, 29 May 2008 16:17:54 +0200
 
 ffmpeg-free (0.svn20080206-7) unstable; urgency=low
 

Modified: unstable/ffmpeg/debian/patches/013_strip_unneeded_linker_flags.diff
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg/debian/patches/013_strip_unneeded_linker_flags.diff?rev=1211&op=diff
==============================================================================
--- unstable/ffmpeg/debian/patches/013_strip_unneeded_linker_flags.diff (original)
+++ unstable/ffmpeg/debian/patches/013_strip_unneeded_linker_flags.diff Thu May 29 14:19:00 2008
@@ -1,8 +1,8 @@
-Index: ffmpeg.20080206/configure
+Index: ffmpeg/configure
 ===================================================================
---- ffmpeg.20080206.orig/configure	2008-03-15 22:55:15.000000000 +0100
-+++ ffmpeg.20080206/configure	2008-03-15 23:03:37.000000000 +0100
-@@ -2180,11 +2180,11 @@
+--- ffmpeg.orig/configure	2008-05-29 15:39:38.000000000 +0200
++++ ffmpeg/configure	2008-05-29 15:39:43.000000000 +0200
+@@ -2170,11 +2170,11 @@
  pkgconfig_generate libavutil "FFmpeg utility library" "$lavu_version" -lavutil "" ffmpeg
  pkgconfig_generate_uninstalled libavutil "FFmpeg utility library" "$lavu_version"
  

Modified: unstable/ffmpeg/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg/debian/patches/series?rev=1211&op=diff
==============================================================================
--- unstable/ffmpeg/debian/patches/series (original)
+++ unstable/ffmpeg/debian/patches/series Thu May 29 14:19:00 2008
@@ -1,11 +1,8 @@
-005_m68k_workaround.diff
 005_runtime_cpudetect.diff
-006_mips_pthreads.diff
 010_proper_rpath.diff
 010_ffmpeg-config.diff
 011_link_plugins.diff
 013_strip_unneeded_linker_flags.diff
 020_fix_libswscale_pic_code
-020_fix_sws_scale_crash
 054_h264_mmx_chroma_mc_crash.diff
 300_c++_compliant_headers.diff