From nobody Wed May 29 00:32:33 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 4Vpr1s4YbLz5LXDp; Wed, 29 May 2024 00:32:33 +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 4Vpr1s41Lpz48Qg; Wed, 29 May 2024 00:32:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716942753; 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=9tz+ArBpeotzSJYfGONgQJWIISz+bnvMqqn5UwXgcrU=; b=Si3nzxpP0+KS745f7bOG0hddxnKWvmRwqgUWkf4PmhArEPOLWfCeUMyK+daxGUPMMvoDYJ WR8wV+5BnxjCJbIDQfCInlOui6wLDXuZKuWsYs1f2zi4LlNz9JbRQ7o51CUju8Nudtw5ON Uvr2C8sa97nqiimr2qH4wA6Gl3AVXC/H2D996TmNU32UDqGcfLENQsoGo1M2xZc9f/IoLx 0/0OPefwDIuY2zxoxdvIH/UMtRQ8zhYzY8qjh8BEQvc2oG29Z1HZMBvJBk28iuQ5v+xZ4t 2HZFXn39EGIvx7+mZgcg0DWZrVqC/3dNHXDwBPnJjeharUyq4AYdJqkFYYTJoQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716942753; a=rsa-sha256; cv=none; b=oITUOmn9ozt9s87BkMyqgvUhV+lxr+TAb+VkmU5crFpP106FGfkOzRSZEY+cNO57+ZjiX/ fTFCmeuShk5NC8XVDtXGOiPwqVFBnAFRiX+TzUoUi2+NZTIcKXZ+Op1vt3CIz1mMfxoJpP rwbevor5JzjNv4Zq+koCzQ/kcZDOQKPauPvAL4wNBO4e4qIgJzMUIZbQPVDz3g8l81U/xY iM73dvMRJkuYdHgwgZg3/B93MwKIFFxioDLZIDDSROtdZGg0tMXzDiE7FAMgoPPsdmym9r Mgc3FyCKs0Kq297rM41Onx1NF9S8cNeUas+GzAjZTs3o0yQyGGpNvdNfofvLOQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716942753; 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=9tz+ArBpeotzSJYfGONgQJWIISz+bnvMqqn5UwXgcrU=; b=qriLBS0a/VQgdsy8NJ7PlUzqCW604/BL3FzRwcg0ZAEm8hziqg/OhB0lfX1rP2+QyPKrU8 TF9qiv27a84VoEMy/SfMasGC2kBkyWvS1bCKRLvqyjPaYZcRAgY4T+lQPGVssuRF2MbwxU NN/yHrQQGJ0yqUSujUnWKzqjD6FOANcFkxzXUd899dbYHDW2/2/JCq5/zdu9/0va99zdC+ uyp/u8Cv1Fjunti+Is4nxTwvIJo0ibGPHF6BFvZLytW3e78b44YgiIfuoSJom9TmASH+3J 5raaCGyu3R7tmB8JnmJuhnpcwxmTqqRf6Hv5r2R/pmM5VtlrnAvJUo2eip6lqA== 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 4Vpr1s3cSxzZmD; Wed, 29 May 2024 00:32:33 +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 44T0WXqe078590; Wed, 29 May 2024 00:32:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44T0WX5w078587; Wed, 29 May 2024 00:32:33 GMT (envelope-from git) Date: Wed, 29 May 2024 00:32:33 GMT Message-Id: <202405290032.44T0WX5w078587@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Andree Subject: git: fd30adef308a - main - graphics/rawtherapee: replace workaround by cherry-pick 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mandree X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fd30adef308a544af99ad204353915adffe609c6 Auto-Submitted: auto-generated The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=fd30adef308a544af99ad204353915adffe609c6 commit fd30adef308a544af99ad204353915adffe609c6 Author: Matthias Andree AuthorDate: 2024-05-28 21:40:33 +0000 Commit: Matthias Andree CommitDate: 2024-05-29 00:32:21 +0000 graphics/rawtherapee: replace workaround by cherry-pick ...of upstream's merged change here: https://github.com/Beep6581/RawTherapee/pull/7080 PR: 279371 --- graphics/rawtherapee/Makefile | 2 +- .../rawtherapee/files/patch-rtengine_jdatasrc.cc | 56 +++++++++++++++++----- 2 files changed, 46 insertions(+), 12 deletions(-) diff --git a/graphics/rawtherapee/Makefile b/graphics/rawtherapee/Makefile index 1753aab3ee68..883bc94aeca9 100644 --- a/graphics/rawtherapee/Makefile +++ b/graphics/rawtherapee/Makefile @@ -1,6 +1,6 @@ PORTNAME= rawtherapee PORTVERSION= 5.10 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= https://rawtherapee.com/shared/source/ \ LOCAL/mandree/ diff --git a/graphics/rawtherapee/files/patch-rtengine_jdatasrc.cc b/graphics/rawtherapee/files/patch-rtengine_jdatasrc.cc index 950b3b205be2..9bd4ac27ef90 100644 --- a/graphics/rawtherapee/files/patch-rtengine_jdatasrc.cc +++ b/graphics/rawtherapee/files/patch-rtengine_jdatasrc.cc @@ -1,20 +1,54 @@ +This is a combinediff of +https://github.com/Beep6581/RawTherapee/pull/7080/commits/efdc5bce3b9794847093baeb040937ab55eba86e +https://github.com/Beep6581/RawTherapee/pull/7080/commits/7789a8574b454ebd874522a70930ae4b40726da4 + --- rtengine/jdatasrc.cc.orig 2024-02-16 05:12:09 UTC +++ rtengine/jdatasrc.cc -@@ -409,6 +409,8 @@ my_jpeg_std_error (struct jpeg_error_mgr * err) +@@ -247,20 +247,6 @@ my_error_exit (j_common_ptr cinfo) + #endif + } + +- +-#ifdef _WIN32 +-#define JVERSION "6b 27-Mar-1998" +-#define JCOPYRIGHT_SHORT "(C) 1998, Thomas G. Lane" +-#define JMESSAGE(code,string) string , +- +-const char * const jpeg_std_message_table[] = { +-#include "jerror.h" +- NULL +-}; +-#else +-extern const char * const jpeg_std_message_table[]; +-#endif +- + /* + * Actual output of an error or trace message. + * Applications may override this method to send JPEG messages somewhere +@@ -409,24 +395,10 @@ my_jpeg_std_error (struct jpeg_error_mgr * err) GLOBAL(struct jpeg_error_mgr *) my_jpeg_std_error (struct jpeg_error_mgr * err) { -+ struct jpeg_error_mgr std_jpeg_err; -+ (void)jpeg_std_error(&std_jpeg_err); ++ err = jpeg_std_error(err); ++ /* override these functions */ err->error_exit = my_error_exit; - err->emit_message = emit_message; -@@ -421,7 +423,7 @@ my_jpeg_std_error (struct jpeg_error_mgr * err) - err->msg_code = 0; /* may be useful as a flag for "no error" */ - - /* Initialize message table pointers */ +- err->emit_message = emit_message; +- err->output_message = output_message; +- err->format_message = format_message; +- err->reset_error_mgr = reset_error_mgr; +- +- err->trace_level = 0; /* default = no tracing */ +- err->num_warnings = 0; /* no warnings emitted yet */ +- err->msg_code = 0; /* may be useful as a flag for "no error" */ +- +- /* Initialize message table pointers */ - err->jpeg_message_table = jpeg_std_message_table; -+ err->jpeg_message_table = std_jpeg_err.jpeg_message_table; - err->last_jpeg_message = (int) JMSG_LASTMSGCODE - 1; +- err->last_jpeg_message = (int) JMSG_LASTMSGCODE - 1; +- +- err->addon_message_table = nullptr; +- err->first_addon_message = 0; /* for safety */ +- err->last_addon_message = 0; - err->addon_message_table = nullptr; + return err; + }