On 25/12/2016 18:30, Diego Biurrun wrote:
> The (required) version numbers disappeared after edb4348732.
> ---
>
> Hrmpf, the perils of reordering commits :-/
>
> avbuild/pkgconfig_generate.sh | 10 +++++++++-
> configure | 20 ++++++--------------
> 2 files changed, 15 insertions(+), 15 deletions(-)
>
> diff --git a/avbuild/pkgconfig_generate.sh b/avbuild/pkgconfig_generate.sh
> index 33e188f..0e90094 100755
> --- a/avbuild/pkgconfig_generate.sh
> +++ b/avbuild/pkgconfig_generate.sh
> @@ -12,7 +12,15 @@ shortname=$1
> name=lib${shortname}
> comment=$2
> libs=$(eval echo \$extralibs_${shortname})
> -requires=$(eval echo \$requires_${shortname})
> +deps=$(eval echo \$${shortname}_deps)
> +
> +for dep in $deps; do
> + depname=lib${dep}
> + . ${depname}/${depname}.version
> + depversion=$(eval echo \$${depname}_VERSION_MAJOR)
> + requires="$requires ${depname} >= ${depversion}, "
> +done
> +
> requires=${requires%, }
>
> version=$(grep ${name}_VERSION= $name/${name}.version | cut -d= -f2)
> diff --git a/configure b/configure
> index 8e40238..09674aa 100755
> --- a/configure
> +++ b/configure
> @@ -5396,11 +5396,7 @@ print_enabled_components libavformat/protocol_list.c
> URLProtocol url_protocols $
>
> test -n "$WARNINGS" && printf "\n$WARNINGS"
>
> -# build pkg-config files
> -
> -lib_version(){
> - eval printf "\"lib${1} >= \$LIB$(toupper ${1})_VERSION, \""
> -}
> +# Settings for pkg-config files
>
> cat > avbuild/config.sh <<EOF
> # Automatically generated by configure - do not modify!
> @@ -5411,15 +5407,6 @@ includedir=$incdir
> source_path=${source_path}
> LIBPREF=${LIBPREF}
> LIBSUF=${LIBSUF}
> -
> -requires_avutil="$(map 'lib_version $v' $(echo $avutil_deps))"
> -requires_avcodec="$(map 'lib_version $v' $(echo $avcodec_deps))"
> -requires_avformat="$(map 'lib_version $v' $(echo $avformat_deps))"
> -requires_avdevice="$(map 'lib_version $v' $(echo $avdevice_deps))"
> -requires_avfilter="$(map 'lib_version $v' $(echo $avfilter_deps))"
> -requires_avresample="$(map 'lib_version $v' $(echo $avresample_deps))"
> -requires_swscale="$(map 'lib_version $v' $(echo $swscale_deps))"
> -
> extralibs_avutil="$LIBRT $LIBM"
> extralibs_avcodec="$extralibs"
> extralibs_avformat="$extralibs"
> @@ -5428,3 +5415,8 @@ extralibs_avfilter="$extralibs"
> extralibs_avresample="$LIBM"
> extralibs_swscale="$LIBM"
> EOF
> +
> +for lib in $LIBRARY_LIST; do
> + lib_deps="$(eval echo \$${lib}_deps)"
> + echo ${lib}_deps=\"$lib_deps\" >> avbuild/config.sh
> +done
>
ok.
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
