kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix build in presence of x11/nvidia-driver

Browse source 
PR:		ports/71052
Submitted by:	Stephen Montgomery-Smith (maintainer)
This commit is contained in:
Volker Stolz 2004-09-03 09:02:31 +00:00
parent 60edc06e0b
commit 3f4a478e61
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=118021
3 changed files with 29 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
science/vmd/Makefile
View file

@ -7,6 +7,7 @@
PORTNAME= vmd
PORTVERSION= 1.8.2
PORTREVISION= 1
CATEGORIES= science graphics python tcl84 tk84
MASTER_SITES= #
DISTFILES= ${PORTNAME}-${PORTVERSION}.src.tar.gz

21
science/vmd/files/patch-OpenGLExtensions.C Normal file
View file

@ -0,0 +1,21 @@
--- src/OpenGLExtensions.C-xxx Fri Dec 5 13:21:59 2003
+++ src/OpenGLExtensions.C Fri Aug 27 16:42:14 2004
@@ -117,7 +117,17 @@
#endif
#if !defined(_MSC_VER) && !defined(__APPLE__)
-#if !defined(ARCH_LINUX) && !defined(ARCH_LINUXALPHA) && !defined(ARCH_LINUXAMD64) && !defined(ARCH_LINUXPPC) && (defined(GLX_VERSION_1_4) || defined(ARCH_SOLARIS2))
+/*
+ Why the !defined(ARCH_FREEBSD)? Typically the X libraries that
+ come with FreeBSD work with glXGetProcAddress. However, if the
+ nvidia-driver port is installed, it seems not to work. But using
+ glXGetProcAddressARB seems to work whether or not the nvidia-driver
+ port is installed. (To be honest, I do feel that this is a bit hackish,
+ and maybe this will break something in other environments, but lets face
+ that bridge when we come to it - email me at stephen@math.missouri.edu
+ about it.)
+*/
+#if !defined(ARCH_FREEBSD) && !defined(ARCH_LINUX) && !defined(ARCH_LINUXALPHA) && !defined(ARCH_LINUXAMD64) && !defined(ARCH_LINUXPPC) && (defined(GLX_VERSION_1_4) || defined(ARCH_SOLARIS2))
// GLX 1.4 form found on commercial Unix systems that
// don't bother providing the ARB extension version that Linux prefers.
return glXGetProcAddress((const GLubyte *) procname);

10
science/vmd/files/patch-configure
View file

@ -1,15 +1,19 @@
--- configure-xxx Fri Dec 5 13:20:58 2003
+++ configure Thu Aug 12 00:22:30 2004
@@ -1175,7 +1175,7 @@
@@ -1174,8 +1174,10 @@
# XFree 4.0 Direct Rendering Interface and GLX
$opengl_dir = "/usr/X11R6";
$opengl_include = "-I$opengl_dir/include";
- $opengl_include = "-I$opengl_dir/include";
- $opengl_library = "-L$opengl_dir/lib";
+# -DGLX_GLXEXT_LEGACY is required for patched OpenGLExtensions.C to compile.
+# See patched OpenGLExtensions.C for explanation.
+ $opengl_include = "-DGLX_GLXEXT_LEGACY -I$opengl_dir/include";
+ $opengl_library = "-L$opengl_dir/lib -L/usr/local/lib";
$opengl_libs = "-lGL -lGLU";
$arch_lex = "flex";
@@ -1209,7 +1209,7 @@
@@ -1209,7 +1211,7 @@
# this is to make tcl happy,
# also needed for plugins