<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/aa210d5dc85032e7aba5d971411029d276b2a65a">https://github.com/macports/macports-ports/commit/aa210d5dc85032e7aba5d971411029d276b2a65a</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit aa210d5dc85032e7aba5d971411029d276b2a65a
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Wed Jun 28 09:00:51 2023 -0400
<span style='display:block; white-space:pre;color:#404040;'> libopenraw: cleanup
</span>---
graphics/libopenraw/Portfile | 39 ++++++++++++++++++++++-----------------
1 file changed, 22 insertions(+), 17 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/libopenraw/Portfile b/graphics/libopenraw/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1ac29288126..c25b673b12b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/libopenraw/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/libopenraw/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,10 +20,9 @@ long_description ${description} \
</span> applications, and there is a need for an easy to use API to build free software \
digital image processing applications. It also has the goal to address features \
missing from dcraw such as meta-data decoding and easy thumbnail extraction.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> homepage https://libopenraw.freedesktop.org/${name}/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites https://libopenraw.freedesktop.org/download/
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites https://libopenraw.freedesktop.org/download/
</span> use_xz yes
checksums ${distname}${extract.suffix} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,20 +32,21 @@ checksums ${distname}${extract.suffix} \
</span>
conflicts libopenraw-legacy
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-Makefile.am.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-ifdentry.hpp.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-Makefile.am.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-ifdentry.hpp.diff
</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:#e0ffe0;'>+depends_lib-append \
</span> port:curl \
<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;'>+ 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;'>@@ -63,22 +63,27 @@ 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:#ffe0e0;'>- --disable-gnome
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-gnome \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-boost=[boost::install_area]
</span>
# hijack CARGO_VERBOSE to include other cargo flags
pre-build {
# on older systems, cargo.offline_cmd may be changed after calling cargo.crates
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build.args-append CARGO_VERBOSE="${cargo.offline_cmd} -v -j${build.jobs}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CARGO_VERBOSE="${cargo.offline_cmd} -v -j${build.jobs}"
</span> }
# libopenraw expects cargo to build the library in CARGO_BUILD_TARGET/{debug,release}
# however, when CARGO_BUILD_TARGET is set, its value is inserted between CARGO_TARGET_DIR and {debug,release}
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach subdir {release debug} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d -m 0755 ${worksrcpath}/lib/mp4/target/${subdir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ../[option triplet.${muniversal.build_arch}]/${subdir}/libmp4.a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/lib/mp4/target/${subdir}/libmp4.a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set mp4_target_dir ${worksrcpath}/lib/mp4/target
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach subdir {debug release} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set mp4_dir ${mp4_target_dir}/${subdir}
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d -m 0755 ${mp4_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ../[option triplet.${muniversal.build_arch}]/${subdir}/libmp4.a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${mp4_dir}/libmp4.a
</span> }
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -87,8 +92,8 @@ variant gnome description {Build with GNOME/GTK+ support} {
</span> port:gettext
depends_lib-append \
port:gettext-runtime \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/pkgconfig/glib-2.0.pc:glib2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/pkgconfig/gdk-pixbuf-2.0.pc:gdk-pixbuf2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/gdk-pixbuf-2.0.pc:gdk-pixbuf2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/glib-2.0.pc:glib2
</span> configure.args-delete \
--disable-gnome
}
</pre><pre style='margin:0'>
</pre>