CVS commit: pkgsrc/graphics/imlib2

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Mon Mar 18 18:37:19 UTC 2024

Modified Files:
        pkgsrc/graphics/imlib2: PLIST distinfo options.mk
Added Files:
        pkgsrc/graphics/imlib2/patches: patch-src_modules_loaders_Makefile.am
            patch-src_modules_loaders_Makefile.in

Log Message:
imlib2: add 'heif' option, off by default.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 pkgsrc/graphics/imlib2/PLIST
cvs rdiff -u -r1.49 -r1.50 pkgsrc/graphics/imlib2/distinfo
cvs rdiff -u -r1.14 -r1.15 pkgsrc/graphics/imlib2/options.mk
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/graphics/imlib2/patches/patch-src_modules_loaders_Makefile.am \
    pkgsrc/graphics/imlib2/patches/patch-src_modules_loaders_Makefile.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/imlib2/PLIST
diff -u pkgsrc/graphics/imlib2/PLIST:1.17 pkgsrc/graphics/imlib2/PLIST:1.18
--- pkgsrc/graphics/imlib2/PLIST:1.17   Tue Feb  6 14:24:44 2024
+++ pkgsrc/graphics/imlib2/PLIST        Mon Mar 18 18:37:19 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2024/02/06 14:24:44 tsutsui Exp $
+@comment $NetBSD: PLIST,v 1.18 2024/03/18 18:37:19 schmonz Exp $
 ${PLIST.x11}bin/imlib2_bumpmap
 ${PLIST.x11}bin/imlib2_colorspace
 bin/imlib2_conv
@@ -17,6 +17,7 @@ lib/imlib2/loaders/bmp.la
 lib/imlib2/loaders/bz2.la
 lib/imlib2/loaders/ff.la
 lib/imlib2/loaders/gif.la
+${PLIST.heif}lib/imlib2/loaders/heif.la
 lib/imlib2/loaders/ico.la
 lib/imlib2/loaders/jpeg.la
 lib/imlib2/loaders/lbm.la

Index: pkgsrc/graphics/imlib2/distinfo
diff -u pkgsrc/graphics/imlib2/distinfo:1.49 pkgsrc/graphics/imlib2/distinfo:1.50
--- pkgsrc/graphics/imlib2/distinfo:1.49        Fri Jul 29 05:56:08 2022
+++ pkgsrc/graphics/imlib2/distinfo     Mon Mar 18 18:37:19 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.49 2022/07/29 05:56:08 rin Exp $
+$NetBSD: distinfo,v 1.50 2024/03/18 18:37:19 schmonz Exp $
 
 BLAKE2s (imlib2-1.9.1.tar.xz) = 58f6cdd4dac5d538bd74cf4c0a939f2e87293042861672c6f930dc4b93d70ab7
 SHA512 (imlib2-1.9.1.tar.xz) = 00eb8804a32e1403614e9f899f358dd9797f4bcfa7e9fdecd37992731019933e39834a60bd20be8fb69a35161ba1e784bd638b5ecb626d01a4f69c70c330e5f1
@@ -6,3 +6,5 @@ Size (imlib2-1.9.1.tar.xz) = 813104 byte
 SHA1 (patch-src_bin_imlib2__view.c) = 53a7bdb2e1f8687db095b796b46945ee5a72f552
 SHA1 (patch-src_lib_amd64__blend.S) = 09e89c6b1d6fb622b3ee88f6c3a5e9b6f3ab3fad
 SHA1 (patch-src_lib_amd64__blend__cmod.S) = d533eeacd4b196086f1854c657d3e0773596790b
+SHA1 (patch-src_modules_loaders_Makefile.am) = 00c441c3c0227b6eba9afd526a03caea1ec3f51f
+SHA1 (patch-src_modules_loaders_Makefile.in) = 9f3326cbe20272b6b33e96b5898466cdfeba8d3f

