This script creates a working vlc-2.2.0 plus npapi package

Need to fix: projectM plugin (libGLEW.so.1.9 not found on current)

1 files changed, 19 insertions, 17 deletions

diff --git a/vlc/build/vlc.SlackBuild b/vlc/build/vlc.SlackBuild
index 599caccc..2828320d 100755
--- a/vlc/build/vlc.SlackBuild
+++ b/vlc/build/vlc.SlackBuild
@@ -1283,28 +1283,21 @@ fi
 echo Building ...
 
 # We will be installing static libs into the following directory:
-mkdir -p $VLCDEPSDIR/usr/{bin,doc,include,lib,man}
+mkdir -p $VLCDEPSDIR/usr/{bin,doc,include,lib${LIBDIRSUFFIX},man}
 
 # -----------------------------------------------------------------------------
 # Helper function to expose private libs:
-# Copyright (C) 2012 Remi Denis-Courmont
-# This file is distributed under the same license as the vlc package.
-# Modified 2014 Eric Hameleers
 # -----------------------------------------------------------------------------
 pkg_static ()
 {
-PCFILE=$1
-LIBS_PUBLIC=""
-LIBS_PRIVATE=""
-REQUIRES_PUBLIC=""
-REQUIRES_PRIVATE=""
+PCFILE="$1"
 
 TEMPOUTL=$(mktemp -t alien.XXXXXX)
 TEMPOUTR=$(mktemp -t alien.XXXXXX)
 
-mv ${PCFILE} ${PCFILE}.orig
-touch ${PCFILE}
-cat ${PCFILE}.orig | while read LINE; do
+mv "${PCFILE}" "${PCFILE}.orig"
+touch "${PCFILE}"
+cat "${PCFILE}.orig" | while read LINE; do
   lpub="${LINE#Libs:}"
   lpriv="${LINE#Libs.private:}"
   rpub="${LINE#Requires:}"
@@ -1323,6 +1316,7 @@ cat ${PCFILE}.orig | while read LINE; do
 done
 echo "Libs: $(echo $(cat $TEMPOUTL))" >> ${PCFILE}
 echo "Requires: $(echo $(cat $TEMPOUTR))" >> ${PCFILE}
+
 rm -f $TEMPOUTL $TEMPOUTR
 }
 
@@ -2603,6 +2597,8 @@ LDFLAGS="$SLKLDFLAGS" \
 # Install libGLEW into a temp location so vlc can pickup the library
 make GLEW_DEST=$VLCDEPSDIR/usr install \
   2>&1 | tee -a $OUTPUT/make-${PRGNAM}_glew.log
+# We must get rid of these:
+rm $VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}/libGLEW.so*
 # Add DOCS to the vlcdeps to have it added to vlc package later:
 mkdir -p $VLCDEPSDIR/doc/glew/
 cp LICENSE* README* doc/* \
@@ -2628,10 +2624,15 @@ sed -i -e "s#share/projectM#share/vlc/projectM#" $(grep -lr 'share/projectM' .)
 
 mkdir build
 cd build
-  CFLAGS="-I$VLCDEPSDIR/usr/include $SLKCFLAGS" \
-  CPPFLAGS="-I$VLCDEPSDIR/usr/include $SLKCFLAGS" \
-  LDFLAGS="-L$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX} $SLKLDFLAGS" \
-  PKG_CONFIG_PATH="$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}/pkgconfig" \
+  # I would need this to statically link to my libGLEW.a however it causes symbol errors:
+  # libprojectM.a(projectM.cpp.o): relocation R_X86_64_32S against `_ZTV8projectM' can not be used when making a shared object; recompile with -fPIC
+  #CFLAGS="-I$VLCDEPSDIR/usr/include $SLKCFLAGS" \
+  #CPPFLAGS="-I$VLCDEPSDIR/usr/include $SLKCFLAGS" \
+  #LDFLAGS="-L$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX} $SLKLDFLAGS" \
+  #PKG_CONFIG_PATH="$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}/pkgconfig" \
+  CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
+  LDFLAGS="$SLKLDFLAGS" \
   cmake \
     -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
     -DUSE_FTGL:BOOL=OFF \
@@ -4178,7 +4179,8 @@ else
   make_opus
 
   # Visualisations:
-  make_glew
+  # FIXME: getting symbol errors but we need a static libGLEW:
+  #make_glew
   make_goom
   make_ggi
   make_projectm