rendered paste bodydiff --git a/configure b/configureindex 5c09691..852c8ac 100755--- a/configure+++ b/configure@@ -1837,9 +1837,9 @@ check_deps $CONFIG_LIST \ $OUTDEV_LIST \ $PROTOCOL_LIST \ -enabled libdc1394 && append pkg_requires "libraw1394"-enabled libtheora && append pkg_requires "theora"-enabled libvorbis && append pkg_requires "vorbisenc"+enabled libdc1394 && append pkg_requires_private "libraw1394"+enabled libtheora && append pkg_requires_private "theora"+enabled libvorbis && append pkg_requires_private "vorbisenc" echo "install prefix $prefix" echo "source path $source_path"@@ -2107,7 +2107,9 @@ name=$1 comment=$2 version=$3 libs=$4-requires=$5+libs_private=$5+requires=$6+requires_private=$7 cat <<EOF >$name.pc prefix=$prefix exec_prefix=\${prefix}@@ -2118,8 +2120,10 @@ Name: $name Description: $comment Version: $version Requires: $requires+Requires.private: $requires_private Conflicts: Libs: -L\${libdir} $libs+Libs.private: $libs_private Cflags: -I\${includedir} EOF }@@ -2131,6 +2135,7 @@ comment=$2 version=$3 libs=$4 requires=$5+requires_private=$6 cat <<EOF >$name-uninstalled.pc prefix= exec_prefix=@@ -2141,39 +2146,41 @@ Name: $name 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" "$LIBAVUTIL_VERSION" -lavutil ""+pkgconfig_generate libavutil "FFmpeg utility library" "$LIBAVUTIL_VERSION" -lavutil "" "" "" pkgconfig_generate_uninstalled libavutil "FFmpeg utility library" "$LIBAVUTIL_VERSION" -pkgconfig_generate libavcodec "FFmpeg codec library" "$LIBAVCODEC_VERSION" "-lavcodec $extralibs" "$pkg_requires libavutil = $LIBAVUTIL_VERSION"-pkgconfig_generate_uninstalled libavcodec "FFmpeg codec library" "$LIBAVCODEC_VERSION" "$extralibs" "$pkg_requires libavutil = $LIBAVUTIL_VERSION"+pkgconfig_generate libavcodec "FFmpeg codec library" "$LIBAVCODEC_VERSION" -lavcodec "$extralibs" "libavutil = $LIBAVUTIL_VERSION" "$pkg_requires_private"+pkgconfig_generate_uninstalled libavcodec "FFmpeg codec library" "$LIBAVCODEC_VERSION" "$extralibs" "libavutil = $LIBAVUTIL_VERSION" "$pkg_requires_private"++pkgconfig_generate libavformat "FFmpeg container format library" "$LIBAVFORMAT_VERSION" -lavformat "$extralibs" "libavcodec = $LIBAVCODEC_VERSION" "$pkg_requires_private"+pkgconfig_generate_uninstalled libavformat "FFmpeg container format library" "$LIBAVFORMAT_VERSION" "$extralibs" "libavcodec = $LIBAVCODEC_VERSION" "$pkg_requires_private" -pkgconfig_generate libavformat "FFmpeg container format library" "$LIBAVFORMAT_VERSION" "-lavformat $extralibs" "$pkg_requires libavcodec = $LIBAVCODEC_VERSION"-pkgconfig_generate_uninstalled libavformat "FFmpeg container format library" "$LIBAVFORMAT_VERSION" "$extralibs" "$pkg_requires libavcodec = $LIBAVCODEC_VERSION"+pkgconfig_generate libavdevice "FFmpeg device handling library" "$LIBAVDEVICE_VERSION" "-lavdevice" "$extralibs" "libavformat = $LIBAVFORMAT_VERSION" "$pkg_requires_private"+pkgconfig_generate_uninstalled libavdevice "FFmpeg device handling library" "$LIBAVDEVICE_VERSION" "$extralibs" "libavformat = $LIBAVFORMAT_VERSION" "$pkg_requires_private" -pkgconfig_generate libavdevice "FFmpeg device handling library" "$LIBAVDEVICE_VERSION" "-lavdevice $extralibs" "$pkg_requires libavformat = $LIBAVFORMAT_VERSION"-pkgconfig_generate_uninstalled libavdevice "FFmpeg device handling library" "$LIBAVDEVICE_VERSION" "$extralibs" "$pkg_requires libavformat = $LIBAVFORMAT_VERSION" if enabled postproc; then- pkgconfig_generate libpostproc "FFmpeg post processing library" "$LIBPOSTPROC_VERSION" -lpostproc ""- pkgconfig_generate_uninstalled libpostproc "FFmpeg post processing library" "$LIBPOSTPROC_VERSION"+ pkgconfig_generate libpostproc "FFmpeg post processing library" "$LIBPOSTPROC_VERSION" -lpostproc "" "" ""+ pkgconfig_generate_uninstalled libpostproc "FFmpeg post processing library" "$LIBPOSTPROC_VERSION" "" "" "" fi if enabled swscale; then- pkgconfig_generate libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" -lswscale "libavutil = $LIBAVUTIL_VERSION"+ pkgconfig_generate libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" -lswscale "" "libavutil = $LIBAVUTIL_VERSION" "" pkgconfig_generate_uninstalled libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "" "libavutil = $LIBAVUTIL_VERSION" else- pkgconfig_generate libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "" "$pkg_requires libavcodec = $LIBAVCODEC_VERSION"- pkgconfig_generate_uninstalled libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "" "$pkg_requires libavcodec = $LIBAVCODEC_VERSION"+ pkgconfig_generate libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "" "" "libavcodec = $LIBAVCODEC_VERSION" "$pkg_requires_private"+ pkgconfig_generate_uninstalled libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "" "libavcodec = $LIBAVCODEC_VERSION" "$pkg_requires_private" apply libswscale.pc sed s/^Libs:.*$/Libs:/ apply libswscale-uninstalled.pc sed s/^Libs:.*$/Libs:/ fi if enabled avfilter; then- pkgconfig_generate libavfilter "FFmpeg video filtering library" "$LIBAVFILTER_VERSION" "-lavfilter $extralibs" "$pkg_requires libavutil = $LIBAVUTIL_VERSION" ffmpeg- pkgconfig_generate_uninstalled libavfilter "FFmpeg video filtering library" "$LIBAVFILTER_VERSION" "$extralibs" "$pkg_requires libavutil = $LIBAVUTIL_VERSION"+ pkgconfig_generate libavfilter "FFmpeg video filtering library" "$LIBAVFILTER_VERSION" -lavfilter "$extralibs" "libavutil = $LIBAVUTIL_VERSION" ffmpeg+ pkgconfig_generate_uninstalled libavfilter "FFmpeg video filtering library" "$LIBAVFILTER_VERSION" "$extralibs" "libavutil = $LIBAVUTIL_VERSION" "" fi