[patch] Xorg 7.2 - graphics/mesa-demos broken for non-NVIDIA
[LoN]Kamikaze
LoN_Kamikaze at gmx.de
Mon May 14 06:20:05 UTC 2007
I appear to be stuck with blindness, I don't find where to submit patches for
the new ports-tree.
There are actually 2 mistakes in the port:
-DWITH_NVIDIA_GL=0
triggers
#ifdef WITH_NVIDIA_GL
and the patchfile that introduces the NVIDIA preprocessor macro contains #elif
where it should be #else.
-------------- next part --------------
diff -Pur graphics/mesa-demos.orig/Makefile graphics/mesa-demos/Makefile
--- graphics/mesa-demos.orig/Makefile Mon May 14 08:08:47 2007
+++ graphics/mesa-demos/Makefile Mon May 14 08:10:43 2007
@@ -97,8 +97,6 @@
.if defined(WITH_NVIDIA_GL)
CFLAGS+= -DWITH_NVIDIA_GL=1
-.else
-CFLAGS+= -DWITH_NVIDIA_GL=0
.endif
.include <bsd.port.post.mk>
diff -Pur graphics/mesa-demos.orig/files/patch-progs-xdemos-yuvrect_client.c graphics/mesa-demos/files/patch-progs-xdemos-yuvrect_client.c
--- graphics/mesa-demos.orig/files/patch-progs-xdemos-yuvrect_client.c Mon May 14 08:08:47 2007
+++ graphics/mesa-demos/files/patch-progs-xdemos-yuvrect_client.c Mon May 14 08:09:29 2007
@@ -7,7 +7,7 @@
- glx_memory = glXAllocateMemoryMESA(dpy, screen, ImgWidth * ImgHeight * 2, 0, 0 ,0);
+ #ifdef WITH_NVIDIA_GL
+ glx_memory = glXAllocateMemoryNV(ImgWidth * ImgHeight * 2, 0, 0 ,0);
-+ #elif
++ #else
+ glx_memory = glXAllocateMemoryMESA(dpy, screen, ImgWidth * ImgHeight * 2, 0, 0 ,0);
+ #endif
if (!glx_memory)
@@ -20,7 +20,7 @@
- glXFreeMemoryMESA(dpy, DefaultScreen(dpy), glx_memory);
+ #ifdef WITH_NVIDIA_GL
+ glXFreeMemoryNV(glx_memory);
-+ #elif
++ #else
+ glXFreeMemoryMESA(dpy, DefaultScreen(dpy), glx_memory);
+ #endif
glXDestroyContext(dpy, ctx);
More information about the freebsd-ports
mailing list