diff options
| author |   Eric Hameleers <alien@slackware.com> | 2017-06-10 09:13:51 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2017-06-10 09:13:51 +0000 |
| commit | c35cd45d262b239171b347153413ca920574d7db (patch) | |
| tree | f002ebca2363a84b94563a71a30a521cc9b071b3 /ffmpeg | |
| parent | 5c16b444ca1b34f116121bb582ca47cb7d95a231 (diff) | |
| download | asb-c35cd45d262b239171b347153413ca920574d7db.tar.gz asb-c35cd45d262b239171b347153413ca920574d7db.tar.xz | |
ffmpeg: make it compile on Slackware 14.1
Diffstat (limited to 'ffmpeg')
| -rwxr-xr-x | ffmpeg/build/ffmpeg.SlackBuild | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/ffmpeg/build/ffmpeg.SlackBuild b/ffmpeg/build/ffmpeg.SlackBuild index 21f27588..2fb715bf 100755 --- a/ffmpeg/build/ffmpeg.SlackBuild +++ b/ffmpeg/build/ffmpeg.SlackBuild @@ -1165,9 +1165,12 @@ cd $TMP/tmp-$PRGNAM/libmfx-$MFX [ ! -x configure ] && autoreconf -vif -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -LDFLAGS="$SLKLDFLAGS" \ +# Note: libmfx needs libva. + +CFLAGS="-I$FFMPEGDEPSDIR/usr/include $SLKCFLAGS" \ +CXXFLAGS="-I$FFMPEGDEPSDIR/usr/include $SLKCFLAGS" \ +LDFLAGS="-L$FFMPEGDEPSDIR/usr/lib${LIBDIRSUFFIX} $SLKLDFLAGS" \ +PKG_CONFIG_PATH="$FFMPEGDEPSDIR/usr/lib${LIBDIRSUFFIX}/pkgconfig" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ @@ -1325,6 +1328,10 @@ fi cat $SRCDIR/patches/fribidi.patch | patch -p1 --verbose \ 2>&1 | tee $OUTPUT/patch-${PRGNAM}_fribidi.log +# Fix error on Slackware 14.1, no issue on Slackware 14.2... +# configure.ac:49: error: possibly undefined macro: AC_CONFIG_MACRO_DIRS +sed -i -e "s/AC_CONFIG_MACRO_DIRS/AC_CONFIG_MACRO_DIR/" configure.ac + # And since we patched the Makefile.am we have to bootstrap: rm -f configure ./bootstrap @@ -1622,10 +1629,10 @@ make_orc make_schroedinger make_x264 make_x265 -make_mfx make_vpx make_libva make_vdpau +make_mfx make_fribidi make_ass make_zvbi |