virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

build: Add version numbers to "Requires" entries in pkg-config files

Browse Source 
The (required) version numbers disappeared after edb4348732.
This commit is contained in:
Diego Biurrun 2016-12-25 18:25:41 +01:00
parent 53618054b6
commit 8a34f36593
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
avbuild/pkgconfig_generate.sh
View File

@ -12,7 +12,15 @@ shortname=$1
name=lib${shortname} name=lib${shortname}
comment=$2 comment=$2
libs=$(eval echo \$extralibs_${shortname}) 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)
requires="$requires ${depname} >= ${depversion}, "
done
requires=${requires%, } requires=${requires%, }
version=$(grep ${name}_VERSION= $name/${name}.version | cut -d= -f2) version=$(grep ${name}_VERSION= $name/${name}.version | cut -d= -f2)

20
configure vendored
View File

@ -5396,11 +5396,7 @@ print_enabled_components libavformat/protocol_list.c URLProtocol url_protocols $
test -n "$WARNINGS" && printf "\n$WARNINGS" test -n "$WARNINGS" && printf "\n$WARNINGS"
# build pkg-config files # Settings for pkg-config files
lib_version(){
eval printf "\"lib${1} >= \$LIB$(toupper ${1})_VERSION, \""
}
cat > avbuild/config.sh <<EOF cat > avbuild/config.sh <<EOF
# Automatically generated by configure - do not modify! # Automatically generated by configure - do not modify!
@ -5411,15 +5407,6 @@ includedir=$incdir
source_path=${source_path} source_path=${source_path}
LIBPREF=${LIBPREF} LIBPREF=${LIBPREF}
LIBSUF=${LIBSUF} 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_avutil="$LIBRT $LIBM"
extralibs_avcodec="$extralibs" extralibs_avcodec="$extralibs"
extralibs_avformat="$extralibs" extralibs_avformat="$extralibs"
@ -5428,3 +5415,8 @@ extralibs_avfilter="$extralibs"
extralibs_avresample="$LIBM" extralibs_avresample="$LIBM"
extralibs_swscale="$LIBM" extralibs_swscale="$LIBM"
EOF EOF
for lib in $LIBRARY_LIST; do
lib_deps="$(eval echo \$${lib}_deps)"
echo ${lib}_deps=\"$lib_deps\" >> avbuild/config.sh
done