3 files changed, 43 insertions, 27 deletions
diff --git a/graphics/enblend-enfuse/README b/graphics/enblend-enfuse/README
index 7565c894bc..34f7e3c6d1 100644
--- a/graphics/enblend-enfuse/README
+++ b/graphics/enblend-enfuse/README
@@ -1,4 +1,5 @@
-Enblend combines images that overlap into a single large image with no seams.
-Enfuse combines images that overlap into a single image with good exposure
-and good focus. Both programs assume that your images are already lined up.
-To make panoramas with Enblend and/or Enfuse, use Hugin.
+Enblend combines images that overlap into a single large image with no
+seams. Enfuse combines images that overlap into a single image with
+good exposure and good focus. Both programs assume that your images
+are already lined up. To make panoramas with Enblend and/or Enfuse,
+use Hugin.
diff --git a/graphics/enblend-enfuse/enblend-enfuse.SlackBuild b/graphics/enblend-enfuse/enblend-enfuse.SlackBuild
index 26381c3f52..1e06bc91c6 100644
--- a/graphics/enblend-enfuse/enblend-enfuse.SlackBuild
+++ b/graphics/enblend-enfuse/enblend-enfuse.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Slackware build script for Enblend-Enfuse
 #
@@ -23,10 +23,16 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20230629 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - install binaries stripped.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=enblend-enfuse
-VERSION=${VERSION:-4.2}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-20191019_4c30a326b3f4}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,7 +42,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -61,34 +71,39 @@ 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.?z
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} + -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} +
 
-CXXFLAGS="$SLKCFLAGS" \
-CFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --mandir=/usr/man \
-  --infodir=/usr/info \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --build=$ARCH-slackware-linux
+#sed -i '/^#include <vector>$/a #include <limits>' src/minimizer.h
 
-make -j1
-make install-strip DESTDIR=$PKG
+export MANDIR=/usr/man
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS_RELEASE="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS_RELEASE="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DBUILD_SHARED_LIBS=on \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DENABLE_OPENMP=on \
+    -DENABLE_METADATA_TRANSFER=on \
+    -Wno-dev ..
 
-rm -f $PKG/usr/info/dir
+  make
+  make install/strip DESTDIR=$PKG
+cd -
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog NEWS README README.txt VERSION \
+cp -a AUTHORS COPYING ChangeLog NEWS README VERSION \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -96,4 +111,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/graphics/enblend-enfuse/enblend-enfuse.info b/graphics/enblend-enfuse/enblend-enfuse.info
index f99b8df8c4..657d77a78f 100644
--- a/graphics/enblend-enfuse/enblend-enfuse.info
+++ b/graphics/enblend-enfuse/enblend-enfuse.info
@@ -1,8 +1,8 @@
 PRGNAM="enblend-enfuse"
-VERSION="4.2"
+VERSION="20191019_4c30a326b3f4"
 HOMEPAGE="http://enblend.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/enblend/enblend-enfuse-4.2.tar.gz"
-MD5SUM="e26751f393862cecfd1a113003787001"
+DOWNLOAD="https://ponce.cc/slackware/sources/repo/enblend-enfuse-20191019_4c30a326b3f4.tar.xz"
+MD5SUM="93c9ce25de51c00f84d90b05532a4964"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="vigra"