<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/7871a8e8ca9116c6f0275106313beb1c7e2e5b4b">https://github.com/macports/macports-ports/commit/7871a8e8ca9116c6f0275106313beb1c7e2e5b4b</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 7871a8e8ca9 libopenraw-legacy: update to 0.3.6
</span>7871a8e8ca9 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 7871a8e8ca9116c6f0275106313beb1c7e2e5b4b
</span>Author: Sergey Fedorov <vital.had@gmail.com>
AuthorDate: Mon Jul 3 13:20:40 2023 +0800
<span style='display:block; white-space:pre;color:#404040;'> libopenraw-legacy: update to 0.3.6
</span>---
graphics/libopenraw-legacy/Portfile | 38 ++++++++++++------
.../files/patch-endian-legacy.diff | 46 ++++++++++++++++++++++
graphics/libopenraw-legacy/files/patch-endian.diff | 24 +++++++++++
3 files changed, 97 insertions(+), 11 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/libopenraw-legacy/Portfile b/graphics/libopenraw-legacy/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 04fc705c7f3..4030d2b3855 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/libopenraw-legacy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/libopenraw-legacy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup boost 1.0
</span> PortGroup compiler_blacklist_versions 1.0
name libopenraw-legacy
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 0.3.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 0.3.6
</span> revision 0
categories graphics
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,9 +27,9 @@ use_xz yes
</span>
distname libopenraw-${version}
checksums ${distname}${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 2372f9eaa4b4f806a0533c867cb7656186a47d59 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 c365210796161e017ce87d09bd746237d845ade9ab74faaafcede89382b95640 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 570500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 e6403bcc5f286358596cf7c9feba8be7949c3e9f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 07c1f92272afdeb5792b62ffd38b171626ba67160febd5620d05b0784f3938ec \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2536224
</span>
conflicts libopenraw
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,17 +38,25 @@ patchfiles patch-Makefile.am.diff \
</span> patch-ifdentry.hpp.diff \
patch-Make-CR3-support-optional.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.platform} eq "darwin" && ${os.major} < 13} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-endian-legacy.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-endian.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_build-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:pkgconfig \
</span> port:autoconf-archive \
port:cctools \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gawk \
</span> port:grep \
port:gsed \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gawk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append port:libxml2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:curl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path:include/turbojpeg.h:libjpeg-turbo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:curl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:include/turbojpeg.h:libjpeg-turbo \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libxml2
</span>
#--------------------------------------------------------------------------------------------------
# Blacklist MacPorts Clang 14 and 15 for now, as crashes during link.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -65,11 +73,19 @@ compiler.cxx_standard 2014
</span> use_autoreconf yes
autoreconf.args -fvi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --with-boost=[boost::install_area] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-boost=[boost::install_area] \
</span> --disable-gnome \
--disable-cr3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant gnome description {Build with GNOME/GTK+ support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Until a better fix for endian macros.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# error: invalid conversion from 'uint16_t' {aka 'short unsigned int'} to 'const volatile void*' [-fpermissive]
</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;'>+ configure.cxxflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -fpermissive
</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;'>+variant gnome description {Build with GNOME/GTK+ support} {
</span> depends_build-append \
port:gettext
depends_lib-append \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/libopenraw-legacy/files/patch-endian-legacy.diff b/graphics/libopenraw-legacy/files/patch-endian-legacy.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..5ff52325419
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/libopenraw-legacy/files/patch-endian-legacy.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,46 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/peffile.cpp.orig 2023-06-10 22:35:25.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/peffile.cpp 2023-07-03 01:01:37.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -28,6 +28,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "peffile.hpp"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "rawfile_private.hpp"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <libkern/OSByteOrder.h>
</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;'>+ using namespace Debug;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace OpenRaw {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -334,7 +338,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ auto p = data.data();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uint16_t* pixels = (uint16_t*)p;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (size_t i = 0; i < data.size() / 2; i++) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- *pixels = be16toh(*pixels);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *pixels = OSReadBigInt16(*pixels, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pixels++;
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/mrwfile.cpp.orig 2023-06-10 22:35:32.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/mrwfile.cpp 2023-07-03 01:05:26.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -42,6 +42,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "unpack.hpp"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "rawfile_private.hpp"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <libkern/OSByteOrder.h>
</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;'>+ using namespace Debug;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace OpenRaw {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -239,7 +243,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fetched = m_container->fetchData(p, offset, datalen);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uint16_t* pixels = (uint16_t*)p;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (auto i = 0; i < x * y; i++) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- *pixels = be16toh(*pixels);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *pixels = OSReadBigInt16(*pixels, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pixels++;
</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;color:#808080;'>diff --git a/graphics/libopenraw-legacy/files/patch-endian.diff b/graphics/libopenraw-legacy/files/patch-endian.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..054d193bd57
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/libopenraw-legacy/files/patch-endian.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,24 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/mrwfile.cpp.orig 2023-06-28 08:40:14.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/mrwfile.cpp 2023-06-28 08:54:24.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -26,6 +26,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <memory>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <machine/endian.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define be16toh(x) ntohs(x)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <libopenraw/cameraids.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <libopenraw/debug.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/peffile.cpp.orig 2023-06-28 08:40:22.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/peffile.cpp 2023-06-28 08:55:07.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -21,6 +21,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <libopenraw/cameraids.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <machine/endian.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define be16toh(x) ntohs(x)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "rawdata.hpp"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "ifd.hpp"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "ifdfilecontainer.hpp"
</span></pre><pre style='margin:0'>
</pre>