Update to 0.9.6

1 files changed, 38 insertions, 22 deletions

diff --git a/handbrake/build/handbrake.SlackBuild b/handbrake/build/handbrake.SlackBuild
index 1e110059..d7133fd5 100755
--- a/handbrake/build/handbrake.SlackBuild
+++ b/handbrake/build/handbrake.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 # $Id$
-# Copyright (c) 2009,2010,2011 Eric Hameleers, Eindhoven, NL
+# Copyright (c) 2009,2010,2011, 2012  Eric Hameleers, Eindhoven, NL
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -28,8 +28,7 @@
 # For:        handbrake
 # Descr:      video transcoder and ripper
 # URL:        http://handbrake.fr/
-# Needs:      yasm (only during compilation)
-#             vlc or libdvdcss (to read encrypted DVD's)
+# Needs:      vlc or libdvdcss (to read encrypted DVD's)
 # Changelog:  
 # r2606-1:    23/Jun/2009 by Eric Hameleers, Eindhoven, NL
 #             * Initial build.
@@ -46,6 +45,8 @@
 # 0.9.5-1:    04/jan/2011 by Eric Hameleers <alien@slackware.com>
 #             * Finally, a new release. Also, make it show an icon in the
 #               XFCE menu. This package no longer depends on webkitgtk.
+# 0.9.6-1:    13/apr/2012 by Eric Hameleers <alien@slackware.com>
+#             * New release.
 # 
 # Run 'sh handbrake.SlackBuild' to build a Slackware package.
 # The package (.tgz) and .txt file as well as build logs are created in /tmp .
@@ -56,7 +57,7 @@
 # Set initial variables:
 
 PRGNAM=handbrake
-VERSION=${VERSION:-0.9.5}
+VERSION=${VERSION:-0.9.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-alien}
 
@@ -64,25 +65,27 @@ DOCS="AUTHORS BUILD COPYING* CREDITS NEWS THANKS TRANSLATIONS"
 
 # Versions of the contribs which are compiled additionally:
 A52DEC=0.7.4
-ASS=0.9.9
-BLURAY="0.0.1-pre-16-g1aab213"
+ASS=0.10.0-1
+BLURAY="0.0.1-pre-213-ga869da8"
+DCA="r81-strapped"
 FAAC=1.28
 FAAD2=2.7
-FFMPEG=r25689
+FFMPEG=v0.7-1696-gcae4f4b
 FONTCONFIG=2.8.0
 FREETYPE=2.3.9
+FRIBIDI=0.19.2
 LAME=3.98
-DCA="r81-strapped"
+DCA=r81-strapped
 DVDNAV=svn1168
 DVDREAD=svn1168
-MKV="0.6.4.1-0-ga80e593"
-OGG=1.1.3
+MKV="0.6.5-0-g82075ae"
+OGG=1.3.0
 SAMPLERATE=0.1.4
 THEORA=1.1.0
-VORBIS="aotuv_b5"
+VORBIS="aotuv_b6.03"
 MP4V2="trunk-r355"
 MPEG2DEC=0.5.1
-X264="r1834-a51816a"
+X264="r2146-bcd41db"
 XML2="2.7.7"
 
 # Where do we look for sources?
@@ -96,7 +99,7 @@ OUTPUT=${OUTPUT:-/tmp}
 SOURCE[0]="$SRCDIR/HandBrake-${VERSION}.tar.bz2"
 SRCURL[0]="http://downloads.sourceforge.net/${PRGNAM}/HandBrake-${VERSION}.tar.bz2"
 
-CONTRIBURL="http://download.m0k.org/handbrake/contrib/"
+CONTRIBURL=" http://download.handbrake.fr/handbrake/contrib"
 
 SOURCE[1]="$SRCDIR/a52dec-$A52DEC.tar.gz"
 SRCURL[1]="$CONTRIBURL/a52dec-$A52DEC.tar.gz"
@@ -113,8 +116,8 @@ SRCURL[4]="$CONTRIBURL/ffmpeg-$FFMPEG.tar.bz2"
 SOURCE[5]="$SRCDIR/lame-$LAME.tar.gz"
 SRCURL[5]="$CONTRIBURL/lame-$LAME.tar.gz"
 
