From nobody Tue May 28 20:53:56 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 4Vpl9d07nWz5L8mD; Tue, 28 May 2024 20:53:57 +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 4Vpl9c6psBz4nVf; Tue, 28 May 2024 20:53:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716929637; 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=sFHgl5qJCovGIjjxhDCzpywCa8bR7VYABCdGJHVO8Ow=; b=rsB+UoNc/FXEcPX59omSN9MvrvsgLNq+zX4uO53AUauxdfaoNrcFhsZ1GK6Zr7QCsGPJMR lYeNh49ewni4Uvz8fYNKpbth9Cdk2uIH2Yb/yZCFZ1flKJlyIssmBzrmP7bBgEIDHOSRzk z0SxnVMJLZvKN/bG2qDLs/gZXILrPnNGBjezYdq8mlJZ3i2Fl+jMc3UCVlufNF0wp/s0Or uh4kaI+e0wt7b9UxMi0iqcwsmx3MNQ00wJ2E/Kmd6WNV7Ss5PYpE+BiZHrcmvGC5x2Lz2L QWkkfQAUqAF36fPnNaJNOWKq2aNHuriXGQCtZXALz0Z3tM1CHujWvdGLkQa0Ig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716929637; a=rsa-sha256; cv=none; b=Jqrpu/VlFDeBABxGtUGXgItIHWjvOlAsp1E4RclhjWDVmCCS8U9jjp1txTJwtsQ5HTwziY J61J/HERD6LdmGiRhCts6w3yy9+5F4Oyxv/57bYWwGl/wLUqvS5yJVKqQ25v6W/t6UGost 1ds+s5AGxewWcxiHZrrmVjgTTF6F9RZWjweHPN4MbJrPJtapNfbnGxXr9TX8Dq43HPuXu2 niMLJalfA/IrEebOK70wWmf1/du3FVwvV2L+thHLm5hJHxvTWRGUdzE7PQ/4ZfojnzrFR+ V9x2pgwXQ2E+ZRegJkjH7DNbLz3rjtseBKmg0bYO3UHIc/9TGpIrn/w7nH2AqA== 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=1716929637; 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=sFHgl5qJCovGIjjxhDCzpywCa8bR7VYABCdGJHVO8Ow=; b=wlNifu1E9tyLBAV+jfwhNiQcq2sC/WRNmGDt237HrlSga/wWbxZPysrluxcTSIU5szvckN JiFYHqm9eIqJ4zwXCP+m4dpD792bM5wCc52AUqvxp8iI88WNphmQDHeHDsAcZ9rBPC9bHU yFVJqcRcXx18pHMOauef5TBAY6BIJ2L+JBtrJ/F/vihmUcz0Ba9YmWrtZ9gfsop2Ho27iD WNk7KM1TqBbTdXPIORN6KNSwAA45GSVASDjnUp7ywT+iZsHtTeChAisKqhbK/Q815FEwNa Z9slFaX6F6eb75ymzJ+Y8oUwyH33ym5DIeiH9hM6TgUHb0g1obsFg6SqsFM1oQ== 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 4Vpl9c66ghzS7G; Tue, 28 May 2024 20:53:56 +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 44SKru1I003748; Tue, 28 May 2024 20:53:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44SKru77003745; Tue, 28 May 2024 20:53:56 GMT (envelope-from git) Date: Tue, 28 May 2024 20:53:56 GMT Message-Id: <202405282053.44SKru77003745@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: 3aaca1788173 - main - graphics/rawtherapee: work around jpeg-turbo regression 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: 3aaca1788173e1e855ab87b9632bc54a0654ed2a Auto-Submitted: auto-generated The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=3aaca1788173e1e855ab87b9632bc54a0654ed2a commit 3aaca1788173e1e855ab87b9632bc54a0654ed2a Author: Matthias Andree AuthorDate: 2024-05-28 20:48:06 +0000 Commit: Matthias Andree CommitDate: 2024-05-28 20:53:44 +0000 graphics/rawtherapee: work around jpeg-turbo regression jpeg-turbo hides the jpg_std_message_table, causing linker troubles, as reported by pkg-fallout. This somehow also snuck past the -exp run. We now set up the default table in the code that wanted to reference it and steal the const pointer to the message table as a workaround. Also, the jpeg-turbo upgrade breaks rawtherapee at run-time, so we must bump its PORTREVISION. Rawtherapee 5.10_1 with jpeg-turbo 3.0.3 causes this error, preventing a program start: ld-elf.so.1: /usr/local/bin/rawtherapee: Undefined symbol "jpeg_std_message_table@LIBJPEG_8.0" PR: 279371 --- graphics/rawtherapee/Makefile | 2 +- .../rawtherapee/files/patch-rtengine_jdatasrc.cc | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/graphics/rawtherapee/Makefile b/graphics/rawtherapee/Makefile index f415b7f66636..1753aab3ee68 100644 --- a/graphics/rawtherapee/Makefile +++ b/graphics/rawtherapee/Makefile @@ -1,6 +1,6 @@ PORTNAME= rawtherapee PORTVERSION= 5.10 -PORTREVISION= 1 +PORTREVISION= 2 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 new file mode 100644 index 000000000000..950b3b205be2 --- /dev/null +++ b/graphics/rawtherapee/files/patch-rtengine_jdatasrc.cc @@ -0,0 +1,20 @@ +--- 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) + 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->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->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->addon_message_table = nullptr;