<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/318966c769b918a99b10fb847250e1edb3823eb6">https://github.com/macports/macports-ports/commit/318966c769b918a99b10fb847250e1edb3823eb6</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 318966c769b918a99b10fb847250e1edb3823eb6
</span>Author: barracuda156 <vital.had@gmail.com>
AuthorDate: Fri Mar 29 16:46:37 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> rawstudio: fix building with gcc
</span>---
graphics/rawstudio/Portfile | 30 +++++++++++++---------
.../{patch-plugins-dcp.diff => patch-inlines.diff} | 27 ++++++++++++-------
graphics/rawstudio/files/patch-rawstudio.h.diff | 23 -----------------
3 files changed, 36 insertions(+), 44 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/rawstudio/Portfile b/graphics/rawstudio/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a1799b73740..2a94c3e7904 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/rawstudio/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/rawstudio/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,6 +3,7 @@
</span> PortSystem 1.0
PortGroup github 1.0
PortGroup legacysupport 1.1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup openssl 1.0
</span>
github.setup rawstudio rawstudio c140a5eb64901e07db5190db20f9884e86e5dcae
version 20210603
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,11 +12,11 @@ categories graphics
</span> license GPL-2+
maintainers {@barracuda156 gmail.com:vital.had} openmaintainer
homepage https://rawstudio.org
<span style='display:block; white-space:pre;background:#ffe0e0;'>-description Raw-image converter.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description Raw-image converter
</span> long_description \
Rawstudio is a modern raw-image converter and organizer with many features. \
* Reads all dcraw supported formats \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- * Internal 16bit rgb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Internal 16-bit rgb \
</span> * Various post-shot controls (white balance, saturation \
and exposure compensation among others) \
* Realtime histogram \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,13 +37,19 @@ post-fetch {
</span> patchfiles-append \
patch-DARWIN_C_SOURCE.diff \
patch-rawstudio.h.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-compatibility-with-libxml2-2.12.x.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-plugins-dcp.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-compatibility-with-libxml2-2.12.x.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[string match *gcc* ${configure.compiler}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-inlines.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# gcc-4.2 fails to build Rawspeed.
</span> # Apple clangs fail to build it too, at least very recent ones.
compiler.blacklist-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- *gcc-4.* {clang} {macports-clang-1[5-9]}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {clang} {macports-clang-1[5-9]}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Not declared explicitly, but used.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Symbol not found: __ZN5Exiv27ExifKeyC1ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard 2011
</span>
depends_build-append \
port:autoconf \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,21 +59,20 @@ depends_build-append \
</span> port:pkgconfig
depends_lib-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- path:include/turbojpeg.h:libjpeg-turbo \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/pkgconfig/dbus-1.pc:dbus \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/pkgconfig/gtk+-3.0.pc:gtk3 \
</span> port:curl \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/dbus-1.pc:dbus \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:exiv2 \
</span> port:fftw-3 \
port:fftw-3-single \
port:flickcurl \
port:gconf \
port:gettext-runtime \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/gtk+-3.0.pc:gtk3 \
</span> port:lcms2 \
port:lensfun \
port:libgphoto2 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:openssl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:include/turbojpeg.h:libjpeg-turbo \
</span> port:libxml2 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:exiv2 \
</span> port:sqlite3 \
port:tiff \
port:xorg-libX11
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -82,7 +88,7 @@ platform darwin {
</span> -Wno-return-type
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} == 10 && ${build_arch} eq "ppc"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${configure.build_arch} in [list ppc ppc64]} {
</span> # Do not use Xcode clang for ppc.
compiler.blacklist-append clang
# Do not use Intel instructions on Rosetta.
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/rawstudio/files/patch-plugins-dcp.diff b/graphics/rawstudio/files/patch-inlines.diff
</span>similarity index 50%
rename from graphics/rawstudio/files/patch-plugins-dcp.diff
rename to graphics/rawstudio/files/patch-inlines.diff
<span style='display:block; white-space:pre;color:#808080;'>index e722351bf81..ba74592be90 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/rawstudio/files/patch-plugins-dcp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/rawstudio/files/patch-inlines.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From ff6f56b68e3be3a3436134b7a0270cb6c92fb7cc Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 481a136670dbbb79f9fe8cac367a4e8962268864 Mon Sep 17 00:00:00 2001
</span> From: Sergey Fedorov <vital.had@gmail.com>
Date: Sun, 17 Mar 2024 16:44:27 +0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Fix for missing _exposure_ramp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- plugins/dcp/dcp.c | 6 +++---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 3 insertions(+), 3 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Fix for missing _exposure_ramp etc.
</span>
diff --git plugins/dcp/dcp.c plugins/dcp/dcp.c
index 9fabc1e4..fef4b1bf 100644
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,7 +12,7 @@ index 9fabc1e4..fef4b1bf 100644
</span> }
-inline void
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+static void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static inline void
</span> RGBtoHSV(gfloat r, gfloat g, gfloat b, gfloat *h, gfloat *s, gfloat *v)
{
*v = MAX(r, MAX (g, b));
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,7 +21,7 @@ index 9fabc1e4..fef4b1bf 100644
</span> }
-inline gfloat
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+static gfloat
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static inline gfloat
</span> exposure_ramp (RSDcp *dcp, gfloat x)
{
if (x <= dcp->exposure_black - dcp->exposure_radius)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,7 +30,20 @@ index 9fabc1e4..fef4b1bf 100644
</span>
-inline void
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+static void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static inline void
</span> HSVtoRGB(gfloat h, gfloat s, gfloat v, gfloat *r, gfloat *g, gfloat *b)
{
if (s > 0.0f)
<span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git plugins/demosaic/demosaic.c plugins/demosaic/demosaic.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 9b5ffa66..46ea6eb5 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- plugins/demosaic/demosaic.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ plugins/demosaic/demosaic.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -416,7 +416,7 @@ expand_cfa_data(const ThreadInfo* t) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Patterned Pixel Grouping Interpolation by Alain Desbiolles
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-inline guint clampbits16(gint x) { guint32 _y_temp; if( (_y_temp=x>>16) ) x = ~_y_temp >> 16; return x;}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static inline guint clampbits16(gint x) { guint32 _y_temp; if( (_y_temp=x>>16) ) x = ~_y_temp >> 16; return x;}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define CLIP(x) clampbits16(x)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define ULIM(x,y,z) ((y) < (z) ? CLAMP(x,y,z) : CLAMP(x,z,y))
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/rawstudio/files/patch-rawstudio.h.diff b/graphics/rawstudio/files/patch-rawstudio.h.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index ecb9fa68312..e0ed083bec2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/rawstudio/files/patch-rawstudio.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/rawstudio/files/patch-rawstudio.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,26 +1,3 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- librawstudio/rawstudio.h.orig 2021-06-03 05:43:01.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ librawstudio/rawstudio.h 2023-06-09 06:18:23.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -23,10 +23,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <sys/types.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "rs-types.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifdef __cplusplus
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--extern "C" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "rs-macros.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "rs-debug.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -78,8 +74,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "x86-cpu.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifdef __cplusplus
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--} /* extern "c" */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif /* RAWSTUDIO_H */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> --- librawstudio/rs-macros.h.orig 2021-06-03 05:43:01.000000000 +0800
+++ librawstudio/rs-macros.h 2023-06-09 06:26:30.000000000 +0800
@@ -51,12 +51,10 @@
</pre><pre style='margin:0'>
</pre>