3 files changed, 24 insertions, 31 deletions
diff --git a/graphics/luminance-hdr/README b/graphics/luminance-hdr/README
index cd5ac26958..02242f1d62 100644
--- a/graphics/luminance-hdr/README
+++ b/graphics/luminance-hdr/README
@@ -3,11 +3,9 @@ set of images (JPEG, TIFF 8 and 16 bit, RAW) of the same scene taken
 at different exposure settings.  You can save and load HDR images,
 rotate and resize them, tonemap your images, and copy your EXIF data.
 
-Luminance HDR was formerly named qtpfsgui. 
+Luminance HDR was formerly named qtpfsgui.
 
-If your target CPU supports SSE2 extensions, you can pass the variable
-SSE2=yes to the script:   SSE2=yes sh luminance-hdr.SlackBuild
-If in doubt, just let the SlackBuild figure it out for you -- the
-default is SSE2=yes on x86_64 only, and SSE2=no on all other ARCHes. 
+To run Luminance HDR, your processor must support SSE2 instructions
+(i.e. Pentium 4 or higher, or Athlon 64 or higher).
 
 This requires LibRaw and gsl.
diff --git a/graphics/luminance-hdr/luminance-hdr.SlackBuild b/graphics/luminance-hdr/luminance-hdr.SlackBuild
index 15f11dcfc4..5748aa0aa3 100644
--- a/graphics/luminance-hdr/luminance-hdr.SlackBuild
+++ b/graphics/luminance-hdr/luminance-hdr.SlackBuild
@@ -23,13 +23,15 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=luminance-hdr
-VERSION=${VERSION:-2.1.0}
+VERSION=${VERSION:-2.2.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    # SSE2 instructions are now *required* at runtime, so force i686 to alert
+    # users of older cpus -- not the same thing, but the best we can do :-(
+    i?86) ARCH=i686 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -40,16 +42,12 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
+if [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
-  SSE2=${SSE2:-yes}
 else
   SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
@@ -61,30 +59,27 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf ${PRGNAM}-${VERSION}
-tar xvf $CWD/${PRGNAM}-${VERSION}.tar.gz
+tar xvf $CWD/${PRGNAM}-${VERSION}.tar.bz2
 cd ${PRGNAM}-${VERSION}
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
-# Upstream unconditionally assumes SSE2 optimisation.
-# We can do better than that :-)
-if [ ${SSE2:-no} = "no" ]; then
-  sed -e 's/ -msse2//' -i project.pro
-fi
-
-qmake \
-  INSTALL_ROOT=$PKG \
-  PREFIX=/usr \
-  QMAKE_CFLAGS="$SLKCFLAGS" \
-  QMAKE_CXXFLAGS="$SLKCFLAGS"
-make
-make INSTALL_ROOT=$PKG install
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  make install DESTDIR=$PKG
+cd ..
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
   AUTHORS BUGS Changelog INSTALL LICENSE README TODO \
-  $CWD/$PRGNAM.SlackBuild \
   $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/graphics/luminance-hdr/luminance-hdr.info b/graphics/luminance-hdr/luminance-hdr.info
index dd1c712b57..6dbe8bb243 100644
--- a/graphics/luminance-hdr/luminance-hdr.info
+++ b/graphics/luminance-hdr/luminance-hdr.info
@@ -1,10 +1,10 @@
 PRGNAM="luminance-hdr"
-VERSION="2.1.0"
+VERSION="2.2.1"
 HOMEPAGE="http://qtpfsgui.sourceforge.net"
-DOWNLOAD="http://downloads.sourceforge.net/qtpfsgui/luminance-hdr-2.1.0.tar.gz"
-MD5SUM="d8f95aafdb36ba84f82f2eb46bdc7361"
+DOWNLOAD="http://downloads.sourceforge.net/qtpfsgui/luminance-hdr-2.2.1.tar.bz2"
+MD5SUM="9c64d89bda6cea685d1158dd3cbc823b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="David Spencer"
 EMAIL="baildon.research@googlemail.com"
-APPROVED="Niels Horn,Erik Hanson"
+APPROVED="dsomero"