graphics/qiv: add .avif image support.

Signed-off-by: B. Watson <urchlay@slackware.uk>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

4 files changed, 33 insertions, 12 deletions

diff --git a/graphics/qiv/README b/graphics/qiv/README
index 8daaa2239f..a0bd7a134a 100644
--- a/graphics/qiv/README
+++ b/graphics/qiv/README
@@ -15,6 +15,8 @@ Optional supported formats:
 
 Format                  | Optional dependenc(y|ies)
 ------------------------+-----------------------------------------------
+HEIF, AVIF              | libheif
+------------------------+-----------------------------------------------
 PCX                     | pcx-pixbuf-loader
 ------------------------+-----------------------------------------------
 PSD (PhotoShop native)  | gdk-pixbuf-psd
diff --git a/graphics/qiv/new_formats.diff b/graphics/qiv/new_formats.diff
index 0953a23b67..7daddffa97 100644
--- a/graphics/qiv/new_formats.diff
+++ b/graphics/qiv/new_formats.diff
@@ -1,6 +1,6 @@
 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	2023-06-06 02:52:08.518230436 -0400
++++ 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,
@@ -12,11 +12,14 @@ diff -Naur qiv-2.3.3/Makefile qiv-2.3.3.patched/Makefile
  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	2023-06-06 02:58:13.422196095 -0400
-@@ -211,6 +211,21 @@
- #ifdef EXTN_HEIF
-     ".heic", ".heif",
++++ qiv-2.3.3.patched/main.h	2024-12-28 14:51:17.988142813 -0500
+@@ -209,7 +209,22 @@
+     ".webp",
  #endif
+ #ifdef EXTN_HEIF
+-    ".heic", ".heif",
++    ".heic", ".heif", ".avif",
++#endif
 +#ifdef EXTN_XCF
 +    ".xcf",
 +#endif
@@ -31,14 +34,15 @@ diff -Naur qiv-2.3.3/main.h qiv-2.3.3.patched/main.h
 +#endif
 +#ifdef EXTN_RAW
 +   ".dng", ".cr2", ".crw", ".nef", ".orf", ".pef", ".arw", ".erf", ".mrw", ".raf",
-+#endif
+ #endif
      NULL
  };
- 
-@@ -256,6 +271,27 @@
+@@ -255,6 +270,28 @@
+ #endif
  #ifdef EXTN_HEIF
    "ISO Media, HEIF Image",
- #endif
++  "ISO Media, AVIF Image",
++#endif
 +#ifdef EXTN_XCF
 +  "GIMP XCF image data",
 +#endif
@@ -59,7 +63,6 @@ diff -Naur qiv-2.3.3/main.h qiv-2.3.3.patched/main.h
 +  "Canon CR2",
 +  "Olympus ORF",
 +  "Minolta Dimage",
-+#endif
+ #endif
   NULL
  };
- #endif
diff --git a/graphics/qiv/qiv-allfmt.sqf b/graphics/qiv/qiv-allfmt.sqf
index a550ba4e91..98e1200eff 100644
--- a/graphics/qiv/qiv-allfmt.sqf
+++ b/graphics/qiv/qiv-allfmt.sqf
@@ -5,4 +5,14 @@ xcf-pixbuf-loader
 gdk-pixbuf-psd
 pcx-pixbuf-loader
 libwmf-type1-fonts
+rust-opt
+cargo-c
+x265
+svt-av1
+rav1e
+libde265
+kvazaar
+dav1d
+aom
+libheif
 qiv
diff --git a/graphics/qiv/qiv.SlackBuild b/graphics/qiv/qiv.SlackBuild
index cb552ebf14..34217d62e4 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.
 
+# 20241228 bkw: BUILD=2
+# - support AVIF images. libheif handles them, just have to add the
+#   filename extension and magic to main.h (in new_formats.diff).
+# - mention libheif as an optional dep in README.
+# - update qiv-allfmt.sqf to include libheif and its deps.
+
 # 20230605 bkw:
 # - Update for v2.3.3.
 # - JPEG 2000 works now, so enable it in the Makefile.
@@ -41,7 +47,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=qiv
 VERSION=${VERSION:-2.3.3}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}