vlc: link dynamically against libva/libvdpau if available.

Install an empty plugin cache file, so that the plugin cache will be deleted along with the package using 'removepkg'.

1 files changed, 21 insertions, 9 deletions

diff --git a/vlc/build/vlc.SlackBuild b/vlc/build/vlc.SlackBuild
index be44868c..d4c16a4c 100755
--- a/vlc/build/vlc.SlackBuild
+++ b/vlc/build/vlc.SlackBuild
@@ -569,6 +569,13 @@ STATIC_FFMPEG=$(echo $STATIC_FFMPEG | tr 'a-z' 'A-Z')
 MOZPLUGIN=${MOZPLUGIN:-"YES"}
 MOZPLUGIN=$(echo $MOZPLUGIN | tr 'a-z' 'A-Z')
 
+# Let VLC link dynamically to libva* and libvdpau if those are present:
+if pkg-config --exists libva 2>/dev/null ; then
+  STATIC_LIBVA=${STATIC_LIBVA:-"NO"}
+else
+  STATIC_LIBVA=${STATIC_LIBVA:-"YES"}
+fi
+
 # Explicitly enable pulseaudio or it will not be picked up by ffmpeg:
 if pkg-config --exists libpulse 2>/dev/null ; then
   USE_PULSE="--enable-libpulse"
@@ -608,7 +615,7 @@ GOOM=2k4-0
 GSM=1.0.16
 KATE=0.4.1
 LAME=3.100
-LIBVA=1.8.2
+LIBVA=2.0.0
 LIVE=2016.02.22
 LUA=5.1.5
 MATROSKA=1.4.8
@@ -907,7 +914,7 @@ USE[34]="YES"
 
 # VAAPI for video hardware acceleration:
 SOURCE[35]="$SRCDIR/libva-${LIBVA}.tar.bz2"
-SRCURL[35]="http://www.freedesktop.org/software/vaapi/releases/libva/libva-${LIBVA}.tar.bz2"
+SRCURL[35]="https://github.com/01org/libva/releases/download/${LIBVA}/libva-${LIBVA}.tar.bz2"
 SRCPAT[35]="NO"
 USE[35]="YES"
 
@@ -3617,7 +3624,7 @@ if [ "$STATIC_FFMPEG" == "YES" ]; then
   ## vlc-cache-gen trips over at the end of the build, when we add LIBS
   ## to avoid missing symbols in the avcodec plugin at runtime: 
   if ! grep -q " -ldrm" ${VLCDEPSDIR}/usr/lib${LIBDIRSUFFIX}/pkgconfig/libavcodec.pc ; then
-    sed -i "/^Libs: /s/$/ -lvdpau -lva -lva-drm -lva-x11 -lX11 -lXext -lXfixes -lm -ldrm/" \
+    sed -i "/^Libs: /s/$/ -lvdpau -lva-drm -lva-x11 -lva -lX11 -lXext -lXfixes -lm -ldrm/" \
       ${VLCDEPSDIR}/usr/lib${LIBDIRSUFFIX}/pkgconfig/libavcodec.pc
   fi
 fi
@@ -3866,6 +3873,10 @@ if [ -d $VLCDEPSDIR/usr/share/vlc/projectM ]; then
   ln -sf /usr/share/fonts/TTF/DejaVuSansMono.ttf $PKG/usr/share/vlc/projectM/fonts/VeraMono.ttf
 fi
 
+# Create an empty plugin cache configuration file, so that
+# it will be deleted too in the event of a 'removepkg':
+touch $PKG/usr/lib${LIBDIRSUFFIX}/vlc/plugins.dat
+
 # Add this to the doinst.sh:
 mkdir -p $PKG/install
 cat <<EOINS > $PKG/install/doinst.sh
@@ -3997,12 +4008,13 @@ else
   make_x264
   make_x262
 
-  # If anyone can fix the 'unresolved symbols' in several vlc plugins when
-  # libva is compiled before ffmpeg, let me know!
-  make_libva
-
-  # VLC supports VDPAU directly since 2.1.
-  make_vdpau
+  if [ "${STATIC_LIBVA}" = "YES" ]; then
+    # VLC supports VAAPI & VDPAU directly since 2.1.
+    # If anyone can fix the 'unresolved symbols' in several vlc plugins when
+    # libva is compiled before ffmpeg, let me know!
+    make_libva
+    make_vdpau
+  fi
 
   # CD/VCD image support:
   # Circular dependencies need these loops: