<pre style='margin:0'>
Ryan Carsten Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/bc9ae4de44c5c78c2fc3870140249c18f310f6fb">https://github.com/macports/macports-ports/commit/bc9ae4de44c5c78c2fc3870140249c18f310f6fb</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 bc9ae4de44c libbpg: Work around C++20 <version> header conflict
</span>bc9ae4de44c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit bc9ae4de44c5c78c2fc3870140249c18f310f6fb
</span>Author: Ryan Carsten Schmidt <ryandesign@macports.org>
AuthorDate: Tue May 28 01:27:06 2024 -0500
<span style='display:block; white-space:pre;color:#404040;'> libbpg: Work around C++20 <version> header conflict
</span>---
graphics/libbpg/Portfile | 9 +++++++--
graphics/libbpg/files/Makefile.patch | 13 +++++++++++--
2 files changed, 18 insertions(+), 4 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/libbpg/Portfile b/graphics/libbpg/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9a030386919..ea359a7ece7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/libbpg/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/libbpg/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,6 @@ name libbpg
</span> version 0.9.8
revision 1
categories graphics
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> maintainers {ryandesign @ryandesign} openmaintainer
license BSD LGPL-2.1+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,13 +23,19 @@ checksums rmd160 9960aea61e9e51e6c53a477d95a7c7b37d0dd7cc \
</span> sha256 c0788e23bdf1a7d36cb4424ccb2fae4c7789ac94949563c4ad0e2569d3bf0095 \
size 2029021
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build path:bin/pkg-config:pkgconfig
</span>
depends_lib path:include/turbojpeg.h:libjpeg-turbo \
port:libpng \
port:libsdl \
port:libsdl_image
<span style='display:block; white-space:pre;background:#e0ffe0;'>+post-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Work around conflict with C++20 <version> header on case-insensitive filesystems:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ./version:1:1: error: expected unqualified-id
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${worksrcpath}/VERSION ${worksrcpath}/VERSION.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> patchfiles Makefile.patch \
implicit.patch
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/libbpg/files/Makefile.patch b/graphics/libbpg/files/Makefile.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index c3a82f3a080..162023bd7ed 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/libbpg/files/Makefile.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/libbpg/files/Makefile.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.orig 2016-05-15 04:06:19.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile 2016-09-26 00:19:13.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.orig 2018-04-21 04:42:55.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile 2024-05-28 01:24:06.000000000 -0500
</span> @@ -5,9 +5,9 @@
# Enable compilation of Javascript decoder with Emscripten
#USE_EMCC=y
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,6 +12,15 @@
</span> # Compile bpgview (SDL and SDL_image libraries needed)
USE_BPGVIEW=y
# Enable it to use bit depths > 12 (need more tests to validate encoder)
<span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -41,7 +41,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS:=-Os -Wall -MMD -fno-asynchronous-unwind-tables -fdata-sections -ffunction-sections -fno-math-errno -fno-signed-zeros -fno-tree-vectorize -fomit-frame-pointer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS+=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_REENTRANT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS+=-I.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CFLAGS+=-DCONFIG_BPG_VERSION=\"$(shell cat VERSION)\"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CFLAGS+=-DCONFIG_BPG_VERSION=\"$(shell cat VERSION.txt)\"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifdef USE_JCTVC_HIGH_BIT_DEPTH
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS+=-DRExt__HIGH_BIT_DEPTH_SUPPORT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span> @@ -181,7 +181,7 @@
BPGDEC_LIBS:=-lpng $(LIBS)
</pre><pre style='margin:0'>
</pre>