multimedia/HandBrake: Updated for version 0.9.5.

Signed-off-by: dsomero <xgizzmo@slackbuilds.org>

4 files changed, 60 insertions, 33 deletions

diff --git a/multimedia/HandBrake/HandBrake.SlackBuild b/multimedia/HandBrake/HandBrake.SlackBuild
index f65066329c..361695e7de 100644
--- a/multimedia/HandBrake/HandBrake.SlackBuild
+++ b/multimedia/HandBrake/HandBrake.SlackBuild
@@ -6,32 +6,30 @@
 # Modified by David Somero at SlackBuilds.org.
 
 PRGNAM=HandBrake
-VERSION=${VERSION:-0.9.4}
-ARCH=${ARCH:-i686}
+VERSION=${VERSION:-0.9.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i686 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-# Has to be i686 or x86_64
-if [ "$ARCH" != "x86_64" ]; then
- ARCH="i686"
-fi
-
-# We are doing this to prevent HandBrake from downloading these
-# files. SBo does not allow scripts/source to download stuff.
-DLOADS="a52dec-0.7.4.tar.gz faac-1.28.tar.gz faad2-2.7.tar.gz 
-ffmpeg-r19067.tar.bz2 lame-3.98.tar.gz libdca-r81-strapped.tar.gz 
-libdvdnav-svn1168.tar.gz libdvdread-svn1168.tar.gz libmkv-0.6.4.tar.bz2 
-libogg-1.1.3.tar.gz libsamplerate-0.1.4.tar.gz libtheora-1.1.0.tar.bz2 
-libvorbis-aotuv_b5.tar.gz mp4v2-trunk-r355.tar.bz2 mpeg2dec-0.5.1.tar.gz 
-x264-r1347-5ddd61b.tar.gz"
-
 set -e
 
+# Support building with no GUI.
+if [ "${GUI:-yes}" = "no" ]; then
+    GUI="--disable-gtk"
+fi
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
@@ -39,21 +37,18 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
 mkdir download
-for file in $DLOADS ; do cp $CWD/$file download ; done
+cp -r $CWD/* download
 chown -R root:root .
 chmod -R a-s,u+w,g-w+r,o-w+r .
 
-./configure \
+./configure $GUI \
   --prefix=/usr\
   --arch=$ARCH
 
 cd build
   make
-cd ..
-  install -D -m0755 -s build/HandBrakeCLI $PKG/usr/bin/HandBrakeCLI
-  install -D -m0755 -s build/gtk/src/ghb $PKG/usr/bin/ghb
-  install -D -m0644 gtk/src/ghb.desktop $PKG/usr/share/applications/ghb.desktop
-  install -D -m0644 gtk/src/hb-icon.64.png $PKG/usr/share/pixmaps/hb-icon.png
+  make install DESTDIR=$PKG
+cd $TMP/$PRGNAM-$VERSION
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS COPYING CREDITS NEWS THANKS $PKG/usr/doc/$PRGNAM-$VERSION
@@ -61,6 +56,7 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/multimedia/HandBrake/HandBrake.info b/multimedia/HandBrake/HandBrake.info
index 6a250609d0..cbc6d59c69 100644
--- a/multimedia/HandBrake/HandBrake.info
+++ b/multimedia/HandBrake/HandBrake.info
@@ -1,40 +1,58 @@
 PRGNAM="HandBrake"
-VERSION="0.9.4"
+VERSION="0.9.5"
 HOMEPAGE="http://handbrake.fr/"
-DOWNLOAD="http://dl.dropbox.com/u/56460/Handbrake/HandBrake-0.9.4.tar.bz2 \
+DOWNLOAD="http://downloads.sourceforge.net/project/handbrake/0.9.5/HandBrake-0.9.5.tar.bz2 \
           http://download.m0k.org/handbrake/contrib/a52dec-0.7.4.tar.gz \
+          http://download.handbrake.fr/handbrake/contrib/bzip2-1.0.6.tar.gz \
           http://download.m0k.org/handbrake/contrib/faac-1.28.tar.gz \
           http://download.m0k.org/handbrake/contrib/faad2-2.7.tar.gz \
-          http://download.m0k.org/handbrake/contrib/ffmpeg-r19067.tar.bz2 \
+          http://download.m0k.org/handbrake/contrib/ffmpeg-r25689.tar.bz2 \
+          http://download.m0k.org/handbrake/contrib/fontconfig-2.8.0.tar.gz \
+          http://download.m0k.org/handbrake/contrib/freetype-2.3.9.tar.gz \
           http://download.m0k.org/handbrake/contrib/lame-3.98.tar.gz \
+          http://download.m0k.org/handbrake/contrib/libass-0.9.9.tar.bz2 \
+          http://download.m0k.org/handbrake/contrib/libbluray-0.0.1-pre-16-g1aab213.tar.gz \
           http://download.m0k.org/handbrake/contrib/libdca-r81-strapped.tar.gz \
           http://download.m0k.org/handbrake/contrib/libdvdnav-svn1168.tar.gz \
           http://download.m0k.org/handbrake/contrib/libdvdread-svn1168.tar.gz \
-          http://download.m0k.org/handbrake/contrib/libmkv-0.6.4.tar.bz2 \
+          http://download.m0k.org/handbrake/contrib/libiconv-1.13.tar.bz2 \
+          http://download.m0k.org/handbrake/contrib/libmkv-0.6.4.1-0-ga80e593.tar.bz2 \
           http://download.m0k.org/handbrake/contrib/libogg-1.1.3.tar.gz \
           http://download.m0k.org/handbrake/contrib/libsamplerate-0.1.4.tar.gz \
           http://download.m0k.org/handbrake/contrib/libtheora-1.1.0.tar.bz2 \
           http://download.m0k.org/handbrake/contrib/libvorbis-aotuv_b5.tar.gz \
-          http://mp4v2.googlecode.com/files/mp4v2-trunk-r355.tar.bz2 \
+          http://download.m0k.org/handbrake/contrib/libxml2-2.7.7.tar.gz \
+          http://download.m0k.org/handbrake/contrib/mp4v2-trunk-r355.tar.bz2 \
           http://download.m0k.org/handbrake/contrib/mpeg2dec-0.5.1.tar.gz \
-          http://download.handbrake.fr/handbrake/contrib/x264-r1347-5ddd61b.tar.gz"
-MD5SUM="69f88b2e602550615da75947f914d7e6 \
+          http://download.m0k.org/handbrake/contrib/pthreads-w32-cvs20100909.tar.bz2 \
+          http://download.handbrake.fr/handbrake/contrib/x264-r1834-a51816a.tar.gz \
+          http://download.m0k.org/handbrake/contrib/zlib-1.2.3.tar.gz"
+MD5SUM="e17d3663fc36a985fe43e188695e3196 \
         ce5a978bb359f642dcbd24c6e14a45a7 \
+        6ec09fe81e3380184ed11e21ea06c215 \
         80763728d392c7d789cde25614c878f6 \
         ee1b4d67ea2d76ee52c5621bc6dbf61e \
-        4ed27775c4c16590a52ef9609fd6c010 \
+        a3afaa93224d321cd9e4971ad8d17570 \
+        77e15a92006ddc2adbb06f840d591c0e \
+        9c2744f1aa72fe755adda33663aa3fad \
         7036b52e792538fd665595d56b9e49a0 \
+        6f545089d838d524c4f3b12e8ef6ed38 \
+        e2b6c143356acba946bf71dc5c24edd1 \
         448bab6df6e4f738e4afaa6ebc085d65 \
         327c0a3a4304d7c06d75199a75ad4f02 \
         39cb0b27cc6b05e4f5c849dececf1f7a \
-        03cfd2a0594e5cfe0c682992ab0b3319 \
+        9c8b41b77f508edf72e26b406e873a2f \
+        af1b218aa5a5a259a18b4647ae4cb001 \
         e3b881ea94a6d29749a19b024d2974ef \
         69ec6c05f487458f688dda8f3e722e5d \
         d0f83cf7f13e2b3bd068a858ca1398ad \
         e282d60273dcc8cc6602f65b434f3591 \
+        9abc9959823ca9ff904f1fbcf21df066 \
         38a753e936df5ef4c2f7de3d16f440f6 \
         a6173dc90cfe7f0414624c3c8bbad727 \
-        b63ba174ca21e06dc82cc393cbfac855"
+        d1dea735b53176567e9841ca77388633 \
+        d360714750d234de675628aeb80cd80c \
+        af3358a811ad3469a2e54db49f77d52a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="klaatu"
diff --git a/multimedia/HandBrake/README b/multimedia/HandBrake/README
index 43e142f021..9aee476f6d 100644
--- a/multimedia/HandBrake/README
+++ b/multimedia/HandBrake/README
@@ -5,6 +5,9 @@ pixel aspect ratio, deinterlacing, and so on.
 
 The legality of ripping content from commercial DVDs may vary.
 
+webkit is a dependency for the GUI only. Disable it with the following:
+  "GUI=no ./HandBrake.SlackBuild"
+
 Lacking a GUI, the binary is HandBrakeCLI -- not HandBrake as you might 
 otherwise expect.  To launch this application after installing, type in 
 "HandBrakeCLI"  For the manual, type in "HandBrakeCLI --help"
diff --git a/multimedia/HandBrake/doinst.sh b/multimedia/HandBrake/doinst.sh
new file mode 100644
index 0000000000..1f8ff67ded
--- /dev/null
+++ b/multimedia/HandBrake/doinst.sh
@@ -0,0 +1,10 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
+