From nobody Sat Jan 20 15:14:16 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 4THKlD3qfyz57L6n; Sat, 20 Jan 2024 15:14:16 +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 4THKlD30wpz3xBb; Sat, 20 Jan 2024 15:14:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705763656; 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=rJnFh2vuvt2SQ+9tmk76Lw0Bc+d57Tk+MxbJVAUgAlI=; b=UWAfs7lfqILc7V88TsvLoUuVEHOIyJpJmqNWVcjV8IMZI8MhaVa+uQzcab/0w4GTqm19ff nWZX4MUH9aO0IBeVJOK5eJFC+0x4r78sIy+YOQj5PbWivmuNK0vMgK9/RANuCM1JSigNdy Z4fgDN3OqBinCTz3iTFC7egxo245alA7rHslESs+iDQbXjyISRjoCovnwe3xToV0o6WAqF YXVH5Tz3xvya4nNTz22eP67sQXlT/kH1d5uH3LEIUaQUo5rN4W0UwVdfBt5ODep/9Hj+GM mUxeTu2dICgZ2iMcY6Uj5/gJ8qEDP3ya3YRcXGIQ29Jma/VOIwTqwmrnCEmWqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705763656; 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=rJnFh2vuvt2SQ+9tmk76Lw0Bc+d57Tk+MxbJVAUgAlI=; b=qHj8skaDPa6W1KtVEfzu7jse/Ld5t5uicPBw9GH1hKwLXV+JGpCpmfFfLtIY61XOENaCFq rE1o3nrTnjda80RYq569BMDbbNBBSj3BeSes372jiUJWcop8+HrKJBCly+P2ONLQ/vpHUh cTOTb76TyXeFo13EDA/B1vDzt0yGnb6Rhfwwkj6QUirGJJIITwghYVlovX+bXDOwIAruru 1euNUwxuBR0Ick2xDDh0smeZX4tpLgec/fkSSLT5uvRhIOTtsLOLiZp7HPyf5HTKXEO2g8 79/eTFOUpDCEDepDRMLMRMdO1/wikZrqUsf3XUEcLmcZIdBluOvjtvHJCGdnPg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705763656; a=rsa-sha256; cv=none; b=EML9zhYSn59Wj+bwALX8KTHaYXFjpn0VozG+pkgf5uzGNAUry7okIqMtJVvlSkbW8Ey+RH Hgm7OSEWABMU+r4/Z7olMPQVqNdFMHDjbbT0lT1n8cEPMlWqazTOrX8i56lmExfc1gZhku o4unBW8hfSWbZ0oQM9688w3HeHTvi2bqyNzibF7DIqEOFJ+WFPuSmRf4q6YgwzaWE2BB3k OQvb1KPrldr4PR1t8dQX7yglKhyrBkFvHIQnpinlMskk35e+CP90t7a8LT2+8BfA8r5ibC wMFtG9xdDg54suV7mAdySW/Fmn858p34Fbqdr2oWpLpvom0Yy1vAp8GnQgDEyA== 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 4THKlD255rzgC2; Sat, 20 Jan 2024 15:14:16 +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 40KFEGAG016484; Sat, 20 Jan 2024 15:14:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40KFEGiG016481; Sat, 20 Jan 2024 15:14:16 GMT (envelope-from git) Date: Sat, 20 Jan 2024 15:14:16 GMT Message-Id: <202401201514.40KFEGiG016481@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 0f80a85a1ac5 - main - graphics/imlib2-jxl: update to 0.2.0 after 026dc430636a 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: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0f80a85a1ac57bc791c22fc341415d573da6d8e2 Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=0f80a85a1ac57bc791c22fc341415d573da6d8e2 commit 0f80a85a1ac57bc791c22fc341415d573da6d8e2 Author: Jan Beich AuthorDate: 2023-04-28 21:01:29 +0000 Commit: Jan Beich CommitDate: 2024-01-20 15:13:31 +0000 graphics/imlib2-jxl: update to 0.2.0 after 026dc430636a Changes: https://github.com/alistair7/imlib2-jxl/releases/tag/v0.2.0 Reported by: GitHub (watch releases) --- graphics/imlib2-jxl/Makefile | 6 ++- graphics/imlib2-jxl/distinfo | 8 +-- graphics/imlib2-jxl/files/patch-imlib2-jxl.c | 76 ---------------------------- 3 files changed, 9 insertions(+), 81 deletions(-) diff --git a/graphics/imlib2-jxl/Makefile b/graphics/imlib2-jxl/Makefile index 29262ddf5d08..09253568e5db 100644 --- a/graphics/imlib2-jxl/Makefile +++ b/graphics/imlib2-jxl/Makefile @@ -1,9 +1,11 @@ PORTNAME= imlib2-jxl DISTVERSIONPREFIX= v -DISTVERSION= 0.1.1 -PORTREVISION= 4 +DISTVERSION= 0.2.0 CATEGORIES= graphics +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +PATCHFILES+= de2b38f5f34f.patch:-p1 # libjxl 0.9 + MAINTAINER= jbeich@FreeBSD.org COMMENT= JPEG XL loader for imlib2 WWW= https://github.com/alistair7/imlib2-jxl diff --git a/graphics/imlib2-jxl/distinfo b/graphics/imlib2-jxl/distinfo index 64e175fc75f6..28c5c7e30634 100644 --- a/graphics/imlib2-jxl/distinfo +++ b/graphics/imlib2-jxl/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1642715616 -SHA256 (alistair7-imlib2-jxl-v0.1.1_GH0.tar.gz) = 25d220e4638948174d5e76c66e2f0441ee41e0758fa63f065cdfd51bb76c1465 -SIZE (alistair7-imlib2-jxl-v0.1.1_GH0.tar.gz) = 24731 +TIMESTAMP = 1682715689 +SHA256 (alistair7-imlib2-jxl-v0.2.0_GH0.tar.gz) = b49ded4e9251569cfa0245a3075796924656f565e681c60a02c8ec7e16fd9a71 +SIZE (alistair7-imlib2-jxl-v0.2.0_GH0.tar.gz) = 385197 +SHA256 (de2b38f5f34f.patch) = 3722403f4caa909535f3cfb37dda1b2c092d6370e2709241736b439b5a2e9cc8 +SIZE (de2b38f5f34f.patch) = 3181 diff --git a/graphics/imlib2-jxl/files/patch-imlib2-jxl.c b/graphics/imlib2-jxl/files/patch-imlib2-jxl.c deleted file mode 100644 index 9a1d71d329e3..000000000000 --- a/graphics/imlib2-jxl/files/patch-imlib2-jxl.c +++ /dev/null @@ -1,76 +0,0 @@ -https://github.com/alistair7/imlib2-jxl/commit/3888defd345f -https://github.com/alistair7/imlib2-jxl/commit/06a3b71e4d13 -https://github.com/alistair7/imlib2-jxl/commit/de2b38f5f34f - ---- imlib2-jxl.c.orig 2022-01-20 21:53:36 UTC -+++ imlib2-jxl.c -@@ -402,7 +402,7 @@ char load(ImlibImage *im, ImlibProgressFunction progre - * extract an ICC profile and save it for later. */ - - JxlColorEncoding color_enc; -- if(JxlDecoderGetColorAsEncodedProfile(dec, &pixel_format, JXL_COLOR_PROFILE_TARGET_DATA, &color_enc) == JXL_DEC_SUCCESS) -+ if(JxlDecoderGetColorAsEncodedProfile(dec, JXL_COLOR_PROFILE_TARGET_DATA, &color_enc) == JXL_DEC_SUCCESS) - { - if(color_enc.color_space == JXL_COLOR_SPACE_RGB && color_enc.transfer_function == JXL_TRANSFER_FUNCTION_SRGB) - { -@@ -412,7 +412,7 @@ char load(ImlibImage *im, ImlibProgressFunction progre - } - } - -- if(JxlDecoderGetICCProfileSize(dec, &pixel_format, JXL_COLOR_PROFILE_TARGET_DATA, &icc_size) != JXL_DEC_SUCCESS) -+ if(JxlDecoderGetICCProfileSize(dec, JXL_COLOR_PROFILE_TARGET_DATA, &icc_size) != JXL_DEC_SUCCESS) - { - icc_size = 0; - break; -@@ -420,7 +420,7 @@ char load(ImlibImage *im, ImlibProgressFunction progre - if(!(icc_blob = malloc(icc_size))) - RETURN_ERR("Failed to allocate %zu B for ICC profile", icc_size); - -- if(JxlDecoderGetColorAsICCProfile(dec, &pixel_format, JXL_COLOR_PROFILE_TARGET_DATA, icc_blob, icc_size) != JXL_DEC_SUCCESS) -+ if(JxlDecoderGetColorAsICCProfile(dec, JXL_COLOR_PROFILE_TARGET_DATA, icc_blob, icc_size) != JXL_DEC_SUCCESS) - icc_size = 0; - - break; -@@ -596,9 +596,9 @@ char save(ImlibImage *im, ImlibProgressFunction progre - if(JxlEncoderSetParallelRunner(enc, JxlThreadParallelRunner, runner) != JXL_ENC_SUCCESS) - RETURN_ERR("Failed in JxlEncoderSetParallelRunner"); - -- JxlEncoderOptions *opts; -- if(!(opts = JxlEncoderOptionsCreate(enc, NULL))) -- RETURN_ERR("Failed in JxlEncoderOptionsCreate"); -+ JxlEncoderFrameSettings *opts; -+ if(!(opts = JxlEncoderFrameSettingsCreate(enc, NULL))) -+ RETURN_ERR("Failed in JxlEncoderFrameSettingsCreate"); - - JxlPixelFormat pixel_format = { .align = 0, .data_type = JXL_TYPE_UINT8, .num_channels = 4, .endianness = JXL_NATIVE_ENDIAN}; - -@@ -633,14 +633,14 @@ char save(ImlibImage *im, ImlibProgressFunction progre - quality = max_quality; - - // Transform quality 0-99 to distance 15-0 -- if(JxlEncoderOptionsSetDistance(opts, 15 - (quality * 15/(float)max_quality)) != JXL_ENC_SUCCESS) -- RETURN_ERR("Failed in JxlEncoderOptionsSetDistance: %.1f", 15 - (quality * 15/(float)max_quality)); -+ if(JxlEncoderSetFrameDistance(opts, 15 - (quality * 15/(float)max_quality)) != JXL_ENC_SUCCESS) -+ RETURN_ERR("Failed in JxlEncoderSetFrameDistance: %.1f", 15 - (quality * 15/(float)max_quality)); - - // If quality is maxed out, explicity enable lossless mode - if(quality == max_quality) - { -- if(JxlEncoderOptionsSetLossless(opts, 1) != JXL_ENC_SUCCESS) -- RETURN_ERR("Failed in JxlEncoderOptionsSetLossless"); -+ if(JxlEncoderSetFrameLossless(opts, JXL_TRUE) != JXL_ENC_SUCCESS) -+ RETURN_ERR("Failed in JxlEncoderSetFrameLossless"); - } - - } -@@ -659,8 +659,8 @@ char save(ImlibImage *im, ImlibProgressFunction progre - // Transform compression 0-9 to effort 3-9 - compression = 3 + (int)roundf(compression * 6/(float)max_compression); - -- if(JxlEncoderOptionsSetEffort(opts, compression) != JXL_ENC_SUCCESS) -- RETURN_ERR("Failed in JxlEncoderOptionsSetEffort: %d", compression); -+ if(JxlEncoderFrameSettingsSetOption(opts, JXL_ENC_FRAME_SETTING_EFFORT, compression) != JXL_ENC_SUCCESS) -+ RETURN_ERR("Failed in JxlEncoderFrameSettingsSetOption(JXL_ENC_FRAME_SETTING_EFFORT, %d)", compression); - } - - const size_t pixels_size = 4 * im->w * im->h;