From nobody Sat Jan 20 16:12:41 2024 X-Original-To: dev-commits-ports-all@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 4THM2d5SXNz57RGT; Sat, 20 Jan 2024 16:12:41 +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 4THM2d4Ry6z472Q; Sat, 20 Jan 2024 16:12:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705767161; 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=6/1i2HCZXchmArGbt1FiOK2kaUhX83fjH7huiJB2V6E=; b=uwsqV9eXPldPZ/e4+6OqTCOfC6lc6BZwVeGh9fUQA3pwcak+yrMatTRrqt10mVzxV9PrDl sAa2WilTeJDBI1b2JzIZH6WT0qZW0niQtBUbluGIS5evlXy+C18LV42S/YDCL2xdQ4PUue oK0ByNGCcEnfRrzA3r7scFTz7m7ryM3/ALk658ddSeQuVdPHsNHbL+OK6r7ZDqnccbxslA rFt++XUbQSyulmssLEOXlgfihoNAm4cl1JHU4CbO1elb9dAhV4qK92Y2eVeZaui740Du2E Xr6+uqDDoML2R+ddPcO2Q5lE+ZRKnO5luj5CT3qEeE8Uce2I86I4FELJUR5+3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705767161; 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=6/1i2HCZXchmArGbt1FiOK2kaUhX83fjH7huiJB2V6E=; b=OGIFgWVLyOXQT+LJDgdJ0tcBZE9fusaJtbda1YZRGk4kY6WwLrdH9nERNPGcR9F6uxzV6P P/LmbtqTRyVfqGNRjgm5tQqUe90qZ498bh2H+62ag4hrwPrXXiIJYDenRsq3z6/I3+9Pdj tlFyTr23cV116Z0PdBgVQC/DV7tpwUkNVlXFb3NsK6Z5hRrTYCOnQT1ClVt6ekQal8rERq pzcorGYVUowe3ToBTEA6em6vra1VOwQV8TsSU9uG8o+v/ew0HSoOI4YHAWnnQnP3hdFKqX dH63zgdLYSDdSeXHCS8ep6QVdENCSPFhVq5pCFYHZUmQAR7Kwoiv9nnO1bAsRA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705767161; a=rsa-sha256; cv=none; b=k4C5jLH+BdmrLz5eh39vj5ovFZ8j11WFHT0322YmkZ1ByFiCcVv17PMSDLCmUuSfP0ASG4 H9/TING0ZknPg0YJuAOLTa6CCNfIA7H0GBjN6OJYLyM9sYsl03STxaouriC2PdBWIbAcSs Gs5vpCIogLBTvJaSGIU89UL8sN8A2Ol0aPSkNirn0CvOHtT5ALthVvrhVWfUAqEPK9Q/a8 f8BYgv1f91yy6KP2Vzzjhwgzv8fz0jcPAzk8cWjSCsPRSy1+CwmgW78bWqgY6FIQyApagp Bq4vnxscR3vy4TWQS50F47nXRWU1a0+QP1TzuJvTUQwnmviHTZGsWwF+EWRVWA== 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 4THM2d3Vc2zhfx; Sat, 20 Jan 2024 16:12:41 +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 40KGCfVQ017743; Sat, 20 Jan 2024 16:12:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40KGCf8B017740; Sat, 20 Jan 2024 16:12:41 GMT (envelope-from git) Date: Sat, 20 Jan 2024 16:12:41 GMT Message-Id: <202401201612.40KGCf8B017740@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: 6c7466cb7f3c - main - graphics/imlib2: enable JPEG XL by default List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 6c7466cb7f3c9d5e52f356847bf0ee8cbb619252 Auto-Submitted: auto-generated The branch main has been updated by eduardo: URL: https://cgit.FreeBSD.org/ports/commit/?id=6c7466cb7f3c9d5e52f356847bf0ee8cbb619252 commit 6c7466cb7f3c9d5e52f356847bf0ee8cbb619252 Author: Jan Beich AuthorDate: 2024-01-20 16:09:48 +0000 Commit: Nuno Teixeira CommitDate: 2024-01-20 16:09:48 +0000 graphics/imlib2: enable JPEG XL by default Already default upstream via auto-detection. Adjust conflicts per options. PR: 276473 --- graphics/imlib2/Makefile | 12 ++++++++---- graphics/imlib2/pkg-plist | 1 + 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile index 7239bc32bc7c..e6b0b91ce6b6 100644 --- a/graphics/imlib2/Makefile +++ b/graphics/imlib2/Makefile @@ -1,5 +1,6 @@ PORTNAME= imlib2 DISTVERSION= 1.12.1 +PORTREVISION= 1 PORTEPOCH= 2 CATEGORIES= graphics enlightenment MASTER_SITES= SF/enlightenment/imlib2-src/${DISTVERSION} @@ -27,13 +28,11 @@ CONFIGURE_ARGS= --disable-static \ 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_DEFINE= GIF ID3 JPEG JXL PNG TIFF WEBP X11 +OPTIONS_DEFAULT= GIF ID3 JPEG JXL PNG TIFF WEBP X11 OPTIONS_SUB= yes GIF_LIB_DEPENDS= libgif.so:graphics/giflib @@ -45,6 +44,10 @@ ID3_CONFIGURE_WITH= id3 JPEG_USES= jpeg JPEG_CONFIGURE_WITH= jpeg +JXL_LIB_DEPENDS= libjxl.so:graphics/libjxl +JXL_CONFIGURE_WITH= jxl +JXL_CONFLICTS_INSTALL= imlib2-jxl + PNG_LIB_DEPENDS= libpng16.so:graphics/png PNG_CONFIGURE_WITH= png @@ -53,6 +56,7 @@ TIFF_CONFIGURE_WITH= tiff WEBP_LIB_DEPENDS= libwebpdemux.so:graphics/webp WEBP_CONFIGURE_WITH= webp +WEBP_CONFLICTS_INSTALL= imlib2-webp X11_USES= xorg X11_USE= XORG=sm,x11,xcb,xext diff --git a/graphics/imlib2/pkg-plist b/graphics/imlib2/pkg-plist index a3460a4cc2f0..0fc4ea4a4b38 100644 --- a/graphics/imlib2/pkg-plist +++ b/graphics/imlib2/pkg-plist @@ -21,6 +21,7 @@ lib/imlib2/loaders/ff.so lib/imlib2/loaders/ico.so %%ID3%%lib/imlib2/loaders/id3.so %%JPEG%%lib/imlib2/loaders/jpeg.so +%%JXL%%lib/imlib2/loaders/jxl.so lib/imlib2/loaders/lbm.so lib/imlib2/loaders/lzma.so %%PNG%%lib/imlib2/loaders/png.so