diff options
| author | Robby Workman <rworkman@slackbuilds.org> | 2016-01-09 18:30:03 -0600 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2016-01-17 09:40:16 +0700 |
| commit | d0d3fbaa3ee505e924b34f7215d375f1c457f9f0 (patch) | |
| tree | b0495c7373015d6cbfe0185edd7aa0b6254843a6 /multimedia/ffmpeg010/ffmpeg010.SlackBuild | |
| parent | 36590f73e0aa3b0cf7b2293cdda6988e036c54b2 (diff) | |
| download | slackbuilds-d0d3fbaa3ee505e924b34f7215d375f1c457f9f0.tar.gz | |
multimedia/ffmpeg010: Use Slackware's libvpx and openjpeg (libopenmj2)
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
Diffstat (limited to 'multimedia/ffmpeg010/ffmpeg010.SlackBuild')
| -rw-r--r-- | multimedia/ffmpeg010/ffmpeg010.SlackBuild | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/multimedia/ffmpeg010/ffmpeg010.SlackBuild b/multimedia/ffmpeg010/ffmpeg010.SlackBuild index ddb46bcea0..2759e407fa 100644 --- a/multimedia/ffmpeg010/ffmpeg010.SlackBuild +++ b/multimedia/ffmpeg010/ffmpeg010.SlackBuild @@ -77,9 +77,6 @@ libfaac="" ; [ "${FAAC:-no}" != "no" ] && \ { libfaac="--enable-libfaac" ; non_free="--enable-nonfree" ; } ssl="" ; [ "${OPENSSL:-no}" != "no" ] && \ { ssl="--enable-openssl" ; non_free="--enable-nonfree" ; } -openjpeg="" ; [ "${JP2:-no}" != "no" ] && \ - { openjpeg="--enable-libopenjpeg" ; \ - SLKCFLAGS="$SLKCFLAGS -I/usr/include/openjpeg-1.5" ; } mp3lame="--enable-libmp3lame" ; [ "${LAME:-yes}" != "yes" ] && mp3lame="" libx264="--enable-libx264" ; [ "${X264:-yes}" != "yes" ] && libx264="" @@ -98,8 +95,12 @@ cd $SRCNAM-$VERSION chown -R root:root . chmod -R u+w,go+r-w,a-s . -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +sed -i 's,-lopenjpeg,-lopenmj2,' configure + +patch -p1 < $CWD/ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch + +CFLAGS="$SLKCFLAGS -I/usr/include/openmj2-2.1" \ +CXXFLAGS="$SLKCFLAGS -I/usr/include/openmj2-2.1" \ ./configure \ --prefix=/usr \ --incdir=/usr/include/$PRGNAM \ @@ -121,8 +122,9 @@ CXXFLAGS="$SLKCFLAGS" \ --enable-x11grab \ --enable-avfilter \ --enable-gnutls \ + --enable-libopenjpeg \ + --enable-libvpx \ --arch=$ARCH \ - $openjpeg \ $libdc1394 \ $mp3lame \ $libfaac \ @@ -132,7 +134,6 @@ CXXFLAGS="$SLKCFLAGS" \ $dirac_fast \ $non_free \ $libgsm \ - $libvpx \ $librtmp \ $opencore_amr \ $libfrei0r \ |