Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 20 Jan 2024 13:56:02 GMT
From:      Nuno Teixeira <eduardo@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 047c0a038fa6 - main - graphics/imlib2_loaders: Update to 1.12.1
Message-ID:  <202401201356.40KDu278082504@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by eduardo:

URL: https://cgit.FreeBSD.org/ports/commit/?id=047c0a038fa69833f80b0c5d521e9a93b0df411f

commit 047c0a038fa69833f80b0c5d521e9a93b0df411f
Author:     Nuno Teixeira <eduardo@FreeBSD.org>
AuthorDate: 2024-01-20 13:45:55 +0000
Commit:     Nuno Teixeira <eduardo@FreeBSD.org>
CommitDate: 2024-01-20 13:55:48 +0000

    graphics/imlib2_loaders: Update to 1.12.1
    
    - Switch to DISTVERSION
    - Use multi option since at least one needed to be selected or a empty
      install will happen
    - Pet portlint, portclippy, portfmt and Q/A check
    - Take maintainership
    
    ChangeLog:
    https://git.enlightenment.org/old/legacy-imlib2_loaders/src/branch/master/ChangeLog
    
    PR:             276399
---
 graphics/imlib2_loaders/Makefile                   | 34 ++++++++++++----------
 graphics/imlib2_loaders/distinfo                   |  6 ++--
 .../files/patch-src_modules_loaders_loader__eet.c  | 28 ------------------
 graphics/imlib2_loaders/pkg-plist                  |  1 -
 4 files changed, 22 insertions(+), 47 deletions(-)

diff --git a/graphics/imlib2_loaders/Makefile b/graphics/imlib2_loaders/Makefile
index 4af9aad052f7..cac92e6db1a1 100644
--- a/graphics/imlib2_loaders/Makefile
+++ b/graphics/imlib2_loaders/Makefile
@@ -1,38 +1,42 @@
 PORTNAME=	imlib2_loaders
-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
+MAINTAINER=	eduardo@FreeBSD.org
 COMMENT=	Extra image loader plugins for Imlib 2
 WWW=		https://docs.enlightenment.org/api/imlib2/html/
 
-LICENSE=		imlib2 GPLv2
-LICENSE_COMB=		multi
+LICENSE=	GPLv2 imlib2
+LICENSE_COMB=	multi
 LICENSE_NAME_imlib2=	imlib2 license
 LICENSE_FILE_imlib2=	${WRKSRC}/COPYING
 LICENSE_PERMS_imlib2=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-LIB_DEPENDS=	libImlib2.so:graphics/imlib2
+BUILD_DEPENDS=	imlib2>0:graphics/imlib2
 
-GNU_CONFIGURE=	yes
-INSTALL_TARGET=	install-strip
-USES=		libtool localbase pathfix pkgconfig tar:bzip2 xorg
+USES=		libtool localbase pathfix pkgconfig tar:xz xorg
 USE_XORG=	x11 xext
 
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-static
 
-OPTIONS_DEFINE=	EET XCF
-OPTIONS_DEFAULT=	EET XCF
+INSTALL_TARGET=	install-strip
+
+OPTIONS_DEFAULT=	XCF
+OPTIONS_MULTI=		LOADERS
+OPTIONS_MULTI_LOADERS=	EET XCF
+
 OPTIONS_SUB=	yes
 
 EET_DESC=	Enable eet loader
+XCF_DESC=	Enable XCF loader
+
+EET_BROKEN=		eet loader broken since v1.7.2
 EET_LIB_DEPENDS=	libefl.so:devel/efl
-EET_CONFIGURE_OFF=	--disable-eet
+EET_CONFIGURE_ENABLE=	eet
 
-XCF_DESC=	Enable XCF loader
-XCF_CONFIGURE_OFF=	--disable-xcf
+XCF_CONFIGURE_ENABLE=	xcf
 
 .include <bsd.port.mk>
diff --git a/graphics/imlib2_loaders/distinfo b/graphics/imlib2_loaders/distinfo
index 913db936448e..9d61ecc80fb0 100644
--- a/graphics/imlib2_loaders/distinfo
+++ b/graphics/imlib2_loaders/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1596568222
-SHA256 (imlib2_loaders-1.7.0.tar.bz2) = 7af5490e9998de039f8234977c3f505c96dcf2d2c9887db811cbbdba492e95af
-SIZE (imlib2_loaders-1.7.0.tar.bz2) = 301990
+TIMESTAMP = 1705402335
+SHA256 (imlib2_loaders-1.12.1.tar.xz) = ca3a92b109b4a7ef0173a62ff91a8330b901eef85984ed591ec227d15251be0f
+SIZE (imlib2_loaders-1.12.1.tar.xz) = 254388
diff --git a/graphics/imlib2_loaders/files/patch-src_modules_loaders_loader__eet.c b/graphics/imlib2_loaders/files/patch-src_modules_loaders_loader__eet.c
deleted file mode 100644
index e6af723024ed..000000000000
--- a/graphics/imlib2_loaders/files/patch-src_modules_loaders_loader__eet.c
+++ /dev/null
@@ -1,28 +0,0 @@
---- src/modules/loaders/loader_eet.c.orig	2020-08-05 10:54:15 UTC
-+++ src/modules/loaders/loader_eet.c
-@@ -6,11 +6,6 @@
- 
- #include "loader_common.h"
- 
--#define SWAP32(x) (x) = \
--((((x) & 0x000000ff ) << 24) |\
-- (((x) & 0x0000ff00 ) << 8) |\
-- (((x) & 0x00ff0000 ) >> 8) |\
-- (((x) & 0xff000000 ) >> 24))
- #include <Eet.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-@@ -379,11 +374,6 @@ void
- formats(ImlibLoader * l)
- {
-    static const char  *const list_formats[] = { "eet" };
--   int                 i;
--
--   l->num_formats = sizeof(list_formats) / sizeof(char *);
--   l->formats = malloc(sizeof(char *) * l->num_formats);
--
--   for (i = 0; i < l->num_formats; i++)
--      l->formats[i] = strdup(list_formats[i]);
-+   __imlib_LoaderSetFormats(l, list_formats,
-+                            sizeof(list_formats) / sizeof(char *));
- }
diff --git a/graphics/imlib2_loaders/pkg-plist b/graphics/imlib2_loaders/pkg-plist
index bfc328991804..34fa671d9510 100644
--- a/graphics/imlib2_loaders/pkg-plist
+++ b/graphics/imlib2_loaders/pkg-plist
@@ -1,3 +1,2 @@
-lib/imlib2/loaders/ani.so
 %%EET%%lib/imlib2/loaders/eet.so
 %%XCF%%lib/imlib2/loaders/xcf.so



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202401201356.40KDu278082504>