git: 026dc430636a - main - graphics/imlib2: Update to 1.12.1
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 20 Jan 2024 13:56:01 UTC
The branch main has been updated by eduardo:
URL: https://cgit.FreeBSD.org/ports/commit/?id=026dc430636af6e3687a5b0499a8893126515a45
commit 026dc430636af6e3687a5b0499a8893126515a45
Author: Nuno Teixeira <eduardo@FreeBSD.org>
AuthorDate: 2024-01-20 13:42:23 +0000
Commit: Nuno Teixeira <eduardo@FreeBSD.org>
CommitDate: 2024-01-20 13:55:48 +0000
graphics/imlib2: Update to 1.12.1
- Switch to DISTVERSION
- Pet portlint, portclippy, portfmt and Q/A check
- Take maintainership
- Drop CONFIGURE_ENV=ac_cv_lib_dl_dlopen=no
- Drop --enable-mmx on supported platforms on this version
(see 1.12.1 changelog)
ChangeLog:
https://git.enlightenment.org/old/legacy-imlib2/src/branch/master/ChangeLog
PR: 276369
---
graphics/imlib2/Makefile | 40 ++++++++++++----------
graphics/imlib2/distinfo | 6 ++--
.../files/patch-src_modules_loaders_loader__argb.c | 12 -------
graphics/imlib2/pkg-plist | 11 ++++--
4 files changed, 32 insertions(+), 37 deletions(-)
diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile
index 270b0c70dd0a..7239bc32bc7c 100644
--- a/graphics/imlib2/Makefile
+++ b/graphics/imlib2/Makefile
@@ -1,12 +1,11 @@
PORTNAME= imlib2
-PORTVERSION= 1.7.0
-PORTREVISION= 1
+DISTVERSION= 1.12.1
PORTEPOCH= 2
CATEGORIES= graphics enlightenment
-MASTER_SITES= SF/enlightenment/imlib2-src/${PORTVERSION}
+MASTER_SITES= SF/enlightenment/imlib2-src/${DISTVERSION}
-MAINTAINER= ports@FreeBSD.org
-COMMENT= The next generation graphics library for Enlightenment
+MAINTAINER= eduardo@FreeBSD.org
+COMMENT= Next generation graphics library for Enlightenment
WWW= https://docs.enlightenment.org/api/imlib2/html/
LICENSE= imlib2
@@ -16,24 +15,26 @@ LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
LIB_DEPENDS= libfreetype.so:print/freetype2
-USES= cpe libtool pathfix pkgconfig tar:bzip2
-GNU_CONFIGURE= yes
+USES= cpe libtool localbase:ldflags pathfix pkgconfig tar:xz
+CPE_VENDOR= enlightenment
USE_LDCONFIG= yes
-INSTALL_TARGET= install-strip
-CPE_VENDOR= enlightenment
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS= --disable-static \
+ --enable-visibility-hiding \
+ --with-bzip2 \
+ --with-zlib
-CONFIGURE_ARGS= --enable-visibility-hiding --disable-static \
- --with-zlib --with-bzip2
-CONFIGURE_ENV= ac_cv_lib_dl_dlopen=no
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
+INSTALL_TARGET= install-strip
CONFLICTS_INSTALL= imlib2-webp
+PLIST_SUB= SHLIB_SHORT=${DISTVERSION:R:R} \
+ SHLIB_VER=${DISTVERSION}
+
OPTIONS_DEFINE= GIF ID3 JPEG PNG TIFF WEBP X11
OPTIONS_DEFAULT= GIF ID3 JPEG PNG TIFF WEBP X11
-OPTIONS_SUB= yes
+OPTIONS_SUB= yes
GIF_LIB_DEPENDS= libgif.so:graphics/giflib
GIF_CONFIGURE_WITH= gif
@@ -44,23 +45,24 @@ ID3_CONFIGURE_WITH= id3
JPEG_USES= jpeg
JPEG_CONFIGURE_WITH= jpeg
-PNG_LIB_DEPENDS= libpng.so:graphics/png
+PNG_LIB_DEPENDS= libpng16.so:graphics/png
PNG_CONFIGURE_WITH= png
TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff
TIFF_CONFIGURE_WITH= tiff
-WEBP_LIB_DEPENDS= libwebp.so:graphics/webp
+WEBP_LIB_DEPENDS= libwebpdemux.so:graphics/webp
WEBP_CONFIGURE_WITH= webp
X11_USES= xorg
-X11_USE= XORG=x11,sm,xcb,xext
+X11_USE= XORG=sm,x11,xcb,xext
X11_CONFIGURE_WITH= x x-shm-fd
.include <bsd.port.options.mk>
+# scaling: MMX asm scaling causes segv, disable for now
.if ${ARCH} == "i386" && !empty(MACHINE_CPU:Mmmx)
-CONFIGURE_ARGS+= --enable-mmx
+CONFIGURE_ARGS+= --disable-mmx
.else
CONFIGURE_ARGS+= --disable-mmx
.endif
diff --git a/graphics/imlib2/distinfo b/graphics/imlib2/distinfo
index b90f1f7652d1..1abef604a3d1 100644
--- a/graphics/imlib2/distinfo
+++ b/graphics/imlib2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1596568156
-SHA256 (imlib2-1.7.0.tar.bz2) = 1976ca3db48cbae79cd0fc737dabe39cc81494fc2560e1d22821e7dc9c22b37d
-SIZE (imlib2-1.7.0.tar.bz2) = 893015
+TIMESTAMP = 1705226776
+SHA256 (imlib2-1.12.1.tar.xz) = 8c24d2d189c4d5ae602dbf2fc0fbb117aa923eab6c883041f0feeca4e8c6774e
+SIZE (imlib2-1.12.1.tar.xz) = 831680
diff --git a/graphics/imlib2/files/patch-src_modules_loaders_loader__argb.c b/graphics/imlib2/files/patch-src_modules_loaders_loader__argb.c
deleted file mode 100644
index 8eb13255fc23..000000000000
--- a/graphics/imlib2/files/patch-src_modules_loaders_loader__argb.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/modules/loaders/loader_argb.c.orig 2020-08-08 14:27:16 UTC
-+++ src/modules/loaders/loader_argb.c
-@@ -7,6 +7,9 @@ load2(ImlibImage * im, int load_data)
- int w = 0, h = 0, alpha = 0;
- DATA32 *ptr;
- int y;
-+#ifdef WORDS_BIGENDIAN
-+ int l;
-+#endif
-
- rc = LOAD_FAIL;
-
diff --git a/graphics/imlib2/pkg-plist b/graphics/imlib2/pkg-plist
index 1c811d3373fe..a3460a4cc2f0 100644
--- a/graphics/imlib2/pkg-plist
+++ b/graphics/imlib2/pkg-plist
@@ -1,4 +1,3 @@
-bin/imlib2-config
%%X11%%bin/imlib2_bumpmap
%%X11%%bin/imlib2_colorspace
bin/imlib2_conv
@@ -9,9 +8,11 @@ bin/imlib2_load
%%X11%%bin/imlib2_test
%%X11%%bin/imlib2_view
include/Imlib2.h
+include/Imlib2_Loader.h
lib/imlib2/filters/bumpmap.so
lib/imlib2/filters/colormod.so
lib/imlib2/filters/testfilter.so
+lib/imlib2/loaders/ani.so
lib/imlib2/loaders/argb.so
lib/imlib2/loaders/bmp.so
lib/imlib2/loaders/bz2.so
@@ -21,17 +22,21 @@ lib/imlib2/loaders/ico.so
%%ID3%%lib/imlib2/loaders/id3.so
%%JPEG%%lib/imlib2/loaders/jpeg.so
lib/imlib2/loaders/lbm.so
+lib/imlib2/loaders/lzma.so
%%PNG%%lib/imlib2/loaders/png.so
lib/imlib2/loaders/pnm.so
+lib/imlib2/loaders/qoi.so
lib/imlib2/loaders/tga.so
%%TIFF%%lib/imlib2/loaders/tiff.so
%%WEBP%%lib/imlib2/loaders/webp.so
+lib/imlib2/loaders/xbm.so
lib/imlib2/loaders/xpm.so
lib/imlib2/loaders/zlib.so
lib/libImlib2.so
-lib/libImlib2.so.1
-lib/libImlib2.so.1.7.0
+lib/libImlib2.so.%%SHLIB_SHORT%%
+lib/libImlib2.so.%%SHLIB_VER%%
libdata/pkgconfig/imlib2.pc
+%%DATADIR%%/rgb.txt
%%DATADIR%%/data/fonts/cinema.ttf
%%DATADIR%%/data/fonts/grunge.ttf
%%DATADIR%%/data/fonts/morpheus.ttf