summaryrefslogtreecommitdiffstats
path: root/graphics/qiv/qiv.SlackBuild
diff options
context:
space:
mode:
Diffstat (limited to 'graphics/qiv/qiv.SlackBuild')
-rw-r--r--graphics/qiv/qiv.SlackBuild87
1 files changed, 62 insertions, 25 deletions
diff --git a/graphics/qiv/qiv.SlackBuild b/graphics/qiv/qiv.SlackBuild
index 6933f0602d..cb552ebf14 100644
--- a/graphics/qiv/qiv.SlackBuild
+++ b/graphics/qiv/qiv.SlackBuild
@@ -1,13 +1,34 @@
-#!/bin/sh
+#!/bin/bash
# Slackware build script for qiv
# Written by Pablo Santamaria (email removed)
-# Modified & now maintained by B. Watson <yalhcru@gmail.com>. Original
+# Modified & now maintained by B. Watson <urchlay@slackware.uk>. Original
# version had no license, modified version released under the WTFPL. See
# http://www.wtfpl.net/txt/copying/ for details.
+# 20230605 bkw:
+# - Update for v2.3.3.
+# - JPEG 2000 works now, so enable it in the Makefile.
+# - WMF is broken. Fixed by adding new libwmf-type1-fonts optional
+# dep. Documented in README.
+# - Rework new_formats.diff. Script can no longer build old version.
+# - Fix and update qiv-allfmt.sqf.
+
+# 20191231 bkw:
+# - Add libopenraw (raw camera image) formats, BUILD=2.
+# - Remove mention of wmf-pixbuf loader from README and .sqf
+# since there's a Slackware update that removes the need for it.
+
+# 20191226 bkw:
+# - Upgrade for v2.3.2. This was released a month after my last update,
+# but the download page on the site doesn't link to it (found it just
+# now by editing the URL for v2.3.1), so my update-checker script
+# never saw it...
+# - As compensation for my tardiness, add support for a bunch of new
+# image types.
+
# 20170209 bkw:
# - Take over maintenance
# - i486 => i586
@@ -16,10 +37,13 @@
# of man pages (upstream's 'make install' already does it)
# - Don't install README.INSTALL
+cd $(dirname $0) ; CWD=$(pwd)
+
PRGNAM=qiv
-VERSION=${VERSION:-2.3.2pre20160530}
+VERSION=${VERSION:-2.3.3}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
@@ -29,47 +53,60 @@ 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}
if [ "$ARCH" = "i586" ]; then
SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
else
SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
fi
set -e
-OLDVER=2.3.1
-
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
-rm -rf $PRGNAM-$OLDVER
-tar xvf $CWD/$PRGNAM-$OLDVER.tgz
-cd $PRGNAM-$OLDVER
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tgz
+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 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-# bugfixes from upstream's git repo.
-patch -p1 < $CWD/648ed5a.diff
-
-sed -i "s/-O2 -Wall/$SLKCFLAGS/" Makefile
-sed -i "s|\./qiv|echo &|" Makefile # remove test
+find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+# Patch to add potential support for various image formats. This patch
+# doesn't actually contain any code for decoding/displaying new image
+# formats. All it does is add file extensions and magic to the list
+# of filetypes qiv will attempt to display via imlib and/or pixbuf.
+# It's up to imlib/pixbuf to actually support the image types. Some of
+# these are already supported in Slackware, a few require optional deps
+# (see README).
+
+# For the optional ones (e.g. webp), this patch doesn't do any harm
+# if the support library's not installed. All it does is make qiv warn
+# "Unable to read file" on stderr, instead of silently skipping it.
+
+patch -p1 < $CWD/new_formats.diff
+
+# Three sed expressions here. In order:
+# 1. Make qiv build with our compiler flags.
+# 2. Disable the test, since it requires X to be running and
+# accepting connections from root.
+# 3. Put man page where Slackware likes them.
+sed -i -e "s/-O2 -Wall/$SLKCFLAGS/" \
+ -e "s|\./qiv|echo &|" \
+ -e 's,/share/man,/man,g' \
+ Makefile
make
make install PREFIX=$PKG/usr
@@ -87,4 +124,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
cat $CWD/doinst.sh > $PKG/install/doinst.sh
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