diff options
| -rw-r--r-- | graphics/qiv/README | 13 | ||||
| -rw-r--r-- | graphics/qiv/new_formats.diff | 24 | ||||
| -rw-r--r-- | graphics/qiv/qiv-allfmt.sqf | 3 | ||||
| -rw-r--r-- | graphics/qiv/qiv.SlackBuild | 8 | ||||
| -rw-r--r-- | graphics/qiv/qiv.info | 8 |
5 files changed, 34 insertions, 22 deletions
diff --git a/graphics/qiv/README b/graphics/qiv/README index a0bd7a134a..d4c21c3cd6 100644 --- a/graphics/qiv/README +++ b/graphics/qiv/README @@ -9,7 +9,7 @@ you can use qiv to set your X11-Desktop background. These formats are supported by default: -GIF TIFF XPM PNG PPM PNM PGM BMP JPEG SVG ICO TGA ICNS JP2 +GIF TIFF XPM PNG PPM PNM PGM BMP JPEG SVG ICO TGA ICNS Optional supported formats: @@ -17,6 +17,8 @@ Format | Optional dependenc(y|ies) ------------------------+----------------------------------------------- HEIF, AVIF | libheif ------------------------+----------------------------------------------- +JP2 (JPEG2000) | jp2-pixbuf-loader +------------------------+----------------------------------------------- PCX | pcx-pixbuf-loader ------------------------+----------------------------------------------- PSD (PhotoShop native) | gdk-pixbuf-psd @@ -24,10 +26,9 @@ PSD (PhotoShop native) | gdk-pixbuf-psd RAW (camera images, | libopenraw. Note that only a few raw image various extensions) | formats will actually display with qiv. These | include .crw (Canon), .erf (Epson), and - | .nef (Nikon). + | .nef (Nikon). YMMV. ------------------------+----------------------------------------------- -WEBP | imlib2 and webp-pixbuf-loader. Build and - | install *in that order*. +WEBP | webp-pixbuf-loader ------------------------+----------------------------------------------- WMF (Windows MetaFile) | libwmf-type1-fonts (only needed for .wmf files | with embedded text, but all the ones I tested @@ -41,3 +42,7 @@ without rebuilding qiv. To easily build all the optional dependencies, use sbopkg with the qiv-allfmt.sqf in the SlackBuild directory. + +Upgrade note: Starting with version 3.0.0, qiv no longer uses +imlib2. If you have images that would display in qiv-2.3.x, but not in +3.0.x, *please* contact the SlackBuild maintainer, so I can fix it! diff --git a/graphics/qiv/new_formats.diff b/graphics/qiv/new_formats.diff index 7daddffa97..1cf5257d5c 100644 --- a/graphics/qiv/new_formats.diff +++ b/graphics/qiv/new_formats.diff @@ -1,19 +1,19 @@ -diff -Naur qiv-2.3.3/Makefile qiv-2.3.3.patched/Makefile ---- qiv-2.3.3/Makefile 2023-01-28 16:37:29.000000000 -0500 -+++ qiv-2.3.3.patched/Makefile 2024-12-28 14:48:05.290139204 -0500 -@@ -26,7 +26,7 @@ - # or is compiled into imlib. - # The latest version of imlib has removed imagemagick fallback support, - # so some extensions (XBM TGA) have been removed. +diff -Naur qiv/Makefile qiv.patched/Makefile +--- qiv/Makefile 2025-04-03 02:54:29.000000000 -0400 ++++ qiv.patched/Makefile 2025-06-16 22:57:44.205086413 -0400 +@@ -23,7 +23,7 @@ + + # This sets the file extentions to filter on (other file types will be + # skipped.) It should reflect whatever can be loaded via gdk-pixbuf-loader. -EXTNS = GIF TIFF XPM PNG PPM PNM PGM PCX BMP EIM JPEG SVG WMF ICO WEBP HEIF +EXTNS = GIF TIFF XPM PNG PPM PNM PGM PCX BMP EIM JPEG SVG WMF ICO WEBP HEIF XCF PSD ICNS TGA RAW JP2 # Comment this line out if your system doesn't have getopt_long(). GETOPT_LONG = -DHAVE_GETOPT_LONG -diff -Naur qiv-2.3.3/main.h qiv-2.3.3.patched/main.h ---- qiv-2.3.3/main.h 2023-01-28 16:37:29.000000000 -0500 -+++ qiv-2.3.3.patched/main.h 2024-12-28 14:51:17.988142813 -0500 -@@ -209,7 +209,22 @@ +diff -Naur qiv/main.h qiv.patched/main.h +--- qiv/main.h 2025-04-03 02:54:29.000000000 -0400 ++++ qiv.patched/main.h 2025-06-16 23:00:45.234069377 -0400 +@@ -206,7 +206,22 @@ ".webp", #endif #ifdef EXTN_HEIF @@ -37,7 +37,7 @@ diff -Naur qiv-2.3.3/main.h qiv-2.3.3.patched/main.h #endif NULL }; -@@ -255,6 +270,28 @@ +@@ -252,6 +267,28 @@ #endif #ifdef EXTN_HEIF "ISO Media, HEIF Image", diff --git a/graphics/qiv/qiv-allfmt.sqf b/graphics/qiv/qiv-allfmt.sqf index 98e1200eff..b1d58b75ea 100644 --- a/graphics/qiv/qiv-allfmt.sqf +++ b/graphics/qiv/qiv-allfmt.sqf @@ -1,4 +1,4 @@ -imlib2 +jp2-pixbuf-loader libopenraw webp-pixbuf-loader xcf-pixbuf-loader @@ -6,6 +6,7 @@ gdk-pixbuf-psd pcx-pixbuf-loader libwmf-type1-fonts rust-opt +cpuinfo cargo-c x265 svt-av1 diff --git a/graphics/qiv/qiv.SlackBuild b/graphics/qiv/qiv.SlackBuild index 6c1ffd6b26..eee22e8c2a 100644 --- a/graphics/qiv/qiv.SlackBuild +++ b/graphics/qiv/qiv.SlackBuild @@ -8,6 +8,12 @@ # version had no license, modified version released under the WTFPL. See # http://www.wtfpl.net/txt/copying/ for details. +# 20250616 bkw: +# - Update for v3.0.1. The 3.x series no longer requires imlib2. +# The new_formats.diff patch had to be reworked, so old versions +# won't build. README rewritten, requirements for various image +# formats have changed a bit. + # 20250328 bkw: # - Update for v2.3.4. This is a release on upstream's codeberg page, # but the homepage hasn't been updated yet. codeberg's URLs are @@ -52,7 +58,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=qiv -VERSION=${VERSION:-2.3.4} +VERSION=${VERSION:-3.0.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/graphics/qiv/qiv.info b/graphics/qiv/qiv.info index 06407646e6..679ddf1198 100644 --- a/graphics/qiv/qiv.info +++ b/graphics/qiv/qiv.info @@ -1,10 +1,10 @@ PRGNAM="qiv" -VERSION="2.3.4" +VERSION="3.0.1" HOMEPAGE="https://spiegl.de/qiv/" -DOWNLOAD="https://codeberg.org/ciberandy/qiv/archive/v2.3.4.tar.gz" -MD5SUM="4e09d3f2e1c091615e70cf22423c362c" +DOWNLOAD="https://codeberg.org/ciberandy/qiv/archive/v3.0.1.tar.gz" +MD5SUM="b2684874520fba0781c7f536f0082dfa" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="imlib2" +REQUIRES="" MAINTAINER="B. Watson" EMAIL="urchlay@slackware.uk" |