[134517] trunk/dports/science/pymol

[khindenburg at macports.org]

Revision: 134517
          https://trac.macports.org/changeset/134517
Author:   khindenburg at macports.org
Date:     2015-03-27 19:10:31 -0700 (Fri, 27 Mar 2015)
Log Message:
-----------
pymol: update to 1.7.5.0 maintainer #47244

Modified Paths:
--------------
    trunk/dports/science/pymol/Portfile
    trunk/dports/science/pymol/files/pymol-use-glkit.diff

Modified: trunk/dports/science/pymol/Portfile
===================================================================
--- 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)
@@ -6,8 +6,7 @@
 PortGroup           active_variants 1.1
 
 name                pymol
-version             1.7.4.0
-revision            1
+version             1.7.5.0
 categories          science chemistry
 license             PSF
 maintainers         gmail.com:howarth.at.macports
@@ -23,7 +22,7 @@
 master_sites        sourceforge
 fetch.type          svn
 svn.url             https://svn.code.sf.net/p/pymol/code/trunk/pymol
-svn.revision        4107
+svn.revision        4113
 worksrcdir          pymol
 
 python.default_version 27
@@ -47,8 +46,7 @@
 patchfiles          setup_py.diff \
                     pymol_shell.diff \
                     pmg_tk_platform.patch \
-                    apbs-psize.patch \
-                    pymol-clang.diff
+                    apbs-psize.patch 
 
 if {${os.platform} eq "darwin" && ${os.major} >= 12} {
     patchfiles-append pymol-use-glkit.diff

Modified: trunk/dports/science/pymol/files/pymol-use-glkit.diff
===================================================================
--- 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)
@@ -1,17 +1,87 @@
+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,
 Index: layer1/Scene.cpp
 ===================================================================
---- layer1/Scene.cpp	(revision 4106)
+--- layer1/Scene.cpp	(revision 4111)
 +++ layer1/Scene.cpp	(working copy)
-@@ -57,6 +57,8 @@ Z* -------------------------------------
- #include"ScrollBar.h"
- #include "ShaderMgr.h"
+@@ -60,6 +60,8 @@ Z* -------------------------------------
+ #include <string>
+ #include <vector>
  
 +#include <GLKit/GLKMatrix4.h>
 +
  #ifdef _PYMOL_IP_EXTRAS
  #include "IncentiveCopyToClipboard.h"
  #endif
-@@ -9156,7 +9158,8 @@ void SceneRender(PyMOLGlobals * G, Picki
+@@ -9072,7 +9074,8 @@ void SceneRender(PyMOLGlobals * G, Picki
      }
      if(!SettingGetGlobal_b(G, cSetting_ortho)) {
        float fov = SettingGetGlobal_f(G, cSetting_field_of_view);
@@ -23,9 +93,9 @@
        width = height * aspRat;
 Index: setup.py
 ===================================================================
---- setup.py	(revision 4106)
+--- setup.py	(revision 4111)
 +++ setup.py	(working copy)
-@@ -279,6 +279,11 @@ else: # unix style (linux, mac, ...)
+@@ -274,6 +274,11 @@ else: # unix style (linux, mac, ...)
          glut = posix_find_lib(['glut', 'freeglut'], lib_dirs)
          pyogl_libs += ["GL", "GLU", glut]
  
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150327/ad9508cc/attachment.html>