[gentoo-commits] repo/gentoo:master commit in: media-gfx/rawtherapee/files/, media-gfx/rawtherapee/

2024-06-14 Thread Ben Kohler 
commit: be07f31399f3dae37d93b4ec86bba83c1bb9b664
Author: Ben Kohler  gentoo  org>
AuthorDate: Fri Jun 14 14:12:27 2024 +
Commit: Ben Kohler  gentoo  org>
CommitDate: Fri Jun 14 14:12:58 2024 +
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  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 ..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 
+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

[gentoo-commits] repo/gentoo:master commit in: media-gfx/rawtherapee/files/, media-gfx/rawtherapee/

2017-08-06 Thread Patrice Clement 
commit: f4a7cee26469d2116e815c907e618707054a7467
Author: Francesco Riosa  gmail  com>
AuthorDate: Sun Aug  6 16:30:09 2017 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Sun Aug  6 22:03:10 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4a7cee2

media-gfx/rawtherapee-5.2: version bump + cleanup.

Gentoo-Bug: https://bugs.gentoo.org/626108
Gentoo-Bug: https://bugs.gentoo.org/520932
Gentoo-Bug: https://bugs.gentoo.org/615058

Closes: https://github.com/gentoo/gentoo/pull/5326

 media-gfx/rawtherapee/Manifest |  3 +-
 .../files/rawtherapee-4.2-CVE-2015-3885.patch  | 28 --
 .../files/rawtherapee-4.2-build-cxx11-2.patch  | 14 -
 .../files/rawtherapee-4.2-build-cxx11.patch| 20 ---
 .../rawtherapee/files/rawtherapee-4.2-cxx11.patch  | 27 --
 .../rawtherapee/files/rawtherapee-4.2-sigc26.patch | 47 -
 media-gfx/rawtherapee/metadata.xml |  2 +-
 media-gfx/rawtherapee/rawtherapee-4.2-r1.ebuild| 61 --
 ...wtherapee-5.0.ebuild => rawtherapee-5.2.ebuild} | 17 +++---
 9 files changed, 11 insertions(+), 208 deletions(-)

diff --git a/media-gfx/rawtherapee/Manifest b/media-gfx/rawtherapee/Manifest
index 63d0437721a..67032d336ab 100644
--- a/media-gfx/rawtherapee/Manifest
+++ b/media-gfx/rawtherapee/Manifest
@@ -1,3 +1,2 @@
-DIST rawtherapee-4.2.tar.xz 7787664 SHA256 
fa4c13e8842df096b19d2dabaed5a61f5f9d4547f7b4f0dc6b77f80bdec16479 SHA512 
feec61aeb84804cf01ff03fa9d7309f0eb3c04c43818c8397cc6f3ee762aca19484bce7594414d2141248b9740bdd4269fd86f76dcf391c61d4647fa169d48f6
 WHIRLPOOL 
56cc3e95ae7484cb91cd6c5fd32504b3fbfb17b9d50a38fa490300ff1b096e80a1d5060db3619c34f8b214dd413bfaab57a9748f5a365a87d257e75c753f307a
-DIST rawtherapee-5.0-gtk3.tar.xz 10442940 SHA256 
25c6bb738535d1efa905bd21fb732bdea352d589d9740a730ec409a49e7eacd8 SHA512 
febcde98ada1059d6553a1dc2a86235adaf5fb8ca81b9f744748d3e8ef52109048ce43996f261796b2f345f2ce4a27c4ccc219b33ccfb79c2c2fa6476f19b41a
 WHIRLPOOL 
479a7f37f523c533cf268edc8f2c710ded867febc13df3c4156040ca4d36ad86ff4af2613e9155506eb6a4620d4323fdc3d3f1374c4332393ba57b4b01bcc948
 DIST rawtherapee-5.1.tar.xz 10785516 SHA256 
fb742065a6b2e1b89df67c70395e52ee1ebd537c86dfc473b41e7af171655b67 SHA512 
6a881fe24a4109c7db39cb8bee500eb2f9357c479ddb32b3c9b7987aa5d12e4f10083533b5657a0e0f0713fe4ebc58e0dcf204eb8d5c5b656f3e7867a775ab19
 WHIRLPOOL 
