[SCM] libav/experimental: libswscale header files are put in a subdirectory named ffmpeg, not swscale.

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 15:57:39 UTC 2013


The following commit has been merged in the experimental branch:
commit 3d3361e50976862285cc0f2c28b94c295ba630d0
Author: Diego Biurrun <diego at biurrun.de>
Date:   Mon Mar 12 16:56:16 2007 +0000

    libswscale header files are put in a subdirectory named ffmpeg, not swscale.
    
    Originally committed as revision 8347 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/configure b/configure
index a85579c..b8fa9ee 100755
--- a/configure
+++ b/configure
@@ -2105,10 +2105,10 @@ if enabled pp; then
 fi
 
 if enabled swscaler; then
-  pkgconfig_generate libswscale "FFmpeg image rescaling library" "$sws_version" "-lswscale" "libavutil = $lavu_version" swscale
+  pkgconfig_generate libswscale "FFmpeg image rescaling library" "$sws_version" -lswscale "libavutil = $lavu_version" ffmpeg
   pkgconfig_generate_uninstalled libswscale "FFmpeg image rescaling library" "$sws_version" "" "libavutil = $lavu_version"
 else
-  pkgconfig_generate libswscale "FFmpeg image rescaling library" "$sws_version" "" "$pkg_requires libavcodec = $lavc_version" swscale
+  pkgconfig_generate libswscale "FFmpeg image rescaling library" "$sws_version" "" "$pkg_requires libavcodec = $lavc_version" ffmpeg
   pkgconfig_generate_uninstalled libswscale "FFmpeg image rescaling library" "$sws_version" "" "$pkg_requires libavcodec = $lavc_version"
   apply libswscale.pc sed s/^Libs:.*$/Libs:/
   apply libswscale-uninstalled.pc sed s/^Libs:.*$/Libs:/

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list