Fixes to the projectM plugin

1 files changed, 20 insertions, 14 deletions

diff --git a/vlc/build/vlc.SlackBuild b/vlc/build/vlc.SlackBuild
index fca28c8f..5e053452 100755
--- a/vlc/build/vlc.SlackBuild
+++ b/vlc/build/vlc.SlackBuild
@@ -204,7 +204,7 @@
 #             * New release. The ffmpeg/x264 snapshots were updated.
 # 20091228-1: 28/dec/2009 by Eric Hameleers <alien@slackware.com>
 #             * Test of git snapshot (1.1.git)
-# 20100317-1: 18/mar/2010 by Eric Hameleers <alien@slackware.com>
+# 20100318-1: 19/mar/2010 by Eric Hameleers <alien@slackware.com>
 #             * Update of git snapshot (1.1.git). Also updated ffmpeg, live555
 #               and x264 snapshots. Fixed the ffmpeg checkout so that we can
 #               control what version of swscale gets used. Fixed the checkout
@@ -395,7 +395,7 @@ V4L=0.6.1
 VCD=0.7.23
 X264_SAFE=20080301-2245 # In later versions nasm complains
                         # about 'function hidden'
-X264=20100313-2245      # Needs yasm installed
+X264=20100318-2245      # Needs yasm installed
 
 # Determine what X we're running (the modular X returns the prefix
 # in the next command, while older versions stay silent):
@@ -1957,10 +1957,12 @@ echo -e "**\n**  projectm  ...\n**"
 cd $TMP/tmp-$PRGNAM/projectM-${PROJECTM}-Source
 
 # Fix linking - get rid of unresolved symbols at runtime:
-#cat $SRCDIR/projectM_linking.patch | patch -p0 --verbose \
 cat $SRCDIR/projectM_static.patch | patch -p1 --verbose \
   2>&1 | tee $OUTPUT/patch-${PRGNAM}_projectm.log
 
+# We need to redefine the presets etc path:
+sed -i -e "s#share/projectM#share/vlc/projectM#" $(grep -lr 'share/projectM' .)
+
 mkdir build
 cd build
   CFLAGS="$SLKCFLAGS" \
@@ -1975,14 +1977,14 @@ cd build
     -DINCLUDE-PROJECTM-QT:BOOL=OFF \
     -DDISABLE_NATIVE_PRESETS:BOOL=ON \
     -DBUILD_PROJECTM_STATIC:BOOL=ON \
-    -DCMAKE_INSTALL_PREFIX=$VLCDEPSDIR/usr \
-    -DLIB_INSTALL_DIR=$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX} \
+    -DCMAKE_INSTALL_PREFIX=/usr \
     -DLIB_SUFFIX=${LIBDIRSUFFIX} \
     .. \
     2>&1 | tee $OUTPUT/cmake-${PRGNAM}_projectm.log
   make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_projectm.log
   # Install projectm into a temp location so vlc can pickup the library
-  make install 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_projectm.log
+  make install DESTDIR=$VLCDEPSDIR \
+    2>&1 | tee -a $OUTPUT/make-${PRGNAM}_projectm.log
   ## These are being forgotten...
   cp Renderer/libRenderer.a MilkdropPresetFactory/libMilkdropPresetFactory.a \
     $VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}/
@@ -2658,6 +2660,14 @@ else
   DO_FFMPEG_LIBS_PAT=""
 fi
 
+# If we built a static projectM support library, let's use it properly:
+if [ -d $VLCDEPSDIR/usr/share/vlc/projectM ]; then
+  sed -i -e "s#share/projectM#share/vlc/projectM#" \
+    $(grep -lr 'share/projectM' .)
+  sed -i -e "s#usr/share/fonts/truetype/ttf-dejavu#usr/share/fonts/TTF#" \
+    $(grep -lr 'usr/share/fonts/truetype/ttf-dejavu' .)
+fi
+
 # VLC 0.9.6 but also 0.9.9 needs to regenerate libtool (known bug)
 if ls m4/lt*.m4 1>/dev/null 2>/dev/null ; then
   rm -f m4/{lt,lib}*.m4; autoreconf -svif
@@ -2869,15 +2879,11 @@ fi
 
 # Copy the projectM presets and other requirements into the package if we
 # are adding support for it:
-if [ -d $VLCDEPSDIR/usr/share/projectM ]; then
-  cp -a $VLCDEPSDIR/usr/share/projectM $PKG/usr/share/vlc/
-  sed -i -e "s#$VLCDEPSDIR/usr/share/projectM/#/usr/share/vlc/projectM/#" \
-         -e "s#Vera#DejaVuSans#" \
-    $PKG/usr/share/vlc/projectM/config.inp
+if [ -d $VLCDEPSDIR/usr/share/vlc/projectM ]; then
+  cp -a $VLCDEPSDIR/usr/share/vlc/projectM $PKG/usr/share/vlc/
   rm $PKG/usr/share/vlc/projectM/fonts/*
-  for FNT in DejaVuSans DejaVuSansMono ; do
-   ln -sf /usr/share/fonts/TTF/${FNT}.ttf $PKG/usr/share/vlc/projectM/fonts/
-  done
+  ln -sf /usr/share/fonts/TTF/DejaVuSans.ttf $PKG/usr/share/vlc/projectM/fonts/Vera.ttf
+  ln -sf /usr/share/fonts/TTF/DejaVuSansMono.ttf $PKG/usr/share/vlc/projectM/fonts/VeraMono.ttf
 fi
 
 # Copy libggi configuration files into the package if we added support for it: