<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/0113e27a0056a2e458c33b719b998796b6bb7f69">https://github.com/macports/macports-ports/commit/0113e27a0056a2e458c33b719b998796b6bb7f69</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 0113e27a005 ftgl: Fix warnings and build failure on Big Sur
</span>0113e27a005 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 0113e27a0056a2e458c33b719b998796b6bb7f69
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Thu Feb 11 00:07:56 2021 -0600
<span style='display:block; white-space:pre;color:#404040;'> ftgl: Fix warnings and build failure on Big Sur
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Add configure args to ensure we always use macOS OpenGL framework not
</span><span style='display:block; white-space:pre;color:#404040;'> MacPorts mesa.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Add patches to fix upstream bugs in handling configure args and
</span><span style='display:block; white-space:pre;color:#404040;'> libGL.dylib.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Specify path to glibtoolize to avoid erroneous warning from autogen.sh.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Use compiler.cxx_standard 2011 instead of cxx11 1.1 portgroup.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Suppress OpenGL deprecation warnings.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Because I'm not confident that files from MacPorts mesa could not have
</span><span style='display:block; white-space:pre;color:#404040;'> been used before, increase revision to rebuild.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/61210
</span>---
graphics/ftgl/Portfile | 28 ++++++++++++++++++++++------
graphics/ftgl/files/AC_ARG_WITH.patch | 35 +++++++++++++++++++++++++++++++++++
graphics/ftgl/files/dylib_file.patch | 22 ++++++++++++++++++++++
3 files changed, 79 insertions(+), 6 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/ftgl/Portfile b/graphics/ftgl/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 46f439f7875..de78cb6d1a7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/ftgl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/ftgl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,10 +2,9 @@
</span>
PortSystem 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup cxx11 1.1
</span>
github.setup frankheckenbach ftgl 2.4.0 v
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> platforms darwin
categories graphics
license MIT
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,7 +18,10 @@ checksums rmd160 c904e2aa2e5dc5329867ce120f4b1ebe1910ff65 \
</span> sha256 933a371dbb2f44c9fa3121484d46081b5f1ed08c18908ba49bff92811629aede \
size 630956
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cmd ./autogen.sh && ./configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_autoreconf yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+autoreconf.env LIBTOOLIZE=${prefix}/bin/glibtoolize
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+autoreconf.cmd ./autogen.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+autoreconf.args
</span>
depends_lib-append \
port:freetype
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,14 +33,28 @@ depends_build-append \
</span> port:libtool \
port:pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Note, this package finds OpenGL.framework... perhaps there should be
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# an x11 variant for mesa?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles AC_ARG_WITH.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dylib_file.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Don't use MacPorts X11 since there doesn't seem to be a need to do so.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Don't use MacPorts OpenGL (mesa) since that would bring in X11 deps.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append ac_cv_header_GL_gl_h=no \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ac_cv_header_GL_glu_h=no \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-gl-lib=/System/Library/Frameworks/OpenGL.framework/Libraries \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-glu-lib=/System/Library/Frameworks/OpenGL.framework/Libraries \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-x
</span>
# Skip building the example program by failing to find GLUT
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --with-glut-inc=/dev/null --with-glut-lib=/dev/null
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append ac_cv_header_GL_glut_h=no \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ac_cv_header_GLUT_glut_h=no
</span>
# Build requires c++11 but does not seem to explicitly enable it...
configure.cxxflags-append -std=c++11
<span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard 2011
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Don't warn that OpenGL is deprecated in macOS; it clutters up the log.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cflags-append -DGL_SILENCE_DEPRECATION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cxxflags-append -DGL_SILENCE_DEPRECATION
</span>
variant doc description {build documentation} {
depends_build-append bin:doxygen:doxygen \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/ftgl/files/AC_ARG_WITH.patch b/graphics/ftgl/files/AC_ARG_WITH.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..a37606e5a71
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/ftgl/files/AC_ARG_WITH.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,35 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Use AC_ARG_WITH correctly so that the advertised configure options
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+actually exist under their expected names.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/frankheckenbach/ftgl/pull/13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- m4/gl.m4.orig 2019-02-07 15:39:58.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ m4/gl.m4 2021-02-10 21:21:30.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7,11 +7,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_REQUIRE([AC_PATH_X])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_REQUIRE([AC_PATH_XTRA])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-AC_ARG_WITH([--with-gl-inc],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++AC_ARG_WITH([gl-inc],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_HELP_STRING([--with-gl-inc=DIR],[Directory where GL/gl.h is installed]))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-AC_ARG_WITH([--with-gl-lib],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++AC_ARG_WITH([gl-lib],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_HELP_STRING([--with-gl-lib=DIR],[Directory where OpenGL libraries are installed]))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-AC_ARG_WITH([--with-glu-lib],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++AC_ARG_WITH([glu-lib],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_HELP_STRING([--with-glu-lib=DIR],[Directory where OpenGL GLU library is installed]))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_LANG_SAVE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- m4/glut.m4.orig 2019-02-07 15:39:58.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ m4/glut.m4 2021-02-10 21:21:21.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8,9 +8,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_REQUIRE([AC_PATH_XTRA])dnl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_REQUIRE([FTGL_CHECK_GL])dnl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-AC_ARG_WITH([--with-glut-inc],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++AC_ARG_WITH([glut-inc],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_HELP_STRING([--with-glut-inc=DIR],[Directory where GL/glut.h is installed (optional)]))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-AC_ARG_WITH([--with-glut-lib],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++AC_ARG_WITH([glut-lib],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_HELP_STRING([--with-glut-lib=DIR],[Directory where GLUT libraries are installed (optional)]))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_LANG_SAVE
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/ftgl/files/dylib_file.patch b/graphics/ftgl/files/dylib_file.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..3485305ec67
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/ftgl/files/dylib_file.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Use correct syntax for the -dylib_file flag (no space after colon).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fixes configure failure on macOS Big Sur and later:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure: error: GL library could not be found, please specify its location with --with-gl-lib.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+config.log contains:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure:17551: /usr/bin/clang -o conftest -pipe -Os -DGL_SILENCE_DEPRECATION -isysroot/Library/Developer/CommandLineTools/SDKs/MacOSX11.0.sdk -arch x86_64 -L/opt/local/lib -Wl,-headerpad_max_install_names -Wl,-syslibroot,/Library/Developer/CommandLineTools/SDKs/MacOSX11.0.sdk -arch x86_64 conftest.c -Xlinker -framework -Xlinker OpenGL -dylib_file /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib: /System/Library/Frameworks/OpenGL.framework/Versions/A/Librari [...]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+clang: error: no such file or directory: '/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/frankheckenbach/ftgl/pull/14
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- m4/gl.m4.orig 2019-02-07 15:39:58.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ m4/gl.m4 2021-02-10 23:23:19.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -50,7 +50,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # -Xlinker is used because libtool is busted prior to 1.6 wrt frameworks
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_TRY_LINK([#include <OpenGL/gl.h>], [glBegin(GL_POINTS)],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [GL_DYLIB="/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- FRAMEWORK_OPENGL="-Xlinker -framework -Xlinker OpenGL -dylib_file $GL_DYLIB: $GL_DYLIB"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ FRAMEWORK_OPENGL="-Xlinker -framework -Xlinker OpenGL -dylib_file $GL_DYLIB:$GL_DYLIB"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ac_cv_search_glBegin="$FRAMEWORK_OPENGL"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_MSG_RESULT(yes)],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [AC_MSG_RESULT(no)])
</span></pre><pre style='margin:0'>
</pre>