Add the man page

1 files changed, 26 insertions, 10 deletions

diff --git a/vlc/build/vlc-1.0.SlackBuild b/vlc/build/vlc-1.0.SlackBuild
index 5f593a54..644c13c4 100755
--- a/vlc/build/vlc-1.0.SlackBuild
+++ b/vlc/build/vlc-1.0.SlackBuild
@@ -136,6 +136,8 @@
 # 0.9.8a-1:   04/dec/2008 by Eric Hameleers <alien@slackware.com>
 #             * VLC bugfix release... also took the opportunity to fix *my*
 #               broken build of the dca and fluidsynth modules.
+# 0.9.8a-2:   04/dec/2008 by Eric Hameleers <alien@slackware.com>
+#             * Updated ffmpeg/x264 snapshots, and re-adding firewire support
 # 
 # Run 'sh vlc.SlackBuild --cleanup' to build a Slackware package.
 # The package (.tgz) plus descriptive .txt file are created in /tmp .
@@ -160,7 +162,7 @@
 PRGNAM=vlc
 PRGNAM2=mozplugin
 ARCH=${ARCH:-"i486"}
-BUILD=${BUILD:-"1"}
+BUILD=${BUILD:-"2"}
 TAG=${TAG:-"alien"}
 
 # SRCVER and VERSION values may be modified later!
@@ -186,7 +188,7 @@ case "$ARCH" in
              SLKLDFLAGS=""; LIBDIRSUFFIX=""
              ;;
   x86_64)    SLKCFLAGS="-O2 -fPIC"
-             SLKLDFLAGS="-L/usr/lib64"; LIBDIRSUFFIX="64"
+             SLKLDFLAGS="-L/usr/lib64 -fPIC"; LIBDIRSUFFIX="64"
              ;;
   athlon-xp) SLKCFLAGS="-march=athlon-xp -O3 -pipe -fomit-frame-pointer"
              SLKLDFLAGS=""; LIBDIRSUFFIX=""
@@ -281,8 +283,8 @@ FAAC=1.26
 FAAD2=2.6.1
 #FFMPEG=20080731
 #FFMPEG=r14080 # latest recommended version for 0.9.0 is r14080 (20080705)
-FFMPEG=r15976 # recommended version for 0.9.2 is r15261 (20080908)
-              # but I use 15976 (20081202)
+FFMPEG=r16043 # recommended version for 0.9.2 is r15261 (20080908)
+              # but I use 16043 (20081210)
 FLUID=1.0.8
 GGI=2.2.2
 GII=1.0.2
@@ -304,7 +306,7 @@ UPNP=1.6.6
 VCD=0.7.23
 X264_SAFE=20080301-2245 # In later versions nasm complains
                         #   about 'function hidden'
-X264=20081201-2245      # Needs yasm installed
+X264=20081210-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):
@@ -1232,6 +1234,8 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 LDFLAGS="$SLKLDFLAGS" \
 ./configure --prefix=$VLCDEPSDIR/usr \
+            --without-x \
+            --disable-sdl \
             --enable-static \
             --disable-shared \
             --program-prefix="" \
@@ -1803,11 +1807,19 @@ cd $INDIR
 make_x264()
 {
 echo -e "**\n**  x264  ...\n**"
+if [ "$ARCH" = "x86_64" ]; then
+  ARCHOPTS="--enable-pic"
+else
+  ARCHOPTS=""
+fi
 cd $TMP/tmp-$PRGNAM/x264-snapshot-${X264}
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 LDFLAGS="$SLKLDFLAGS" \
-./configure --prefix=/usr 2>&1 | tee $OUTPUT/configure-${PRGNAM}_x264.log
+./configure \
+  --prefix=/usr \
+  $ARCHOPTS \
+  2>&1 | tee $OUTPUT/configure-${PRGNAM}_x264.log
 make -j${JOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_x264.log
 # Install x264 into a temp location so vlc can pickup the library
 make install DESTDIR=$VLCDEPSDIR \
@@ -2174,6 +2186,9 @@ PATH="$VLCDEPSDIR/usr/bin:$PATH" \
             --enable-esd \
 	    --disable-gnomevfs \
             --enable-pvr \
+            --enable-dc1394 \
+            --with-dv-raw1394=$TMP/tmp-$PRGNAM/libraw1394-${RAW1394} \
+            --with-dv-avc1394=$TMP/tmp-$PRGNAM/libavc1394-${AVC1394} \
             --disable-dv \
             --enable-dvbpsi \
             --enable-dvdnav \
@@ -2233,9 +2248,6 @@ PATH="$VLCDEPSDIR/usr/bin:$PATH" \
             # Disabled for now (note dvb is now explicitly disabled
             # above or else you get compile errors):
             #--enable-dv \
-            #--enable-dc1394 \
-            #--with-dv-raw1394=$TMP/tmp-$PRGNAM/libraw1394-${RAW1394} \
-            #--with-dv-avc1394=$TMP/tmp-$PRGNAM/libavc1394-${AVC1394} \
             #--enable-ggi \
             #--enable-goom \
             #--with-goom-tree=$TMP/tmp-$PRGNAM/goom$GOOM \
@@ -2329,6 +2341,10 @@ for res in 16 32 48 128; do
     $PKG/usr/share/icons/hicolor/${res}x${res}/apps/vlc.png
 done
 
+# Add the man page:
+mkdir -p $PKG/usr/man/man1
+gzip -9c doc/vlc.1 > $PKG/usr/man/man1/vlc.1.gz
+
 # Add package documentation:
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 mv $PKG/usr/share/doc/vlc/* $PKG/usr/doc/$PRGNAM-$VERSION || true
@@ -2442,11 +2458,11 @@ make_x264
 make_live555
 make_ass
 make_fluid
+make_1394
 
 # Leave these out for now (0.9.0. testing phase)
 #make_goom
 #make_ggi
-#make_1394
 #make_dv
 
 make_dvbpsi