summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobby Workman <rworkman@slackbuilds.org>2016-01-09 16:59:39 -0600
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2016-01-17 09:40:16 +0700
commit1ddc345b9983e0e47dd4c768fa85d4ca87315cd5 (patch)
tree118de2b260764c75127090666bc9bb95b7ab2945
parent0529ec2187b1df943de59e4781ec6b049aa98a8a (diff)
downloadslackbuilds-1ddc345b9983e0e47dd4c768fa85d4ca87315cd5.tar.gz
multimedia/ffmpeg: Use libopenjpeg from Slackware
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
-rw-r--r--multimedia/ffmpeg/README3
-rw-r--r--multimedia/ffmpeg/ffmpeg.SlackBuild9
2 files changed, 4 insertions, 8 deletions
diff --git a/multimedia/ffmpeg/README b/multimedia/ffmpeg/README
index dde67edae6..380e286cb5 100644
--- a/multimedia/ffmpeg/README
+++ b/multimedia/ffmpeg/README
@@ -36,8 +36,7 @@ X265=yes|no (default: no), requires x265
XVID=yes|no (default: no), requires xvidcore
ZVBI=yes|no (default: no), requires zvbi
-Additional optional (autodetected) dependencies are jack-audio-connection-kit,
-libva and libvdpau.
+An additional optional (autodetected) dependency is jack-audio-connection-kit.
Make sure to run this script in a real root shell ("su -") and that you
have either tetex or texlive installed.
diff --git a/multimedia/ffmpeg/ffmpeg.SlackBuild b/multimedia/ffmpeg/ffmpeg.SlackBuild
index 3788503710..c7befb1d62 100644
--- a/multimedia/ffmpeg/ffmpeg.SlackBuild
+++ b/multimedia/ffmpeg/ffmpeg.SlackBuild
@@ -110,9 +110,6 @@ fdk="" ; [ "${FDK_AAC:-no}" != "no" ] && \
{ fdk="--enable-libfdk-aac"; 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" ; }
decklink="" ; [ "${DECKLINK:-no}" != "no" ] && \
{ decklink="--enable-decklink" ; \
SLKCFLAGS="$SLKCFLAGS -I/usr/include/decklink" ; }
@@ -142,8 +139,8 @@ sed -i "s| -lflite\"| -lflite -lm -lasound\"|" \
# Some variables are removed from newer libvpx releases
patch -p1 < $CWD/ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
+CFLAGS="$SLKCFLAGS -I/usr/include/openmj2-2.1" \
+CXXFLAGS="$SLKCFLAGS -I/usr/include/openmj2-2.1" \
./configure \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -170,8 +167,8 @@ CXXFLAGS="$SLKCFLAGS" \
--enable-opengl \
--enable-libvpx \
--enable-libpulse \
+ --enable-libopenjpeg \
--arch=$ARCH \
- $openjpeg \
$libdc1394 \
$mp3lame \
$libfaac \