0fc24843015750ab4747311d5ac6f40e5ebd9cedaa9c78e73c7fa7250dcbda9ea1260b7f6fc9a0c91559be4530a84e3826f991d9b9199d7caf25691ad78fd78b
+DIST rawtherapee-5.2.tar.xz 10819936 SHA256 
5c32679bfb77eca36c26288483be75696086459b7a59bd4437e371ea1bf827b6 SHA512 
ed2ff2e96ad4f0c50ebbc8a232d85b8c5b118bc956bc26aa72beb4741f464c46900aa668127fe7bdc963fabb5c2e2931c50cf784d1fc4fbc4dce3090412a1b5d
 WHIRLPOOL 
02c71705b76df25e86b6ba5bf6439a3a2966e84dfa968b0a82c1dbe0c6297af826d26e973a56db21f5821d0a4eead6c05422bc6cb36269ed18b829bad1df

diff --git a/media-gfx/rawtherapee/files/rawtherapee-4.2-CVE-2015-3885.patch 
b/media-gfx/rawtherapee/files/rawtherapee-4.2-CVE-2015-3885.patch
deleted file mode 100644
index 3de7d7e6b12..000
--- a/media-gfx/rawtherapee/files/rawtherapee-4.2-CVE-2015-3885.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Author: Philip Rinn 
-Description: Fix CVE-2015-3885
-Source: 
https://github.com/rawstudio/rawstudio/commit/983bda1f0fa5fa86884381208274198a620f006e
-Last-update: 2015-05-14
 a/rtengine/dcraw.c
