From 0902464f50b380e64e35d0de6c21d2b1dd4c46d2 Mon Sep 17 00:00:00 2001 From: Andrii Oriekhov Date: Sat, 5 Mar 2022 11:48:10 +0200 Subject: [PATCH 1/3] add GitHub URL for PyPi --- setup.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/setup.py b/setup.py index 741482bf..f6862b85 100644 --- a/setup.py +++ b/setup.py @@ -22,6 +22,9 @@ author = 'Mike C. Fletcher', author_email = 'mcfletch@vrplumber.com', url = 'http://pyopengl.sourceforge.net', + project_urls = { + 'Source': 'https://github.com/mcfletch/pyopengl', + }, license = 'BSD', download_url = "http://sourceforge.net/projects/pyopengl/files/PyOpenGL/", keywords = 'Graphics,3D,OpenGL,GLU,GLUT,GLE,GLX,EXT,ARB,Mesa,ctypes', From 2d2457b4d565bce1c58b76b427e1f9027e8b4bcc Mon Sep 17 00:00:00 2001 From: Scott Talbert Date: Thu, 26 Jan 2023 16:45:17 -0500 Subject: [PATCH 2/3] Implement getGLUTFontPointer for EGL platform This is simply copied from GLX, but there doesn't seem like there should be any differences. Fixes #89. --- OpenGL/platform/egl.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/OpenGL/platform/egl.py b/OpenGL/platform/egl.py index e74f3dd8..55fbb0be 100644 --- a/OpenGL/platform/egl.py +++ b/OpenGL/platform/egl.py @@ -104,3 +104,19 @@ def GLE( self ): @baseplatform.lazy_property def GetCurrentContext( self ): return self.EGL.eglGetCurrentContext + + def getGLUTFontPointer( self, constant ): + """Platform specific function to retrieve a GLUT font pointer + + GLUTAPI void *glutBitmap9By15; + #define GLUT_BITMAP_9_BY_15 (&glutBitmap9By15) + + Key here is that we want the addressof the pointer in the DLL, + not the pointer in the DLL. That is, our pointer is to the + pointer defined in the DLL, we don't want the *value* stored in + that pointer. + """ + name = [ x.title() for x in constant.split( '_' )[1:] ] + internal = 'glut' + "".join( [x.title() for x in name] ) + pointer = ctypes.c_void_p.in_dll( self.GLUT, internal ) + return ctypes.c_void_p(ctypes.addressof(pointer)) From fa3b26603669a023318e3159192d4dfb52ca1e34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Steffen=20M=C3=B6ller?= Date: Sun, 29 Jan 2023 16:53:56 +0100 Subject: [PATCH 3/3] also check for .so without version extension bookworm and later do not ship the freeglut3 library any more that provided the versioned symlink libglut.so.3 for the libglut.so.3.12.0 library, but there is libglut.so , still, and libglut.so.3.12. $ ls -l /usr/lib/x86_64-linux-gnu/*glut* -rw-r--r-- 1 root root 654216 5. Nov 21:59 /usr/lib/x86_64-linux-gnu/libglut.a lrwxrwxrwx 1 root root 15 5. Nov 21:59 /usr/lib/x86_64-linux-gnu/libglut.so -> libglut.so.3.12 lrwxrwxrwx 1 root root 17 5. Nov 21:59 /usr/lib/x86_64-linux-gnu/libglut.so.3.12 -> libglut.so.3.12.0 -rw-r--r-- 1 root root 356016 5. Nov 21:59 /usr/lib/x86_64-linux-gnu/libglut.so.3.12.0 --- OpenGL/platform/ctypesloader.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenGL/platform/ctypesloader.py b/OpenGL/platform/ctypesloader.py index 82ec8e69..d9ff0069 100644 --- a/OpenGL/platform/ctypesloader.py +++ b/OpenGL/platform/ctypesloader.py @@ -52,7 +52,7 @@ def _loadLibraryPosix(dllType, name, mode): suffix = '.so' base_name = prefix + name + suffix - filenames_to_try = [] + filenames_to_try = [base_name] # If a .so is missing, let's try libs with so version (e.g libGLU.so.9, libGLU.so.8 and so on) filenames_to_try.extend(list(reversed([ base_name + '.%i' % i for i in range(0, 10)