<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[134517] trunk/dports/science/pymol</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/134517">134517</a></dd>
<dt>Author</dt> <dd>khindenburg@macports.org</dd>
<dt>Date</dt> <dd>2015-03-27 19:10:31 -0700 (Fri, 27 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>pymol: update to 1.7.5.0 maintainer #47244</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportssciencepymolPortfile">trunk/dports/science/pymol/Portfile</a></li>
<li><a href="#trunkdportssciencepymolfilespymoluseglkitdiff">trunk/dports/science/pymol/files/pymol-use-glkit.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportssciencepymolPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/pymol/Portfile (134516 => 134517)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/pymol/Portfile 2015-03-27 23:22:12 UTC (rev 134516)
+++ trunk/dports/science/pymol/Portfile 2015-03-28 02:10:31 UTC (rev 134517)
</span><span class="lines">@@ -6,8 +6,7 @@
</span><span class="cx"> PortGroup active_variants 1.1
</span><span class="cx">
</span><span class="cx"> name pymol
</span><del>-version 1.7.4.0
-revision 1
</del><ins>+version 1.7.5.0
</ins><span class="cx"> categories science chemistry
</span><span class="cx"> license PSF
</span><span class="cx"> maintainers gmail.com:howarth.at.macports
</span><span class="lines">@@ -23,7 +22,7 @@
</span><span class="cx"> master_sites sourceforge
</span><span class="cx"> fetch.type svn
</span><span class="cx"> svn.url https://svn.code.sf.net/p/pymol/code/trunk/pymol
</span><del>-svn.revision 4107
</del><ins>+svn.revision 4113
</ins><span class="cx"> worksrcdir pymol
</span><span class="cx">
</span><span class="cx"> python.default_version 27
</span><span class="lines">@@ -47,8 +46,7 @@
</span><span class="cx"> patchfiles setup_py.diff \
</span><span class="cx"> pymol_shell.diff \
</span><span class="cx"> pmg_tk_platform.patch \
</span><del>- apbs-psize.patch \
- pymol-clang.diff
</del><ins>+ apbs-psize.patch
</ins><span class="cx">
</span><span class="cx"> if {${os.platform} eq "darwin" && ${os.major} >= 12} {
</span><span class="cx"> patchfiles-append pymol-use-glkit.diff
</span></span></pre></div>
<a id="trunkdportssciencepymolfilespymoluseglkitdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/pymol/files/pymol-use-glkit.diff (134516 => 134517)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/pymol/files/pymol-use-glkit.diff 2015-03-27 23:22:12 UTC (rev 134516)
+++ trunk/dports/science/pymol/files/pymol-use-glkit.diff 2015-03-28 02:10:31 UTC (rev 134517)
</span><span class="lines">@@ -1,17 +1,87 @@
</span><ins>+Index: layer0/os_gl.cpp
+===================================================================
+--- layer0/os_gl.cpp (revision 4111)
++++ layer0/os_gl.cpp (working copy)
+@@ -3,6 +3,43 @@
+
+ #include<stdio.h>
+
++const char* PyMOLgluErrorString(GLenum errorCode)
++{
++ static const struct {
++ GLenum code;
++ const char *string;
++ } errors[]=
++ {
++ /* GL */
++ {GL_NO_ERROR, "no error"},
++ {GL_INVALID_ENUM, "invalid enumerant"},
++ {GL_INVALID_VALUE, "invalid value"},
++ {GL_INVALID_OPERATION, "invalid operation"},
++ {GL_STACK_OVERFLOW, "stack overflow"},
++ {GL_STACK_UNDERFLOW, "stack underflow"},
++ {GL_OUT_OF_MEMORY, "out of memory"},
++ {GLU_INVALID_ENUM, "invalid enumerant"},
++ {GLU_INVALID_VALUE, "invalid value"},
++ {GLU_OUT_OF_MEMORY, "out of memory"},
++ {GLU_INCOMPATIBLE_GL_VERSION, "incompatible gl version"},
++ {GLU_INVALID_OPERATION, "invalid operation"},
++
++ {0, NULL }
++ };
++
++ int i;
++
++ for (i=0; errors[i].string; i++)
++ {
++ if (errors[i].code == errorCode)
++ {
++ return errors[i].string;
++ }
++ }
++
++ return NULL;
++}
++
+ void PyMOLReadPixels(GLint x,
+ GLint y,
+ GLsizei width,
+@@ -96,7 +133,7 @@ int PyMOLCheckOpenGLErr(const char *pos)
+ int flag = 0;
+ GLenum glerr = glGetError();
+ while(glerr != GL_NO_ERROR) {
+- printf("OpenGL-Error: Where? %s: %s\n", pos, (char *) gluErrorString(glerr));
++ printf("OpenGL-Error: Where? %s: %s\n", pos, (char *) PyMOLgluErrorString(glerr));
+ glerr = glGetError();
+ flag = 1;
+ }
+Index: layer0/os_gl.h
+===================================================================
+--- layer0/os_gl.h (revision 4111)
++++ layer0/os_gl.h (working copy)
+@@ -64,6 +64,8 @@
+
+ /* END PROPRIETARY CODE SEGMENT */
+
++static const char* PyMOLgluErrorString(GLenum errorCode);
++
+ void PyMOLReadPixels(GLint x,
+ GLint y,
+ GLsizei width,
</ins><span class="cx"> Index: layer1/Scene.cpp
</span><span class="cx"> ===================================================================
</span><del>---- layer1/Scene.cpp (revision 4106)
</del><ins>+--- layer1/Scene.cpp (revision 4111)
</ins><span class="cx"> +++ layer1/Scene.cpp (working copy)
</span><del>-@@ -57,6 +57,8 @@ Z* -------------------------------------
- #include"ScrollBar.h"
- #include "ShaderMgr.h"
</del><ins>+@@ -60,6 +60,8 @@ Z* -------------------------------------
+ #include <string>
+ #include <vector>
</ins><span class="cx">
</span><span class="cx"> +#include <GLKit/GLKMatrix4.h>
</span><span class="cx"> +
</span><span class="cx"> #ifdef _PYMOL_IP_EXTRAS
</span><span class="cx"> #include "IncentiveCopyToClipboard.h"
</span><span class="cx"> #endif
</span><del>-@@ -9156,7 +9158,8 @@ void SceneRender(PyMOLGlobals * G, Picki
</del><ins>+@@ -9072,7 +9074,8 @@ void SceneRender(PyMOLGlobals * G, Picki
</ins><span class="cx"> }
</span><span class="cx"> if(!SettingGetGlobal_b(G, cSetting_ortho)) {
</span><span class="cx"> float fov = SettingGetGlobal_f(G, cSetting_field_of_view);
</span><span class="lines">@@ -23,9 +93,9 @@
</span><span class="cx"> width = height * aspRat;
</span><span class="cx"> Index: setup.py
</span><span class="cx"> ===================================================================
</span><del>---- setup.py (revision 4106)
</del><ins>+--- setup.py (revision 4111)
</ins><span class="cx"> +++ setup.py (working copy)
</span><del>-@@ -279,6 +279,11 @@ else: # unix style (linux, mac, ...)
</del><ins>+@@ -274,6 +274,11 @@ else: # unix style (linux, mac, ...)
</ins><span class="cx"> glut = posix_find_lib(['glut', 'freeglut'], lib_dirs)
</span><span class="cx"> pyogl_libs += ["GL", "GLU", glut]
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>