diff options
| author | Rudolf Polzer <divVerent@xonotic.org> | 2015-09-08 14:00:27 -0400 |
|---|---|---|
| committer | Rudolf Polzer <divVerent@xonotic.org> | 2015-09-08 14:00:27 -0400 |
| commit | 5cfe83c16a0b110cbd8422828255795a2b814ebe (patch) | |
| tree | bb065e297b4aa7729f5586701e76c0c085de7b74 | |
| parent | aeac68b1649d4e6e3b9a2fc6a64b54c9131a0e16 (diff) | |
| download | mpv-build-5cfe83c16a0b110cbd8422828255795a2b814ebe.tar.bz2 mpv-build-5cfe83c16a0b110cbd8422828255795a2b814ebe.tar.xz | |
Do not clear existing PKG_CONFIG_PATH settings.
In my setup, I use PKG_CONFIG_PATH to point to libfdk-aac; the previous
version of these files overrode this, making ffmpeg fail to configure
for not finding libfdk-aac.
Now, the PKG_CONFIG_PATH variable is always honored, with our own build
directory put in front of existing settings.
| -rwxr-xr-x | scripts/ffmpeg-config | 11 | ||||
| -rwxr-xr-x | scripts/libass-config | 13 | ||||
| -rwxr-xr-x | scripts/mpv-config | 11 |
3 files changed, 31 insertions, 4 deletions
diff --git a/scripts/ffmpeg-config b/scripts/ffmpeg-config index 0bbc217..b83bfe9 100755 --- a/scripts/ffmpeg-config +++ b/scripts/ffmpeg-config @@ -28,8 +28,17 @@ then fi fi +case "$PKG_CONFIG_PATH" in + '') + export PKG_CONFIG_PATH="$BUILD/build_libs/lib/pkgconfig" + ;; + *) + export PKG_CONFIG_PATH="$BUILD/build_libs/lib/pkgconfig:$PKG_CONFIG_PATH" + ;; +esac + echo Using ffmpeg options: $OPTIONS mkdir -p "$BUILD"/ffmpeg_build cd "$BUILD"/ffmpeg_build -PKG_CONFIG_PATH="$BUILD"/build_libs/lib/pkgconfig "$BUILD"/ffmpeg/configure --prefix="$BUILD"/build_libs --enable-static --disable-shared $OPTIONS +"$BUILD"/ffmpeg/configure --prefix="$BUILD"/build_libs --enable-static --disable-shared $OPTIONS diff --git a/scripts/libass-config b/scripts/libass-config index f257028..f391ae7 100755 --- a/scripts/libass-config +++ b/scripts/libass-config @@ -8,8 +8,17 @@ if "$BUILD"/scripts/test-libmpv ; then OPTIONS="$OPTIONS --with-pic" fi +case "$PKG_CONFIG_PATH" in + '') + export PKG_CONFIG_PATH="$BUILD/build_libs/lib/pkgconfig" + ;; + *) + export PKG_CONFIG_PATH="$BUILD/build_libs/lib/pkgconfig:$PKG_CONFIG_PATH" + ;; +esac + cd "$BUILD"/libass # Later libass doesn't automatically run configure with autogen.sh anymore -PKG_CONFIG_PATH="$BUILD"/build_libs/lib/pkgconfig ./autogen.sh --prefix="$BUILD/build_libs" --libdir="$BUILD/build_libs/lib" --enable-static --disable-shared $OPTIONS -PKG_CONFIG_PATH="$BUILD"/build_libs/lib/pkgconfig ./configure --prefix="$BUILD/build_libs" --libdir="$BUILD/build_libs/lib" --enable-static --disable-shared $OPTIONS +./autogen.sh --prefix="$BUILD/build_libs" --libdir="$BUILD/build_libs/lib" --enable-static --disable-shared $OPTIONS +./configure --prefix="$BUILD/build_libs" --libdir="$BUILD/build_libs/lib" --enable-static --disable-shared $OPTIONS diff --git a/scripts/mpv-config b/scripts/mpv-config index b23cf4d..397c513 100755 --- a/scripts/mpv-config +++ b/scripts/mpv-config @@ -9,7 +9,16 @@ if test -f "$BUILD"/mpv_options ; then fi OPTIONS="$USER_OPTS" +case "$PKG_CONFIG_PATH" in + '') + export PKG_CONFIG_PATH="$BUILD/build_libs/lib/pkgconfig" + ;; + *) + export PKG_CONFIG_PATH="$BUILD/build_libs/lib/pkgconfig:$PKG_CONFIG_PATH" + ;; +esac + echo Using mpv options: $OPTIONS cd "$BUILD"/mpv -PKG_CONFIG_PATH="$BUILD"/build_libs/lib/pkgconfig ./waf configure $OPTIONS +./waf configure $OPTIONS |