[FFmpeg-devel] [PATCH] pkg-config files: move pkg_requires to .private and $extralibs to Libs.private.

Pavlov Konstantin thresh
Wed Jun 20 18:22:25 CEST 2007


Hi guys.

The attached patch moves extralibs to Libs.private and Requires of them to
Requires.private.

This results in something like this:

[builder at hasher .in]$ pkg-config --libs libavcodec
-lavcodec -lavutil

and for static builds:

[builder at hasher .in]$ pkg-config --libs libavcodec --static
-lavcodec -lz -la52 -lgsm -lmp3lame -lm -lx264 -ldc1394_control -lfaac
-lfaad -ldl -lX11 -lXext -logg -ltheora -lraw1394 -lavutil

-- 
Can I have an IMPULSE ITEM instead?
-------------- next part --------------
Index: configure
===================================================================
--- configure	(revision 9375)
+++ configure	(working copy)
@@ -1197,6 +1197,7 @@
     EXESUF=".exe"
     osextralibs=""
     pkg_requires=""
+    pkg_requires_private=""
     dv1394="no"
     ffserver="no"
     vhook="no"
@@ -1776,10 +1777,10 @@
 check_deps $CONFIG_LIST $HAVE_LIST $DECODER_LIST $ENCODER_LIST $PARSER_LIST \
     $BSF_LIST $DEMUXER_LIST $MUXER_LIST $PROTOCOL_LIST
 
-enabled libogg    && append pkg_requires "ogg >= 1.1"
-enabled libtheora && append pkg_requires "theora"
-enabled libvorbis && append pkg_requires "vorbis vorbisenc"
-enabled dc1394    && append pkg_requires "libraw1394"
+enabled libogg    && append pkg_requires_private "ogg >= 1.1"
+enabled libtheora && append pkg_requires_private "theora"
+enabled libvorbis && append pkg_requires_private "vorbis vorbisenc"
+enabled dc1394    && append pkg_requires_private "libraw1394"
 
 echo "install prefix            $PREFIX"
 echo "source path               $source_path"
@@ -2035,8 +2036,10 @@
 comment=$2
 version=$3
 libs=$4
-requires=$5
-include=$6
+libs_private=$5
+requires=$6
+requires_private=$7
+include=$8
 cat <<EOF >$name.pc
 prefix=$PREFIX
 exec_prefix=\${prefix}
@@ -2047,8 +2050,10 @@
 Description: $comment
 Version: $version
 Requires: $requires
+Requires.private: $requires_private
 Conflicts:
 Libs: -L\${libdir} $libs
+Libs.private: $libs_private
 Cflags: -I\${includedir} -I\${includedir}/$include
 EOF
 }
@@ -2060,6 +2065,7 @@
 version=$3
 libs=$4
 requires=$5
+requires_private=$6
 cat <<EOF >$name-uninstalled.pc
 prefix=
 exec_prefix=
@@ -2070,32 +2076,33 @@
 Description: $comment
 Version: $version
 Requires: $requires
+Requires.private: $requires_private
 Conflicts:
 Libs: \${libdir}/${LIBPREF}${shortname}${LIBSUF} $libs
 Cflags: -I\${includedir}
 EOF
 }
 
-pkgconfig_generate libavutil "FFmpeg utility library" "$lavu_version" -lavutil "" ffmpeg
+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 "$extralibs" "libavutil = $lavu_version" "$pkg_requires_private" ffmpeg
+pkgconfig_generate_uninstalled libavcodec "FFmpeg codec library" "$lavc_version" "$extralibs" "libavutil = $lavu_version" "$pkg_requires_private"
 
-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 "$extralibs" "libavcodec = $lavc_version" "$pkg_requires_private" ffmpeg
+pkgconfig_generate_uninstalled libavformat "FFmpeg container format library" "$lavf_version" "$extralibs" "libavcodec = $lavc_version" "$pkg_requires_private"
 
 if enabled pp; then
-  pkgconfig_generate libpostproc "FFmpeg post processing library" "$pp_version" -lpostproc "" postproc
+  pkgconfig_generate libpostproc "FFmpeg post processing library" "$pp_version" -lpostproc "" "" postproc
   pkgconfig_generate_uninstalled libpostproc "FFmpeg post processing library" "$pp_version"
 fi
 
 if enabled swscaler; then
-  pkgconfig_generate libswscale "FFmpeg image rescaling library" "$sws_version" -lswscale "libavutil = $lavu_version" ffmpeg
+  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" ffmpeg
-  pkgconfig_generate_uninstalled libswscale "FFmpeg image rescaling library" "$sws_version" "" "$pkg_requires libavcodec = $lavc_version"
+  pkgconfig_generate libswscale "FFmpeg image rescaling library" "$sws_version" "" "" "libavcodec = $lavc_version" "$pkg_requires_private" ffmpeg
+  pkgconfig_generate_uninstalled libswscale "FFmpeg image rescaling library" "$sws_version" "" "libavcodec = $lavc_version" "$pkg_requires_private"
   apply libswscale.pc sed s/^Libs:.*$/Libs:/
   apply libswscale-uninstalled.pc sed s/^Libs:.*$/Libs:/
 fi
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
URL: <http://lists.mplayerhq.hu/pipermail/ffmpeg-devel/attachments/20070620/03e6581e/attachment.pgp>



More information about the ffmpeg-devel mailing list