[FFmpeg-devel] [PATCH]: configure: correct pkgconfig to reflect --build-suffix

Diego Biurrun diego
Wed Nov 12 12:14:30 CET 2008


On Mon, Nov 10, 2008 at 09:25:30PM +0100, Charles Yates wrote:
> 
> The attached patch attempts to reflect the build suffix in the generated
> pkg-config files.
> 
> --- configure	(revision 15797)
> +++ configure	(working copy)
> @@ -2346,11 +2346,12 @@
>  name=$1
> -shortname=${name#lib}
>  comment=$2
>  version=$3
>  libs=$4
>  requires=$5
> +suff=$6
> +shortname=${name#lib}${suff}
>  cat <<EOF > $name/$name.pc
> @@ -2383,17 +2384,17 @@
>  
> -pkgconfig_generate libavutil "FFmpeg utility library" "$LIBAVUTIL_VERSION"
> -pkgconfig_generate libavcodec "FFmpeg codec library" "$LIBAVCODEC_VERSION" "$extralibs" "$pkg_requires libavutil = $LIBAVUTIL_VERSION"
> -pkgconfig_generate libavformat "FFmpeg container format library" "$LIBAVFORMAT_VERSION" "$extralibs" "$pkg_requires libavcodec = $LIBAVCODEC_VERSION"
> -pkgconfig_generate libavdevice "FFmpeg device handling library" "$LIBAVDEVICE_VERSION" "$extralibs" "$pkg_requires libavformat = $LIBAVFORMAT_VERSION"
> +pkgconfig_generate libavutil "FFmpeg utility library" "$LIBAVUTIL_VERSION" "" "" "$build_suffix"
> +pkgconfig_generate libavcodec "FFmpeg codec library" "$LIBAVCODEC_VERSION" "$extralibs" "$pkg_requires libavutil = $LIBAVUTIL_VERSION" "$build_suffix"
> +pkgconfig_generate libavformat "FFmpeg container format library" "$LIBAVFORMAT_VERSION" "$extralibs" "$pkg_requires libavcodec = $LIBAVCODEC_VERSION" "$build_suffix"
> +pkgconfig_generate libavdevice "FFmpeg device handling library" "$LIBAVDEVICE_VERSION" "$extralibs" "$pkg_requires libavformat = $LIBAVFORMAT_VERSION" "$build_suffix"
>  enabled avfilter &&
> -    pkgconfig_generate libavfilter "FFmpeg video filtering library" "$LIBAVFILTER_VERSION" "$extralibs" "$pkg_requires libavutil = $LIBAVUTIL_VERSION"
> +    pkgconfig_generate libavfilter "FFmpeg video filtering library" "$LIBAVFILTER_VERSION" "$extralibs" "$pkg_requires libavutil = $LIBAVUTIL_VERSION" "$build_suffix"
>  enabled postproc &&
> -    pkgconfig_generate libpostproc "FFmpeg post processing library" "$LIBPOSTPROC_VERSION"
> +    pkgconfig_generate libpostproc "FFmpeg post processing library" "$LIBPOSTPROC_VERSION" "$build_suffix"
>  if enabled swscale; then
> -    pkgconfig_generate libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "" "libavutil = $LIBAVUTIL_VERSION"
> +    pkgconfig_generate libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "" "libavutil = $LIBAVUTIL_VERSION" "$build_suffix"
>  else
> -    pkgconfig_generate libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "" "$pkg_requires libavcodec = $LIBAVCODEC_VERSION"
> +    pkgconfig_generate libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "" "$pkg_requires libavcodec = $LIBAVCODEC_VERSION" "$build_suffix"
>      apply libswscale/libswscale.pc sed s/^Libs:.*$/Libs:/

This is pointless.  If you are using $build_suffix everywhere
unconditionally, there is no need to pass it as a parameter.

Diego




More information about the ffmpeg-devel mailing list