- Move ports/branches/xorg-dev to ports/trunk/

git-svn-id: https://trillian.chruetertee.ch/svn/ports/trunk@388 058c260c-8361-11dd-a0ac-aa2bafec7d09

6 files changed, 147 insertions, 0 deletions

diff --git a/graphics/mesa-demos/files/patch-progs-xdemos-glxpixmap.c b/graphics/mesa-demos/files/patch-progs-xdemos-glxpixmap.c
new file mode 100644
index 0000000..1dfc2c4
--- /dev/null
+++ b/graphics/mesa-demos/files/patch-progs-xdemos-glxpixmap.c
@@ -0,0 +1,11 @@
+--- progs/xdemos/glxpixmap.c.orig	Fri Apr  6 22:29:09 2007
++++ progs/xdemos/glxpixmap.c	Fri Apr  6 22:38:33 2007
+@@ -105,7 +105,7 @@
+     *   to render correctly.  This is because Mesa allows RGB rendering
+     *   into any kind of visual, not just TrueColor or DirectColor.
+     */
+-#ifdef GLX_MESA_pixmap_colormap
++#if defined(GLX_MESA_pixmap_colormap) && !defined(WITH_NVIDIA_GL)
+    if (strstr(glXQueryExtensionsString(dpy, 0), "GLX_MESA_pixmap_colormap")) {
+       /* stand-alone Mesa, specify the colormap */
+       glxpm = glXCreateGLXPixmapMESA( dpy, visinfo, pm, attr.colormap );
diff --git a/graphics/mesa-demos/files/patch-progs-xdemos-yuvrect_client.c b/graphics/mesa-demos/files/patch-progs-xdemos-yuvrect_client.c
new file mode 100644
index 0000000..1dbf8e3
--- /dev/null
+++ b/graphics/mesa-demos/files/patch-progs-xdemos-yuvrect_client.c
@@ -0,0 +1,28 @@
+--- progs/xdemos/yuvrect_client.c.orig	Fri Apr  6 22:42:30 2007
++++ progs/xdemos/yuvrect_client.c	Fri Apr  6 22:48:05 2007
+@@ -140,7 +140,11 @@
+       exit(0);
+    }
+    
+-   glx_memory = glXAllocateMemoryMESA(dpy, screen, ImgWidth * ImgHeight * 2, 0, 0 ,0);
++   #ifdef WITH_NVIDIA_GL
++   	glx_memory = glXAllocateMemoryNV(ImgWidth * ImgHeight * 2, 0, 0 ,0);
++   #else
++   	glx_memory = glXAllocateMemoryMESA(dpy, screen, ImgWidth * ImgHeight * 2, 0, 0 ,0);
++   #endif
+    if (!glx_memory)
+    {
+      fprintf(stderr,"Failed to allocate MESA memory\n");
+@@ -317,7 +321,11 @@
+    glXSwapBuffers(dpy, win);
+    event_loop(dpy, win);
+ 
+-   glXFreeMemoryMESA(dpy, DefaultScreen(dpy), glx_memory);
++   #ifdef WITH_NVIDIA_GL
++      glXFreeMemoryNV(glx_memory);
++   #else
++      glXFreeMemoryMESA(dpy, DefaultScreen(dpy), glx_memory);
++   #endif
+    glXDestroyContext(dpy, ctx);
+    XDestroyWindow(dpy, win);
+    XCloseDisplay(dpy);
diff --git a/graphics/mesa-demos/files/patch-src__mesa__x86-64__glapi_x86-64.S b/graphics/mesa-demos/files/patch-src__mesa__x86-64__glapi_x86-64.S
new file mode 100644
index 0000000..908a6fe
--- /dev/null
+++ b/graphics/mesa-demos/files/patch-src__mesa__x86-64__glapi_x86-64.S
@@ -0,0 +1,12 @@
+--- ./src/mesa/x86-64/glapi_x86-64.S.orig	2009-03-13 04:28:49.000000000 +0100
++++ ./src/mesa/x86-64/glapi_x86-64.S	2011-01-28 18:12:18.000000000 +0100
+@@ -73,7 +73,8 @@ _x86_64_get_dispatch:
+ 
+ 	.p2align	4,,15
+ _x86_64_get_dispatch:
+-	movq	_gl_DispatchTSD(%rip), %rdi
++	movq	_gl_DispatchTSD@GOTPCREL(%rip), %rax
++	movl	(%rax), %edi
+ 	jmp	pthread_getspecific@PLT
+ 
+ #elif defined(THREADS)
diff --git a/graphics/mesa-demos/files/patch-src__mesa__x86-64__xform4.S b/graphics/mesa-demos/files/patch-src__mesa__x86-64__xform4.S
new file mode 100644
index 0000000..193e6cc
--- /dev/null
+++ b/graphics/mesa-demos/files/patch-src__mesa__x86-64__xform4.S
@@ -0,0 +1,74 @@
+--- src/mesa/x86-64/xform4.S.orig	2009-01-22 18:38:35.000000000 +0100
++++ src/mesa/x86-64/xform4.S	2011-05-09 21:26:00.000000000 +0200
+@@ -53,7 +53,7 @@ _mesa_x86_64_transform_points4_general:
+  *	rdx = source
+  */
+ 	movl V4F_COUNT(%rdx), %ecx	/* count */
+-	movzx V4F_STRIDE(%rdx), %eax	/* stride */
++	movzbl V4F_STRIDE(%rdx), %eax	/* stride */
+ 
+ 	movl %ecx, V4F_COUNT(%rdi)	/* set dest count */
+ 	movl $4, V4F_SIZE(%rdi)		/* set dest size */
+@@ -116,7 +116,7 @@ p4_constants:
+ .byte  0x00, 0x00, 0x00, 0x00
+ .byte  0x00, 0x00, 0x00, 0x00
+ .byte  0x00, 0x00, 0x00, 0x00
+-.float 0f+1.0
++.float 1.0
+ 
+ .text
+ .align 16
+@@ -135,7 +135,7 @@ _mesa_x86_64_transform_points4_3d:
+ 	movaps 16(%rax), %xmm10
+ 
+ 	movl V4F_COUNT(%rdx), %ecx	/* count */
+-	movzx V4F_STRIDE(%rdx), %eax	/* stride */
++	movzbl V4F_STRIDE(%rdx), %eax	/* stride */
+ 
+ 	movl %ecx, V4F_COUNT(%rdi)	/* set dest count */
+ 	movl $4, V4F_SIZE(%rdi)		/* set dest size */
+@@ -195,7 +195,7 @@ p4_3d_done:
+ _mesa_x86_64_transform_points4_identity:
+ 
+ 	movl V4F_COUNT(%rdx), %ecx	/* count */
+-	movzx V4F_STRIDE(%rdx), %eax	/* stride */
++	movzbl V4F_STRIDE(%rdx), %eax	/* stride */
+ 
+ 	movl %ecx, V4F_COUNT(%rdi)	/* set dest count */
+ 	movl $4, V4F_SIZE(%rdi)		/* set dest size */
+@@ -223,7 +223,7 @@ p4_identity_done:
+ _mesa_3dnow_transform_points4_3d_no_rot:
+ 
+ 	movl V4F_COUNT(%rdx), %ecx	/* count */
+-	movzx V4F_STRIDE(%rdx), %eax	/* stride */
++	movzbl V4F_STRIDE(%rdx), %eax	/* stride */
+ 
+ 	movl %ecx, V4F_COUNT(%rdi)	/* set dest count */
+ 	movl $4, V4F_SIZE(%rdi)		/* set dest size */
+@@ -287,7 +287,7 @@ p4_3d_no_rot_done:
+ _mesa_3dnow_transform_points4_perspective:
+ 
+ 	movl V4F_COUNT(%rdx), %ecx	/* count */
+-	movzx V4F_STRIDE(%rdx), %eax	/* stride */
++	movzbl V4F_STRIDE(%rdx), %eax	/* stride */
+ 
+ 	movl %ecx, V4F_COUNT(%rdi)	/* set dest count */
+ 	movl $4, V4F_SIZE(%rdi)		/* set dest size */
+@@ -353,7 +353,7 @@ p4_perspective_done:
+ _mesa_3dnow_transform_points4_2d_no_rot:
+ 
+ 	movl V4F_COUNT(%rdx), %ecx	/* count */
+-	movzx V4F_STRIDE(%rdx), %eax	/* stride */
++	movzbl V4F_STRIDE(%rdx), %eax	/* stride */
+ 
+ 	movl %ecx, V4F_COUNT(%rdi)	/* set dest count */
+ 	movl $4, V4F_SIZE(%rdi)		/* set dest size */
+@@ -408,7 +408,7 @@ p4_2d_no_rot_done:
+ _mesa_3dnow_transform_points4_2d:
+ 
+ 	movl V4F_COUNT(%rdx), %ecx	/* count */
+-	movzx V4F_STRIDE(%rdx), %eax	/* stride */
++	movzbl V4F_STRIDE(%rdx), %eax	/* stride */
+ 
+ 	movl %ecx, V4F_COUNT(%rdi)	/* set dest count */
+ 	movl $4, V4F_SIZE(%rdi)		/* set dest size */
diff --git a/graphics/mesa-demos/files/patch-src__mesa__x86__glapi_x86.S b/graphics/mesa-demos/files/patch-src__mesa__x86__glapi_x86.S
new file mode 100644
index 0000000..71da78c
--- /dev/null
+++ b/graphics/mesa-demos/files/patch-src__mesa__x86__glapi_x86.S
@@ -0,0 +1,11 @@
+--- ./src/mesa/x86/glapi_x86.S.orig	2009-03-13 04:28:49.000000000 +0100
++++ ./src/mesa/x86/glapi_x86.S	2011-01-28 18:11:56.000000000 +0100
+@@ -47,7 +47,7 @@
+ #define GL_OFFSET(x) CODEPTR(REGOFF(4 * x, EAX))
+ 
+ #if defined(GNU_ASSEMBLER) && !defined(__DJGPP__) && !defined(__MINGW32__)
+-#define GLOBL_FN(x) GLOBL x ; .type x, function
++#define GLOBL_FN(x) GLOBL x ; .type x, @function
+ #else
+ #define GLOBL_FN(x) GLOBL x
+ #endif
diff --git a/graphics/mesa-demos/files/patch-src__mesa__x86__read_rgba_span_x86.S b/graphics/mesa-demos/files/patch-src__mesa__x86__read_rgba_span_x86.S
new file mode 100644
index 0000000..37b08d1
--- /dev/null
+++ b/graphics/mesa-demos/files/patch-src__mesa__x86__read_rgba_span_x86.S
@@ -0,0 +1,11 @@
+--- ./src/mesa/x86/read_rgba_span_x86.S.orig	2008-08-25 16:46:47.000000000 +0200
++++ ./src/mesa/x86/read_rgba_span_x86.S	2011-01-28 18:10:06.000000000 +0100
+@@ -648,7 +648,7 @@ _generic_read_RGBA_span_RGB565_MMX:
+ 	testl	$0x01, %ecx
+ 	je	.L01
+ 
+-	movzxw	(%eax), %ecx
++	movzwl	(%eax), %ecx
+ 	movd	%ecx, %mm4
+ 
+ 	pshufw	$0x00, %mm4, %mm0