Index: pkgsrc/graphics/imlib2/options.mk
diff -u pkgsrc/graphics/imlib2/options.mk:1.14 pkgsrc/graphics/imlib2/options.mk:1.15
--- pkgsrc/graphics/imlib2/options.mk:1.14      Tue Feb  6 14:37:38 2024
+++ pkgsrc/graphics/imlib2/options.mk   Mon Mar 18 18:37:19 2024
@@ -1,9 +1,9 @@
-# $NetBSD: options.mk,v 1.14 2024/02/06 14:37:38 wiz Exp $
+# $NetBSD: options.mk,v 1.15 2024/03/18 18:37:19 schmonz Exp $
 
 .include "../../mk/bsd.prefs.mk"
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.imlib2
-PKG_SUPPORTED_OPTIONS= libwebp x11
+PKG_SUPPORTED_OPTIONS= heif libwebp x11
 PKG_SUGGESTED_OPTIONS= libwebp x11
 .if ${MACHINE_ARCH} == "i386"
 PKG_SUPPORTED_OPTIONS+=        mmx
@@ -20,6 +20,15 @@ CONFIGURE_ARGS+=     --enable-mmx
 CONFIGURE_ARGS+=       --disable-mmx
 .endif
 
+PLIST_VARS+=           heif
+.if !empty(PKG_OPTIONS:Mheif)
+.include "../../graphics/libheif/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-heif
+PLIST.heif=            yes
+.else
+CONFIGURE_ARGS+=       --without-heif
+.endif
+
 .if !empty(PKG_OPTIONS:Mimlib2-amd64)
 CONFIGURE_ARGS+=       --enable-amd64
 .else

Added files:

Index: pkgsrc/graphics/imlib2/patches/patch-src_modules_loaders_Makefile.am
diff -u /dev/null pkgsrc/graphics/imlib2/patches/patch-src_modules_loaders_Makefile.am:1.1
--- /dev/null   Mon Mar 18 18:37:20 2024
+++ pkgsrc/graphics/imlib2/patches/patch-src_modules_loaders_Makefile.am        Mon Mar 18 18:37:19 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_modules_loaders_Makefile.am,v 1.1 2024/03/18 18:37:19 schmonz Exp $
+
+Remove non-portable linker flag not used with most other modules.
+
+--- src/modules/loaders/Makefile.am.orig       2024-03-18 18:26:17.872501876 +0000
++++ src/modules/loaders/Makefile.am
+@@ -83,7 +83,7 @@ gif_la_LIBTOOLFLAGS  = --tag=disable-sta
+ 
+ heif_la_SOURCES      = loader_heif.c
+ heif_la_CPPFLAGS     = $(HEIF_CFLAGS) $(AM_CPPFLAGS)
+-heif_la_LDFLAGS      = -module -avoid-version -Wl,-z,nodelete
++heif_la_LDFLAGS      = -module -avoid-version
+ heif_la_LIBADD       = $(HEIF_LIBS) $(top_builddir)/src/lib/libImlib2.la
+ heif_la_LIBTOOLFLAGS = --tag=disable-static
+ 
Index: pkgsrc/graphics/imlib2/patches/patch-src_modules_loaders_Makefile.in
diff -u /dev/null pkgsrc/graphics/imlib2/patches/patch-src_modules_loaders_Makefile.in:1.1
--- /dev/null   Mon Mar 18 18:37:20 2024
+++ pkgsrc/graphics/imlib2/patches/patch-src_modules_loaders_Makefile.in        Mon Mar 18 18:37:19 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_modules_loaders_Makefile.in,v 1.1 2024/03/18 18:37:19 schmonz Exp $
+
+Remove non-portable linker flag not used with most other modules.
+
+--- src/modules/loaders/Makefile.in.orig       2024-03-18 18:29:12.716422280 +0000
++++ src/modules/loaders/Makefile.in
+@@ -622,7 +622,7 @@ gif_la_LIBADD = $(GIF_LIBS) $(top_buildd
+ gif_la_LIBTOOLFLAGS = --tag=disable-static
+ heif_la_SOURCES = loader_heif.c
+ heif_la_CPPFLAGS = $(HEIF_CFLAGS) $(AM_CPPFLAGS)
+-heif_la_LDFLAGS = -module -avoid-version -Wl,-z,nodelete
++heif_la_LDFLAGS = -module -avoid-version
+ heif_la_LIBADD = $(HEIF_LIBS) $(top_builddir)/src/lib/libImlib2.la
+ heif_la_LIBTOOLFLAGS = --tag=disable-static
+ ico_la_SOURCES = loader_ico.c