Update

1 files changed, 46 insertions, 24 deletions

diff --git a/ffmpeg/build/ffmpeg.SlackBuild b/ffmpeg/build/ffmpeg.SlackBuild
index 722dfd1b..5f94efa7 100755
--- a/ffmpeg/build/ffmpeg.SlackBuild
+++ b/ffmpeg/build/ffmpeg.SlackBuild
@@ -41,6 +41,8 @@
 # 20070612-1: 12/jun/2007 by Eric Hameleers <alien@slackware.com>
 #             * Update. Also, make sure that the script actually works
 #               for newer snapshots if they should be downloaded.
+# 20071006-1: 06/oct/2007 by Eric Hameleers <alien@slackware.com>
+#             * Update. Added documentation of the included libraries.
 # 
 # Run 'sh ffmpeg.SlackBuild --cleanup' to build a Slackware package.
 # The package (.tgz) plus descriptive .txt file are created in /tmp .
@@ -70,16 +72,22 @@ VERSION=${VERSION:-`date +%Y%m%d`}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 
-DOCS="COPYING CREDITS Changelog MAINTAINERS README \
+DOCS="COPYING* CREDITS Changelog MAINTAINERS README* \
       doc/TODO doc/*.txt doc/*.html"
+DOCS_A52="AUTHORS COPYING* ChangeLog HISTORY NEWS README* TODO"
+DOCS_FAAC="AUTHORS COPYING* ChangeLog NEWS README* TODO"
+DOCS_FAAD2="AUTHORS COPYING* ChangeLog NEWS README* TODO"
+DOCS_LAME="API COPYING ChangeLog HACKING LICENSE README STYLEGUIDE TODO USAGE"
+DOCS_X264="AUTHORS COPYING"
+DOCS_XVID="AUTHORS ChangeLog* CodingStyle LICENSE README TODO"
 
 # Support libraries:
 A52=0.7.4
 FAAC=1.25
 FAAD2=2.5
 LAME=3.97
-X264=20070611-2245
-XVID=1.1.2
+X264=20071005-2245
+XVID=1.1.3
 
 # Where do we look for sources?
 CWD=`pwd`
@@ -167,24 +175,16 @@ case "$ARCH" in
 esac
 
 # Create working directories:
-if [ ! -d $TMP/tmp-$PRGNAM ]; then
-  mkdir -p $TMP/tmp-$PRGNAM # location to build the source
-elif [ "$P1" != "--oldbuild" ]; then
+mkdir -p $TMP/tmp-$PRGNAM # location to build the source
+if [ "$P1" != "--oldbuild" ]; then
   # If the "--oldbuild" parameter is present, we keep
   #  the old build files and continue;
   # By default we remove the remnants of previous build and continue:
   rm -rf $TMP/tmp-$PRGNAM/* $OUTPUT/*${PRGNAM}*.log
 fi
-
-if [ ! -d $PKG ]; then
-  mkdir -p $PKG  # place for the package to be built
-else
-  rm -rf $PKG/*  # We always erase old package's contents:
-fi
-
-if [ ! -d $OUTPUT ]; then
-  mkdir -p $OUTPUT  # place for the package to be saved
-fi
+mkdir -p $PKG     # place for the package to be built
+rm -rf $PKG/*     # We always erase old package's contents:
+mkdir -p $OUTPUT  # place for the package to be saved
 
 
 # Source file availability:
@@ -209,7 +209,7 @@ for (( i = 0; i < ${#SOURCE[*]} - $SKIP; i++ )) ; do
       echo "Source '`basename ${SOURCE[$i]}`' not available yet..."
       echo "Will download file to `dirname $SOURCE[$i]`"
       wget -nv --connect-timeout=20 -O "${SOURCE[$i]}" "${SRCURL[$i]}" || true
-      if [ $? -ne 0 ]; then
+      if [ $? -ne 0 -o ! -s "${SOURCE[$i]}" ]; then
         echo "Downloading '`basename ${SOURCE[$i]}`' failed.. aborting the build."
         mv -f "${SOURCE[$i]}" "${SOURCE[$i]}".FAIL
         exit 1
@@ -312,7 +312,8 @@ cd -
 make_faac()
 {
 echo -e "**\n**  faac ...\n**"
-cd $TMP/tmp-$PRGNAM/faac
+mv $TMP/tmp-$PRGNAM/faac $TMP/tmp-$PRGNAM/faac-${FAAC}
+cd $TMP/tmp-$PRGNAM/faac-${FAAC}
 ex +":set ff=unix" +":wq" bootstrap
 ex +":set ff=unix" +":wq" configure.in
 sh bootstrap
@@ -339,7 +340,8 @@ cd -
 make_faad2()
 {
 echo -e "**\n**  faad2 ...\n**"
-cd $TMP/tmp-$PRGNAM/faad2
+mv $TMP/tmp-$PRGNAM/faad2 $TMP/tmp-$PRGNAM/faad2-${FAAD2}
+cd $TMP/tmp-$PRGNAM/faad2-${FAAD2}
 patch -p1 < $SRCDIR/faad2-remove-bmp.patch
 autoreconf -vif
 CFLAGS="$SLKCFLAGS" \
@@ -392,7 +394,8 @@ cd -
 make_x264()
 {
 echo -e "**\n**  x264  ...\n**"
-cd $TMP/tmp-$PRGNAM/x264-snapshot-${X264}
+mv $TMP/tmp-$PRGNAM/x264-snapshot-${X264} $TMP/tmp-$PRGNAM/x264-${X264}
+cd $TMP/tmp-$PRGNAM/x264-${X264}
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 LDFLAGS="$SLKLDFLAGS" \
@@ -434,6 +437,7 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 LDFLAGS="$SLKLDFLAGS" \
 ./configure --prefix=/usr \
+            --mandir=/usr/man \
             --${do_mp3}able-libmp3lame \
             --enable-libogg \
             --enable-libvorbis \
@@ -450,7 +454,7 @@ LDFLAGS="$SLKLDFLAGS" \
             --disable-debug \
             --disable-shared \
             --enable-static \
-            --log=$OUTPUT/ffmpeg.err \
+            --log=$OUTPUT/ffmpeg_conf.log \
             --extra-cflags="-I`pwd`/../ffmpegdeps/usr/include" \
             --extra-ldflags="-L`pwd`/../ffmpegdeps/usr/lib" \
             2>&1 | tee $OUTPUT/configure-${PRGNAM}_ffmpeg.log
@@ -477,9 +481,8 @@ make_ffmpeg || exit 1
 
 # End of compilation, proceed to packaging the binaries:
 cd $TMP/tmp-${PRGNAM}/${PRGNAM}-${VERSION}
-#
+
 # Install all the needed stuff to the package dir
-#
 # Use installwatch if available, to produce a logfile of the installation
 # process that is more easily readable:
 if `which installwatch  > /dev/null 2>&1`; then
@@ -489,8 +492,27 @@ else
 fi
 
 # Add  documentation:
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/{a52dec,faac,faad2,lame,x264,xvidcore}
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION || true
+# And the included libraries:
+( cd ../a52dec-${A52}
+  cp -a $DOCS_A52 $PKG/usr/doc/$PRGNAM-$VERSION/a52dec || true
+)
+( cd ../faac-${FAAC}
+  cp -a $DOCS_FAAC $PKG/usr/doc/$PRGNAM-$VERSION/faac || true
+)
+( cd ../faad2-${FAAD2}
+  cp -a $DOCS_FAAD2 $PKG/usr/doc/$PRGNAM-$VERSION/faad2 || true
+)
+( cd ../lame-${LAME}
+  cp -a $DOCS_LAME $PKG/usr/doc/$PRGNAM-$VERSION/lame || true
+)
+( cd ../x264-${X264}
+  cp -a $DOCS_X264 $PKG/usr/doc/$PRGNAM-$VERSION/x264 || true
+)
+( cd ../xvidcore-${XVID}
+  cp -a $DOCS_XVID $PKG/usr/doc/$PRGNAM-$VERSION/xvidcore || true
+)
 
 # Compress the man page(s)
 if [ -d $PKG/usr/man ]; then