<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/7c03a30a700f7643c3899ee7094a43f13b5aeff9">https://github.com/macports/macports-ports/commit/7c03a30a700f7643c3899ee7094a43f13b5aeff9</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 7c03a30 graphene: fix build on leopard
</span>7c03a30 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 7c03a30a700f7643c3899ee7094a43f13b5aeff9
</span>Author: Ken Cunningham <kencu@macports.org>
AuthorDate: Thu Jul 12 18:05:39 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> graphene: fix build on leopard
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> fall back to malloc if no aligned memory call available
</span><span style='display:block; white-space:pre;color:#404040;'> fixes build on 10.5 ppc and perhaps others
</span><span style='display:block; white-space:pre;color:#404040;'> passes all tests
</span>---
graphics/graphene/Portfile | 7 +++++++
graphics/graphene/files/patch-graphene-leopard.diff | 19 +++++++++++++++++++
graphics/graphene/files/patch-src-bench-matrix.diff | 11 +++++++++++
3 files changed, 37 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/graphene/Portfile b/graphics/graphene/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b9bdb21..669c825 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/graphene/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/graphene/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,6 +38,13 @@ platform darwin i386 {
</span> compiler.blacklist-append *gcc-3.* *gcc-4.* {clang < 212}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# 10.5 or less has no special memalign but doesn't absolutely need it
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# as the fallthrough to malloc returns aligned memory. Passes all tests.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.platform} eq "darwin" && ${os.major} < 10 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-graphene-leopard.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-src-bench-matrix.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # attempt to fix build on 10.6 using gcc-4.2
# error: ‘for’ loop initial declaration used outside C99 mode
configure.cflags-append \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/graphene/files/patch-graphene-leopard.diff b/graphics/graphene/files/patch-graphene-leopard.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..3dc9c0f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/graphene/files/patch-graphene-leopard.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- meson.build.orig 2018-07-12 09:05:18.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ meson.build 2018-07-12 09:18:40.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -92,7 +92,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ '-Wcast-align',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ '-Wno-unused-local-typedefs',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ '-Werror=float-conversion',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- '-Werror=redundant-decls',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ '-Werror=missing-prototypes',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ '-Werror=missing-declarations',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ '-Werror=format=2',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -163,7 +162,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ elif cc.has_function('posix_memalign', prefix: '#include <stdlib.h>') and not (host_system == 'windows')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conf.set10('HAVE_POSIX_MEMALIGN', 1, description: 'Define if posix_memalign() is available')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- error('No aligned malloc function could be found.')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # error('No aligned malloc function could be found.')
</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;'>+ # Look for sincosf(), a GNU libc extension
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/graphene/files/patch-src-bench-matrix.diff b/graphics/graphene/files/patch-src-bench-matrix.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..62ca9f1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/graphene/files/patch-src-bench-matrix.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/bench/matrix.c.orig 2018-04-12 18:56:35.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/bench/matrix.c 2018-04-12 18:56:56.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -59,7 +59,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif defined(HAVE_MEMALIGN)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ res = memalign (alignment, real_size);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#error "Need some type of aligned allocation function"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ res = malloc (real_size);
</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;'>+ g_assert (res != NULL);
</span></pre><pre style='margin:0'>
</pre>