Skip to content

Commit

Permalink
build: Add version numbers to "Requires" entries in pkg-config files
Browse files Browse the repository at this point in the history
The (required) version numbers disappeared after edb4348.
  • Loading branch information
DonDiego committed Dec 28, 2016
1 parent 5361805 commit 8a34f36
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 15 deletions.
10 changes: 9 additions & 1 deletion avbuild/pkgconfig_generate.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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)
requires="$requires ${depname} >= ${depversion}, "
done

requires=${requires%, }

version=$(grep ${name}_VERSION= $name/${name}.version | cut -d= -f2)
Expand Down
20 changes: 6 additions & 14 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -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!
Expand All @@ -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"
Expand All @@ -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

0 comments on commit 8a34f36

Please sign in to comment.