Re: [PR PATCH] [Updated] imlib2: update to 1.8.0, add build options.

[tibequadorian <tibequadorian@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1328 bytes --]

There is an updated pull request by tibequadorian against master on the void-packages repository

https://github.com/tibequadorian/void-packages imlib2
https://github.com/void-linux/void-packages/pull/35612

imlib2: update to 1.8.0, add build options.
imlib2 contains a HEIF loader since 1.8.0
- closes #27814
- closes #27597 

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/35612.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-imlib2-35612.patch --]
[-- Type: text/x-diff, Size: 6040 bytes --]

From 3daa2e215959f5e668d237d95382654b4d8d9306 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 12 Feb 2022 18:45:15 +0100
Subject: [PATCH] imlib2: update to 1.8.0, add build options, adopt.

---
 common/options.description              |  9 ++++--
 srcpkgs/imlib2/patches/big-endian.patch | 37 -------------------------
 srcpkgs/imlib2/template                 | 21 ++++++++++----
 3 files changed, 21 insertions(+), 46 deletions(-)
 delete mode 100644 srcpkgs/imlib2/patches/big-endian.patch

diff --git a/common/options.description b/common/options.description
index ac0f14c0843d..76499862d8c4 100644
--- a/common/options.description
+++ b/common/options.description
@@ -14,7 +14,9 @@ desc_option_dav1d="Enable support for the AV1 decoder"
 desc_option_dbus="Enable support for D-BUS"
 desc_option_dri2="Enable support for the DRI2 extension"
 desc_option_dri="Enable support for the DRI extension"
+desc_option_drm="Enable support for DRM"
 desc_option_efi="Enable support for EFI"
+desc_option_elogind="Enable support for elogind"
 desc_option_expat="Enable support for XML via expat"
 desc_option_faac="Enable support for FAAC codec"
 desc_option_fdk_aac="Enable support for Fraunhofer FDK AAC codec"
@@ -35,7 +37,9 @@ desc_option_gtk="Enable support for the GTK+2 GUI toolkit"
 desc_option_gtk3="Enable support for the GTK+3 GUI toolkit"
 desc_option_guile="Enable support for Guile lang"
 desc_option_ffmpeg="Enable support for FFmpeg"
-desc_option_harfbuzz="enable support for Harfbuzz"
+desc_option_harfbuzz="Enable support for Harfbuzz"
+desc_option_heif="Enable support for HEIF images"
+desc_option_id3="Enable support for ID3 tags"
 desc_option_idn="Enable support for IDN"
 desc_option_imagemagick="Enable support for ImageMagick"
 desc_option_jack="Enable support for the JACK sound server"
@@ -96,6 +100,7 @@ desc_option_vpx="Enable support for VP8/VP9 codecs"
 desc_option_vulkan="Enable support for Vulkan"
 desc_option_wavpack="Enable support for the Wavpack audio format"
 desc_option_wayland="Enable support for the Wayland backend"
+desc_option_webp="Enable support for WEBP images"
 desc_option_x11="Enable support for X11"
 desc_option_x265="Enable support for the x265 codec"
 desc_option_xml="Enable support for XML"
@@ -103,5 +108,3 @@ desc_option_xscreensaver="Enable support for libXScrnSaver to determine idle tim
 desc_option_zeitgeist="Enable support for ZeitGeist"
 desc_option_zimg="Enable support for the zimg image processing library"
 desc_option_zstd="Enable support for ZSTD compression format"
-desc_option_elogind="Enable support for elogind"
-desc_option_drm="Enable support for DRM"
diff --git a/srcpkgs/imlib2/patches/big-endian.patch b/srcpkgs/imlib2/patches/big-endian.patch
deleted file mode 100644
index 54fb7f8f1001..000000000000
--- a/srcpkgs/imlib2/patches/big-endian.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 7d60151ba9696ef07be79af68d5c631a97c63906 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
-Date: Mon, 3 Jan 2022 10:56:03 +0100
-Subject: ICO loader: Fix compilation on big endian architectures
-
-Commit ff79901a071a76ec73cc98c7ff15102c514afb7b refactors the
-ico_read_idir function and removed the local nr variable. Unfortunately,
-this variable is still used within an `#ifdef WORDS_BIGENDIAN` block on
-big endian architectures as a for loop index variable. As such, the code
-does presently not compile since the aforementioned commit. This patch
-fixes this issue by re-introducing the variable conditionally on big
-endian architectures.
-
-Note: It would likely be cleaner to declare the nr variable as part of
-the loop declaration, however, this C99 feature does not seem to be used
-anywhere in the code base, hence I refrained from using it here.
----
- src/modules/loaders/loader_ico.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/modules/loaders/loader_ico.c b/src/modules/loaders/loader_ico.c
-index e8cef41..66c3643 100644
---- a/src/modules/loaders/loader_ico.c
-+++ b/src/modules/loaders/loader_ico.c
-@@ -139,6 +139,9 @@ ico_read_icon(ico_t * ico, int ino)
- {
-    ie_t               *ie;
-    unsigned int        size;
-+#ifdef WORDS_BIGENDIAN
-+   unsigned int        nr;
-+#endif
- 
-    ie = &ico->ie[ino];
- 
--- 
-cgit v1.2.3
-
diff --git a/srcpkgs/imlib2/template b/srcpkgs/imlib2/template
index e01f17311589..794779feee41 100644
--- a/srcpkgs/imlib2/template
+++ b/srcpkgs/imlib2/template
@@ -1,18 +1,27 @@
 # Template file for 'imlib2'
 pkgname=imlib2
-version=1.7.5
+version=1.8.0
 revision=1
 build_style=gnu-configure
-configure_args="--disable-static --sysconfdir=/etc/imlib2 --enable-visibility-hiding"
+configure_args="--disable-static --sysconfdir=/etc/imlib2
+ $(vopt_with gif) $(vopt_with heif) $(vopt_with jpeg) $(vopt_with png)
+ $(vopt_with svg) $(vopt_with svg) $(vopt_with tiff) $(vopt_with webp)
+ $(vopt_with id3)"
 hostmakedepends="pkg-config"
-makedepends="freetype-devel libjpeg-turbo-devel libpng-devel libwebp-devel
- tiff-devel libid3tag-devel giflib-devel libXext-devel libSM-devel"
+makedepends="freetype-devel libXext-devel libSM-devel liblzma-devel bzip2-devel
+ zlib-devel $(vopt_if gif giflib-devel) $(vopt_if heif libheif-devel)
+ $(vopt_if jpeg libjpeg-turbo-devel) $(vopt_if png libpng-devel)
+ $(vopt_if svg librsvg-devel) $(vopt_if webp libwebp-devel)
+ $(vopt_if tiff tiff-devel) $(vopt_if id3 libid3tag-devel)"
 short_desc="Image manipulation library"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
 license="Imlib2"
 homepage="https://sourceforge.net/projects/enlightenment/"
 distfiles="${SOURCEFORGE_SITE}/enlightenment/imlib2-src/imlib2-${version}.tar.gz"
-checksum=73337bc38de13e04832f645367baf932b39d8b558d4ed9bc1f13405b92090b96
+checksum=6f881c9a1eee040484d2f13070fefbf1d88270a75042e2d5de63fa22ea6e1c88
+
+build_options="gif heif jpeg png svg tiff webp id3"
+build_options_default="gif heif jpeg png svg tiff webp id3"
 
 post_install() {
 	vlicense COPYING