From nobody Sat Jan 20 13:56:02 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4THJ0y52Xqz57BWH; Sat, 20 Jan 2024 13:56:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4THJ0y4QwPz4lXT; Sat, 20 Jan 2024 13:56:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705758962; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WrKIQr08LKIBHMml+aimJBXzpvqLeRpYHY0/hB5SMVU=; b=jKQq9lu9vfcHp/zNyzv5LcXdeIsU7O8H9Wo1WpP8wTD7UuYaCxlPCbYnnaM14xZsKLpOJ9 CRKU48/8QfWX8t9RS9j1wTrgkjRePUziTVxbyKrClpqkCsaGco2Pae8F0u/mUd1ayt/2C1 gPv6J41LvrJHZEuVPkWCkq8w6+tFWLvEEA5HeG4eI7KDy3lNbdDX8uoxDLyK1Lanyi4OqJ 4cLYqAtiKxIlvcik3jxYPSRW5IeN3I2bW14QfclaqpGNMHhQ3TD6HTzKC8lYzzk5NV1ga0 3nYsCEOZyDcrR5PqP/Mji9VtZ68QgnIHZ2nC4FHVuW5E1oe/SOqpui7zpKH87g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705758962; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WrKIQr08LKIBHMml+aimJBXzpvqLeRpYHY0/hB5SMVU=; b=uouhU3CiWqKbjh7tqblxFaj8/w5nIek6O/AvTpjdsOaEvCQP0yzZ/+5qfCLOR0rVlJoT6U QKtvHuazRVcf2+j+/WNKam1wFhLp0kfAcbK5NrFelM0nQjA1d0Jlx6RJHXGf/Dbjj4oveX VbOrWCJ+fu4Zw2TDLQyL6ckX3qguTrEvutTsn5UM6vdq1qbhUIaaBzLiLV7HY7S4HuqvXd 56PwWTbbEFoUUcCJBgko2t96zzJLzO8mM8Yio+U+dA48CkwB0dW2fxheeFAAmlgMERp/zv IglgjEuvGzIC98OonhTGSlHRVHVl4k6Uv03KpSHaG53jCNUNgXALiL37jvNCtQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705758962; a=rsa-sha256; cv=none; b=oarvm75yl/TlLfI3ER6YJQGZJxRyqzjMHToOKgVKcqm59KZJ6CwvqjE1J1MX1rJpmkbvmL Ri3Iddfjy3uIjkyFx5aP6g0SQfRg81eBw0pfVKvD4nM956PCgQ8DsWfUEhLS6uDO9JSUWZ IpYbDJ+vsfchQk0FDimPXSsO9q8XQc9CwlUyHAhzina/GCZVQAGydFMCD2JYTrjTblaX8y Ho5UTCigPbLH4LbU1+YIzdK9x1RLpeBqRmvXqnTMgzgpCnzoXuUgZ+oesLRHc1/qdhVF2N DS0QA9FMtlF6tU17Xz6nnX2oPeYARNVebFpflQiPzrcpoQAgFE59cbIGrz7Xwg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4THJ0y3WTfzdPY; Sat, 20 Jan 2024 13:56:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40KDu2Fm082507; Sat, 20 Jan 2024 13:56:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40KDu278082504; Sat, 20 Jan 2024 13:56:02 GMT (envelope-from git) Date: Sat, 20 Jan 2024 13:56:02 GMT Message-Id: <202401201356.40KDu278082504@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Nuno Teixeira Subject: git: 047c0a038fa6 - main - graphics/imlib2_loaders: Update to 1.12.1 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eduardo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 047c0a038fa69833f80b0c5d521e9a93b0df411f Auto-Submitted: auto-generated The branch main has been updated by eduardo: URL: https://cgit.FreeBSD.org/ports/commit/?id=047c0a038fa69833f80b0c5d521e9a93b0df411f commit 047c0a038fa69833f80b0c5d521e9a93b0df411f Author: Nuno Teixeira AuthorDate: 2024-01-20 13:45:55 +0000 Commit: Nuno Teixeira 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 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 - #include - #include -@@ -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