aboutsummaryrefslogtreecommitdiff
path: root/system/vice/vice.SlackBuild
diff options
context:
space:
mode:
authorEric B. Pratt <eric.b.pratt@gmail.com>2020-06-22 17:37:26 +0100
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2020-06-28 08:16:46 +0700
commit55c9dbad5e9729f31c1453c6116cc054ae9f1276 (patch)
tree41d3d044ba63019b0b84f6e2a2577f2a95298d0f /system/vice/vice.SlackBuild
parent989e79e60c01d9559c3aa80d083015d7807259db (diff)
system/vice: Add optional ffmpeg dependency.
Signed-off-by: Dave Woodfall <dave@slackbuilds.org> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'system/vice/vice.SlackBuild')
-rw-r--r--system/vice/vice.SlackBuild8
1 files changed, 6 insertions, 2 deletions
diff --git a/system/vice/vice.SlackBuild b/system/vice/vice.SlackBuild
index f745447368479..578b7d0626a73 100644
--- a/system/vice/vice.SlackBuild
+++ b/system/vice/vice.SlackBuild
@@ -25,7 +25,7 @@
# Initialize variables
PRGNAM=vice
VERSION=${VERSION:-3.4}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -58,6 +58,10 @@ else
LIBDIRSUFFIX=""
fi
+# The "--enable-shared-ffmpeg" option creates conflicts with external ffmpeg libraries
+# So we use an external ffmpeg from another package if requested.
+if [ "${FFMPEG:-no}" = "yes" ]; then ffmpeg="--enable-external-ffmpeg"; else ffmpeg=""; fi
+
# Exit if errors encountered
set -e
@@ -95,7 +99,7 @@ CXXFLAGS="$SLKCFLAGS" \
--localstatedir=/var \
--mandir=/usr/man \
--infodir=/usr/info \
- --enable-shared-ffmpeg \
+ $ffmpeg \
--docdir=/usr/doc/$PRGNAM-$VERSION \
--with-x \
--enable-quicktime \