-+++ b/rtengine/dcraw.c
-@@ -824,7 +824,8 @@
- 
- int CLASS ljpeg_start (struct jhead *jh, int info_only)
- {
--  int c, tag, len;
-+  int c, tag;
-+  ushort len;
-   uchar data[0x1];
-   const uchar *dp;
- 
 a/rtengine/dcraw.cc
-+++ b/rtengine/dcraw.cc
-@@ -787,7 +787,8 @@
- 
- int CLASS ljpeg_start (struct jhead *jh, int info_only)
- {
--  int c, tag, len;
-+  int c, tag;
-+  ushort len;
-   uchar data[0x1];
-   const uchar *dp;
- 

diff --git a/media-gfx/rawtherapee/files/rawtherapee-4.2-build-cxx11-2.patch 
b/media-gfx/rawtherapee/files/rawtherapee-4.2-build-cxx11-2.patch
deleted file mode 100644
index 0d79e25d649..000
--- a/media-gfx/rawtherapee/files/rawtherapee-4.2-build-cxx11-2.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Author: Philip Rinn 
-Description: Fix build with C++11 as char is unsigned on some architectures
-Last-update: 2015-11-04
 a/rtengine/dcraw.cc
-+++ b/rtengine/dcraw.cc
-@@ -2054,7 +2054,7 @@
- 
- void CLASS kodak_radc_load_raw()
- {
--  static const char src[] = {
-+  static const signed char src[] = {
- 1,1, 2,3, 3,4, 4,2, 5,7, 6,5, 7,6, 7,8,
- 1,0, 2,1, 3,3, 4,4, 5,2, 6,7, 7,6, 8,5, 8,8,
- 2,1, 2,3, 3,0, 3,2, 3,4, 4,6, 5,5, 6,7, 6,8,

diff --git a/media-gfx/rawtherapee/files/rawtherapee-4.2-build-cxx11.patch 
b/media-gfx/rawtherapee/files/rawtherapee-4.2-build-cxx11.patch
deleted file mode 100644
index 4832dc3f67a..000
--- a/media-gfx/rawtherapee/files/rawtherapee-4.2-build-cxx11.patch
+++ /dev/null
@@ -1,20

[gentoo-commits] repo/gentoo:master commit in: media-gfx/rawtherapee/files/, media-gfx/rawtherapee/

2017-02-22 Thread Aaron Bauman 
commit: f3dd0d0fe575c93a58a231c658281bee78070764
Author: Aaron Bauman  gentoo  org>
AuthorDate: Wed Feb 22 10:27:14 2017 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Wed Feb 22 10:27:14 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3dd0d0f

media-gfx/rawtherapee: cleanup vulnerable wrt bug #549340

Package-Manager: portage-2.3.3

 media-gfx/rawtherapee/Manifest |  5 --
 .../files/rawtherapee-4.0.9-desktop.patch  |  9 
 .../files/rawtherapee-4.0.9-no-hg.patch| 60 --
 media-gfx/rawtherapee/rawtherapee-4.0.10.ebuild| 55 
 media-gfx/rawtherapee/rawtherapee-4.0.11.ebuild| 55 
 media-gfx/rawtherapee/rawtherapee-4.0.12.ebuild| 50 --
 media-gfx/rawtherapee/rawtherapee-4.0.9-r1.ebuild  | 58 -
 media-gfx/rawtherapee/rawtherapee-4.1.ebuild   | 51 --
 media-gfx/rawtherapee/rawtherapee-4.2.ebuild   | 52 ---
 9 files changed, 395 deletions(-)

diff --git a/media-gfx/rawtherapee/Manifest b/media-gfx/rawtherapee/Manifest
index 7ed0bc1264..69203b4959 100644
--- a/media-gfx/rawtherapee/Manifest
+++ b/media-gfx/rawtherapee/Manifest
@@ -1,6 +1 @@
-DIST rawtherapee-4.0.10.tar.xz 11823324 SHA256 
4f80a00b0fe0a69c8cc09fda155aa81cf47dccb516c6c6b249875f3c456d7ac5 SHA512 
8e8e94cc50130297137d4d4f8ea057b9d954192fd698c327c88591b5ff1e0c66de5e2a1e1ba0c2b223a3633efa26f06b2ba2004dded3b72d025d8a18fef43481
 WHIRLPOOL 
6cc3b75fdaf9fcc1af7e2f3a96d56a9a467abb4fb531e32665e22ecbb7526b20905314e5c574b8944a76d02d6f83eea2960298b3f0f7bb7420b34efb66fbb47a
-DIST rawtherapee-4.0.11.tar.xz 14913984 SHA256 
8f6f35339c9ec5865641fc4cef060f2cbd32be60054700775951148a26de36f6 SHA512 
c31b1c3ef50806d25cdd211d3296b62a1e5fcac66ae0225aa92eaf25ec6470cb946651396b52bb64b247c1be093d2745f0b78bbd5257d61d7b87d53f0bcbac40
 WHIRLPOOL 
a1ea6c442a9e2e75e42a430d5690c1484c37f4f01215a1df34064396772446966eb886312d613cc98b9f398db06324fabb1583d677b184503bb9f86f1141addd
-DIST rawtherapee-4.0.12.tar.xz 15063860 SHA256 
6ef923f4a0e39ee487fd50b4e528db3f8ca7e27613284e309b0625cdb86a03d9 SHA512 
acb7225565b58f556d0c3fc0257ccb8297fe113a8ea3fec31372514434ae4e6cf99b956bbf4d6a5bb9eaca94553ee44815d981f20ec049bdc93e33bdfb86ef1e
 WHIRLPOOL 
9de7831dba2190ab5422280aa553581e1bffa5a831929f8a5c13cb9e8ba5746117f4b5797a3f5da0921cd2ad61ebd7b27863e02eb28e186d0a63d74e55564d2b
-DIST rawtherapee-4.0.9.tar.xz 40201920 SHA256 
4ad49b5d3aae9a178b1cfa5efca653982f0a52763ddd37f89500e8fedfb187d2 SHA512 
885414f0becfaa174b6e0d5689259e88cccf779d25bb92e1015fdb562c57eb70621e952681309aa66f05295b249ba39cca9c73459e6c0ad3266c57389e3c9ab9
 WHIRLPOOL 
cb74a9079c513ac7feb5f9cdd09b9f3474462228023b5a529cf779014476401ad2a2ea24489699c6caa5051ea332ded028407a9f50e4744b504ec41e1e137cfe
-DIST rawtherapee-4.1.tar.xz 7670916 SHA256 
0a36fe407daca95a06f2d3ee28ec91c9c0c95d62a91214bd67a97fd854938307 SHA512 
77f9b6e055c4c2944373dc2abb059da10daace2c503b8f783fe4775161fdcd2b1bacf144065983402eedbd336f65a6a7976008924731e724e9268f39506e8b1b
 WHIRLPOOL 
7fdd4d5b8ca8ce0ebd477ae19a62c11aac37a1f6c8fccddc8fe8688370aaf7003dc76d0ef539877828be98aefcc91a81cf0dc2a97a640a746bafc8eb22451700
 DIST rawtherapee-4.2.tar.xz 7787664 SHA256 
fa4c13e8842df096b19d2dabaed5a61f5f9d4547f7b4f0dc6b77f80bdec16479 SHA512 
feec61aeb84804cf01ff03fa9d7309f0eb3c04c43818c8397cc6f3ee762aca19484bce7594414d2141248b9740bdd4269fd86f76dcf391c61d4647fa169d48f6
 WHIRLPOOL 
56cc3e95ae7484cb91cd6c5fd32504b3fbfb17b9d50a38fa490300ff1b096e80a1d5060db3619c34f8b214dd413bfaab57a9748f5a365a87d257e75c753f307a

diff --git a/media-gfx/rawtherapee/files/rawtherapee-4.0.9-desktop.patch 
b/media-gfx/rawtherapee/files/rawtherapee-4.0.9-desktop.patch
deleted file mode 100644
index 61748428fb..00
--- a/media-gfx/rawtherapee/files/rawtherapee-4.0.9-desktop.patch
+++ /dev/null
@@ -1,9 +0,0 @@
 rawtherapee-4.0.9/rtdata/icons/rawtherapee.desktop.in
-+++ rawtherapee-4.0.9/rtdata/icons/rawtherapee.desktop.in
-@@ -13,5 +13,5 @@
- Icon=rawtherapee
- Exec=rawtherapee %f
- Terminal=false
--MimeType=image/jpeg;image/png;image/tiff;image/x-adobe-dng;image/x-canon-cr2;image/x-canon-crf;image/x-canon-crw;image/x-fuji-raf;image/x-jpg;image/x-kodak-dcr;image/x-kodak-k25;image/x-kodak-kdc;image/x-mamiya-mef;image/x-minolta-mrw;image/x-nikon-nef;image/x-nikon-nrw;image/x-olympus-orf;image/x-panasonic-raw;image/x-panasonic-rw2;image/x-pentax-pef;image/x-pentax-raw;image/x-raw;image/x-rwz;image/x-samsung-srw;image/x-sony-arw;image/x-sony-sr2;image/x-sony-srf;image/x-tif;inode/directory;

[gentoo-commits] repo/gentoo:master commit in: media-gfx/rawtherapee/files/, media-gfx/rawtherapee/

2015-12-15 Thread Pacho Ramos 
commit: 54bde0d76f9295685225547a1e05d037fb5543e2
Author: Pacho Ramos  gentoo  org>
AuthorDate: Tue Dec 15 20:02:04 2015 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Tue Dec 15 20:16:30 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54bde0d7

media-gfx/rawtherapee: Fix building with latest glibmm/libsigc++ (#568136)

Package-Manager: portage-2.2.26

 .../rawtherapee/files/rawtherapee-4.2-cxx11.patch  | 27 ++
 media-gfx/rawtherapee/rawtherapee-4.2.ebuild   |  4 
 2 files changed, 31 insertions(+)

diff --git a/media-gfx/rawtherapee/files/rawtherapee-4.2-cxx11.patch 
b/media-gfx/rawtherapee/files/rawtherapee-4.2-cxx11.patch
new file mode 100644
index 000..48acb5f
--- /dev/null
+++ b/media-gfx/rawtherapee/files/rawtherapee-4.2-cxx11.patch
@@ -0,0 +1,27 @@
+From 39ef59ddeb7679c71274b1da3faadd395b650c73 Mon Sep 17 00:00:00 2001
+From: Adam Reichold 
+Date: Sun, 29 Nov 2015 11:48:30 +0100
+Subject: [PATCH] Build with '-std=c++11' if libsigc++ version 2.5.1 is used as
+ it does require it.
+
+---
+ CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index dd5fcbc..6153484 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -278,10 +278,10 @@ if (OPTION_OMP)
+ endif (OPENMP_FOUND)
+ endif (OPTION_OMP)
+ 
+-if(USE_EXPERIMENTAL_LANG_VERSIONS)
++if(USE_EXPERIMENTAL_LANG_VERSIONS OR NOT (SIGC_VERSION VERSION_LESS 2.5.1))
+   SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu1x")
+   SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++0x")
+-endif (USE_EXPERIMENTAL_LANG_VERSIONS)
++endif ()
+ 
+ # find out whether we are building out of source
+ get_filename_component(ABS_SOURCE_DIR "${PROJECT_SOURCE_DIR}" ABSOLUTE)

diff --git a/media-gfx/rawtherapee/rawtherapee-4.2.ebuild 
b/media-gfx/rawtherapee/rawtherapee-4.2.ebuild
index 6ae07a5..6702661 100644
--- a/media-gfx/rawtherapee/rawtherapee-4.2.ebuild
+++ b/media-gfx/rawtherapee/rawtherapee-4.2.ebuild
@@ -33,6 +33,10 @@ DEPEND="${RDEPEND}
app-arch/xz-utils
virtual/pkgconfig"
 
+PATCHES=(
+"${FILESDIR}"/${P}-cxx11.patch # Upstream patch for fixing bug #568136
+)
+
 pkg_pretend() {
if use openmp ; then
tc-has-openmp || die "Please switch to an openmp compatible 
compiler"