<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/06d3394794e9367e19f0f5b1cbd739fc08b11eee">https://github.com/macports/macports-ports/commit/06d3394794e9367e19f0f5b1cbd739fc08b11eee</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 06d3394 GLC_lib: update to 2.2.0
</span>06d3394 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 06d3394794e9367e19f0f5b1cbd739fc08b11eee
</span>Author: Ken Cunningham <kencu@macports.org>
AuthorDate: Sat May 23 11:00:31 2020 -0700
<span style='display:block; white-space:pre;color:#404040;'> GLC_lib: update to 2.2.0
</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/55854
</span><span style='display:block; white-space:pre;color:#404040;'> closes: https://trac.macports.org/ticket/47418
</span><span style='display:block; white-space:pre;color:#404040;'> see: https://trac.macports.org/ticket/39424
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Examples work.
</span><span style='display:block; white-space:pre;color:#404040;'> There is a newer version 3.0.1
</span><span style='display:block; white-space:pre;color:#404040;'> see: https://trac.macports.org/ticket/55854
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> that uses qt5 but didn't build for Ryan two years ago
</span><span style='display:block; white-space:pre;color:#404040;'> and didn't build for me either after some trying
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This gets the port into a working state while it is
</span><span style='display:block; white-space:pre;color:#404040;'> decided how best to handle 3.0.1 and whether to keep
</span><span style='display:block; white-space:pre;color:#404040;'> both a qt4 and qt5 version of this in MacPorts
</span>---
graphics/GLC_lib/Portfile | 36 +++++--------
graphics/GLC_lib/files/patch-GLC_lib.pro.diff | 33 +++---------
.../files/patch-glc_lib-glu-header-fixes.diff | 61 ++++++++++++++++++++++
3 files changed, 82 insertions(+), 48 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/GLC_lib/Portfile b/graphics/GLC_lib/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 01f15c6..7cabdf4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/GLC_lib/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/GLC_lib/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,47 +1,39 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup qt4 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup qmake 1.0
</span>
categories graphics
platforms darwin
name GLC_lib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.2.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.2.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> maintainers nomaintainer
description C++ class library that enables the quick creation of an OpenGL application based on QT4.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description C++ class library that enables the quick creation of an OpenGL application based on QT4.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description ${description}
</span>
homepage http://www.glc-lib.net/
master_sites sourceforge:glc-lib
distname ${name}_src_${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 2c05978bd719f3dded08ac778b1854bf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 b109895b34940789470dcd3a2748913035a0e576 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 127b6eadfb3b5ae8eb9c26583d63065c1ee6db40
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 00e563a89133cac97588cca36b5bf14c2594bab2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 2e5c79513f17c9b4f6a9204e3d7f7590363efbd856e7c37d3d4d37734bbbaad9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 4585670
</span>
use_zip yes
<span style='display:block; white-space:pre;background:#e0ffe0;'>+worksrcdir glc_lib
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-GLC_lib.pro.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#https://trac.macports.org/ticket/47418
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-glc_lib-glu-header-fixes.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-GLC_lib.pro.diff
</span> post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace s|@@PREFIX@@|${prefix}|g ${worksrcpath}/glc_lib/GLC_lib.pro
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace s|@@PREFIX@@|${prefix}|g GLC_lib.pro
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.pre_args INSTALLDIR=${prefix}/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cmd ${qt_qmake_cmd} glc_lib/GLC_lib.pro PREFIX=${prefix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_parallel_build yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args CC=${configure.cc}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env-append PREFIX=${prefix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-build {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "install_name_tool -id \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${qt_dir}/lib/libGLC_lib.dylib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/libGLC_lib.dylib"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args GLC_lib.pro
</span>
livecheck.type regex
livecheck.url http://sourceforge.net/api/file/index/project-id/153150/mtime/desc/rss?path=%2Fglc-lib
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/GLC_lib/files/patch-GLC_lib.pro.diff b/graphics/GLC_lib/files/patch-GLC_lib.pro.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index dc38760..ff1e229 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/GLC_lib/files/patch-GLC_lib.pro.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/GLC_lib/files/patch-GLC_lib.pro.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,30 +1,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- glc_lib/GLC_lib.pro.orig 2010-04-08 11:00:33.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ glc_lib/GLC_lib.pro 2010-04-08 11:01:13.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3,7 +3,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QT += opengl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- core
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--CONFIG+= x86
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CONFIG += exceptions \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- release \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- warn_on
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -16,7 +15,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DEPENDPATH += .
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- INCLUDEPATH += .
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--INCLUDEPATH += ./zlib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+INCLUDEPATH += ./shading
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Input
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- HEADERS_QUAZIP += quazip/crypt.h \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -310,9 +309,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Linux install configuration
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- unix {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ LIBS += -lz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- GLC_lib.pro.orig 2020-05-23 09:44:46.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ GLC_lib.pro 2020-05-23 09:45:23.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -424,8 +424,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Linux and macx install configuration
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unix {
</span> # Location of HEADERS and library
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- LIB_DIR = /usr/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- INCLUDE_DIR = /usr/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LIB_DIR = /usr/local/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- INCLUDE_DIR = /usr/local/include
</span> + LIB_DIR = @@PREFIX@@/lib
+ INCLUDE_DIR = @@PREFIX@@/include
# Adds a -P to preserve link
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/GLC_lib/files/patch-glc_lib-glu-header-fixes.diff b/graphics/GLC_lib/files/patch-glc_lib-glu-header-fixes.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..956048c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/GLC_lib/files/patch-glc_lib-glu-header-fixes.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,61 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git sceneGraph/glc_3dviewcollection.cpp sceneGraph/glc_3dviewcollection.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 975d49f..b863e6a 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- sceneGraph/glc_3dviewcollection.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ sceneGraph/glc_3dviewcollection.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -33,6 +33,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "glc_spacepartitioning.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <QtDebug>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <OpenGL/glu.h>
</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;'>+ // Constructor/Destructor
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git shading/glc_material.cpp shading/glc_material.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 0d02580..42e06b6 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- shading/glc_material.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ shading/glc_material.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -27,6 +27,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "../glc_factory.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <QtDebug>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <OpenGL/glu.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Class chunk id
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ quint32 GLC_Material::m_ChunkId= 0xA703;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git viewport/glc_camera.cpp viewport/glc_camera.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 05eba54..85b0008 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- viewport/glc_camera.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ viewport/glc_camera.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -26,6 +26,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "glc_camera.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <QtDebug>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <OpenGL/glu.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ using namespace glc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //////////////////////////////////////////////////////////////////////
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git viewport/glc_settargetmover.cpp viewport/glc_settargetmover.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index fce5881..7cb2550 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- viewport/glc_settargetmover.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ viewport/glc_settargetmover.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -24,6 +24,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "glc_viewport.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "glc_openglexception.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <OpenGL/glu.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Default constructor
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GLC_SetTargetMover::GLC_SetTargetMover(GLC_Viewport* pViewport, const QList<GLC_RepMover*>& repsList)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ : GLC_Mover(pViewport, repsList)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git viewport/glc_viewport.cpp viewport/glc_viewport.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 3fc66e8..5b47c4c 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- viewport/glc_viewport.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ viewport/glc_viewport.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -31,6 +31,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "../sceneGraph/glc_3dviewinstance.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <QtDebug>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <OpenGL/glu.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ using namespace glc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //////////////////////////////////////////////////////////////////////
</span></pre><pre style='margin:0'>
</pre>