-SOURCE[6]="$SRCDIR/libass-$ASS.tar.bz2"
-SRCURL[6]="$CONTRIBURL/libass-$ASS.tar.bz2"
+SOURCE[6]="$SRCDIR/libass-$ASS.tar.gz"
+SRCURL[6]="$CONTRIBURL/libass-$ASS.tar.gz"
 
 SOURCE[7]="$SRCDIR/libbluray-$BLURAY.tar.gz"
 SRCURL[7]="$CONTRIBURL/libbluray-$BLURAY.tar.gz"
@@ -128,8 +131,8 @@ SRCURL[9]="$CONTRIBURL/libdvdnav-$DVDNAV.tar.gz"
 SOURCE[10]="$SRCDIR/libdvdread-$DVDREAD.tar.gz"
 SRCURL[10]="$CONTRIBURL/libdvdread-$DVDREAD.tar.gz"
 
-SOURCE[11]="$SRCDIR/libmkv-$MKV.tar.bz2"
-SRCURL[11]="$CONTRIBURL/libmkv-$MKV.tar.bz2"
+SOURCE[11]="$SRCDIR/libmkv-$MKV.tar.gz"
+SRCURL[11]="$CONTRIBURL/libmkv-$MKV.tar.gz"
 
 SOURCE[12]="$SRCDIR/mp4v2-$MP4V2.tar.bz2"
 SRCURL[12]="$CONTRIBURL/mp4v2-$MP4V2.tar.bz2"
@@ -140,17 +143,22 @@ SRCURL[13]="$CONTRIBURL/mpeg2dec-$MPEG2DEC.tar.gz"
 SOURCE[14]="$SRCDIR/x264-$X264.tar.gz"
 SRCURL[14]="$CONTRIBURL/x264-$X264.tar.gz"
 
+SOURCE[15]="$SRCDIR/fribidi-$FRIBIDI.tar.gz"
+SRCURL[15]="$CONTRIBURL/fribidi-$FRIBIDI.tar.gz"
+
 ##
 ## --- with a little luck, you won't have to edit below this point --- ##
 ##
 
 # Automatically determine the architecture we're building on:
+MARCH=$( uname -m )
 if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) export ARCH=i486 ;;
-    arm*) export ARCH=arm ;;
+  case "$MARCH" in
+    i?86)    export ARCH=i486 ;;
+    armv7hl) export ARCH=$MARCH ;;
+    arm*)    export ARCH=arm ;;
     # Unless $ARCH is already set, use uname -m for all other archs:
-       *) export ARCH=$( uname -m ) ;;
+    *)       export ARCH=$MARCH ;;
   esac
 fi
 
@@ -172,6 +180,9 @@ case "$ARCH" in
   x86_64)    SLKCFLAGS="-O2 -fPIC"
              SLKLDFLAGS="-L/usr/lib64"; LIBDIRSUFFIX="64"
              ;;
+  armv7hl)   SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
+             SLKLDFLAGS=""; LIBDIRSUFFIX=""
+             ;;
   *)         SLKCFLAGS="-O2"
              SLKLDFLAGS=""; LIBDIRSUFFIX=""
              ;;
@@ -229,7 +240,7 @@ for (( i = 0; i < ${#SOURCE[*]}; i++ )) ; do
     [ -w "$SRCDIR" ] || SOURCE[$i]="$OUTPUT/$(basename ${SOURCE[$i]})"
     if ! [ "x${SRCURL[$i]}" == "x" ]; then
       echo "Will download file to $(dirname $SOURCE[$i])"
-      if ! $(wget -nv -T 20 -O "${SOURCE[$i]}" "${SRCURL[$i]}"); then
+      if ! $(wget -nv -T 20 -O ${SOURCE[$i]} ${SRCURL[$i]}); then
         echo "Downloading '$(basename ${SOURCE[$i]})' failed.. aborting the build."
         mv -f "${SOURCE[$i]}" "${SOURCE[$i]}".FAIL
         exit 1
@@ -261,6 +272,11 @@ cd $TMP/tmp-$PRGNAM
 echo "Extracting the source archive(s) for $PRGNAM..."
 tar -xvf ${SOURCE[0]}
 cd HandBrake-${VERSION}
+
+# Slackware's fribidi is too old but handbrake refuses to include a static copy:
+cat $SRCDIR/handbrake.static_fribidi.patch | patch -p1 --verbose \
+  2>&1 | tee $OUTPUT/patch-${PRGNAM}.log
+
 mkdir download
 for FF in $(seq 1 $(( ${#SOURCE[@]} -1 ))); do
   cp ${SOURCE[$FF]} download/