Update to Heimdall 1.4.0 which now requires the libusbx fork of libusb.

1 files changed, 18 insertions, 4 deletions

diff --git a/heimdall/build/heimdall.SlackBuild b/heimdall/build/heimdall.SlackBuild
index 03e6b737..b30bea28 100755
--- a/heimdall/build/heimdall.SlackBuild
+++ b/heimdall/build/heimdall.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 # $Id$
-# Copyright 2012  Eric Hameleers, Eindhoven, NL
+# Copyright 2012, 2013  Eric Hameleers, Eindhoven, NL
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -32,6 +32,8 @@
 # Changelog:   
 # 1.3.2-1:     10/May/2012 by Eric Hameleers <alien@slackware.com>
 #              * Initial build.
+# 1.4.0-1:     01/sep/2012 by Eric Hameleers <alien@slackware.com>
+#              * Update.
 # 
 # Run 'sh heimdall.SlackBuild' to build a Slackware package.
 # The package (.tgz) and .txt file as well as build logs are created in /tmp .
@@ -43,7 +45,7 @@
 
 PRGNAM=heimdall
 SRCNAM=Benjamin-Dobell-Heimdall
-VERSION=${VERSION:-1.3.2}
+VERSION=${VERSION:-1.4.0}
 BUILD=${BUILD:-1}
 NUMJOBS=${NUMJOBS:" -j4 "}
 TAG=${TAG:-alien}
@@ -56,7 +58,6 @@ TMP=${TMP:-/tmp/build}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-# Input URL: https://github.com/Benjamin-Dobell/Heimdall/tarball/v1.3.2
 SOURCE="$SRCDIR/${PRGNAM}-${VERSION}.tar.gz"
 SRCURL="https://github.com/Benjamin-Dobell/Heimdall/tarball/v${VERSION}"
 
@@ -155,10 +156,21 @@ cd ${SRCNAM}-*
 # Fix DOS line endings:
 sed -i -e 's/\r$//' Linux/README
 
+# Patches:
+touch $OUTPUT/patch-${PRGNAM}.log
 # Slackware does not have the "service" command and anyway we would not want
 # udev to be restarted while building a package:
 cat $SRCDIR/heimdall.noservice.patch | patch -p0 --verbose \
-  2>&1 | tee $OUTPUT/patch-${PRGNAM}.log
+  2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
+# Install the udev rules into the correct location:
+cat $SRCDIR/heimdall.udevrules.patch | patch -p1 --verbose \
+  2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
+
+# Stuff used for Windows only - get rid of it just in case:
+rm -rf libusbx-1.0
+rm -rf heimdall-frontend/include
+rm -rf heimdall/autom4te.cache
+rm -rf libpit/autom4te.cache
 
 chown -R root:root .
 chmod -R u+w,go+r-w,a+X-s .
@@ -287,6 +299,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
 # Add a package description:
 mkdir -p $PKG/install
 cat $SRCDIR/slack-desc > $PKG/install/slack-desc
+cat $SRCDIR/slack-required > $PKG/install/slack-required
 
 # Build the package:
 cd $PKG
@@ -295,6 +308,7 @@ cd $OUTPUT
 md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-tgz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-tgz}.md5
 cd -
 cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt
+cat $PKG/install/slack-required > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.dep
 
 # Restore the original umask:
 umask ${_UMASK_}