commit: be07f31399f3dae37d93b4ec86bba83c1bb9b664 Author: Ben Kohler <bkohler <AT> gentoo <DOT> org> AuthorDate: Fri Jun 14 14:12:27 2024 +0000 Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org> CommitDate: Fri Jun 14 14:12:58 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be07f313
media-gfx/rawtherapee: add libjpeg-turbo patch Closes: https://bugs.gentoo.org/933377 Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org> ...rapee-5.10-fix-linking-with-libjpeg-turbo.patch | 63 ++++++++++++++++++++++ media-gfx/rawtherapee/rawtherapee-5.10-r1.ebuild | 3 +- 2 files changed, 65 insertions(+), 1 deletion(-) diff --git a/media-gfx/rawtherapee/files/rawtherapee-5.10-fix-linking-with-libjpeg-turbo.patch b/media-gfx/rawtherapee/files/rawtherapee-5.10-fix-linking-with-libjpeg-turbo.patch new file mode 100644 index 000000000000..f65309fc64e6 --- /dev/null +++ b/media-gfx/rawtherapee/files/rawtherapee-5.10-fix-linking-with-libjpeg-turbo.patch @@ -0,0 +1,63 @@ +From efdc5bce3b9794847093baeb040937ab55eba86e Mon Sep 17 00:00:00 2001 +From: Richard E Barber <[email protected]> +Date: Sun, 19 May 2024 04:27:10 -0700 +Subject: [PATCH] Fix linking with jpeg-turbo + +patch via Termux PR +https://github.com/termux-user-repository/tur/pull/1027 +--- + rtengine/jdatasrc.cc | 28 ++-------------------------- + 1 file changed, 2 insertions(+), 26 deletions(-) + +diff --git a/rtengine/jdatasrc.cc b/rtengine/jdatasrc.cc +index fa13b9dd13..a0d12657f2 100644 +--- a/rtengine/jdatasrc.cc ++++ b/rtengine/jdatasrc.cc +@@ -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,14 @@ reset_error_mgr (j_common_ptr cinfo) + GLOBAL(struct jpeg_error_mgr *) + my_jpeg_std_error (struct jpeg_error_mgr * err) + { ++ err = jpeg_std_error(err); + ++ /* override these functions */ + err->error_exit = my_error_exit; + 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->last_jpeg_message = (int) JMSG_LASTMSGCODE - 1; +- +- err->addon_message_table = nullptr; +- err->first_addon_message = 0; /* for safety */ +- err->last_addon_message = 0; +- + return err; + } diff --git a/media-gfx/rawtherapee/rawtherapee-5.10-r1.ebuild b/media-gfx/rawtherapee/rawtherapee-5.10-r1.ebuild index 96a46d2ad16f..bc3e9aa37d1b 100644 --- a/media-gfx/rawtherapee/rawtherapee-5.10-r1.ebuild +++ b/media-gfx/rawtherapee/rawtherapee-5.10-r1.ebuild @@ -9,6 +9,7 @@ inherit cmake flag-o-matic toolchain-funcs xdg-utils DESCRIPTION="A powerful cross-platform raw image processing program" HOMEPAGE="https://www.rawtherapee.com/"; SRC_URI="https://rawtherapee.com/shared/source/${MY_P}.tar.xz"; +S="${WORKDIR}/${MY_P}" LICENSE="GPL-3" SLOT="0" @@ -40,7 +41,7 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" -S="${WORKDIR}/${MY_P}" +PATCHES=( "${FILESDIR}"/rawtherapee-5.10-fix-linking-with-libjpeg-turbo.patch ) pkg_pretend() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
