This package works for 13.37 as well as 14

1 files changed, 24 insertions, 4 deletions

diff --git a/handbrake/build/handbrake.SlackBuild b/handbrake/build/handbrake.SlackBuild
index 559a97c0..f1548add 100755
--- a/handbrake/build/handbrake.SlackBuild
+++ b/handbrake/build/handbrake.SlackBuild
@@ -60,6 +60,9 @@
 
 PRGNAM=handbrake
 VERSION=${VERSION:-0.9.8}
+# Find the revision for a release tag using (example release 0.9.8):
+# svn info svn://svn.handbrake.fr/HandBrake/tags/0.9.8
+RELREV=${RELREV:-"4883"}
 BUILD=${BUILD:-1}
 TAG=${TAG:-alien}
 
@@ -99,7 +102,14 @@ PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 SOURCE[0]="$SRCDIR/HandBrake-${VERSION}.tar.bz2"
-SRCURL[0]="http://downloads.sourceforge.net/${PRGNAM}/HandBrake-${VERSION}.tar.bz2"
+if [ -n "$RELREV" ]; then
+  # Download release tag from SVN so that we can create a "release" build,
+  # which shows the actual version in the about box instead of a SVN revision
+  # ... how twisted can you get.
+  SRCURL[0]=""
+else
+  SRCURL[0]="http://downloads.sourceforge.net/${PRGNAM}/HandBrake-${VERSION}.tar.bz2"
+fi
 
 CONTRIBURL=" http://download.handbrake.fr/handbrake/contrib"
 
@@ -217,13 +227,17 @@ src_checkout() {
   0) # HandBrake-${VERSION}
      if [ "$(echo ${VERSION}|cut -c1)" == 'r' ]; then # revision instead of date
        REV=$(echo ${VERSION} | cut -c2-)
-     else
+       SVNURI="svn://svn.handbrake.fr/HandBrake/trunk"
+     elif [ -z "$RELREV" ]; then
        REV="{${VERSION}}"
+       SVNURI="svn://svn.handbrake.fr/HandBrake/trunk"
+     else
+       REV="${RELREV}"
+       SVNURI="svn://svn.handbrake.fr/HandBrake/tags/$VERSION"
      fi
      mkdir HandBrake-${VERSION} \
        && cd HandBrake-${VERSION} \
-       && svn co --revision $REV svn://svn.handbrake.fr/HandBrake/trunk . \
-       && find . -type d -name '.svn' -depth | xargs rm -rf \
+       && svn co --revision $REV $SVNURI . \
        && chown -R root:root . \
        && cd .. \
        && tar -${TARCOMP}cf ${2} HandBrake-${VERSION}
@@ -296,6 +310,12 @@ if ! which yasm 1>/dev/null 2>&1 ; then
 fi
 
 echo Building ...
+# Make sure the "svn info" command does not fail (which causes configure to
+# decide that this is a developer build:
+# The reason being that svn on Slackware 14 won't accept the metadata format
+# as created by the svn checkout I make on Slackware 13.37.
+[ -e .svn ] && svn upgrade
+
 # Try to shrink the package by using system libraries instead of static libs:
 for module in fontconfig freetype libogg libsamplerate libtheora libvorbis libxml2 ; do
   sed -i -e "s/^MODULES.*\/$module//" make/include/main.defs