Also added libggi support

1 files changed, 55 insertions, 30 deletions

diff --git a/vlc/build/vlc-1.0.SlackBuild b/vlc/build/vlc-1.0.SlackBuild
index 3709b293..ba923d69 100755
--- a/vlc/build/vlc-1.0.SlackBuild
+++ b/vlc/build/vlc-1.0.SlackBuild
@@ -80,6 +80,7 @@ EBML=0.7.7
 FAAC=1.25
 FAAD2=2.5
 FFMPEG=snapshot
+GGI=2.2.2
 GOOM=2k4-0
 LAME=3.97
 LIVE=2007.02.20
@@ -222,6 +223,10 @@ SRCURL[26]="http://downloads.us.xiph.org/releases/speex/speex-${SPEEX}.tar.gz"
 SOURCE[27]="$SRCDIR/goom-${GOOM}-src.tar.gz"
 SRCURL[27]="http://dl.sourceforge.net/goom/goom-${GOOM}-src.tar.gz"
 
+# GGI, output plugin
+SOURCE[28]="$SRCDIR/ggi-${GGI}-bundle.src.tar.bz2"
+SRCURL[28]="http://www.ggi-project.org/ftp/ggi/v2.2/ggi-${GGI}-bundle.src.tar.bz2"
+
 
 ##
 ## --- with a little luck, you won't have to edit below this point --- ##
@@ -962,11 +967,30 @@ LDFLAGS="$SLKLDFLAGS" \
             --program-suffix="" \
             --build=$ARCH-slackware-linux \
   2>&1 | tee $OUTPUT/configure-${PRGNAM}_goom.log
-make  2>&1 | tee $OUTPUT/make-${PRGNAM}_goom.log
-# Install goom into a temp location so vlc can pickup the library
+cd -
+}
+
+# -----------------------------------------------------------------------------
+# Compile ggi
+# -----------------------------------------------------------------------------
+make_ggi()
+{
+echo -e "**\n**  ggi  ...\n**"
+cd $TMP/tmp-$PRGNAM/ggi-${GGI}-bundle
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+LDFLAGS="$SLKLDFLAGS" \
+./configure --prefix=/usr \
+            --enable-static \
+            --disable-shared \
+            --program-prefix="" \
+            --program-suffix="" \
+            --build=$ARCH-slackware-linux \
+  2>&1 | tee $OUTPUT/configure-${PRGNAM}_ggi.log
+# Install ggi into a temp location so vlc can pickup the library
 echo -e "\n**\n**\n"
 make install DESTDIR=$TMP/tmp-$PRGNAM/vlcdeps \
-  2>&1 | tee -a $OUTPUT/make-${PRGNAM}_goom.log
+  2>&1 | tee -a $OUTPUT/make-${PRGNAM}_ggi.log
 cd -
 }
 
@@ -1003,6 +1027,7 @@ PKG_CONFIG_PATH="`pwd`/../vlcdeps/usr/lib/pkgconfig" \
             --disable-hal \
             --disable-qt \
             --disable-kde \
+            --disable-arts \
 	    --disable-gnomevfs \
             --enable-dvdread \
             --with-dvdread-tree=$TMP/tmp-$PRGNAM/libdvdread-$DVDREAD \
@@ -1012,6 +1037,8 @@ PKG_CONFIG_PATH="`pwd`/../vlcdeps/usr/lib/pkgconfig" \
             --enable-cddax \
             --enable-vcdx \
             --enable-libcddb \
+            --enable-svg \
+            --enable-ggi \
             --enable-sdl \
             --enable-svgalib \
             --enable-ncurses \
@@ -1027,7 +1054,6 @@ PKG_CONFIG_PATH="`pwd`/../vlcdeps/usr/lib/pkgconfig" \
             --enable-goom \
             --with-goom-tree==$TMP/tmp-$PRGNAM/goom$GOOM \
             --enable-esd \
-            --enable-arts \
             --enable-mad \
             --enable-flac \
             --enable-taglib \
@@ -1070,8 +1096,6 @@ cd -
 #            --enable-dvb \
 #            --enable-real \
 #            --enable-realrtsp \
-#            --enable-svg \
-#            --enable-ggi \
 #            --enable-portaudio \
 #            --enable-cyberlink \
 #            --enable-pda \
@@ -1177,45 +1201,46 @@ fi
 
 # CD/VCD image support:
 # Circular dependencies need these loops:
-make_cdio --without-vcd-info
-make_vcd
-make_cdio
+make_cdio --without-vcd-info || exit 1
+make_vcd || exit 1
+make_cdio || exit 1
 
 # vlc wants this, but cdio chokes with "cannot find -lcddb" so build it after
 # cdio (which only used cddb for the cd-info binary which we don't use):
-make_cddb
+make_cddb || exit 1
 
 # DVD support:
-make_dvdnav
-make_dvdcss
-make_dvdread
+make_dvdnav || exit 1
+make_dvdcss || exit 1
+make_dvdread || exit 1
 
 # Needed before ffmpeg:
-make_lame
-make_xvid
-make_faac
+make_lame || exit 1
+make_xvid || exit 1
+make_faac || exit 1
 
 # ffmpeg uses the above static libraries:
-make_ffmpeg
+make_ffmpeg || exit 1
 
 # wxgtk is used for the vlc gui:
-make_wxgtk
+make_wxgtk || exit 1
 
 # Additional libraries that vlc will use:
-make_faad2
-make_a52
-make_live555
-make_matroska
-make_mpeg2dec
-make_mpcdec
-make_twolame
-make_daap
-make_dirac
-make_goom
+make_faad2 || exit 1
+make_a52 || exit 1
+make_live555 || exit 1
+make_matroska || exit 1
+make_mpeg2dec || exit 1
+make_mpcdec || exit 1
+make_twolame || exit 1
+make_daap || exit 1
+make_dirac || exit 1
+make_goom || exit 1
+make_ggi || exit 1
 
 # Speex before shout and vlc:
-make_speex
-make_shout
+make_speex || exit 1
+make_shout || exit 1
 
 # And finally, let vlc collect all of the above into one app:
 make_vlc || exit 1