summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--multimedia/ffmpeg/README1
-rw-r--r--multimedia/ffmpeg/ffmpeg.SlackBuild7
2 files changed, 5 insertions, 3 deletions
diff --git a/multimedia/ffmpeg/README b/multimedia/ffmpeg/README
index 36a29c97c2..bff1ab8dec 100644
--- a/multimedia/ffmpeg/README
+++ b/multimedia/ffmpeg/README
@@ -36,6 +36,7 @@ WEBP=yes|no (default: no), requires libwebp
X264=yes|no (default: no), requires x264
X265=yes|no (default: no), requires x265
XVID=yes|no (default: no), requires xvidcore
+ZMQ=yes|no (default: no), requires zeromq
ZVBI=yes|no (default: no), requires zvbi
An additional optional (autodetected) dependency is jack-audio-connection-kit.
diff --git a/multimedia/ffmpeg/ffmpeg.SlackBuild b/multimedia/ffmpeg/ffmpeg.SlackBuild
index 69f488b49d..93ff35efd1 100644
--- a/multimedia/ffmpeg/ffmpeg.SlackBuild
+++ b/multimedia/ffmpeg/ffmpeg.SlackBuild
@@ -118,7 +118,7 @@ decklink="" ; [ "${DECKLINK:-no}" != "no" ] && \
SLKCFLAGS="$SLKCFLAGS -I/usr/include/decklink" ; }
# zeromq support requires zeromq > 3.x
-#libzmq="" ; [ "${ZMQ:-no}" != "no" ] && libzmq="--enable-libzmq"
+libzmq="" ; [ "${ZMQ:-no}" != "no" ] && libzmq="--enable-libzmq"
set -e
@@ -133,7 +133,7 @@ find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-o -perm 511 \) -exec chmod 755 {} \; -o \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
# Fix linking with flite
sed -i "s| -lflite\"| -lflite -lm -lasound\"|" \
@@ -207,7 +207,8 @@ CXXFLAGS="$SLKCFLAGS -I/usr/include/openmj2-2.1" \
$libgme \
$libsnappy \
$libwebp \
- $ssl
+ $ssl \
+ $libzmq
make
make install DESTDIR=$PKG