diff options
Diffstat (limited to 'graphics/demeter/files')
5 files changed, 0 insertions, 142 deletions
diff --git a/graphics/demeter/files/patch-configure.ac b/graphics/demeter/files/patch-configure.ac deleted file mode 100644 index ba59ca8d4854..000000000000 --- a/graphics/demeter/files/patch-configure.ac +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.ac.orig Tue Jun 15 13:17:59 2004 -+++ configure.ac Tue Jun 15 13:18:18 2004 -@@ -56,7 +56,7 @@ - AC_C_CONST - AC_C_INLINE - AC_STRUCT_TM --AC_HEADER_STDBOOL -+dnl AC_HEADER_STDBOOL - - AC_OUTPUT(Makefile \ - src/Makefile \ diff --git a/graphics/demeter/files/patch-samples-SampleRawApplication-SampleRawMain.cpp b/graphics/demeter/files/patch-samples-SampleRawApplication-SampleRawMain.cpp deleted file mode 100644 index 7963b564681f..000000000000 --- a/graphics/demeter/files/patch-samples-SampleRawApplication-SampleRawMain.cpp +++ /dev/null @@ -1,47 +0,0 @@ ---- samples/SampleRawApplication/SampleRawMain.cpp.orig Sat Dec 20 17:28:54 2003 -+++ samples/SampleRawApplication/SampleRawMain.cpp Thu Sep 2 21:44:58 2004 -@@ -28,6 +28,12 @@ - #include <SDL.h> - #include "Elevations.h" - -+#ifndef _WIN32 -+#include <dlfcn.h> -+#undef GLX_GLXEXT_LEGACY -+#include <GL/glx.h> -+#endif -+ - using namespace Demeter; - using namespace std; - -@@ -37,6 +43,7 @@ - #else - typedef void (*PFNGLFOGCOORDPOINTERFARBPROC) (GLenum type,GLint stride,const GLvoid* pointer); - #endif -+PFNGLXGETPROCADDRESSARBPROC glXGetProcAddressARB_ptr = NULL; - PFNGLFOGCOORDPOINTERFARBPROC FogCoordPointerEXT = NULL; - #ifndef FOG_COORDINATE_ARRAY_EXT - #define FOG_COORDINATE_ARRAY_EXT 0x8457 -@@ -193,7 +200,22 @@ - #ifdef _WIN32 - FogCoordPointerEXT = (PFNGLFOGCOORDPOINTERFARBPROC) wglGetProcAddress("glFogCoordPointerEXT"); - #else -- FogCoordPointerEXT = glFogCoordPointerEXT; -+ void* h; -+ -+ if ((h = dlopen(NULL, RTLD_LAZY)) == NULL) { -+ string msg("Unable to find symbol list for the main program."); -+ throw new DemeterException(msg); -+ } -+ -+ glXGetProcAddressARB_ptr = (PFNGLXGETPROCADDRESSARBPROC) dlsym(h, "glXGetProcAddressARB"); -+ if (glXGetProcAddressARB_ptr == NULL) { -+ string msg("Unable to find symbol \"glXGetProcAddressARB\"."); -+ throw new DemeterException(msg); -+ } -+ -+ FogCoordPointerEXT = (PFNGLFOGCOORDPOINTERFARBPROC) glXGetProcAddressARB_ptr((GLubyte*)"glFogCoordPointerEXT"); -+ -+ dlclose(h); - #endif - if (FogCoordPointerEXT != NULL) - { diff --git a/graphics/demeter/files/patch-samples-SampleUtilities-Data.cpp b/graphics/demeter/files/patch-samples-SampleUtilities-Data.cpp deleted file mode 100644 index 8a168293359c..000000000000 --- a/graphics/demeter/files/patch-samples-SampleUtilities-Data.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- samples/SampleUtilities/Data.cpp.orig Mon Jan 26 13:46:44 2004 -+++ samples/SampleUtilities/Data.cpp Mon Jan 26 13:49:15 2004 -@@ -53,7 +53,7 @@ - sprintf(szPath, szFullPath); - return true; - } -- sprintf(szFullPath, "/usr/local/share/DemeterSampleData-3.20/"); -+ sprintf(szFullPath, "%%EXAMPLESDIR%%/DemeterSampleData-3.20/"); - if (TestPath(szFullPath)) - { - sprintf(szPath, szFullPath); diff --git a/graphics/demeter/files/patch-samples_SampleOSGApplication_SampleOSGMain.cpp b/graphics/demeter/files/patch-samples_SampleOSGApplication_SampleOSGMain.cpp deleted file mode 100644 index 24339fe1bc90..000000000000 --- a/graphics/demeter/files/patch-samples_SampleOSGApplication_SampleOSGMain.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- samples/SampleOSGApplication/SampleOSGMain.cpp.orig Tue Jun 15 13:22:12 2004 -+++ samples/SampleOSGApplication/SampleOSGMain.cpp Tue Jun 15 13:22:52 2004 -@@ -21,7 +21,6 @@ - Boston, MA 02111-1307, USA. - */ - #include <stdlib.h> --#include <malloc.h> - #include <memory.h> - #ifdef _WIN32 - #include <tchar.h> diff --git a/graphics/demeter/files/patch-src-Terrain.cpp b/graphics/demeter/files/patch-src-Terrain.cpp deleted file mode 100644 index d91a39413f49..000000000000 --- a/graphics/demeter/files/patch-src-Terrain.cpp +++ /dev/null @@ -1,63 +0,0 @@ ---- src/Terrain.cpp.orig Sat Dec 20 17:28:54 2003 -+++ src/Terrain.cpp Thu Sep 2 22:00:19 2004 -@@ -26,6 +26,13 @@ - #include <iostream> - #include <string> - -+#ifndef _WIN32 -+#include <dlfcn.h> -+#undef GLX_GLXEXT_LEGACY -+#include <GL/glx.h> -+#endif -+ -+ - using namespace Demeter; - using namespace std; - -@@ -45,6 +52,7 @@ - PFNGLLOCKARRAYSEXTPROC glLockArraysEXT_ptr; - PFNGLUNLOCKARRAYSEXTPROC glUnlockArraysEXT_ptr; - PFNGLCLIENTACTIVETEXTUREARBPROC glClientActiveTextureARB_ptr; -+PFNGLXGETPROCADDRESSARBPROC glXGetProcAddressARB_ptr; - - extern void SafelyFillString(char *szSource, char *szTarget, int targetSize); - -@@ -101,6 +109,8 @@ - - void LoadGLExtensions() - { -+ void* h; -+ - #ifdef _WIN32 - glMultiTexCoord2fARB_ptr = (PFNGLMULTITEXCOORD2FARBPROC) wglGetProcAddress("glMultiTexCoord2fARB"); - glActiveTextureARB_ptr = (PFNGLACTIVETEXTUREARBPROC) wglGetProcAddress("glActiveTextureARB"); -@@ -108,11 +118,24 @@ - glUnlockArraysEXT_ptr = (PFNGLUNLOCKARRAYSEXTPROC) wglGetProcAddress("glUnlockArraysEXT"); - glClientActiveTextureARB_ptr = (PFNGLCLIENTACTIVETEXTUREARBPROC) wglGetProcAddress("glClientActiveTextureARB"); - #else -- glMultiTexCoord2fARB_ptr = glMultiTexCoord2fARB; -- glActiveTextureARB_ptr = glActiveTextureARB; -- glLockArraysEXT_ptr = glLockArraysEXT; -- glUnlockArraysEXT_ptr = glUnlockArraysEXT; -- glClientActiveTextureARB_ptr = glClientActiveTextureARB; -+ if ((h = dlopen(NULL, RTLD_LAZY)) == NULL) { -+ string msg("Unable to find symbol list for the main program."); -+ throw new DemeterException(msg); -+ } -+ -+ glXGetProcAddressARB_ptr = (PFNGLXGETPROCADDRESSARBPROC) dlsym(h, "glXGetProcAddressARB"); -+ if (glXGetProcAddressARB_ptr == NULL) { -+ string msg("Unable to find symbol \"glXGetProcAddressARB\"."); -+ throw new DemeterException(msg); -+ } -+ -+ glMultiTexCoord2fARB_ptr = (PFNGLMULTITEXCOORD2FARBPROC) glXGetProcAddressARB_ptr((GLubyte*)"glMultiTexCoord2fARB"); -+ glActiveTextureARB_ptr = (PFNGLACTIVETEXTUREARBPROC) glXGetProcAddressARB_ptr((GLubyte*)"glActiveTextureARB"); -+ glLockArraysEXT_ptr = (PFNGLLOCKARRAYSEXTPROC) glXGetProcAddressARB_ptr((GLubyte*)"glLockArraysEXT"); -+ glUnlockArraysEXT_ptr = (PFNGLUNLOCKARRAYSEXTPROC) glXGetProcAddressARB_ptr((GLubyte*)"glUnlockArraysEXT"); -+ glClientActiveTextureARB_ptr = (PFNGLCLIENTACTIVETEXTUREARBPROC) glXGetProcAddressARB_ptr((GLubyte*)"glClientActiveTextureARB"); -+ -+ dlclose(h); - #endif - } - |