4 files changed, 75 insertions, 30 deletions
diff --git a/libraries/imlib2_loaders/README b/libraries/imlib2_loaders/README
index 369244ecfe..51323d4cce 100644
--- a/libraries/imlib2_loaders/README
+++ b/libraries/imlib2_loaders/README
@@ -1,2 +1,13 @@
+imlib2_loaders (xcf image loader for imlib2)
+
 This package contains image loader plugins for Imlib 2 that are not
-distributed together with the Imlib 2 package itself.
+distributed together with the Imlib 2 package itself, for licensing
+reasons. Currently, the only plugin is for XCF, which is the Gimp's
+native file format.
+
+Note: the version number of this build should match the version number
+of imlib2. If you find that this is not the case, please contact the
+maintainer so I can update this.
+
+Note: if you're trying to add .xcf file support to qiv, this package
+won't help. Install xcf-pixbuf-loader instead.
diff --git a/libraries/imlib2_loaders/imlib2_loaders.SlackBuild b/libraries/imlib2_loaders/imlib2_loaders.SlackBuild
index 3dd4f355bc..5f1cfd065e 100644
--- a/libraries/imlib2_loaders/imlib2_loaders.SlackBuild
+++ b/libraries/imlib2_loaders/imlib2_loaders.SlackBuild
@@ -2,8 +2,9 @@
 
 # Slackware build script for imlib2_loaders
 
-# Copyright 2017 Azure Zanculmarktum <zanculmarktum@gmail.com>
-# Copyright 2020-2021 Igor Alexandrov <igor.alexandrov@outlook.com>
+# Copyright 2017 Azure Zanculmarktum <email removed>
+# Copyright 2020-2021 Igor Alexandrov <email removed>
+# Copyright 2023 B. Watson (urchlay@gmail.com), current maintainer.
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,10 +24,24 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20230902 bkw: update for v1.11.1.
+# Note that the code didn't change between 1.10.0 and 1.11.1. In fact
+# there's a 1.12.0 and *it* has identical code. Basically, upstream
+# (re)releases this whenever the main imlib2 package updates, whether it
+# makes sense or not.
+
+# 20230213 bkw: update for v1.10.0.
+# - take over maintenance.
+# - expand README and slack-desc.
+# - simplify build.
+# - get rid of .la file.
+# - add imlib2 to REQUIRES. it really is a hard dep (always was).
+# - only package the license that actually applies.
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=imlib2_loaders
-VERSION=${VERSION:-1.7.1}
+VERSION=${VERSION:-1.11.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -39,9 +54,6 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
 if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
   exit 0
@@ -71,14 +83,11 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
 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 \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -92,15 +101,40 @@ CXXFLAGS="$SLKCFLAGS" \
   --disable-eet \
   --build=$ARCH-slackware-linux
 make
-make install DESTDIR=$PKG
+make install-strip DESTDIR=$PKG
 
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/*/*/*.la
+# we don't need this:
+rm -f $PKG/usr/lib*/imlib2/loaders/*.la
+
+# 20230213 bkw: A note about the multiple COPYING files:
+#
+# - COPYING is a BSD/MIT style license. It's the same as COPYING
+#   for imlib2. However, the source no longer contains any of
+#   the code this license once applied to, so I don't include
+#   it in the package. It would be misleading to do so (see below).
+#
+# - COPYING-PLAIN is just the lawyer-to-English translation of
+#   COPYING (again, same as imlib2). Not included for the same reason.
+#
+# - COPYING.loader_xcf is the actual license for the single plugin
+#   this installs (xcf.so). It's a copy of the GPLv2, because the xcf
+#   plugin incorporates code taken from the Gimp, which is GPLv2.
+#
+# If you're wondering about the ./configure message about the "eet"
+# format... it can't be built. Enabling it requires some Enlightenment
+# libraries. If you install those (or even if you don't), then build
+# with --enable-eet, the configure script will tell you "Eet loader
+# is broken". So there's no need to include whatever license the eet
+# loader uses, as we can't include the code anyway.
+#
+# This is more excruciating detail than anyone really cares about.
+# It's mostly a note to myself, to remind me why I didn't include all
+# 3 COPYING* files in the package.
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING COPYING-PLAIN COPYING.loader_xcf ChangeLog INSTALL README $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cp -a AUTHORS COPYING.loader_xcf ChangeLog README $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/libraries/imlib2_loaders/imlib2_loaders.info b/libraries/imlib2_loaders/imlib2_loaders.info
index 70dc14f627..2e6fee3c0b 100644
--- a/libraries/imlib2_loaders/imlib2_loaders.info
+++ b/libraries/imlib2_loaders/imlib2_loaders.info
@@ -1,10 +1,10 @@
 PRGNAM="imlib2_loaders"
-VERSION="1.7.1"
+VERSION="1.11.1"
 HOMEPAGE="https://www.enlightenment.org"
-DOWNLOAD="https://sourceforge.net/projects/enlightenment/files/imlib2-src/1.7.1/imlib2_loaders-1.7.1.tar.bz2"
-MD5SUM="029785225ddcbb04bb54301384c01525"
+DOWNLOAD="https://downloads.sourceforge.net/project/enlightenment/imlib2-src/1.11.1/imlib2_loaders-1.11.1.tar.xz"
+MD5SUM="7364c8390595bc996aa9d2f5e395cb65"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Igor Alexandrov"
-EMAIL="igor.alexandrov@outlook.com"
+REQUIRES="imlib2"
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/libraries/imlib2_loaders/slack-desc b/libraries/imlib2_loaders/slack-desc
index 80b8891366..fc65874196 100644
--- a/libraries/imlib2_loaders/slack-desc
+++ b/libraries/imlib2_loaders/slack-desc
@@ -6,12 +6,12 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
               |-----handy-ruler------------------------------------------------------|
-imlib2_loaders: imlib2_loaders (additional image loaders for imlib2)
+imlib2_loaders: imlib2_loaders (xcf image loader for imlib2)
 imlib2_loaders:
 imlib2_loaders: This package contains image loader plugins for Imlib 2 that are not
-imlib2_loaders: distributed together with the Imlib 2 package itself.
-imlib2_loaders:
-imlib2_loaders:
+imlib2_loaders: distributed together with the Imlib 2 package itself, for licensing
+imlib2_loaders: reasons. Currently, the only plugin is for XCF, which is the Gimp's
+imlib2_loaders: native file format.
 imlib2_loaders:
 imlib2_loaders:
 imlib2_loaders: