[Lunar-commits] <moonbase> vlc: use sane default font

[Paul Bredbury]

commit df7a7f38ae81629b187b7b16a2426899350f42d5
Author: Paul Bredbury <brebs at lunar-linux.org>
Date:   Thu Sep 3 05:51:07 2009 +0700

    vlc: use sane default font
    
    Also fix compilation when .png files are (naughtily) in /usr/share/icons/ instead of /usr/share/pixmaps/
---
 video/vlc/BUILD   |   22 ++++++++++++----------
 video/vlc/DEPENDS |    1 +
 video/vlc/DETAILS |    2 +-
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/video/vlc/BUILD b/video/vlc/BUILD
index c974cc4..e66415e 100644
--- a/video/vlc/BUILD
+++ b/video/vlc/BUILD
@@ -1,23 +1,25 @@
 (
 
+  # Use a default font which actually exists
+  sedit "s:truetype/freefont/FreeSerifBold.ttf:dejavu-ttf/DejaVuSerif-Bold.ttf:" modules/misc/freetype.c  &&
+
   if in_depends qt4; then
    . /etc/profile.d/qt4.rc
   fi  &&
 
-  OPTS="$OPTS --enable-release --enable-x11 --enable-xvideo --enable-v4l \
-       --disable-nls --disable-mozilla"
+  OPTS+=" --enable-release --enable-x11 --enable-xvideo --enable-v4l \
+          --disable-nls --disable-mozilla"  &&
 
   default_build  &&
 
-  #It's 2009. Why can't VLC install their own icons yet?
-  if module_installed gnome2 || module_installed xfce4 ; then
-    for x in 16x16 32x32 48x48 128x128 ; do
-      ln -sf /usr/share/vlc/vlc$x.png /usr/share/icons/hicolor/$x/apps/vlc.png ;
-    done  &&
+  # It's 2009. Why can't VLC install their own icons yet?
+  for x in 16x16 32x32 48x48 128x128 ; do
+    mkdir -p /usr/share/icons/hicolor/$x/apps/  &&
+    ln -sf /usr/share/vlc/vlc$x.png /usr/share/icons/hicolor/$x/apps/vlc.png ;
+  done  &&
 
-    for x in `ls -d /usr/share/icons/*` ; do
-      gtk-update-icon-cache -f $x ;
-    done  
+  if [[ -e /usr/bin/gtk-update-icon-cache ]] ; then
+    gtk-update-icon-cache -f /usr/share/icons/hicolor/
   fi
 
 ) > $C_FIFO 2>&1
diff --git a/video/vlc/DEPENDS b/video/vlc/DEPENDS
index e535f6d..09eddf7 100644
--- a/video/vlc/DEPENDS
+++ b/video/vlc/DEPENDS
@@ -1,6 +1,7 @@
 depends  mpeg2dec
 depends  ffmpeg
 
+optional_depends  "dejavu-ttf"   ""  ""  "for DejaVu (default) font"
 optional_depends  "hal"          ""  ""  "for HAL support"
 optional_depends  "alsa-lib"     ""  ""  "for ALSA support"
 optional_depends  "libogg"       ""  ""  "for OGG support"
diff --git a/video/vlc/DETAILS b/video/vlc/DETAILS
index 995cd72..013152b 100644
--- a/video/vlc/DETAILS
+++ b/video/vlc/DETAILS
@@ -5,7 +5,7 @@
       SOURCE_VFY=sha1:4bd670f538651633c1115c8f4efc94211ff882ec
         WEB_SITE=http://www.videolan.org
          ENTERED=20011113
-         UPDATED=20090728
+         UPDATED=20090902
            SHORT="Videolan client multimedia player"
 
 cat << EOF