summaryrefslogtreecommitdiffstats
path: root/vlc
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2014-01-21 10:52:05 +0000
committer Eric Hameleers <alien@slackware.com>2014-01-21 10:52:05 +0000
commita01c4b8005e74f7e5f6f9d90ee6a32bd44d5eebb (patch)
tree3d10ac4fb7ca60f757b8dc35606125e88f00ab8b /vlc
parent3720b1f5ee5985aa32391a7a4c2d90f7b5c122b5 (diff)
downloadasb-a01c4b8005e74f7e5f6f9d90ee6a32bd44d5eebb.tar.gz
asb-a01c4b8005e74f7e5f6f9d90ee6a32bd44d5eebb.tar.xz
Fix dvdcss binding, should also work when we don't want to include it
Diffstat (limited to 'vlc')
-rwxr-xr-xvlc/build/vlc.SlackBuild4
1 files changed, 3 insertions, 1 deletions
diff --git a/vlc/build/vlc.SlackBuild b/vlc/build/vlc.SlackBuild
index bb15c8fd..5af463eb 100755
--- a/vlc/build/vlc.SlackBuild
+++ b/vlc/build/vlc.SlackBuild
@@ -1997,8 +1997,10 @@ if [ "${USE_PATENTS}" == "YES" ]; then
# If we allow patented software, we also link libdvdcss statically into
# libdvdread. Otherwise, you can just install libdvdcss additionally
# and the dvdread library will find and load dvdcss support at runtime.
+ CSS_LIBS="$VLCDEPSDIR/usr/lib$LIBDIRSUFFIX/libdvdcss.a -static" \
DO_CSS="--with-libdvdcss"
else
+ CSS_LIBS=""
DO_CSS=""
fi
@@ -2020,7 +2022,7 @@ CFLAGS="-I$VLCDEPSDIR/usr/include $SLKCFLAGS" \
CXXFLAGS="-I$VLCDEPSDIR/usr/include $SLKCFLAGS" \
LDFLAGS="-L$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX} $SLKLDFLAGS" \
PKG_CONFIG_PATH="$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}/pkgconfig" \
-CSS_LIBS="$VLCDEPSDIR/usr/lib$LIBDIRSUFFIX/libdvdcss.a -static" \
+CSS_LIBS="${CSS_LIBS}" \
./configure \
--prefix=$VLCDEPSDIR/usr \
--libdir=$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX} \