r175 - in experimental/ffmpeg/debian: . patches

[Samuel Hocevar]

Author: sho
Date: 2007-03-09 16:44:29 +0000 (Fri, 09 Mar 2007)
New Revision: 175

Added:
   experimental/ffmpeg/debian/patches/013_strip_unneeded_linker_flags.diff
Modified:
   experimental/ffmpeg/debian/changelog
   experimental/ffmpeg/debian/patches/series
Log:
  * debian/patches/013_strip_unneeded_linker_flags.diff:
    + Remove unneeded -l flags from .pc files (Closes: #373986).


Modified: experimental/ffmpeg/debian/changelog
===================================================================
--- experimental/ffmpeg/debian/changelog	2007-03-09 16:23:08 UTC (rev 174)
+++ experimental/ffmpeg/debian/changelog	2007-03-09 16:44:29 UTC (rev 175)
@@ -1,38 +1,23 @@
 ffmpeg (0.cvs20070307-1) UNRELEASED; urgency=low
 
-  [ Reinhard Tartler ]
-
-  * debian/rules:
-    + Ignore libswscale.pc and rgb2rgb.h.
-
-  * debian/libavcodec-dev.install:
-    + Ship fifo.h and opt.h.
-
-  * debian/patches/005_altivec_flags.diff:
-  * debian/patches/005_m68k_workaround.diff:
-  * debian/patches/005_runtime_cpudetect.diff:
-  * debian/patches/006_mips_pthreads.diff:
-  * debian/patches/020_really_use_liba52.diff:
-    + Sync patches.
-
-  * debian/patches/007_disable_ffmpeg_option.diff:
-  * debian/patches/030_arm_cpu_detect.diff:
-  * debian/patches/030_arm_workaround.diff:
-    + Drop patches, applied upstream or no longer relevant.
-
   [ Sam Hocevar ]
 
   * New upstream snapshot (Closes: #403330, #404788).
+  * This snapshot fixes numerous file parsing crashes (Closes: #404176,
+    Closes: #407003, #396282, #365006, #403398).
 
   * debian/patches/010_proper_rpath.diff:
     + New patch. Link objects with the libraries that we generate, not the
       ones installed on the system.
 
+  * debian/patches/010_shared_library_versioning.diff:
+    + Strip unneeded prefix from .pc files (Closes: #404758).
+
   * debian/patches/011_link_plugins.diff:
     + New patch. Link vhook plugins with the appropriate libraries.
 
-  * debian/patches/010_shared_library_versioning.diff:
-    + Strip unneeded prefix from .pc files (Closes: #404758).
+  * debian/patches/013_strip_unneeded_linker_flags.diff:
+    + Remove unneeded -l flags from .pc files (Closes: #373986).
 
   * debian/patches/020_mmx_optims.diff:
   * debian/patches/020_disable_snow_mmx_in_pic.diff:
@@ -54,6 +39,26 @@
     + Readded --enable-libtheora, it's here again.
     + Activate --enable-swscaler (Closes: #399141, #398442).
 
+  [ Reinhard Tartler ]
+
+  * debian/rules:
+    + Ignore libswscale.pc and rgb2rgb.h.
+
+  * debian/libavcodec-dev.install:
+    + Ship fifo.h and opt.h.
+
+  * debian/patches/005_altivec_flags.diff:
+  * debian/patches/005_m68k_workaround.diff:
+  * debian/patches/005_runtime_cpudetect.diff:
+  * debian/patches/006_mips_pthreads.diff:
+  * debian/patches/020_really_use_liba52.diff:
+    + Sync patches.
+
+  * debian/patches/007_disable_ffmpeg_option.diff:
+  * debian/patches/030_arm_cpu_detect.diff:
+  * debian/patches/030_arm_workaround.diff:
+    + Drop patches, applied upstream or no longer relevant.
+
  -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Fri,  9 Mar 2007 15:13:16 +0100
 
 ffmpeg (0.cvs20060823-7) unstable; urgency=high

Added: experimental/ffmpeg/debian/patches/013_strip_unneeded_linker_flags.diff
===================================================================
--- experimental/ffmpeg/debian/patches/013_strip_unneeded_linker_flags.diff	2007-03-09 16:23:08 UTC (rev 174)
+++ experimental/ffmpeg/debian/patches/013_strip_unneeded_linker_flags.diff	2007-03-09 16:44:29 UTC (rev 175)
@@ -0,0 +1,20 @@
+Index: ffmpeg-0.cvs20070307/configure
+===================================================================
+--- ffmpeg-0.cvs20070307.orig/configure	2007-03-09 17:23:30.000000000 +0100
++++ ffmpeg-0.cvs20070307/configure	2007-03-09 17:25:58.000000000 +0100
+@@ -2103,11 +2103,11 @@
+ pkgconfig_generate libavutil "FFmpeg utility library" "$lavu_version" -lavutil "" ffmpeg
+ pkgconfig_generate_uninstalled libavutil "FFmpeg utility library" "$lavu_version"
+ 
+-pkgconfig_generate libavcodec "FFmpeg codec library" "$lavc_version" "-lavcodec $extralibs" "$pkg_requires libavutil = $lavu_version" ffmpeg
+-pkgconfig_generate_uninstalled libavcodec "FFmpeg codec library" "$lavc_version" "$extralibs" "$pkg_requires libavutil = $lavu_version"
++pkgconfig_generate libavcodec "FFmpeg codec library" "$lavc_version" "-lavcodec" "$pkg_requires libavutil = $lavu_version" ffmpeg
++pkgconfig_generate_uninstalled libavcodec "FFmpeg codec library" "$lavc_version" "" "$pkg_requires libavutil = $lavu_version"
+ 
+-pkgconfig_generate libavformat "FFmpeg container format library" "$lavf_version" "-lavformat $extralibs" "$pkg_requires libavcodec = $lavc_version" ffmpeg
+-pkgconfig_generate_uninstalled libavformat "FFmpeg container format library" "$lavf_version" "$extralibs" "$pkg_requires libavcodec = $lavc_version"
++pkgconfig_generate libavformat "FFmpeg container format library" "$lavf_version" "-lavformat" "$pkg_requires libavcodec = $lavc_version" ffmpeg
++pkgconfig_generate_uninstalled libavformat "FFmpeg container format library" "$lavf_version" "" "$pkg_requires libavcodec = $lavc_version"
+ 
+ if enabled pp; then
+   pkgconfig_generate libpostproc "FFmpeg post processing library" "$pp_version" -lpostproc "" postproc

Modified: experimental/ffmpeg/debian/patches/series
===================================================================
--- experimental/ffmpeg/debian/patches/series	2007-03-09 16:23:08 UTC (rev 174)
+++ experimental/ffmpeg/debian/patches/series	2007-03-09 16:44:29 UTC (rev 175)
@@ -7,6 +7,7 @@
 010_shared_library_versioning.diff
 #020_mmx_intrinsics.diff
 011_link_plugins.diff
+013_strip_unneeded_linker_flags.diff
 020_mmx_optims.diff
 020_mmx_pic_code.diff
 020_disable_snow_mmx_in_pic.diff