Add x264 encoder, fix libggi compile (finally)

1 files changed, 42 insertions, 8 deletions

diff --git a/vlc/build/vlc-1.0.SlackBuild b/vlc/build/vlc-1.0.SlackBuild
index 9006683a..1e5fe980 100755
--- a/vlc/build/vlc-1.0.SlackBuild
+++ b/vlc/build/vlc-1.0.SlackBuild
@@ -94,6 +94,7 @@ TWOLAME=0.3.10
 VCD=0.7.21
 #WXGTK=2.8.2 << does not work
 WXGTK=2.6.3
+X264=20070408-2245
 XVID=1.1.2
 
 # Determine what X we're running (the modular X returns the prefix
@@ -228,6 +229,10 @@ SRCURL[27]="http://dl.sourceforge.net/goom/goom-${GOOM}-src.tar.gz"
 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"
 
+# X264 encoder - for H264/AVC video streams
+SOURCE[29]="$SRCDIR/x264-snapshot-${X264}.tar.bz2"
+SRCURL[29]="ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${X264}.tar.bz2"
+
 
 ##
 ## --- with a little luck, you won't have to edit below this point --- ##
@@ -957,6 +962,8 @@ cd -
 make_goom()
 {
 echo -e "**\n**  goom  ...\n**"
+# First, fix a blatant bug in the archive:
+find $TMP/tmp-$PRGNAM/goom${GOOM} -type d -exec chmod 755 {} \;
 cd $TMP/tmp-$PRGNAM/goom${GOOM}
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -985,7 +992,8 @@ cd $TMP/tmp-$PRGNAM/ggi-${GGI}-bundle/libgii-$GII
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 LDFLAGS="$SLKLDFLAGS" \
-./configure --prefix=/usr \
+./configure --prefix=$TMP/tmp-$PRGNAM/vlcdeps/usr \
+            --sysconfdir=$TMP/tmp-$PRGNAM/vlcdeps/etc \
             --enable-static \
             --disable-shared \
 	    --disable-debug \
@@ -996,18 +1004,19 @@ LDFLAGS="$SLKLDFLAGS" \
 make  2>&1 | tee $OUTPUT/make-${PRGNAM}_ggi.log
 # Install gii into a temp location so libggi can pickup the library
 echo -e "\n**\n**\n"
-make install DESTDIR=$TMP/tmp-$PRGNAM/vlcdeps \
+make install \
   2>&1 | tee -a $OUTPUT/make-${PRGNAM}_ggi.log
 # Next, libggi
 cd $TMP/tmp-$PRGNAM/ggi-${GGI}-bundle/libggi-$GGI
-CFLAGS="$SLKCFLAGS -I`pwd`/../vlcdeps/usr/include" \
-CPPFLAGS="$SLKCFLAGS -I`pwd`/../vlcdeps/usr/include" \
-LDFLAGS="$SLKLDFLAGS -L`pwd`/../vlcdeps/usr/lib" \
-PKG_CONFIG_PATH="`pwd`/../vlcdeps/usr/lib/pkgconfig" \
+CFLAGS="$SLKCFLAGS" \
+CPPFLAGS="$SLKCFLAGS" \
+LDFLAGS="$SLKLDFLAGS" \
 ./configure --prefix=/usr \
+            --sysconfdir=/etc \
             --enable-static \
             --disable-shared \
 	    --disable-debug \
+            --with-gii=`pwd`/../../vlcdeps/usr \
             --program-prefix="" \
             --program-suffix="" \
             --build=$ARCH-slackware-linux \
@@ -1021,6 +1030,28 @@ cd $INDIR
 }
 
 # -----------------------------------------------------------------------------
+# Compile x264
+# -----------------------------------------------------------------------------
+make_x264()
+{
+echo -e "**\n**  x264  ...\n**"
+cd $TMP/tmp-$PRGNAM/x264-snapshot-${X264}
+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}_x264.log
+make  2>&1 | tee $OUTPUT/make-${PRGNAM}_x264.log
+# No need to install, vlc wants the source tree
+cd -
+}
+
+# -----------------------------------------------------------------------------
 # VLC
 # -----------------------------------------------------------------------------
 make_vlc()
@@ -1064,8 +1095,8 @@ PKG_CONFIG_PATH="`pwd`/../vlcdeps/usr/lib/pkgconfig" \
             --enable-vcdx \
             --enable-libcddb \
             --enable-svg \
-            --enable-ggi \
             --enable-sdl \
+            --enable-ggi \
             --enable-svgalib \
             --enable-ncurses \
             --enable-release \
@@ -1078,7 +1109,7 @@ PKG_CONFIG_PATH="`pwd`/../vlcdeps/usr/lib/pkgconfig" \
             --enable-aa \
             --enable-galaktos \
             --enable-goom \
-            --with-goom-tree==$TMP/tmp-$PRGNAM/goom$GOOM \
+            --with-goom-tree=$TMP/tmp-$PRGNAM/goom$GOOM \
             --enable-esd \
             --enable-mad \
             --enable-flac \
@@ -1094,6 +1125,8 @@ PKG_CONFIG_PATH="`pwd`/../vlcdeps/usr/lib/pkgconfig" \
             --with-speex-tree=$TMP/tmp-$PRGNAM/speex-$SPEEX \
             --enable-shout \
             --enable-dirac \
+            --enable-x264 \
+            --with-x264-tree=$TMP/tmp-$PRGNAM/x264-snapshot-$X264 \
             --enable-faad \
             --with-faad-tree=$TMP/tmp-$PRGNAM/faad2 \
             --enable-a52 \
@@ -1261,6 +1294,7 @@ make_mpcdec || exit 1
 make_twolame || exit 1
 make_daap || exit 1
 make_dirac || exit 1
+make_x264 || exit 1
 make_goom || exit 1
 make_ggi || exit 1