<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/060278f4d43f5cba7be604c6addffe35c502721d">https://github.com/macports/macports-ports/commit/060278f4d43f5cba7be604c6addffe35c502721d</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 060278f4d43 rawtherapee: backport upstream patch for libjpeg-turbo 3.0.3
</span>060278f4d43 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 060278f4d43f5cba7be604c6addffe35c502721d
</span>Author: barracuda156 <vital.had@gmail.com>
AuthorDate: Wed May 22 15:11:32 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> rawtherapee: backport upstream patch for libjpeg-turbo 3.0.3
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/69982
</span>---
graphics/rawtherapee/Portfile | 7 ++-
.../files/0001-Fix-linking-with-jpeg-turbo.patch | 63 ++++++++++++++++++++++
...0002-removes-redundant-jpeg-error-message.patch | 25 +++++++++
3 files changed, 94 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/rawtherapee/Portfile b/graphics/rawtherapee/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 267d5a0b638..fdf3ed640d6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/rawtherapee/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/rawtherapee/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,7 +12,7 @@ legacysupport.newest_darwin_requires_legacy 0
</span> github.setup Beep6581 RawTherapee 5.10
github.tarball_from releases
name rawtherapee
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span>
categories graphics
license GPL-3
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,6 +61,11 @@ depends_lib-append port:adwaita-icon-theme \
</span> patchfiles-append no-modified-project_source_dir.diff \
patch-config_h_in.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/Beep6581/RawTherapee/commit/6b9f45c69c1ddfc3607d3d9c1206dcf1def30295
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://trac.macports.org/ticket/69982
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append 0001-Fix-linking-with-jpeg-turbo.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0002-removes-redundant-jpeg-error-message.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> pre-configure {
if {![variant_isset quartz] && ![variant_isset x11]} {
error "Either +x11 or +quartz is required"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/rawtherapee/files/0001-Fix-linking-with-jpeg-turbo.patch b/graphics/rawtherapee/files/0001-Fix-linking-with-jpeg-turbo.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..3b556e535c2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/rawtherapee/files/0001-Fix-linking-with-jpeg-turbo.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,63 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From efdc5bce3b9794847093baeb040937ab55eba86e Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Richard E Barber <kd6kxr@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sun, 19 May 2024 04:27:10 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1/2] Fix linking with jpeg-turbo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patch via Termux PR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/termux-user-repository/tur/pull/1027
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rtengine/jdatasrc.cc | 28 ++--------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 2 insertions(+), 26 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git rtengine/jdatasrc.cc rtengine/jdatasrc.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index fa13b9dd1..a0d12657f 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- rtengine/jdatasrc.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ rtengine/jdatasrc.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -247,20 +247,6 @@ my_error_exit (j_common_ptr cinfo)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef _WIN32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define JVERSION "6b 27-Mar-1998"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define JCOPYRIGHT_SHORT "(C) 1998, Thomas G. Lane"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define JMESSAGE(code,string) string ,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-const char * const jpeg_std_message_table[] = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include "jerror.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- NULL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-extern const char * const jpeg_std_message_table[];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Actual output of an error or trace message.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Applications may override this method to send JPEG messages somewhere
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -409,24 +395,14 @@ reset_error_mgr (j_common_ptr cinfo)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GLOBAL(struct jpeg_error_mgr *)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ my_jpeg_std_error (struct jpeg_error_mgr * err)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ err = jpeg_std_error(err);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* override these functions */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ err->error_exit = my_error_exit;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ err->emit_message = emit_message;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ err->output_message = output_message;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ err->format_message = format_message;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ err->reset_error_mgr = reset_error_mgr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- err->trace_level = 0; /* default = no tracing */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- err->num_warnings = 0; /* no warnings emitted yet */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- err->msg_code = 0; /* may be useful as a flag for "no error" */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /* Initialize message table pointers */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- err->jpeg_message_table = jpeg_std_message_table;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- err->last_jpeg_message = (int) JMSG_LASTMSGCODE - 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- err->addon_message_table = nullptr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- err->first_addon_message = 0; /* for safety */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- err->last_addon_message = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return err;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/rawtherapee/files/0002-removes-redundant-jpeg-error-message.patch b/graphics/rawtherapee/files/0002-removes-redundant-jpeg-error-message.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..f52e2f172f4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/rawtherapee/files/0002-removes-redundant-jpeg-error-message.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,25 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 7789a8574b454ebd874522a70930ae4b40726da4 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Richard E Barber <kd6kxr@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sun, 19 May 2024 16:39:28 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 2/2] removes redundant jpeg error message
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Co-authored-by: Lawrence37 <45837045+Lawrence37@users.noreply.github.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rtengine/jdatasrc.cc | 4 ----
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 4 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git rtengine/jdatasrc.cc rtengine/jdatasrc.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index a0d12657f..96b6f83b6 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- rtengine/jdatasrc.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ rtengine/jdatasrc.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -399,10 +399,6 @@ my_jpeg_std_error (struct jpeg_error_mgr * err)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* override these functions */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ err->error_exit = my_error_exit;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- err->emit_message = emit_message;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- err->output_message = output_message;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- err->format_message = format_message;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- err->reset_error_mgr = reset_error_mgr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return err;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span></pre><pre style='margin:0'>
</pre>