diff options
Diffstat (limited to 'hardened/media-libs/mesa/files')
27 files changed, 0 insertions, 2212 deletions
diff --git a/hardened/media-libs/mesa/files/6.4-dont-install-gles-headers.patch b/hardened/media-libs/mesa/files/6.4-dont-install-gles-headers.patch deleted file mode 100644 index 5bdc0a1..0000000 --- a/hardened/media-libs/mesa/files/6.4-dont-install-gles-headers.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -urN Mesa-6.4.orig/bin/installmesa Mesa-6.4/bin/installmesa ---- Mesa-6.4.orig/bin/installmesa 2005-09-13 06:36:17.000000000 -0700 -+++ Mesa-6.4/bin/installmesa 2005-10-13 14:10:39.000000000 -0700 -@@ -60,7 +60,6 @@ - - mkdir ${INCLUDE_DIR} - mkdir ${INCLUDE_DIR}/GL --mkdir ${INCLUDE_DIR}/GLES - mkdir ${LIB_DIR} - cp -f ${TOP}/include/GL/*.h ${INCLUDE_DIR}/GL - # NOT YET: cp -f ${TOP}/include/GLES/*.h ${INCLUDE_DIR}/GLES diff --git a/hardened/media-libs/mesa/files/6.4-multilib-fix.patch b/hardened/media-libs/mesa/files/6.4-multilib-fix.patch deleted file mode 100644 index 0eb7aa2..0000000 --- a/hardened/media-libs/mesa/files/6.4-multilib-fix.patch +++ /dev/null @@ -1,29 +0,0 @@ -Index: Mesa-6.4.2/bin/installmesa -=================================================================== ---- Mesa-6.4.2.orig/bin/installmesa -+++ Mesa-6.4.2/bin/installmesa -@@ -9,8 +9,9 @@ - - TOP=. - --INCLUDE_DIR="/usr/local/include" --LIB_DIR="/usr/local/lib" -+# Default to /usr/local if these aren't already set. -+INCLUDE_DIR="${INCLUDE_DIR:-/usr/local/include}" -+LIB_DIR="${LIB_DIR:-/usr/local/lib}" - - if [ "x$#" = "x0" ] ; then - echo -@@ -40,9 +41,9 @@ echo "Press <Enter> to continue, or <ctr - - read INPUT - --else --INCLUDE_DIR=$1/include --LIB_DIR=$1/lib -+#else -+#INCLUDE_DIR=$1/include -+#LIB_DIR=$1/lib - fi - - # flags: diff --git a/hardened/media-libs/mesa/files/6.4-pic-textrel-fix.patch b/hardened/media-libs/mesa/files/6.4-pic-textrel-fix.patch deleted file mode 100644 index a7e5c6c..0000000 --- a/hardened/media-libs/mesa/files/6.4-pic-textrel-fix.patch +++ /dev/null @@ -1,278 +0,0 @@ -Index: Mesa-6.4.2/src/mesa/x86/mmx_blend.S -=================================================================== ---- Mesa-6.4.2.orig/src/mesa/x86/mmx_blend.S -+++ Mesa-6.4.2/src/mesa/x86/mmx_blend.S -@@ -1,4 +1,4 @@ -- -+ ; - /* - * Written by José Fonseca <j_r_fonseca@yahoo.co.uk> - */ -@@ -240,7 +240,9 @@ TWO(PUNPCKHDQ ( MA2, MA2 )) - ONE(MOVD ( MSS, REGIND(rgba) )) /* | | | | sa1 | sb1 | sg1 | sr1 */ ;\ - TWO(MOVQ ( MSS, REGIND(rgba) )) /* sa2 | sb2 | sg2 | sr2 | sa1 | sb1 | sg1 | sr1 */ - -- -+/* Kevin F. Quinn <kevquinn@gentoo.org> 2 July 2006 -+ * Replace data segment constants with text-segment -+ * constants (via pushl/movq) - SEG_DATA - - ALIGNDATA8 -@@ -249,6 +251,11 @@ const_0080: - - const_80: - D_LONG 0x80808080, 0x80808080 -+*/ -+#define const_0080_l 0x00800080 -+#define const_0080_h 0x00800080 -+#define const_80_l 0x80808080 -+#define const_80_h 0x80808080 - - SEG_TEXT - -@@ -302,8 +309,16 @@ TWO(MOVQ ( MM1, REGIND(rgba) )) - #define TAG(x) CONCAT(x,_min) - #define LLTAG(x) LLBL2(x,_min) - -+/* Kevin F. Quinn 2nd July 2006 -+ * Replace data segment constants with text-segment instructions -+#define INIT \ -+ MOVQ ( CONTENT(const_80), MM7 ) -+ */ - #define INIT \ -- MOVQ ( CONTENT(const_80), MM7 ) /* 0x80| 0x80| 0x80| 0x80| 0x80| 0x80| 0x80| 0x80*/ -+ PUSH_L ( CONST(const_80_h) ) /* 0x80| 0x80| 0x80| 0x80| 0x80| 0x80| 0x80| 0x80*/ ;\ -+ PUSH_L ( CONST(const_80_l) ) ;\ -+ MOVQ ( REGIND(ESP), MM7 ) ;\ -+ ADD_L ( CONST(8), ESP) - - #define MAIN( rgba, dest ) \ - GMB_LOAD( rgba, dest, MM1, MM2 ) ;\ -@@ -326,8 +341,16 @@ TWO(MOVQ ( MM1, REGIND(rgba) )) - #define TAG(x) CONCAT(x,_max) - #define LLTAG(x) LLBL2(x,_max) - -+/* Kevin F. Quinn 2nd July 2006 -+ * Replace data segment constants with text-segment instructions - #define INIT \ -- MOVQ ( CONTENT(const_80), MM7 ) /* 0x80| 0x80| 0x80| 0x80| 0x80| 0x80| 0x80| 0x80*/ -+ MOVQ ( CONTENT(const_80), MM7 ) -+ */ -+#define INIT \ -+ PUSH_L ( CONST(const_80_l) ) /* 0x80| 0x80| 0x80| 0x80| 0x80| 0x80| 0x80| 0x80*/ ;\ -+ PUSH_L ( CONST(const_80_h) ) ;\ -+ MOVQ ( REGIND(ESP), MM7 ) ;\ -+ ADD_L ( CONST(8), ESP) - - #define MAIN( rgba, dest ) \ - GMB_LOAD( rgba, dest, MM1, MM2 ) ;\ -@@ -350,9 +373,17 @@ TWO(MOVQ ( MM1, REGIND(rgba) )) - #define TAG(x) CONCAT(x,_modulate) - #define LLTAG(x) LLBL2(x,_modulate) - -+/* Kevin F. Quinn 2nd July 2006 -+ * Replace data segment constants with text-segment instructions -+#define INIT \ -+ MOVQ ( CONTENT(const_0080), MM7 ) -+ */ - #define INIT \ - PXOR ( MM0, MM0 ) /* 0x0000 | 0x0000 | 0x0000 | 0x0000 */ ;\ -- MOVQ ( CONTENT(const_0080), MM7 ) /* 0x0080 | 0x0080 | 0x0080 | 0x0080 */ -+ PUSH_L ( CONST(const_0080_l) ) /* 0x0080 | 0x0080 | 0x0080 | 0x0080 */ ;\ -+ PUSH_L ( CONST(const_0080_h) ) ;\ -+ MOVQ ( REGIND(ESP), MM7 ) ;\ -+ ADD_L ( CONST(8), ESP) - - #define MAIN( rgba, dest ) \ - GMB_LOAD( rgba, dest, MM1, MM2 ) ;\ -Index: Mesa-6.4.2/src/mesa/x86/read_rgba_span_x86.S -=================================================================== ---- Mesa-6.4.2.orig/src/mesa/x86/read_rgba_span_x86.S -+++ Mesa-6.4.2/src/mesa/x86/read_rgba_span_x86.S -@@ -32,6 +32,8 @@ - - .file "read_rgba_span_x86.S" - #if !defined(__DJGPP__) && !defined(__MINGW32__) /* this one cries for assyntax.h */ -+/* Kevin F. Quinn 2nd July 2006 -+ * Replace data segment constants with text-segment instructions - .section .rodata - .align 16 - .type mask, @object -@@ -45,6 +47,19 @@ mask: - .long 0x00ff0000 - .long 0x00ff0000 - .long 0x00ff0000 -+ */ -+#define LOAD_MASK(mvins,m1,m2) \ -+ pushl $0xff00ff00 ;\ -+ pushl $0xff00ff00 ;\ -+ pushl $0xff00ff00 ;\ -+ pushl $0xff00ff00 ;\ -+ mvins (%esp), m1 ;\ -+ pushl $0x00ff0000 ;\ -+ pushl $0x00ff0000 ;\ -+ pushl $0x00ff0000 ;\ -+ pushl $0x00ff0000 ;\ -+ mvins (%esp), m2 ;\ -+ addl $32, %esp - - - /* I implemented these as macros because the appear in quite a few places, -@@ -84,8 +99,12 @@ _generic_read_RGBA_span_BGRA8888_REV_MMX - #ifdef USE_INNER_EMMS - emms - #endif -+/* Kevin F. Quinn 2nd July 2006 -+ * Replace data segment constants with text-segment instructions - movq mask, %mm1 - movq mask+16, %mm2 -+ */ -+ LOAD_MASK(movq,%mm1,%mm2) - - movl 8(%esp), %ebx /* source pointer */ - movl 16(%esp), %edx /* number of pixels to copy */ -@@ -182,8 +201,12 @@ _generic_read_RGBA_span_BGRA8888_REV_SSE - #ifdef USE_INNER_EMMS - emms - #endif -+/* Kevin F. Quinn 2nd July 2006 -+ * Replace data segment constants with text-segment instructions - movq mask, %mm1 - movq mask+16, %mm2 -+ */ -+ LOAD_MASK(movq,%mm1,%mm2) - - movl 16(%esp), %ebx /* source pointer */ - movl 24(%esp), %edx /* number of pixels to copy */ -@@ -341,8 +364,12 @@ _generic_read_RGBA_span_BGRA8888_REV_SSE - pushl %esi - pushl %ebx - -+/* Kevin F. Quinn 2nd July 2006 -+ * Replace data segment constants with text-segment instructions - movdqa mask, %xmm1 - movdqa mask+16, %xmm2 -+ */ -+ LOAD_MASK(movdqa,%xmm1,%xmm2) - - movl 12(%esp), %ebx /* source pointer */ - movl 20(%esp), %edx /* number of pixels to copy */ -@@ -464,6 +491,10 @@ _generic_read_RGBA_span_BGRA8888_REV_SSE - - - -+/* Kevin F. Quinn 2nd July 2006 -+ * Replace data segment constants with text-segment instructions -+ */ -+#if 0 - .section .rodata - - .align 16 -@@ -510,6 +541,26 @@ scale: - - alpha: .long 0x00000000 - .long 0x00ff0000 -+#endif -+ -+#define MASK_565_L 0x07e0f800 -+#define MASK_565_H 0x0000001f -+#define SCALE_ADJUST 5 -+#if SCALE_ADJUST == 5 -+#define PRESCALE_L 0x00100001 -+#define PRESCALE_H 0x00000200 -+#define SCALE_L 0x40C620E8 -+#define SCALE_H 0x0000839d -+#elif SCALE_ADJUST == 0 -+#define PRESCALE_L 0x00200001 -+#define PRESCALE_H 0x00000800 -+#define SCALE_L 0x01040108 -+#define SCALE_H 0x00000108 -+#else -+#error SCALE_ADJUST must either be 5 or 0. -+#endif -+#define ALPHA_L 0x00000000 -+#define ALPHA_H 0x00ff0000 - - /** - * MMX optimized version of the RGB565 to RGBA copy routine. -@@ -530,9 +581,25 @@ _generic_read_RGBA_span_RGB565_MMX: - movl 8(%esp), %edx /* destination pointer */ - movl 12(%esp), %ecx /* number of pixels to copy */ - -+/* Kevin F. Quinn 2nd July 2006 -+ * Replace data segment constants with text-segment instructions - movq mask_565, %mm5 - movq prescale, %mm6 - movq scale, %mm7 -+ */ -+ pushl MASK_565_H -+ pushl MASK_565_L -+ movq (%esp), %mm5 -+ pushl PRESCALE_H -+ pushl PRESCALE_L -+ movq (%esp), %mm6 -+ pushl SCALE_H -+ pushl SCALE_L -+ movq (%esp), %mm7 -+ pushl ALPHA_H -+ pushl ALPHA_L -+ movq (%esp), %mm3 -+ addl $32,%esp - - sarl $2, %ecx - jle .L01 /* Bail early if the count is negative. */ -@@ -581,8 +648,13 @@ _generic_read_RGBA_span_RGB565_MMX: - /* Always set the alpha value to 0xff. - */ - -+/* Kevin F. Quinn 2nd July 2006 -+ * Replace data segment constants with text-segment instructions - por alpha, %mm0 - por alpha, %mm2 -+ */ -+ por %mm3, %mm0 -+ por %mm3, %mm2 - - - /* Pack the 16-bit values to 8-bit values and store the converted -@@ -609,8 +681,13 @@ _generic_read_RGBA_span_RGB565_MMX: - pmulhuw %mm7, %mm0 - pmulhuw %mm7, %mm2 - -+/* Kevin F. Quinn 2nd July 2006 -+ * Replace data segment constants with text-segment instructions - por alpha, %mm0 - por alpha, %mm2 -+ */ -+ por %mm3, %mm0 -+ por %mm3, %mm2 - - packuswb %mm2, %mm0 - -@@ -647,8 +724,13 @@ _generic_read_RGBA_span_RGB565_MMX: - pmulhuw %mm7, %mm0 - pmulhuw %mm7, %mm2 - -+/* Kevin F. Quinn 2nd July 2006 -+ * Replace data segment constants with text-segment instructions - por alpha, %mm0 - por alpha, %mm2 -+ */ -+ por %mm3, %mm0 -+ por %mm3, %mm2 - - packuswb %mm2, %mm0 - -@@ -675,7 +757,11 @@ _generic_read_RGBA_span_RGB565_MMX: - #endif - pmulhuw %mm7, %mm0 - -+/* Kevin F. Quinn 2nd July 2006 -+ * Replace data segment constants with text-segment instructions - por alpha, %mm0 -+ */ -+ por %mm3, %mm0 - - packuswb %mm0, %mm0 - diff --git a/hardened/media-libs/mesa/files/6.5-fix-radeon-PCIE.patch b/hardened/media-libs/mesa/files/6.5-fix-radeon-PCIE.patch deleted file mode 100644 index fda0957..0000000 --- a/hardened/media-libs/mesa/files/6.5-fix-radeon-PCIE.patch +++ /dev/null @@ -1,45 +0,0 @@ -http://bugs.gentoo.org/show_bug.cgi?id=136315 ---- src/mesa/drivers/dri/radeon/radeon_screen.c -+++ src/mesa/drivers/dri/radeon/radeon_screen.c -@@ -343,7 +343,6 @@ - return NULL; - } - -- if (sPriv->drmMinor >= 6) { - gp.param = RADEON_PARAM_GART_BASE; - gp.value = &screen->gart_base; - -@@ -371,7 +370,6 @@ - screen->drmSupportsFragShader = (sPriv->drmMinor >= 18); - screen->drmSupportsPointSprites = (sPriv->drmMinor >= 13); - screen->drmSupportsCubeMapsR100 = (sPriv->drmMinor >= 15); -- } - } - - screen->mmio.handle = dri_priv->registerHandle; -@@ -425,9 +423,7 @@ - return NULL; - } - -- screen->gart_texture_offset = dri_priv->gartTexOffset + ( screen->IsPCI -- ? INREG( RADEON_AIC_LO_ADDR ) -- : ( ( INREG( RADEON_MC_AGP_LOCATION ) & 0x0ffffU ) << 16 ) ); -+ screen->gart_texture_offset = dri_priv->gartTexOffset + screen->gart_base; - } - - screen->chip_flags = 0; -@@ -976,12 +972,12 @@ - static const char *driver_name = "Radeon"; - static const __DRIutilversion2 ddx_expected = { 4, 5, 0, 0 }; - static const __DRIversion dri_expected = { 4, 0, 0 }; -- static const __DRIversion drm_expected = { 1, 3, 0 }; -+ static const __DRIversion drm_expected = { 1, 6, 0 }; - #elif RADEON_COMMON && defined(RADEON_COMMON_FOR_R200) - static const char *driver_name = "R200"; - static const __DRIutilversion2 ddx_expected = { 4, 5, 0, 0 }; - static const __DRIversion dri_expected = { 4, 0, 0 }; -- static const __DRIversion drm_expected = { 1, 5, 0 }; -+ static const __DRIversion drm_expected = { 1, 6, 0 }; - #elif RADEON_COMMON && defined(RADEON_COMMON_FOR_R300) - static const char *driver_name = "R300"; - static const __DRIutilversion2 ddx_expected = { 4, 5, 0, 0 }; diff --git a/hardened/media-libs/mesa/files/6.5-pic-textrel-fix.patch b/hardened/media-libs/mesa/files/6.5-pic-textrel-fix.patch deleted file mode 100644 index 9859702..0000000 --- a/hardened/media-libs/mesa/files/6.5-pic-textrel-fix.patch +++ /dev/null @@ -1,274 +0,0 @@ ---- src/mesa/x86/mmx_blend.S.orig 2006-07-02 12:59:54.000000000 +0200 -+++ src/mesa/x86/mmx_blend.S 2006-07-02 15:52:35.000000000 +0200 -@@ -1,4 +1,4 @@ -- -+ ; - /* - * Written by José Fonseca <j_r_fonseca@yahoo.co.uk> - */ -@@ -240,7 +240,9 @@ - ONE(MOVD ( MSS, REGIND(rgba) )) /* | | | | sa1 | sb1 | sg1 | sr1 */ ;\ - TWO(MOVQ ( MSS, REGIND(rgba) )) /* sa2 | sb2 | sg2 | sr2 | sa1 | sb1 | sg1 | sr1 */ - -- -+/* Kevin F. Quinn <kevquinn@gentoo.org> 2 July 2006 -+ * Replace data segment constants with text-segment -+ * constants (via pushl/movq) - SEG_DATA - - ALIGNDATA8 -@@ -249,6 +251,11 @@ - - const_80: - D_LONG 0x80808080, 0x80808080 -+*/ -+#define const_0080_l 0x00800080 -+#define const_0080_h 0x00800080 -+#define const_80_l 0x80808080 -+#define const_80_h 0x80808080 - - SEG_TEXT - -@@ -302,8 +309,16 @@ - #define TAG(x) CONCAT(x,_min) - #define LLTAG(x) LLBL2(x,_min) - -+/* Kevin F. Quinn 2nd July 2006 -+ * Replace data segment constants with text-segment instructions -+#define INIT \ -+ MOVQ ( CONTENT(const_80), MM7 ) -+ */ - #define INIT \ -- MOVQ ( CONTENT(const_80), MM7 ) /* 0x80| 0x80| 0x80| 0x80| 0x80| 0x80| 0x80| 0x80*/ -+ PUSH_L ( CONST(const_80_h) ) /* 0x80| 0x80| 0x80| 0x80| 0x80| 0x80| 0x80| 0x80*/ ;\ -+ PUSH_L ( CONST(const_80_l) ) ;\ -+ MOVQ ( REGIND(ESP), MM7 ) ;\ -+ ADD_L ( CONST(8), ESP) - - #define MAIN( rgba, dest ) \ - GMB_LOAD( rgba, dest, MM1, MM2 ) ;\ -@@ -326,8 +341,16 @@ - #define TAG(x) CONCAT(x,_max) - #define LLTAG(x) LLBL2(x,_max) - -+/* Kevin F. Quinn 2nd July 2006 -+ * Replace data segment constants with text-segment instructions - #define INIT \ -- MOVQ ( CONTENT(const_80), MM7 ) /* 0x80| 0x80| 0x80| 0x80| 0x80| 0x80| 0x80| 0x80*/ -+ MOVQ ( CONTENT(const_80), MM7 ) -+ */ -+#define INIT \ -+ PUSH_L ( CONST(const_80_l) ) /* 0x80| 0x80| 0x80| 0x80| 0x80| 0x80| 0x80| 0x80*/ ;\ -+ PUSH_L ( CONST(const_80_h) ) ;\ -+ MOVQ ( REGIND(ESP), MM7 ) ;\ -+ ADD_L ( CONST(8), ESP) - - #define MAIN( rgba, dest ) \ - GMB_LOAD( rgba, dest, MM1, MM2 ) ;\ -@@ -350,9 +373,17 @@ - #define TAG(x) CONCAT(x,_modulate) - #define LLTAG(x) LLBL2(x,_modulate) - -+/* Kevin F. Quinn 2nd July 2006 -+ * Replace data segment constants with text-segment instructions -+#define INIT \ -+ MOVQ ( CONTENT(const_0080), MM7 ) -+ */ - #define INIT \ - PXOR ( MM0, MM0 ) /* 0x0000 | 0x0000 | 0x0000 | 0x0000 */ ;\ -- MOVQ ( CONTENT(const_0080), MM7 ) /* 0x0080 | 0x0080 | 0x0080 | 0x0080 */ -+ PUSH_L ( CONST(const_0080_l) ) /* 0x0080 | 0x0080 | 0x0080 | 0x0080 */ ;\ -+ PUSH_L ( CONST(const_0080_h) ) ;\ -+ MOVQ ( REGIND(ESP), MM7 ) ;\ -+ ADD_L ( CONST(8), ESP) - - #define MAIN( rgba, dest ) \ - GMB_LOAD( rgba, dest, MM1, MM2 ) ;\ ---- src/mesa/x86/read_rgba_span_x86.S.orig 2006-07-02 16:12:27.000000000 +0200 -+++ src/mesa/x86/read_rgba_span_x86.S 2006-07-02 16:50:47.000000000 +0200 -@@ -32,6 +32,8 @@ - - .file "read_rgba_span_x86.S" - #if !defined(__DJGPP__) && !defined(__MINGW32__) /* this one cries for assyntax.h */ -+/* Kevin F. Quinn 2nd July 2006 -+ * Replace data segment constants with text-segment instructions - .section .rodata - .align 16 - .type mask, @object -@@ -45,6 +47,19 @@ - .long 0x00ff0000 - .long 0x00ff0000 - .long 0x00ff0000 -+ */ -+#define LOAD_MASK(mvins,m1,m2) \ -+ pushl $0xff00ff00 ;\ -+ pushl $0xff00ff00 ;\ -+ pushl $0xff00ff00 ;\ -+ pushl $0xff00ff00 ;\ -+ mvins (%esp), m1 ;\ -+ pushl $0x00ff0000 ;\ -+ pushl $0x00ff0000 ;\ -+ pushl $0x00ff0000 ;\ -+ pushl $0x00ff0000 ;\ -+ mvins (%esp), m2 ;\ -+ addl $32, %esp - - - /* I implemented these as macros because the appear in quite a few places, -@@ -84,8 +99,12 @@ - #ifdef USE_INNER_EMMS - emms - #endif -+/* Kevin F. Quinn 2nd July 2006 -+ * Replace data segment constants with text-segment instructions - movq mask, %mm1 - movq mask+16, %mm2 -+ */ -+ LOAD_MASK(movq,%mm1,%mm2) - - movl 8(%esp), %ebx /* source pointer */ - movl 16(%esp), %edx /* number of pixels to copy */ -@@ -182,8 +201,12 @@ - #ifdef USE_INNER_EMMS - emms - #endif -+/* Kevin F. Quinn 2nd July 2006 -+ * Replace data segment constants with text-segment instructions - movq mask, %mm1 - movq mask+16, %mm2 -+ */ -+ LOAD_MASK(movq,%mm1,%mm2) - - movl 16(%esp), %ebx /* source pointer */ - movl 24(%esp), %edx /* number of pixels to copy */ -@@ -341,8 +364,12 @@ - pushl %esi - pushl %ebx - -+/* Kevin F. Quinn 2nd July 2006 -+ * Replace data segment constants with text-segment instructions - movdqa mask, %xmm1 - movdqa mask+16, %xmm2 -+ */ -+ LOAD_MASK(movdqa,%xmm1,%xmm2) - - movl 12(%esp), %ebx /* source pointer */ - movl 20(%esp), %edx /* number of pixels to copy */ -@@ -464,6 +491,10 @@ - - - -+/* Kevin F. Quinn 2nd July 2006 -+ * Replace data segment constants with text-segment instructions -+ */ -+#if 0 - .section .rodata - - .align 16 -@@ -510,6 +541,26 @@ - - alpha: .long 0x00000000 - .long 0x00ff0000 -+#endif -+ -+#define MASK_565_L 0x07e0f800 -+#define MASK_565_H 0x0000001f -+#define SCALE_ADJUST 5 -+#if SCALE_ADJUST == 5 -+#define PRESCALE_L 0x00100001 -+#define PRESCALE_H 0x00000200 -+#define SCALE_L 0x40C620E8 -+#define SCALE_H 0x0000839d -+#elif SCALE_ADJUST == 0 -+#define PRESCALE_L 0x00200001 -+#define PRESCALE_H 0x00000800 -+#define SCALE_L 0x01040108 -+#define SCALE_H 0x00000108 -+#else -+#error SCALE_ADJUST must either be 5 or 0. -+#endif -+#define ALPHA_L 0x00000000 -+#define ALPHA_H 0x00ff0000 - - /** - * MMX optimized version of the RGB565 to RGBA copy routine. -@@ -530,9 +581,25 @@ - movl 8(%esp), %edx /* destination pointer */ - movl 12(%esp), %ecx /* number of pixels to copy */ - -+/* Kevin F. Quinn 2nd July 2006 -+ * Replace data segment constants with text-segment instructions - movq mask_565, %mm5 - movq prescale, %mm6 - movq scale, %mm7 -+ */ -+ pushl MASK_565_H -+ pushl MASK_565_L -+ movq (%esp), %mm5 -+ pushl PRESCALE_H -+ pushl PRESCALE_L -+ movq (%esp), %mm6 -+ pushl SCALE_H -+ pushl SCALE_L -+ movq (%esp), %mm7 -+ pushl ALPHA_H -+ pushl ALPHA_L -+ movq (%esp), %mm3 -+ addl $32,%esp - - sarl $2, %ecx - jle .L01 /* Bail early if the count is negative. */ -@@ -581,8 +648,13 @@ - /* Always set the alpha value to 0xff. - */ - -+/* Kevin F. Quinn 2nd July 2006 -+ * Replace data segment constants with text-segment instructions - por alpha, %mm0 - por alpha, %mm2 -+ */ -+ por %mm3, %mm0 -+ por %mm3, %mm2 - - - /* Pack the 16-bit values to 8-bit values and store the converted -@@ -609,8 +681,13 @@ - pmulhuw %mm7, %mm0 - pmulhuw %mm7, %mm2 - -+/* Kevin F. Quinn 2nd July 2006 -+ * Replace data segment constants with text-segment instructions - por alpha, %mm0 - por alpha, %mm2 -+ */ -+ por %mm3, %mm0 -+ por %mm3, %mm2 - - packuswb %mm2, %mm0 - -@@ -647,8 +724,13 @@ - pmulhuw %mm7, %mm0 - pmulhuw %mm7, %mm2 - -+/* Kevin F. Quinn 2nd July 2006 -+ * Replace data segment constants with text-segment instructions - por alpha, %mm0 - por alpha, %mm2 -+ */ -+ por %mm3, %mm0 -+ por %mm3, %mm2 - - packuswb %mm2, %mm0 - -@@ -675,7 +757,11 @@ - #endif - pmulhuw %mm7, %mm0 - -+/* Kevin F. Quinn 2nd July 2006 -+ * Replace data segment constants with text-segment instructions - por alpha, %mm0 -+ */ -+ por %mm3, %mm0 - - packuswb %mm0, %mm0 - diff --git a/hardened/media-libs/mesa/files/6.5-re-order-context-destruction.patch b/hardened/media-libs/mesa/files/6.5-re-order-context-destruction.patch deleted file mode 100644 index a882d07..0000000 --- a/hardened/media-libs/mesa/files/6.5-re-order-context-destruction.patch +++ /dev/null @@ -1,72 +0,0 @@ ---- src/mesa/drivers/dri/r128/r128_context.c 2006/02/03 13:29:11 1.23 -+++ src/mesa/drivers/dri/r128/r128_context.c 2006/04/09 17:48:28 1.24 -@@ -296,10 +296,6 @@ - _ac_DestroyContext( rmesa->glCtx ); - _swrast_DestroyContext( rmesa->glCtx ); - -- /* free the Mesa context */ -- rmesa->glCtx->DriverCtx = NULL; -- _mesa_destroy_context(rmesa->glCtx); -- - if ( release_texture_heaps ) { - /* This share group is about to go away, free our private - * texture object data. -@@ -314,6 +310,10 @@ - assert( is_empty_list( & rmesa->swapped ) ); - } - -+ /* free the Mesa context */ -+ rmesa->glCtx->DriverCtx = NULL; -+ _mesa_destroy_context(rmesa->glCtx); -+ - /* free the option cache */ - driDestroyOptionCache (&rmesa->optionCache); - ---- src/mesa/drivers/dri/r200/r200_context.c 2006/04/04 11:04:30 1.58 -+++ src/mesa/drivers/dri/r200/r200_context.c 2006/04/09 17:48:28 1.59 -@@ -590,10 +590,6 @@ - r200VtxfmtDestroy( rmesa->glCtx ); - } - -- /* free the Mesa context */ -- rmesa->glCtx->DriverCtx = NULL; -- _mesa_destroy_context( rmesa->glCtx ); -- - if (rmesa->state.scissor.pClipRects) { - FREE(rmesa->state.scissor.pClipRects); - rmesa->state.scissor.pClipRects = NULL; -@@ -613,6 +609,10 @@ - assert( is_empty_list( & rmesa->swapped ) ); - } - -+ /* free the Mesa context */ -+ rmesa->glCtx->DriverCtx = NULL; -+ _mesa_destroy_context( rmesa->glCtx ); -+ - /* free the option cache */ - driDestroyOptionCache (&rmesa->optionCache); - ---- src/mesa/drivers/dri/radeon/radeon_context.c 2006/04/04 11:04:30 1.51 -+++ src/mesa/drivers/dri/radeon/radeon_context.c 2006/04/09 17:48:28 1.52 -@@ -521,10 +521,6 @@ - radeonVtxfmtDestroy( rmesa->glCtx ); - } - -- /* free the Mesa context */ -- rmesa->glCtx->DriverCtx = NULL; -- _mesa_destroy_context( rmesa->glCtx ); -- - _mesa_vector4f_free( &rmesa->tcl.ObjClean ); - - if (rmesa->state.scissor.pClipRects) { -@@ -546,6 +542,10 @@ - assert( is_empty_list( & rmesa->swapped ) ); - } - -+ /* free the Mesa context */ -+ rmesa->glCtx->DriverCtx = NULL; -+ _mesa_destroy_context( rmesa->glCtx ); -+ - /* free the option cache */ - driDestroyOptionCache (&rmesa->optionCache); - diff --git a/hardened/media-libs/mesa/files/6.5.1-freebsd-dri.patch b/hardened/media-libs/mesa/files/6.5.1-freebsd-dri.patch deleted file mode 100644 index aac4ab4..0000000 --- a/hardened/media-libs/mesa/files/6.5.1-freebsd-dri.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- Mesa-6.5.1/configs/freebsd-dri.orig 2006-08-17 11:09:02 -0300 -+++ Mesa-6.5.1/configs/freebsd-dri 2006-09-19 19:29:35 -0300 -@@ -16,20 +16,21 @@ - DEFINES = -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER \ - -DGLX_DIRECT_RENDERING -DHAVE_ALIAS -DHAVE_POSIX_MEMALIGN - --CFLAGS = -Wmissing-prototypes -g -std=c99 -Wundef -fPIC -ffast-math \ -- $(ASM_FLAGS) $(X11_INCLUDES) $(DEFINES) -+CFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) -Wmissing-prototypes -std=c99 -Wundef -ffast-math \ -+ $(ASM_FLAGS) $(X11_INCLUDES) $(DEFINES) - --CXXFLAGS = $(DEFINES) -Wall -g -ansi -pedantic -fPIC -+CXXFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(DEFINES) -Wall -ansi -pedantic $(ASM_FLAGS) $(X11_INCLUDES) - - ASM_SOURCES = - - # Library/program dependencies - LIBDRM_LIB = `pkg-config --libs libdrm` -+LIBDRM_CFLAGS = `pkg-config --cflags libdrm` - DRI_LIB_DEPS = -L/usr/local/lib -lm -lpthread -lexpat $(LIBDRM_LIB) - GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lXxf86vm -lm -lpthread $(LIBDRM_LIB) - - GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/X11R6/lib -lGLU -lGL -lX11 -lXmu -lXt -lXi -lm --GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/X11R6/lib -lGL -lXt -lXm -lX11 -+GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/X11R6/lib -lGL -lXt -lX11 - - - # Directories diff --git a/hardened/media-libs/mesa/files/6.5.1-i965-bufmgr.patch b/hardened/media-libs/mesa/files/6.5.1-i965-bufmgr.patch deleted file mode 100644 index f3a0829..0000000 --- a/hardened/media-libs/mesa/files/6.5.1-i965-bufmgr.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- src/mesa/drivers/dri/i965/bufmgr_fake.c.orig 2006-11-29 00:41:37.000000000 +0200 -+++ src/mesa/drivers/dri/i965/bufmgr_fake.c 2006-11-29 00:43:12.000000000 +0200 -@@ -1242,7 +1242,6 @@ - LOCK(bm); - { - struct block *block, *tmp; -- assert(intel->locked); - - foreach_s (block, tmp, &bm->referenced) { - diff --git a/hardened/media-libs/mesa/files/6.5.1-mach64-dri-private-dma-2.patch b/hardened/media-libs/mesa/files/6.5.1-mach64-dri-private-dma-2.patch deleted file mode 100644 index 885ab3e..0000000 --- a/hardened/media-libs/mesa/files/6.5.1-mach64-dri-private-dma-2.patch +++ /dev/null @@ -1,141 +0,0 @@ ---- src/mesa/drivers/dri/mach64/mach64_ioctl.c 2006-04-01 05:37:38.000000000 +0300 -+++ src/mesa/drivers/dri/mach64-tst/mach64_ioctl.c 2006-07-18 19:43:10.000000000 +0300 -@@ -105,7 +105,7 @@ void mach64FlushVerticesLocked( mach64Co - int prim = mmesa->hw_primitive; - int fd = mmesa->driScreen->fd; - drm_mach64_vertex_t vertex; -- int i, ret; -+ int i; - - mmesa->num_verts = 0; - mmesa->vert_used = 0; -@@ -123,6 +123,9 @@ void mach64FlushVerticesLocked( mach64Co - mmesa->dirty |= MACH64_UPLOAD_CLIPRECTS; - - if ( !count || !(mmesa->dirty & MACH64_UPLOAD_CLIPRECTS) ) { -+ int to = 0; -+ int ret; -+ - /* FIXME: Is this really necessary */ - if ( nbox == 1 ) - mmesa->sarea->nbox = 0; -@@ -133,7 +136,10 @@ void mach64FlushVerticesLocked( mach64Co - vertex.buf = buffer; - vertex.used = count; - vertex.discard = 1; -- ret = drmCommandWrite( fd, DRM_MACH64_VERTEX, &vertex, sizeof(drm_mach64_vertex_t) ); -+ do { -+ ret = drmCommandWrite( fd, DRM_MACH64_VERTEX, -+ &vertex, sizeof(drm_mach64_vertex_t) ); -+ } while ( ( ret == -EAGAIN ) && ( to++ < MACH64_TIMEOUT ) ); - if ( ret ) { - UNLOCK_HARDWARE( mmesa ); - fprintf( stderr, "Error flushing vertex buffer: return = %d\n", ret ); -@@ -146,6 +152,8 @@ void mach64FlushVerticesLocked( mach64Co - int nr = MIN2( i + MACH64_NR_SAREA_CLIPRECTS, nbox ); - drm_clip_rect_t *b = mmesa->sarea->boxes; - int discard = 0; -+ int to = 0; -+ int ret; - - mmesa->sarea->nbox = nr - i; - for ( ; i < nr ; i++ ) { -@@ -164,7 +172,10 @@ void mach64FlushVerticesLocked( mach64Co - vertex.buf = buffer; - vertex.used = count; - vertex.discard = discard; -- ret = drmCommandWrite( fd, DRM_MACH64_VERTEX, &vertex, sizeof(drm_mach64_vertex_t) ); -+ do { -+ ret = drmCommandWrite( fd, DRM_MACH64_VERTEX, -+ &vertex, sizeof(drm_mach64_vertex_t) ); -+ } while ( ( ret == -EAGAIN ) && ( to++ < MACH64_TIMEOUT ) ); - if ( ret ) { - UNLOCK_HARDWARE( mmesa ); - fprintf( stderr, "Error flushing vertex buffer: return = %d\n", ret ); -@@ -180,14 +191,15 @@ void mach64FlushVerticesLocked( mach64Co - * Texture uploads - */ - --void mach64FireBlitLocked( mach64ContextPtr mmesa, drmBufPtr buffer, -+void mach64FireBlitLocked( mach64ContextPtr mmesa, void *buffer, - GLint offset, GLint pitch, GLint format, - GLint x, GLint y, GLint width, GLint height ) - { - drm_mach64_blit_t blit; -- GLint ret; -+ int to = 0; -+ int ret; - -- blit.idx = buffer->idx; -+ blit.buf = buffer; - blit.offset = offset; - blit.pitch = pitch; - blit.format = format; -@@ -196,8 +208,10 @@ void mach64FireBlitLocked( mach64Context - blit.width = width; - blit.height = height; - -- ret = drmCommandWrite( mmesa->driFd, DRM_MACH64_BLIT, -- &blit, sizeof(drm_mach64_blit_t) ); -+ do { -+ ret = drmCommandWrite( mmesa->driFd, DRM_MACH64_BLIT, -+ &blit, sizeof(drm_mach64_blit_t) ); -+ } while ( ( ret == -EAGAIN ) && ( to++ < MACH64_TIMEOUT ) ); - - if ( ret ) { - UNLOCK_HARDWARE( mmesa ); ---- src/mesa/drivers/dri/mach64/mach64_ioctl.h 2005-02-01 01:40:05.000000000 +0200 -+++ src/mesa/drivers/dri/mach64-tst/mach64_ioctl.h 2006-04-11 18:52:56.000000000 +0300 -@@ -74,7 +74,7 @@ static __inline void *mach64AllocDmaLock - return head; - } - --extern void mach64FireBlitLocked( mach64ContextPtr mmesa, drmBufPtr buffer, -+extern void mach64FireBlitLocked( mach64ContextPtr mmesa, void *buffer, - GLint offset, GLint pitch, GLint format, - GLint x, GLint y, GLint width, GLint height ); - ---- src/mesa/drivers/dri/mach64/mach64_screen.c 2005-10-19 05:46:42.000000000 +0300 -+++ src/mesa/drivers/dri/mach64-tst/mach64_screen.c 2006-07-16 04:58:55.000000000 +0300 -@@ -520,7 +520,7 @@ void * __driCreateNewScreen_20050727( __ - __DRIscreenPrivate *psp; - static const __DRIversion ddx_expected = { 6, 4, 0 }; - static const __DRIversion dri_expected = { 4, 0, 0 }; -- static const __DRIversion drm_expected = { 1, 0, 0 }; -+ static const __DRIversion drm_expected = { 2, 0, 0 }; - - dri_interface = interface; - ---- src/mesa/drivers/dri/mach64/mach64_texmem.c 2004-06-03 01:45:00.000000000 +0300 -+++ src/mesa/drivers/dri/mach64-tst/mach64_texmem.c 2006-04-11 18:54:09.000000000 +0300 -@@ -569,27 +569,17 @@ static void mach64UploadLocalSubImage( m - remaining > 0 ; - remaining -= rows, y += rows, i++ ) - { -- drmBufPtr buffer; -- CARD32 *dst; -- - height = MIN2(remaining, rows); - -- /* Grab the dma buffer for the texture blit */ -- buffer = mach64GetBufferLocked( mmesa ); -- -- dst = (CARD32 *)((char *)buffer->address + MACH64_HOSTDATA_BLIT_OFFSET); -- - assert(image->Data); - - { - const GLubyte *src = (const GLubyte *) image->Data + - (y * image->Width + x) * image->TexFormat->TexelBytes; -- const GLuint bytes = width * height * image->TexFormat->TexelBytes; -- memcpy(dst, src, bytes); -- } - -- mach64FireBlitLocked( mmesa, buffer, offset, pitch, format, -- x, y, width, height ); -+ mach64FireBlitLocked( mmesa, (void *)src, offset, pitch, format, -+ x, y, width, height ); -+ } - - } - diff --git a/hardened/media-libs/mesa/files/6.5.1-pic-textrel-fix.patch b/hardened/media-libs/mesa/files/6.5.1-pic-textrel-fix.patch deleted file mode 100644 index d3ea6fb..0000000 --- a/hardened/media-libs/mesa/files/6.5.1-pic-textrel-fix.patch +++ /dev/null @@ -1,278 +0,0 @@ -Index: Mesa-6.5.1/src/mesa/x86/mmx_blend.S -=================================================================== ---- Mesa-6.5.1.orig/src/mesa/x86/mmx_blend.S -+++ Mesa-6.5.1/src/mesa/x86/mmx_blend.S -@@ -1,4 +1,4 @@ -- -+ ; - /* - * Written by José Fonseca <j_r_fonseca@yahoo.co.uk> - */ -@@ -240,7 +240,9 @@ TWO(PUNPCKHDQ ( MA2, MA2 )) - ONE(MOVD ( MSS, REGIND(rgba) )) /* | | | | sa1 | sb1 | sg1 | sr1 */ ;\ - TWO(MOVQ ( MSS, REGIND(rgba) )) /* sa2 | sb2 | sg2 | sr2 | sa1 | sb1 | sg1 | sr1 */ - -- -+/* Kevin F. Quinn <kevquinn@gentoo.org> 2 July 2006 -+ * Replace data segment constants with text-segment -+ * constants (via pushl/movq) - SEG_DATA - - ALIGNDATA8 -@@ -249,6 +251,11 @@ const_0080: - - const_80: - D_LONG 0x80808080, 0x80808080 -+*/ -+#define const_0080_l 0x00800080 -+#define const_0080_h 0x00800080 -+#define const_80_l 0x80808080 -+#define const_80_h 0x80808080 - - SEG_TEXT - -@@ -302,8 +309,16 @@ TWO(MOVQ ( MM1, REGIND(rgba) )) - #define TAG(x) CONCAT(x,_min) - #define LLTAG(x) LLBL2(x,_min) - -+/* Kevin F. Quinn 2nd July 2006 -+ * Replace data segment constants with text-segment instructions -+#define INIT \ -+ MOVQ ( CONTENT(const_80), MM7 ) -+ */ - #define INIT \ -- MOVQ ( CONTENT(const_80), MM7 ) /* 0x80| 0x80| 0x80| 0x80| 0x80| 0x80| 0x80| 0x80*/ -+ PUSH_L ( CONST(const_80_h) ) /* 0x80| 0x80| 0x80| 0x80| 0x80| 0x80| 0x80| 0x80*/ ;\ -+ PUSH_L ( CONST(const_80_l) ) ;\ -+ MOVQ ( REGIND(ESP), MM7 ) ;\ -+ ADD_L ( CONST(8), ESP) - - #define MAIN( rgba, dest ) \ - GMB_LOAD( rgba, dest, MM1, MM2 ) ;\ -@@ -326,8 +341,16 @@ TWO(MOVQ ( MM1, REGIND(rgba) )) - #define TAG(x) CONCAT(x,_max) - #define LLTAG(x) LLBL2(x,_max) - -+/* Kevin F. Quinn 2nd July 2006 -+ * Replace data segment constants with text-segment instructions - #define INIT \ -- MOVQ ( CONTENT(const_80), MM7 ) /* 0x80| 0x80| 0x80| 0x80| 0x80| 0x80| 0x80| 0x80*/ -+ MOVQ ( CONTENT(const_80), MM7 ) -+ */ -+#define INIT \ -+ PUSH_L ( CONST(const_80_l) ) /* 0x80| 0x80| 0x80| 0x80| 0x80| 0x80| 0x80| 0x80*/ ;\ -+ PUSH_L ( CONST(const_80_h) ) ;\ -+ MOVQ ( REGIND(ESP), MM7 ) ;\ -+ ADD_L ( CONST(8), ESP) - - #define MAIN( rgba, dest ) \ - GMB_LOAD( rgba, dest, MM1, MM2 ) ;\ -@@ -350,9 +373,17 @@ TWO(MOVQ ( MM1, REGIND(rgba) )) - #define TAG(x) CONCAT(x,_modulate) - #define LLTAG(x) LLBL2(x,_modulate) - -+/* Kevin F. Quinn 2nd July 2006 -+ * Replace data segment constants with text-segment instructions -+#define INIT \ -+ MOVQ ( CONTENT(const_0080), MM7 ) -+ */ - #define INIT \ - PXOR ( MM0, MM0 ) /* 0x0000 | 0x0000 | 0x0000 | 0x0000 */ ;\ -- MOVQ ( CONTENT(const_0080), MM7 ) /* 0x0080 | 0x0080 | 0x0080 | 0x0080 */ -+ PUSH_L ( CONST(const_0080_l) ) /* 0x0080 | 0x0080 | 0x0080 | 0x0080 */ ;\ -+ PUSH_L ( CONST(const_0080_h) ) ;\ -+ MOVQ ( REGIND(ESP), MM7 ) ;\ -+ ADD_L ( CONST(8), ESP) - - #define MAIN( rgba, dest ) \ - GMB_LOAD( rgba, dest, MM1, MM2 ) ;\ -Index: Mesa-6.5.1/src/mesa/x86/read_rgba_span_x86.S -=================================================================== ---- Mesa-6.5.1.orig/src/mesa/x86/read_rgba_span_x86.S -+++ Mesa-6.5.1/src/mesa/x86/read_rgba_span_x86.S -@@ -32,6 +32,8 @@ - - .file "read_rgba_span_x86.S" - #if !defined(__DJGPP__) && !defined(__MINGW32__) /* this one cries for assyntax.h */ -+/* Kevin F. Quinn 2nd July 2006 -+ * Replace data segment constants with text-segment instructions - .section .rodata - .align 16 - .type mask, @object -@@ -45,6 +47,19 @@ mask: - .long 0x00ff0000 - .long 0x00ff0000 - .long 0x00ff0000 -+ */ -+#define LOAD_MASK(mvins,m1,m2) \ -+ pushl $0xff00ff00 ;\ -+ pushl $0xff00ff00 ;\ -+ pushl $0xff00ff00 ;\ -+ pushl $0xff00ff00 ;\ -+ mvins (%esp), m1 ;\ -+ pushl $0x00ff0000 ;\ -+ pushl $0x00ff0000 ;\ -+ pushl $0x00ff0000 ;\ -+ pushl $0x00ff0000 ;\ -+ mvins (%esp), m2 ;\ -+ addl $32, %esp - - - /* I implemented these as macros because the appear in quite a few places, -@@ -84,8 +99,12 @@ _generic_read_RGBA_span_BGRA8888_REV_MMX - #ifdef USE_INNER_EMMS - emms - #endif -+/* Kevin F. Quinn 2nd July 2006 -+ * Replace data segment constants with text-segment instructions - movq mask, %mm1 - movq mask+16, %mm2 -+ */ -+ LOAD_MASK(movq,%mm1,%mm2) - - movl 8(%esp), %ebx /* source pointer */ - movl 16(%esp), %edx /* number of pixels to copy */ -@@ -182,8 +201,12 @@ _generic_read_RGBA_span_BGRA8888_REV_SSE - #ifdef USE_INNER_EMMS - emms - #endif -+/* Kevin F. Quinn 2nd July 2006 -+ * Replace data segment constants with text-segment instructions - movq mask, %mm1 - movq mask+16, %mm2 -+ */ -+ LOAD_MASK(movq,%mm1,%mm2) - - movl 16(%esp), %ebx /* source pointer */ - movl 24(%esp), %edx /* number of pixels to copy */ -@@ -341,8 +364,12 @@ _generic_read_RGBA_span_BGRA8888_REV_SSE - pushl %esi - pushl %ebx - -+/* Kevin F. Quinn 2nd July 2006 -+ * Replace data segment constants with text-segment instructions - movdqa mask, %xmm1 - movdqa mask+16, %xmm2 -+ */ -+ LOAD_MASK(movdqa,%xmm1,%xmm2) - - movl 12(%esp), %ebx /* source pointer */ - movl 20(%esp), %edx /* number of pixels to copy */ -@@ -464,6 +491,10 @@ _generic_read_RGBA_span_BGRA8888_REV_SSE - - - -+/* Kevin F. Quinn 2nd July 2006 -+ * Replace data segment constants with text-segment instructions -+ */ -+#if 0 - .section .rodata - - .align 16 -@@ -510,6 +541,26 @@ scale: - - alpha: .long 0x00000000 - .long 0x00ff0000 -+#endif -+ -+#define MASK_565_L 0x07e0f800 -+#define MASK_565_H 0x0000001f -+#define SCALE_ADJUST 5 -+#if SCALE_ADJUST == 5 -+#define PRESCALE_L 0x00100001 -+#define PRESCALE_H 0x00000200 -+#define SCALE_L 0x40C620E8 -+#define SCALE_H 0x0000839d -+#elif SCALE_ADJUST == 0 -+#define PRESCALE_L 0x00200001 -+#define PRESCALE_H 0x00000800 -+#define SCALE_L 0x01040108 -+#define SCALE_H 0x00000108 -+#else -+#error SCALE_ADJUST must either be 5 or 0. -+#endif -+#define ALPHA_L 0x00000000 -+#define ALPHA_H 0x00ff0000 - - /** - * MMX optimized version of the RGB565 to RGBA copy routine. -@@ -530,9 +581,25 @@ _generic_read_RGBA_span_RGB565_MMX: - movl 8(%esp), %edx /* destination pointer */ - movl 12(%esp), %ecx /* number of pixels to copy */ - -+/* Kevin F. Quinn 2nd July 2006 -+ * Replace data segment constants with text-segment instructions - movq mask_565, %mm5 - movq prescale, %mm6 - movq scale, %mm7 -+ */ -+ pushl MASK_565_H -+ pushl MASK_565_L -+ movq (%esp), %mm5 -+ pushl PRESCALE_H -+ pushl PRESCALE_L -+ movq (%esp), %mm6 -+ pushl SCALE_H -+ pushl SCALE_L -+ movq (%esp), %mm7 -+ pushl ALPHA_H -+ pushl ALPHA_L -+ movq (%esp), %mm3 -+ addl $32,%esp - - sarl $2, %ecx - jle .L01 /* Bail early if the count is negative. */ -@@ -581,8 +648,13 @@ _generic_read_RGBA_span_RGB565_MMX: - /* Always set the alpha value to 0xff. - */ - -+/* Kevin F. Quinn 2nd July 2006 -+ * Replace data segment constants with text-segment instructions - por alpha, %mm0 - por alpha, %mm2 -+ */ -+ por %mm3, %mm0 -+ por %mm3, %mm2 - - - /* Pack the 16-bit values to 8-bit values and store the converted -@@ -609,8 +681,13 @@ _generic_read_RGBA_span_RGB565_MMX: - pmulhuw %mm7, %mm0 - pmulhuw %mm7, %mm2 - -+/* Kevin F. Quinn 2nd July 2006 -+ * Replace data segment constants with text-segment instructions - por alpha, %mm0 - por alpha, %mm2 -+ */ -+ por %mm3, %mm0 -+ por %mm3, %mm2 - - packuswb %mm2, %mm0 - -@@ -647,8 +724,13 @@ _generic_read_RGBA_span_RGB565_MMX: - pmulhuw %mm7, %mm0 - pmulhuw %mm7, %mm2 - -+/* Kevin F. Quinn 2nd July 2006 -+ * Replace data segment constants with text-segment instructions - por alpha, %mm0 - por alpha, %mm2 -+ */ -+ por %mm3, %mm0 -+ por %mm3, %mm2 - - packuswb %mm2, %mm0 - -@@ -675,7 +757,11 @@ _generic_read_RGBA_span_RGB565_MMX: - #endif - pmulhuw %mm7, %mm0 - -+/* Kevin F. Quinn 2nd July 2006 -+ * Replace data segment constants with text-segment instructions - por alpha, %mm0 -+ */ -+ por %mm3, %mm0 - - packuswb %mm0, %mm0 - diff --git a/hardened/media-libs/mesa/files/6.5.1-use-new-xcb-naming.patch b/hardened/media-libs/mesa/files/6.5.1-use-new-xcb-naming.patch deleted file mode 100644 index 857501a..0000000 --- a/hardened/media-libs/mesa/files/6.5.1-use-new-xcb-naming.patch +++ /dev/null @@ -1,859 +0,0 @@ -Index: src/glx/x11/indirect.c -=================================================================== -RCS file: /cvs/mesa/Mesa/src/glx/x11/indirect.c,v -retrieving revision 1.32 -retrieving revision 1.33 -diff -u -b -B -r1.32 -r1.33 ---- src/glx/x11/indirect.c 31 Aug 2006 20:41:16 -0000 1.32 -+++ src/glx/x11/indirect.c 26 Sep 2006 23:56:20 -0000 1.33 -@@ -33,8 +33,8 @@ - #include <GL/glxproto.h> - #ifdef USE_XCB --#include <X11/xcl.h> --#include <X11/XCB/xcb.h> --#include <X11/XCB/glx.h> -+#include <X11/Xlib-xcb.h> -+#include <xcb/xcb.h> -+#include <xcb/glx.h> - #endif /* USE_XCB */ - - #define __GLX_PAD(n) (((n) + 3) & ~3) -@@ -280,9 +280,9 @@ - const GLuint cmdlen = 8; - if (__builtin_expect(dpy != NULL, 1)) { - #ifdef USE_XCB -- XCBConnection *c = XCBConnectionOfDisplay(dpy); -+ xcb_connection_t *c = XGetXCBConnection(dpy); - (void) __glXFlushRenderBuffer(gc, gc->pc); -- XCBGlxNewList(c, gc->currentContextTag, list, mode); -+ xcb_glx_new_list(c, gc->currentContextTag, list, mode); - #else - GLubyte const * pc = __glXSetupSingleRequest(gc, X_GLsop_NewList, cmdlen); - (void) memcpy((void *)(pc + 0), (void *)(&list), 4); -@@ -302,9 +302,9 @@ - const GLuint cmdlen = 0; - if (__builtin_expect(dpy != NULL, 1)) { - #ifdef USE_XCB -- XCBConnection *c = XCBConnectionOfDisplay(dpy); -+ xcb_connection_t *c = XGetXCBConnection(dpy); - (void) __glXFlushRenderBuffer(gc, gc->pc); -- XCBGlxEndList(c, gc->currentContextTag); -+ xcb_glx_end_list(c, gc->currentContextTag); - #else - (void) __glXSetupSingleRequest(gc, X_GLsop_EndList, cmdlen); - UnlockDisplay(dpy); SyncHandle(); -@@ -366,9 +366,9 @@ - const GLuint cmdlen = 8; - if (__builtin_expect(dpy != NULL, 1)) { - #ifdef USE_XCB -- XCBConnection *c = XCBConnectionOfDisplay(dpy); -+ xcb_connection_t *c = XGetXCBConnection(dpy); - (void) __glXFlushRenderBuffer(gc, gc->pc); -- XCBGlxDeleteLists(c, gc->currentContextTag, list, range); -+ xcb_glx_delete_lists(c, gc->currentContextTag, list, range); - #else - GLubyte const * pc = __glXSetupSingleRequest(gc, X_GLsop_DeleteLists, cmdlen); - (void) memcpy((void *)(pc + 0), (void *)(&list), 4); -@@ -389,9 +389,9 @@ - const GLuint cmdlen = 4; - if (__builtin_expect(dpy != NULL, 1)) { - #ifdef USE_XCB -- XCBConnection *c = XCBConnectionOfDisplay(dpy); -+ xcb_connection_t *c = XGetXCBConnection(dpy); - (void) __glXFlushRenderBuffer(gc, gc->pc); -- XCBGlxGenListsRep *reply = XCBGlxGenListsReply(c, XCBGlxGenLists(c, gc->currentContextTag, range), NULL); -+ xcb_glx_gen_lists_reply_t *reply = xcb_glx_gen_lists_reply(c, xcb_glx_gen_lists(c, gc->currentContextTag, range), NULL); - retval = reply->ret_val; - free(reply); - #else -@@ -3312,10 +3312,10 @@ - const GLuint cmdlen = 28; - if (__builtin_expect(dpy != NULL, 1)) { - #ifdef USE_XCB -- XCBConnection *c = XCBConnectionOfDisplay(dpy); -+ xcb_connection_t *c = XGetXCBConnection(dpy); - (void) __glXFlushRenderBuffer(gc, gc->pc); -- XCBGlxReadPixelsRep *reply = XCBGlxReadPixelsReply(c, XCBGlxReadPixels(c, gc->currentContextTag, x, y, width, height, format, type, state->storePack.swapEndian, 0), NULL); -- (void)memcpy(pixels, XCBGlxReadPixelsData(reply), XCBGlxReadPixelsDataLength(reply) * sizeof(GLvoid)); -+ xcb_glx_read_pixels_reply_t *reply = xcb_glx_read_pixels_reply(c, xcb_glx_read_pixels(c, gc->currentContextTag, x, y, width, height, format, type, state->storePack.swapEndian, 0), NULL); -+ (void)memcpy(pixels, xcb_glx_read_pixels_data(reply), xcb_glx_read_pixels_data_length(reply) * sizeof(GLvoid)); - free(reply); - #else - GLubyte const * pc = __glXSetupSingleRequest(gc, X_GLsop_ReadPixels, cmdlen); -@@ -3384,10 +3384,10 @@ - const GLuint cmdlen = 4; - if (__builtin_expect(dpy != NULL, 1)) { - #ifdef USE_XCB -- XCBConnection *c = XCBConnectionOfDisplay(dpy); -+ xcb_connection_t *c = XGetXCBConnection(dpy); - (void) __glXFlushRenderBuffer(gc, gc->pc); -- XCBGlxGetClipPlaneRep *reply = XCBGlxGetClipPlaneReply(c, XCBGlxGetClipPlane(c, gc->currentContextTag, plane), NULL); -- (void)memcpy(equation, XCBGlxGetClipPlaneData(reply), XCBGlxGetClipPlaneDataLength(reply) * sizeof(GLdouble)); -+ xcb_glx_get_clip_plane_reply_t *reply = xcb_glx_get_clip_plane_reply(c, xcb_glx_get_clip_plane(c, gc->currentContextTag, plane), NULL); -+ (void)memcpy(equation, xcb_glx_get_clip_plane_data(reply), xcb_glx_get_clip_plane_data_length(reply) * sizeof(GLdouble)); - free(reply); - #else - GLubyte const * pc = __glXSetupSingleRequest(gc, X_GLsop_GetClipPlane, cmdlen); -@@ -3408,13 +3408,13 @@ - const GLuint cmdlen = 8; - if (__builtin_expect(dpy != NULL, 1)) { - #ifdef USE_XCB -- XCBConnection *c = XCBConnectionOfDisplay(dpy); -+ xcb_connection_t *c = XGetXCBConnection(dpy); - (void) __glXFlushRenderBuffer(gc, gc->pc); -- XCBGlxGetLightfvRep *reply = XCBGlxGetLightfvReply(c, XCBGlxGetLightfv(c, gc->currentContextTag, light, pname), NULL); -- if (XCBGlxGetLightfvDataLength(reply) == 0) -+ xcb_glx_get_lightfv_reply_t *reply = xcb_glx_get_lightfv_reply(c, xcb_glx_get_lightfv(c, gc->currentContextTag, light, pname), NULL); -+ if (xcb_glx_get_lightfv_data_length(reply) == 0) - (void)memcpy(params, &reply->datum, sizeof(reply->datum)); - else -- (void)memcpy(params, XCBGlxGetLightfvData(reply), XCBGlxGetLightfvDataLength(reply) * sizeof(GLfloat)); -+ (void)memcpy(params, xcb_glx_get_lightfv_data(reply), xcb_glx_get_lightfv_data_length(reply) * sizeof(GLfloat)); - free(reply); - #else - GLubyte const * pc = __glXSetupSingleRequest(gc, X_GLsop_GetLightfv, cmdlen); -@@ -3436,13 +3436,13 @@ - const GLuint cmdlen = 8; - if (__builtin_expect(dpy != NULL, 1)) { - #ifdef USE_XCB -- XCBConnection *c = XCBConnectionOfDisplay(dpy); -+ xcb_connection_t *c = XGetXCBConnection(dpy); - (void) __glXFlushRenderBuffer(gc, gc->pc); -- XCBGlxGetLightivRep *reply = XCBGlxGetLightivReply(c, XCBGlxGetLightiv(c, gc->currentContextTag, light, pname), NULL); -- if (XCBGlxGetLightivDataLength(reply) == 0) -+ xcb_glx_get_lightiv_reply_t *reply = xcb_glx_get_lightiv_reply(c, xcb_glx_get_lightiv(c, gc->currentContextTag, light, pname), NULL); -+ if (xcb_glx_get_lightiv_data_length(reply) == 0) - (void)memcpy(params, &reply->datum, sizeof(reply->datum)); - else -- (void)memcpy(params, XCBGlxGetLightivData(reply), XCBGlxGetLightivDataLength(reply) * sizeof(GLint)); -+ (void)memcpy(params, xcb_glx_get_lightiv_data(reply), xcb_glx_get_lightiv_data_length(reply) * sizeof(GLint)); - free(reply); - #else - GLubyte const * pc = __glXSetupSingleRequest(gc, X_GLsop_GetLightiv, cmdlen); -@@ -3464,13 +3464,13 @@ - const GLuint cmdlen = 8; - if (__builtin_expect(dpy != NULL, 1)) { - #ifdef USE_XCB -- XCBConnection *c = XCBConnectionOfDisplay(dpy); -+ xcb_connection_t *c = XGetXCBConnection(dpy); - (void) __glXFlushRenderBuffer(gc, gc->pc); -- XCBGlxGetMapdvRep *reply = XCBGlxGetMapdvReply(c, XCBGlxGetMapdv(c, gc->currentContextTag, target, query), NULL); -- if (XCBGlxGetMapdvDataLength(reply) == 0) -+ xcb_glx_get_mapdv_reply_t *reply = xcb_glx_get_mapdv_reply(c, xcb_glx_get_mapdv(c, gc->currentContextTag, target, query), NULL); -+ if (xcb_glx_get_mapdv_data_length(reply) == 0) - (void)memcpy(v, &reply->datum, sizeof(reply->datum)); - else -- (void)memcpy(v, XCBGlxGetMapdvData(reply), XCBGlxGetMapdvDataLength(reply) * sizeof(GLdouble)); -+ (void)memcpy(v, xcb_glx_get_mapdv_data(reply), xcb_glx_get_mapdv_data_length(reply) * sizeof(GLdouble)); - free(reply); - #else - GLubyte const * pc = __glXSetupSingleRequest(gc, X_GLsop_GetMapdv, cmdlen); -@@ -3492,13 +3492,13 @@ - const GLuint cmdlen = 8; - if (__builtin_expect(dpy != NULL, 1)) { - #ifdef USE_XCB -- XCBConnection *c = XCBConnectionOfDisplay(dpy); -+ xcb_connection_t *c = XGetXCBConnection(dpy); - (void) __glXFlushRenderBuffer(gc, gc->pc); -- XCBGlxGetMapfvRep *reply = XCBGlxGetMapfvReply(c, XCBGlxGetMapfv(c, gc->currentContextTag, target, query), NULL); -- if (XCBGlxGetMapfvDataLength(reply) == 0) -+ xcb_glx_get_mapfv_reply_t *reply = xcb_glx_get_mapfv_reply(c, xcb_glx_get_mapfv(c, gc->currentContextTag, target, query), NULL); -+ if (xcb_glx_get_mapfv_data_length(reply) == 0) - (void)memcpy(v, &reply->datum, sizeof(reply->datum)); - else -- (void)memcpy(v, XCBGlxGetMapfvData(reply), XCBGlxGetMapfvDataLength(reply) * sizeof(GLfloat)); -+ (void)memcpy(v, xcb_glx_get_mapfv_data(reply), xcb_glx_get_mapfv_data_length(reply) * sizeof(GLfloat)); - free(reply); - #else - GLubyte const * pc = __glXSetupSingleRequest(gc, X_GLsop_GetMapfv, cmdlen); -@@ -3520,13 +3520,13 @@ - const GLuint cmdlen = 8; - if (__builtin_expect(dpy != NULL, 1)) { - #ifdef USE_XCB -- XCBConnection *c = XCBConnectionOfDisplay(dpy); -+ xcb_connection_t *c = XGetXCBConnection(dpy); - (void) __glXFlushRenderBuffer(gc, gc->pc); -- XCBGlxGetMapivRep *reply = XCBGlxGetMapivReply(c, XCBGlxGetMapiv(c, gc->currentContextTag, target, query), NULL); -- if (XCBGlxGetMapivDataLength(reply) == 0) -+ xcb_glx_get_mapiv_reply_t *reply = xcb_glx_get_mapiv_reply(c, xcb_glx_get_mapiv(c, gc->currentContextTag, target, query), NULL); -+ if (xcb_glx_get_mapiv_data_length(reply) == 0) - (void)memcpy(v, &reply->datum, sizeof(reply->datum)); - else -- (void)memcpy(v, XCBGlxGetMapivData(reply), XCBGlxGetMapivDataLength(reply) * sizeof(GLint)); -+ (void)memcpy(v, xcb_glx_get_mapiv_data(reply), xcb_glx_get_mapiv_data_length(reply) * sizeof(GLint)); - free(reply); - #else - GLubyte const * pc = __glXSetupSingleRequest(gc, X_GLsop_GetMapiv, cmdlen); -@@ -3548,13 +3548,13 @@ - const GLuint cmdlen = 8; - if (__builtin_expect(dpy != NULL, 1)) { - #ifdef USE_XCB -- XCBConnection *c = XCBConnectionOfDisplay(dpy); -+ xcb_connection_t *c = XGetXCBConnection(dpy); - (void) __glXFlushRenderBuffer(gc, gc->pc); -- XCBGlxGetMaterialfvRep *reply = XCBGlxGetMaterialfvReply(c, XCBGlxGetMaterialfv(c, gc->currentContextTag, face, pname), NULL); -- if (XCBGlxGetMaterialfvDataLength(reply) == 0) -+ xcb_glx_get_materialfv_reply_t *reply = xcb_glx_get_materialfv_reply(c, xcb_glx_get_materialfv(c, gc->currentContextTag, face, pname), NULL); -+ if (xcb_glx_get_materialfv_data_length(reply) == 0) - (void)memcpy(params, &reply->datum, sizeof(reply->datum)); - else -- (void)memcpy(params, XCBGlxGetMaterialfvData(reply), XCBGlxGetMaterialfvDataLength(reply) * sizeof(GLfloat)); -+ (void)memcpy(params, xcb_glx_get_materialfv_data(reply), xcb_glx_get_materialfv_data_length(reply) * sizeof(GLfloat)); - free(reply); - #else - GLubyte const * pc = __glXSetupSingleRequest(gc, X_GLsop_GetMaterialfv, cmdlen); -@@ -3576,13 +3576,13 @@ - const GLuint cmdlen = 8; - if (__builtin_expect(dpy != NULL, 1)) { - #ifdef USE_XCB -- XCBConnection *c = XCBConnectionOfDisplay(dpy); -+ xcb_connection_t *c = XGetXCBConnection(dpy); - (void) __glXFlushRenderBuffer(gc, gc->pc); -- XCBGlxGetMaterialivRep *reply = XCBGlxGetMaterialivReply(c, XCBGlxGetMaterialiv(c, gc->currentContextTag, face, pname), NULL); -- if (XCBGlxGetMaterialivDataLength(reply) == 0) -+ xcb_glx_get_materialiv_reply_t *reply = xcb_glx_get_materialiv_reply(c, xcb_glx_get_materialiv(c, gc->currentContextTag, face, pname), NULL); -+ if (xcb_glx_get_materialiv_data_length(reply) == 0) - (void)memcpy(params, &reply->datum, sizeof(reply->datum)); - else -- (void)memcpy(params, XCBGlxGetMaterialivData(reply), XCBGlxGetMaterialivDataLength(reply) * sizeof(GLint)); -+ (void)memcpy(params, xcb_glx_get_materialiv_data(reply), xcb_glx_get_materialiv_data_length(reply) * sizeof(GLint)); - free(reply); - #else - GLubyte const * pc = __glXSetupSingleRequest(gc, X_GLsop_GetMaterialiv, cmdlen); -@@ -3604,13 +3604,13 @@ - const GLuint cmdlen = 4; - if (__builtin_expect(dpy != NULL, 1)) { - #ifdef USE_XCB -- XCBConnection *c = XCBConnectionOfDisplay(dpy); -+ xcb_connection_t *c = XGetXCBConnection(dpy); - (void) __glXFlushRenderBuffer(gc, gc->pc); -- XCBGlxGetPixelMapfvRep *reply = XCBGlxGetPixelMapfvReply(c, XCBGlxGetPixelMapfv(c, gc->currentContextTag, map), NULL); -- if (XCBGlxGetPixelMapfvDataLength(reply) == 0) -+ xcb_glx_get_pixel_mapfv_reply_t *reply = xcb_glx_get_pixel_mapfv_reply(c, xcb_glx_get_pixel_mapfv(c, gc->currentContextTag, map), NULL); -+ if (xcb_glx_get_pixel_mapfv_data_length(reply) == 0) - (void)memcpy(values, &reply->datum, sizeof(reply->datum)); - else -- (void)memcpy(values, XCBGlxGetPixelMapfvData(reply), XCBGlxGetPixelMapfvDataLength(reply) * sizeof(GLfloat)); -+ (void)memcpy(values, xcb_glx_get_pixel_mapfv_data(reply), xcb_glx_get_pixel_mapfv_data_length(reply) * sizeof(GLfloat)); - free(reply); - #else - GLubyte const * pc = __glXSetupSingleRequest(gc, X_GLsop_GetPixelMapfv, cmdlen); -@@ -3631,13 +3631,13 @@ - const GLuint cmdlen = 4; - if (__builtin_expect(dpy != NULL, 1)) { - #ifdef USE_XCB -- XCBConnection *c = XCBConnectionOfDisplay(dpy); -+ xcb_connection_t *c = XGetXCBConnection(dpy); - (void) __glXFlushRenderBuffer(gc, gc->pc); -- XCBGlxGetPixelMapuivRep *reply = XCBGlxGetPixelMapuivReply(c, XCBGlxGetPixelMapuiv(c, gc->currentContextTag, map), NULL); -- if (XCBGlxGetPixelMapuivDataLength(reply) == 0) -+ xcb_glx_get_pixel_mapuiv_reply_t *reply = xcb_glx_get_pixel_mapuiv_reply(c, xcb_glx_get_pixel_mapuiv(c, gc->currentContextTag, map), NULL); -+ if (xcb_glx_get_pixel_mapuiv_data_length(reply) == 0) - (void)memcpy(values, &reply->datum, sizeof(reply->datum)); - else -- (void)memcpy(values, XCBGlxGetPixelMapuivData(reply), XCBGlxGetPixelMapuivDataLength(reply) * sizeof(GLuint)); -+ (void)memcpy(values, xcb_glx_get_pixel_mapuiv_data(reply), xcb_glx_get_pixel_mapuiv_data_length(reply) * sizeof(GLuint)); - free(reply); - #else - GLubyte const * pc = __glXSetupSingleRequest(gc, X_GLsop_GetPixelMapuiv, cmdlen); -@@ -3658,13 +3658,13 @@ - const GLuint cmdlen = 4; - if (__builtin_expect(dpy != NULL, 1)) { - #ifdef USE_XCB -- XCBConnection *c = XCBConnectionOfDisplay(dpy); -+ xcb_connection_t *c = XGetXCBConnection(dpy); - (void) __glXFlushRenderBuffer(gc, gc->pc); -- XCBGlxGetPixelMapusvRep *reply = XCBGlxGetPixelMapusvReply(c, XCBGlxGetPixelMapusv(c, gc->currentContextTag, map), NULL); -- if (XCBGlxGetPixelMapusvDataLength(reply) == 0) -+ xcb_glx_get_pixel_mapusv_reply_t *reply = xcb_glx_get_pixel_mapusv_reply(c, xcb_glx_get_pixel_mapusv(c, gc->currentContextTag, map), NULL); -+ if (xcb_glx_get_pixel_mapusv_data_length(reply) == 0) - (void)memcpy(values, &reply->datum, sizeof(reply->datum)); - else -- (void)memcpy(values, XCBGlxGetPixelMapusvData(reply), XCBGlxGetPixelMapusvDataLength(reply) * sizeof(GLushort)); -+ (void)memcpy(values, xcb_glx_get_pixel_mapusv_data(reply), xcb_glx_get_pixel_mapusv_data_length(reply) * sizeof(GLushort)); - free(reply); - #else - GLubyte const * pc = __glXSetupSingleRequest(gc, X_GLsop_GetPixelMapusv, cmdlen); -@@ -3686,10 +3686,10 @@ - const GLuint cmdlen = 4; - if (__builtin_expect(dpy != NULL, 1)) { - #ifdef USE_XCB -- XCBConnection *c = XCBConnectionOfDisplay(dpy); -+ xcb_connection_t *c = XGetXCBConnection(dpy); - (void) __glXFlushRenderBuffer(gc, gc->pc); -- XCBGlxGetPolygonStippleRep *reply = XCBGlxGetPolygonStippleReply(c, XCBGlxGetPolygonStipple(c, gc->currentContextTag, 0), NULL); -- (void)memcpy(mask, XCBGlxGetPolygonStippleData(reply), XCBGlxGetPolygonStippleDataLength(reply) * sizeof(GLubyte)); -+ xcb_glx_get_polygon_stipple_reply_t *reply = xcb_glx_get_polygon_stipple_reply(c, xcb_glx_get_polygon_stipple(c, gc->currentContextTag, 0), NULL); -+ (void)memcpy(mask, xcb_glx_get_polygon_stipple_data(reply), xcb_glx_get_polygon_stipple_data_length(reply) * sizeof(GLubyte)); - free(reply); - #else - GLubyte const * pc = __glXSetupSingleRequest(gc, X_GLsop_GetPolygonStipple, cmdlen); -@@ -3710,13 +3710,13 @@ - const GLuint cmdlen = 8; - if (__builtin_expect(dpy != NULL, 1)) { - #ifdef USE_XCB -- XCBConnection *c = XCBConnectionOfDisplay(dpy); -+ xcb_connection_t *c = XGetXCBConnection(dpy); - (void) __glXFlushRenderBuffer(gc, gc->pc); -- XCBGlxGetTexEnvfvRep *reply = XCBGlxGetTexEnvfvReply(c, XCBGlxGetTexEnvfv(c, gc->currentContextTag, target, pname), NULL); -- if (XCBGlxGetTexEnvfvDataLength(reply) == 0) -+ xcb_glx_get_tex_envfv_reply_t *reply = xcb_glx_get_tex_envfv_reply(c, xcb_glx_get_tex_envfv(c, gc->currentContextTag, target, pname), NULL); -+ if (xcb_glx_get_tex_envfv_data_length(reply) == 0) - (void)memcpy(params, &reply->datum, sizeof(reply->datum)); - else -- (void)memcpy(params, XCBGlxGetTexEnvfvData(reply), XCBGlxGetTexEnvfvDataLength(reply) * sizeof(GLfloat)); -+ (void)memcpy(params, xcb_glx_get_tex_envfv_data(reply), xcb_glx_get_tex_envfv_data_length(reply) * sizeof(GLfloat)); - free(reply); - #else - GLubyte const * pc = __glXSetupSingleRequest(gc, X_GLsop_GetTexEnvfv, cmdlen); -@@ -3738,13 +3738,13 @@ - const GLuint cmdlen = 8; - if (__builtin_expect(dpy != NULL, 1)) { - #ifdef USE_XCB -- XCBConnection *c = XCBConnectionOfDisplay(dpy); -+ xcb_connection_t *c = XGetXCBConnection(dpy); - (void) __glXFlushRenderBuffer(gc, gc->pc); -- XCBGlxGetTexEnvivRep *reply = XCBGlxGetTexEnvivReply(c, XCBGlxGetTexEnviv(c, gc->currentContextTag, target, pname), NULL); -- if (XCBGlxGetTexEnvivDataLength(reply) == 0) -+ xcb_glx_get_tex_enviv_reply_t *reply = xcb_glx_get_tex_enviv_reply(c, xcb_glx_get_tex_enviv(c, gc->currentContextTag, target, pname), NULL); -+ if (xcb_glx_get_tex_enviv_data_length(reply) == 0) - (void)memcpy(params, &reply->datum, sizeof(reply->datum)); - else -- (void)memcpy(params, XCBGlxGetTexEnvivData(reply), XCBGlxGetTexEnvivDataLength(reply) * sizeof(GLint)); -+ (void)memcpy(params, xcb_glx_get_tex_enviv_data(reply), xcb_glx_get_tex_enviv_data_length(reply) * sizeof(GLint)); - free(reply); - #else - GLubyte const * pc = __glXSetupSingleRequest(gc, X_GLsop_GetTexEnviv, cmdlen); -@@ -3766,13 +3766,13 @@ - const GLuint cmdlen = 8; - if (__builtin_expect(dpy != NULL, 1)) { - #ifdef USE_XCB -- XCBConnection *c = XCBConnectionOfDisplay(dpy); -+ xcb_connection_t *c = XGetXCBConnection(dpy); - (void) __glXFlushRenderBuffer(gc, gc->pc); -- XCBGlxGetTexGendvRep *reply = XCBGlxGetTexGendvReply(c, XCBGlxGetTexGendv(c, gc->currentContextTag, coord, pname), NULL); -- if (XCBGlxGetTexGendvDataLength(reply) == 0) -+ xcb_glx_get_tex_gendv_reply_t *reply = xcb_glx_get_tex_gendv_reply(c, xcb_glx_get_tex_gendv(c, gc->currentContextTag, coord, pname), NULL); -+ if (xcb_glx_get_tex_gendv_data_length(reply) == 0) - (void)memcpy(params, &reply->datum, sizeof(reply->datum)); - else -- (void)memcpy(params, XCBGlxGetTexGendvData(reply), XCBGlxGetTexGendvDataLength(reply) * sizeof(GLdouble)); -+ (void)memcpy(params, xcb_glx_get_tex_gendv_data(reply), xcb_glx_get_tex_gendv_data_length(reply) * sizeof(GLdouble)); - free(reply); - #else - GLubyte const * pc = __glXSetupSingleRequest(gc, X_GLsop_GetTexGendv, cmdlen); -@@ -3794,13 +3794,13 @@ - const GLuint cmdlen = 8; - if (__builtin_expect(dpy != NULL, 1)) { - #ifdef USE_XCB -- XCBConnection *c = XCBConnectionOfDisplay(dpy); -+ xcb_connection_t *c = XGetXCBConnection(dpy); - (void) __glXFlushRenderBuffer(gc, gc->pc); -- XCBGlxGetTexGenfvRep *reply = XCBGlxGetTexGenfvReply(c, XCBGlxGetTexGenfv(c, gc->currentContextTag, coord, pname), NULL); -- if (XCBGlxGetTexGenfvDataLength(reply) == 0) -+ xcb_glx_get_tex_genfv_reply_t *reply = xcb_glx_get_tex_genfv_reply(c, xcb_glx_get_tex_genfv(c, gc->currentContextTag, coord, pname), NULL); -+ if (xcb_glx_get_tex_genfv_data_length(reply) == 0) - (void)memcpy(params, &reply->datum, sizeof(reply->datum)); - else -- (void)memcpy(params, XCBGlxGetTexGenfvData(reply), XCBGlxGetTexGenfvDataLength(reply) * sizeof(GLfloat)); -+ (void)memcpy(params, xcb_glx_get_tex_genfv_data(reply), xcb_glx_get_tex_genfv_data_length(reply) * sizeof(GLfloat)); - free(reply); - #else - GLubyte const * pc = __glXSetupSingleRequest(gc, X_GLsop_GetTexGenfv, cmdlen); -@@ -3822,13 +3822,13 @@ - const GLuint cmdlen = 8; - if (__builtin_expect(dpy != NULL, 1)) { - #ifdef USE_XCB -- XCBConnection *c = XCBConnectionOfDisplay(dpy); -+ xcb_connection_t *c = XGetXCBConnection(dpy); - (void) __glXFlushRenderBuffer(gc, gc->pc); -- XCBGlxGetTexGenivRep *reply = XCBGlxGetTexGenivReply(c, XCBGlxGetTexGeniv(c, gc->currentContextTag, coord, pname), NULL); -- if (XCBGlxGetTexGenivDataLength(reply) == 0) -+ xcb_glx_get_tex_geniv_reply_t *reply = xcb_glx_get_tex_geniv_reply(c, xcb_glx_get_tex_geniv(c, gc->currentContextTag, coord, pname), NULL); -+ if (xcb_glx_get_tex_geniv_data_length(reply) == 0) - (void)memcpy(params, &reply->datum, sizeof(reply->datum)); - else -- (void)memcpy(params, XCBGlxGetTexGenivData(reply), XCBGlxGetTexGenivDataLength(reply) * sizeof(GLint)); -+ (void)memcpy(params, xcb_glx_get_tex_geniv_data(reply), xcb_glx_get_tex_geniv_data_length(reply) * sizeof(GLint)); - free(reply); - #else - GLubyte const * pc = __glXSetupSingleRequest(gc, X_GLsop_GetTexGeniv, cmdlen); -@@ -3851,10 +3851,10 @@ - const GLuint cmdlen = 20; - if (__builtin_expect(dpy != NULL, 1)) { - #ifdef USE_XCB -- XCBConnection *c = XCBConnectionOfDisplay(dpy); -+ xcb_connection_t *c = XGetXCBConnection(dpy); - (void) __glXFlushRenderBuffer(gc, gc->pc); -- XCBGlxGetTexImageRep *reply = XCBGlxGetTexImageReply(c, XCBGlxGetTexImage(c, gc->currentContextTag, target, level, format, type, state->storePack.swapEndian), NULL); -- (void)memcpy(pixels, XCBGlxGetTexImageData(reply), XCBGlxGetTexImageDataLength(reply) * sizeof(GLvoid)); -+ xcb_glx_get_tex_image_reply_t *reply = xcb_glx_get_tex_image_reply(c, xcb_glx_get_tex_image(c, gc->currentContextTag, target, level, format, type, state->storePack.swapEndian), NULL); -+ (void)memcpy(pixels, xcb_glx_get_tex_image_data(reply), xcb_glx_get_tex_image_data_length(reply) * sizeof(GLvoid)); - free(reply); - #else - GLubyte const * pc = __glXSetupSingleRequest(gc, X_GLsop_GetTexImage, cmdlen); -@@ -3880,13 +3880,13 @@ - const GLuint cmdlen = 8; - if (__builtin_expect(dpy != NULL, 1)) { - #ifdef USE_XCB -- XCBConnection *c = XCBConnectionOfDisplay(dpy); -+ xcb_connection_t *c = XGetXCBConnection(dpy); - (void) __glXFlushRenderBuffer(gc, gc->pc); -- XCBGlxGetTexParameterfvRep *reply = XCBGlxGetTexParameterfvReply(c, XCBGlxGetTexParameterfv(c, gc->currentContextTag, target, pname), NULL); -- if (XCBGlxGetTexParameterfvDataLength(reply) == 0) -+ xcb_glx_get_tex_parameterfv_reply_t *reply = xcb_glx_get_tex_parameterfv_reply(c, xcb_glx_get_tex_parameterfv(c, gc->currentContextTag, target, pname), NULL); -+ if (xcb_glx_get_tex_parameterfv_data_length(reply) == 0) - (void)memcpy(params, &reply->datum, sizeof(reply->datum)); - else -- (void)memcpy(params, XCBGlxGetTexParameterfvData(reply), XCBGlxGetTexParameterfvDataLength(reply) * sizeof(GLfloat)); -+ (void)memcpy(params, xcb_glx_get_tex_parameterfv_data(reply), xcb_glx_get_tex_parameterfv_data_length(reply) * sizeof(GLfloat)); - free(reply); - #else - GLubyte const * pc = __glXSetupSingleRequest(gc, X_GLsop_GetTexParameterfv, cmdlen); -@@ -3908,13 +3908,13 @@ - const GLuint cmdlen = 8; - if (__builtin_expect(dpy != NULL, 1)) { - #ifdef USE_XCB -- XCBConnection *c = XCBConnectionOfDisplay(dpy); -+ xcb_connection_t *c = XGetXCBConnection(dpy); - (void) __glXFlushRenderBuffer(gc, gc->pc); -- XCBGlxGetTexParameterivRep *reply = XCBGlxGetTexParameterivReply(c, XCBGlxGetTexParameteriv(c, gc->currentContextTag, target, pname), NULL); -- if (XCBGlxGetTexParameterivDataLength(reply) == 0) -+ xcb_glx_get_tex_parameteriv_reply_t *reply = xcb_glx_get_tex_parameteriv_reply(c, xcb_glx_get_tex_parameteriv(c, gc->currentContextTag, target, pname), NULL); -+ if (xcb_glx_get_tex_parameteriv_data_length(reply) == 0) - (void)memcpy(params, &reply->datum, sizeof(reply->datum)); - else -- (void)memcpy(params, XCBGlxGetTexParameterivData(reply), XCBGlxGetTexParameterivDataLength(reply) * sizeof(GLint)); -+ (void)memcpy(params, xcb_glx_get_tex_parameteriv_data(reply), xcb_glx_get_tex_parameteriv_data_length(reply) * sizeof(GLint)); - free(reply); - #else - GLubyte const * pc = __glXSetupSingleRequest(gc, X_GLsop_GetTexParameteriv, cmdlen); -@@ -3936,13 +3936,13 @@ - const GLuint cmdlen = 12; - if (__builtin_expect(dpy != NULL, 1)) { - #ifdef USE_XCB -- XCBConnection *c = XCBConnectionOfDisplay(dpy); -+ xcb_connection_t *c = XGetXCBConnection(dpy); - (void) __glXFlushRenderBuffer(gc, gc->pc); -- XCBGlxGetTexLevelParameterfvRep *reply = XCBGlxGetTexLevelParameterfvReply(c, XCBGlxGetTexLevelParameterfv(c, gc->currentContextTag, target, level, pname), NULL); -- if (XCBGlxGetTexLevelParameterfvDataLength(reply) == 0) -+ xcb_glx_get_tex_level_parameterfv_reply_t *reply = xcb_glx_get_tex_level_parameterfv_reply(c, xcb_glx_get_tex_level_parameterfv(c, gc->currentContextTag, target, level, pname), NULL); -+ if (xcb_glx_get_tex_level_parameterfv_data_length(reply) == 0) - (void)memcpy(params, &reply->datum, sizeof(reply->datum)); - else -- (void)memcpy(params, XCBGlxGetTexLevelParameterfvData(reply), XCBGlxGetTexLevelParameterfvDataLength(reply) * sizeof(GLfloat)); -+ (void)memcpy(params, xcb_glx_get_tex_level_parameterfv_data(reply), xcb_glx_get_tex_level_parameterfv_data_length(reply) * sizeof(GLfloat)); - free(reply); - #else - GLubyte const * pc = __glXSetupSingleRequest(gc, X_GLsop_GetTexLevelParameterfv, cmdlen); -@@ -3965,13 +3965,13 @@ - const GLuint cmdlen = 12; - if (__builtin_expect(dpy != NULL, 1)) { - #ifdef USE_XCB -- XCBConnection *c = XCBConnectionOfDisplay(dpy); -+ xcb_connection_t *c = XGetXCBConnection(dpy); - (void) __glXFlushRenderBuffer(gc, gc->pc); -- XCBGlxGetTexLevelParameterivRep *reply = XCBGlxGetTexLevelParameterivReply(c, XCBGlxGetTexLevelParameteriv(c, gc->currentContextTag, target, level, pname), NULL); -- if (XCBGlxGetTexLevelParameterivDataLength(reply) == 0) -+ xcb_glx_get_tex_level_parameteriv_reply_t *reply = xcb_glx_get_tex_level_parameteriv_reply(c, xcb_glx_get_tex_level_parameteriv(c, gc->currentContextTag, target, level, pname), NULL); -+ if (xcb_glx_get_tex_level_parameteriv_data_length(reply) == 0) - (void)memcpy(params, &reply->datum, sizeof(reply->datum)); - else -- (void)memcpy(params, XCBGlxGetTexLevelParameterivData(reply), XCBGlxGetTexLevelParameterivDataLength(reply) * sizeof(GLint)); -+ (void)memcpy(params, xcb_glx_get_tex_level_parameteriv_data(reply), xcb_glx_get_tex_level_parameteriv_data_length(reply) * sizeof(GLint)); - free(reply); - #else - GLubyte const * pc = __glXSetupSingleRequest(gc, X_GLsop_GetTexLevelParameteriv, cmdlen); -@@ -3995,9 +3995,9 @@ - const GLuint cmdlen = 4; - if (__builtin_expect(dpy != NULL, 1)) { - #ifdef USE_XCB -- XCBConnection *c = XCBConnectionOfDisplay(dpy); -+ xcb_connection_t *c = XGetXCBConnection(dpy); - (void) __glXFlushRenderBuffer(gc, gc->pc); -- XCBGlxIsListRep *reply = XCBGlxIsListReply(c, XCBGlxIsList(c, gc->currentContextTag, list), NULL); -+ xcb_glx_is_list_reply_t *reply = xcb_glx_is_list_reply(c, xcb_glx_is_list(c, gc->currentContextTag, list), NULL); - retval = reply->ret_val; - free(reply); - #else -@@ -4311,10 +4311,10 @@ - const GLuint cmdlen = 4 + __GLX_PAD((n * 4)); - if (__builtin_expect((n >= 0) && (dpy != NULL), 1)) { - #ifdef USE_XCB -- XCBConnection *c = XCBConnectionOfDisplay(dpy); -+ xcb_connection_t *c = XGetXCBConnection(dpy); - (void) __glXFlushRenderBuffer(gc, gc->pc); -- XCBGlxAreTexturesResidentRep *reply = XCBGlxAreTexturesResidentReply(c, XCBGlxAreTexturesResident(c, gc->currentContextTag, n, textures), NULL); -- (void)memcpy(residences, XCBGlxAreTexturesResidentData(reply), XCBGlxAreTexturesResidentDataLength(reply) * sizeof(GLboolean)); -+ xcb_glx_are_textures_resident_reply_t *reply = xcb_glx_are_textures_resident_reply(c, xcb_glx_are_textures_resident(c, gc->currentContextTag, n, textures), NULL); -+ (void)memcpy(residences, xcb_glx_are_textures_resident_data(reply), xcb_glx_are_textures_resident_data_length(reply) * sizeof(GLboolean)); - retval = reply->ret_val; - free(reply); - #else -@@ -4426,10 +4426,10 @@ - const GLuint cmdlen = 4; - if (__builtin_expect((n >= 0) && (dpy != NULL), 1)) { - #ifdef USE_XCB -- XCBConnection *c = XCBConnectionOfDisplay(dpy); -+ xcb_connection_t *c = XGetXCBConnection(dpy); - (void) __glXFlushRenderBuffer(gc, gc->pc); -- XCBGlxGenTexturesRep *reply = XCBGlxGenTexturesReply(c, XCBGlxGenTextures(c, gc->currentContextTag, n), NULL); -- (void)memcpy(textures, XCBGlxGenTexturesData(reply), XCBGlxGenTexturesDataLength(reply) * sizeof(GLuint)); -+ xcb_glx_gen_textures_reply_t *reply = xcb_glx_gen_textures_reply(c, xcb_glx_gen_textures(c, gc->currentContextTag, n), NULL); -+ (void)memcpy(textures, xcb_glx_gen_textures_data(reply), xcb_glx_gen_textures_data_length(reply) * sizeof(GLuint)); - free(reply); - #else - GLubyte const * pc = __glXSetupSingleRequest(gc, X_GLsop_GenTextures, cmdlen); -@@ -4451,9 +4451,9 @@ - const GLuint cmdlen = 4; - if (__builtin_expect(dpy != NULL, 1)) { - #ifdef USE_XCB -- XCBConnection *c = XCBConnectionOfDisplay(dpy); -+ xcb_connection_t *c = XGetXCBConnection(dpy); - (void) __glXFlushRenderBuffer(gc, gc->pc); -- XCBGlxIsTextureRep *reply = XCBGlxIsTextureReply(c, XCBGlxIsTexture(c, gc->currentContextTag, texture), NULL); -+ xcb_glx_is_texture_reply_t *reply = xcb_glx_is_texture_reply(c, xcb_glx_is_texture(c, gc->currentContextTag, texture), NULL); - retval = reply->ret_val; - free(reply); - #else -@@ -4672,10 +4672,10 @@ - const GLuint cmdlen = 16; - if (__builtin_expect(dpy != NULL, 1)) { - #ifdef USE_XCB -- XCBConnection *c = XCBConnectionOfDisplay(dpy); -+ xcb_connection_t *c = XGetXCBConnection(dpy); - (void) __glXFlushRenderBuffer(gc, gc->pc); -- XCBGlxGetColorTableRep *reply = XCBGlxGetColorTableReply(c, XCBGlxGetColorTable(c, gc->currentContextTag, target, format, type, state->storePack.swapEndian), NULL); -- (void)memcpy(table, XCBGlxGetColorTableData(reply), XCBGlxGetColorTableDataLength(reply) * sizeof(GLvoid)); -+ xcb_glx_get_color_table_reply_t *reply = xcb_glx_get_color_table_reply(c, xcb_glx_get_color_table(c, gc->currentContextTag, target, format, type, state->storePack.swapEndian), NULL); -+ (void)memcpy(table, xcb_glx_get_color_table_data(reply), xcb_glx_get_color_table_data_length(reply) * sizeof(GLvoid)); - free(reply); - #else - GLubyte const * pc = __glXSetupSingleRequest(gc, X_GLsop_GetColorTable, cmdlen); -@@ -4700,13 +4700,13 @@ - const GLuint cmdlen = 8; - if (__builtin_expect(dpy != NULL, 1)) { - #ifdef USE_XCB -- XCBConnection *c = XCBConnectionOfDisplay(dpy); -+ xcb_connection_t *c = XGetXCBConnection(dpy); - (void) __glXFlushRenderBuffer(gc, gc->pc); -- XCBGlxGetColorTableParameterfvRep *reply = XCBGlxGetColorTableParameterfvReply(c, XCBGlxGetColorTableParameterfv(c, gc->currentContextTag, target, pname), NULL); -- if (XCBGlxGetColorTableParameterfvDataLength(reply) == 0) -+ xcb_glx_get_color_table_parameterfv_reply_t *reply = xcb_glx_get_color_table_parameterfv_reply(c, xcb_glx_get_color_table_parameterfv(c, gc->currentContextTag, target, pname), NULL); -+ if (xcb_glx_get_color_table_parameterfv_data_length(reply) == 0) - (void)memcpy(params, &reply->datum, sizeof(reply->datum)); - else -- (void)memcpy(params, XCBGlxGetColorTableParameterfvData(reply), XCBGlxGetColorTableParameterfvDataLength(reply) * sizeof(GLfloat)); -+ (void)memcpy(params, xcb_glx_get_color_table_parameterfv_data(reply), xcb_glx_get_color_table_parameterfv_data_length(reply) * sizeof(GLfloat)); - free(reply); - #else - GLubyte const * pc = __glXSetupSingleRequest(gc, X_GLsop_GetColorTableParameterfv, cmdlen); -@@ -4728,13 +4728,13 @@ - const GLuint cmdlen = 8; - if (__builtin_expect(dpy != NULL, 1)) { - #ifdef USE_XCB -- XCBConnection *c = XCBConnectionOfDisplay(dpy); -+ xcb_connection_t *c = XGetXCBConnection(dpy); - (void) __glXFlushRenderBuffer(gc, gc->pc); -- XCBGlxGetColorTableParameterivRep *reply = XCBGlxGetColorTableParameterivReply(c, XCBGlxGetColorTableParameteriv(c, gc->currentContextTag, target, pname), NULL); -- if (XCBGlxGetColorTableParameterivDataLength(reply) == 0) -+ xcb_glx_get_color_table_parameteriv_reply_t *reply = xcb_glx_get_color_table_parameteriv_reply(c, xcb_glx_get_color_table_parameteriv(c, gc->currentContextTag, target, pname), NULL); -+ if (xcb_glx_get_color_table_parameteriv_data_length(reply) == 0) - (void)memcpy(params, &reply->datum, sizeof(reply->datum)); - else -- (void)memcpy(params, XCBGlxGetColorTableParameterivData(reply), XCBGlxGetColorTableParameterivDataLength(reply) * sizeof(GLint)); -+ (void)memcpy(params, xcb_glx_get_color_table_parameteriv_data(reply), xcb_glx_get_color_table_parameteriv_data_length(reply) * sizeof(GLint)); - free(reply); - #else - GLubyte const * pc = __glXSetupSingleRequest(gc, X_GLsop_GetColorTableParameteriv, cmdlen); -@@ -4965,10 +4965,10 @@ - const GLuint cmdlen = 16; - if (__builtin_expect(dpy != NULL, 1)) { - #ifdef USE_XCB -- XCBConnection *c = XCBConnectionOfDisplay(dpy); -+ xcb_connection_t *c = XGetXCBConnection(dpy); - (void) __glXFlushRenderBuffer(gc, gc->pc); -- XCBGlxGetConvolutionFilterRep *reply = XCBGlxGetConvolutionFilterReply(c, XCBGlxGetConvolutionFilter(c, gc->currentContextTag, target, format, type, state->storePack.swapEndian), NULL); -- (void)memcpy(image, XCBGlxGetConvolutionFilterData(reply), XCBGlxGetConvolutionFilterDataLength(reply) * sizeof(GLvoid)); -+ xcb_glx_get_convolution_filter_reply_t *reply = xcb_glx_get_convolution_filter_reply(c, xcb_glx_get_convolution_filter(c, gc->currentContextTag, target, format, type, state->storePack.swapEndian), NULL); -+ (void)memcpy(image, xcb_glx_get_convolution_filter_data(reply), xcb_glx_get_convolution_filter_data_length(reply) * sizeof(GLvoid)); - free(reply); - #else - GLubyte const * pc = __glXSetupSingleRequest(gc, X_GLsop_GetConvolutionFilter, cmdlen); -@@ -4993,13 +4993,13 @@ - const GLuint cmdlen = 8; - if (__builtin_expect(dpy != NULL, 1)) { - #ifdef USE_XCB -- XCBConnection *c = XCBConnectionOfDisplay(dpy); -+ xcb_connection_t *c = XGetXCBConnection(dpy); - (void) __glXFlushRenderBuffer(gc, gc->pc); -- XCBGlxGetConvolutionParameterfvRep *reply = XCBGlxGetConvolutionParameterfvReply(c, XCBGlxGetConvolutionParameterfv(c, gc->currentContextTag, target, pname), NULL); -- if (XCBGlxGetConvolutionParameterfvDataLength(reply) == 0) -+ xcb_glx_get_convolution_parameterfv_reply_t *reply = xcb_glx_get_convolution_parameterfv_reply(c, xcb_glx_get_convolution_parameterfv(c, gc->currentContextTag, target, pname), NULL); -+ if (xcb_glx_get_convolution_parameterfv_data_length(reply) == 0) - (void)memcpy(params, &reply->datum, sizeof(reply->datum)); - else -- (void)memcpy(params, XCBGlxGetConvolutionParameterfvData(reply), XCBGlxGetConvolutionParameterfvDataLength(reply) * sizeof(GLfloat)); -+ (void)memcpy(params, xcb_glx_get_convolution_parameterfv_data(reply), xcb_glx_get_convolution_parameterfv_data_length(reply) * sizeof(GLfloat)); - free(reply); - #else - GLubyte const * pc = __glXSetupSingleRequest(gc, X_GLsop_GetConvolutionParameterfv, cmdlen); -@@ -5021,13 +5021,13 @@ - const GLuint cmdlen = 8; - if (__builtin_expect(dpy != NULL, 1)) { - #ifdef USE_XCB -- XCBConnection *c = XCBConnectionOfDisplay(dpy); -+ xcb_connection_t *c = XGetXCBConnection(dpy); - (void) __glXFlushRenderBuffer(gc, gc->pc); -- XCBGlxGetConvolutionParameterivRep *reply = XCBGlxGetConvolutionParameterivReply(c, XCBGlxGetConvolutionParameteriv(c, gc->currentContextTag, target, pname), NULL); -- if (XCBGlxGetConvolutionParameterivDataLength(reply) == 0) -+ xcb_glx_get_convolution_parameteriv_reply_t *reply = xcb_glx_get_convolution_parameteriv_reply(c, xcb_glx_get_convolution_parameteriv(c, gc->currentContextTag, target, pname), NULL); -+ if (xcb_glx_get_convolution_parameteriv_data_length(reply) == 0) - (void)memcpy(params, &reply->datum, sizeof(reply->datum)); - else -- (void)memcpy(params, XCBGlxGetConvolutionParameterivData(reply), XCBGlxGetConvolutionParameterivDataLength(reply) * sizeof(GLint)); -+ (void)memcpy(params, xcb_glx_get_convolution_parameteriv_data(reply), xcb_glx_get_convolution_parameteriv_data_length(reply) * sizeof(GLint)); - free(reply); - #else - GLubyte const * pc = __glXSetupSingleRequest(gc, X_GLsop_GetConvolutionParameteriv, cmdlen); -@@ -5050,10 +5050,10 @@ - const GLuint cmdlen = 16; - if (__builtin_expect(dpy != NULL, 1)) { - #ifdef USE_XCB -- XCBConnection *c = XCBConnectionOfDisplay(dpy); -+ xcb_connection_t *c = XGetXCBConnection(dpy); - (void) __glXFlushRenderBuffer(gc, gc->pc); -- XCBGlxGetHistogramRep *reply = XCBGlxGetHistogramReply(c, XCBGlxGetHistogram(c, gc->currentContextTag, target, reset, format, type, state->storePack.swapEndian), NULL); -- (void)memcpy(values, XCBGlxGetHistogramData(reply), XCBGlxGetHistogramDataLength(reply) * sizeof(GLvoid)); -+ xcb_glx_get_histogram_reply_t *reply = xcb_glx_get_histogram_reply(c, xcb_glx_get_histogram(c, gc->currentContextTag, target, reset, format, type, state->storePack.swapEndian), NULL); -+ (void)memcpy(values, xcb_glx_get_histogram_data(reply), xcb_glx_get_histogram_data_length(reply) * sizeof(GLvoid)); - free(reply); - #else - GLubyte const * pc = __glXSetupSingleRequest(gc, X_GLsop_GetHistogram, cmdlen); -@@ -5079,13 +5079,13 @@ - const GLuint cmdlen = 8; - if (__builtin_expect(dpy != NULL, 1)) { - #ifdef USE_XCB -- XCBConnection *c = XCBConnectionOfDisplay(dpy); -+ xcb_connection_t *c = XGetXCBConnection(dpy); - (void) __glXFlushRenderBuffer(gc, gc->pc); -- XCBGlxGetHistogramParameterfvRep *reply = XCBGlxGetHistogramParameterfvReply(c, XCBGlxGetHistogramParameterfv(c, gc->currentContextTag, target, pname), NULL); -- if (XCBGlxGetHistogramParameterfvDataLength(reply) == 0) -+ xcb_glx_get_histogram_parameterfv_reply_t *reply = xcb_glx_get_histogram_parameterfv_reply(c, xcb_glx_get_histogram_parameterfv(c, gc->currentContextTag, target, pname), NULL); -+ if (xcb_glx_get_histogram_parameterfv_data_length(reply) == 0) - (void)memcpy(params, &reply->datum, sizeof(reply->datum)); - else -- (void)memcpy(params, XCBGlxGetHistogramParameterfvData(reply), XCBGlxGetHistogramParameterfvDataLength(reply) * sizeof(GLfloat)); -+ (void)memcpy(params, xcb_glx_get_histogram_parameterfv_data(reply), xcb_glx_get_histogram_parameterfv_data_length(reply) * sizeof(GLfloat)); - free(reply); - #else - GLubyte const * pc = __glXSetupSingleRequest(gc, X_GLsop_GetHistogramParameterfv, cmdlen); -@@ -5107,13 +5107,13 @@ - const GLuint cmdlen = 8; - if (__builtin_expect(dpy != NULL, 1)) { - #ifdef USE_XCB -- XCBConnection *c = XCBConnectionOfDisplay(dpy); -+ xcb_connection_t *c = XGetXCBConnection(dpy); - (void) __glXFlushRenderBuffer(gc, gc->pc); -- XCBGlxGetHistogramParameterivRep *reply = XCBGlxGetHistogramParameterivReply(c, XCBGlxGetHistogramParameteriv(c, gc->currentContextTag, target, pname), NULL); -- if (XCBGlxGetHistogramParameterivDataLength(reply) == 0) -+ xcb_glx_get_histogram_parameteriv_reply_t *reply = xcb_glx_get_histogram_parameteriv_reply(c, xcb_glx_get_histogram_parameteriv(c, gc->currentContextTag, target, pname), NULL); -+ if (xcb_glx_get_histogram_parameteriv_data_length(reply) == 0) - (void)memcpy(params, &reply->datum, sizeof(reply->datum)); - else -- (void)memcpy(params, XCBGlxGetHistogramParameterivData(reply), XCBGlxGetHistogramParameterivDataLength(reply) * sizeof(GLint)); -+ (void)memcpy(params, xcb_glx_get_histogram_parameteriv_data(reply), xcb_glx_get_histogram_parameteriv_data_length(reply) * sizeof(GLint)); - free(reply); - #else - GLubyte const * pc = __glXSetupSingleRequest(gc, X_GLsop_GetHistogramParameteriv, cmdlen); -@@ -5136,10 +5136,10 @@ - const GLuint cmdlen = 16; - if (__builtin_expect(dpy != NULL, 1)) { - #ifdef USE_XCB -- XCBConnection *c = XCBConnectionOfDisplay(dpy); -+ xcb_connection_t *c = XGetXCBConnection(dpy); - (void) __glXFlushRenderBuffer(gc, gc->pc); -- XCBGlxGetMinmaxRep *reply = XCBGlxGetMinmaxReply(c, XCBGlxGetMinmax(c, gc->currentContextTag, target, reset, format, type, state->storePack.swapEndian), NULL); -- (void)memcpy(values, XCBGlxGetMinmaxData(reply), XCBGlxGetMinmaxDataLength(reply) * sizeof(GLvoid)); -+ xcb_glx_get_minmax_reply_t *reply = xcb_glx_get_minmax_reply(c, xcb_glx_get_minmax(c, gc->currentContextTag, target, reset, format, type, state->storePack.swapEndian), NULL); -+ (void)memcpy(values, xcb_glx_get_minmax_data(reply), xcb_glx_get_minmax_data_length(reply) * sizeof(GLvoid)); - free(reply); - #else - GLubyte const * pc = __glXSetupSingleRequest(gc, X_GLsop_GetMinmax, cmdlen); -@@ -5165,13 +5165,13 @@ - const GLuint cmdlen = 8; - if (__builtin_expect(dpy != NULL, 1)) { - #ifdef USE_XCB -- XCBConnection *c = XCBConnectionOfDisplay(dpy); -+ xcb_connection_t *c = XGetXCBConnection(dpy); - (void) __glXFlushRenderBuffer(gc, gc->pc); -- XCBGlxGetMinmaxParameterfvRep *reply = XCBGlxGetMinmaxParameterfvReply(c, XCBGlxGetMinmaxParameterfv(c, gc->currentContextTag, target, pname), NULL); -- if (XCBGlxGetMinmaxParameterfvDataLength(reply) == 0) -+ xcb_glx_get_minmax_parameterfv_reply_t *reply = xcb_glx_get_minmax_parameterfv_reply(c, xcb_glx_get_minmax_parameterfv(c, gc->currentContextTag, target, pname), NULL); -+ if (xcb_glx_get_minmax_parameterfv_data_length(reply) == 0) - (void)memcpy(params, &reply->datum, sizeof(reply->datum)); - else -- (void)memcpy(params, XCBGlxGetMinmaxParameterfvData(reply), XCBGlxGetMinmaxParameterfvDataLength(reply) * sizeof(GLfloat)); -+ (void)memcpy(params, xcb_glx_get_minmax_parameterfv_data(reply), xcb_glx_get_minmax_parameterfv_data_length(reply) * sizeof(GLfloat)); - free(reply); - #else - GLubyte const * pc = __glXSetupSingleRequest(gc, X_GLsop_GetMinmaxParameterfv, cmdlen); -@@ -5193,13 +5193,13 @@ - const GLuint cmdlen = 8; - if (__builtin_expect(dpy != NULL, 1)) { - #ifdef USE_XCB -- XCBConnection *c = XCBConnectionOfDisplay(dpy); -+ xcb_connection_t *c = XGetXCBConnection(dpy); - (void) __glXFlushRenderBuffer(gc, gc->pc); -- XCBGlxGetMinmaxParameterivRep *reply = XCBGlxGetMinmaxParameterivReply(c, XCBGlxGetMinmaxParameteriv(c, gc->currentContextTag, target, pname), NULL); -- if (XCBGlxGetMinmaxParameterivDataLength(reply) == 0) -+ xcb_glx_get_minmax_parameteriv_reply_t *reply = xcb_glx_get_minmax_parameteriv_reply(c, xcb_glx_get_minmax_parameteriv(c, gc->currentContextTag, target, pname), NULL); -+ if (xcb_glx_get_minmax_parameteriv_data_length(reply) == 0) - (void)memcpy(params, &reply->datum, sizeof(reply->datum)); - else -- (void)memcpy(params, XCBGlxGetMinmaxParameterivData(reply), XCBGlxGetMinmaxParameterivDataLength(reply) * sizeof(GLint)); -+ (void)memcpy(params, xcb_glx_get_minmax_parameteriv_data(reply), xcb_glx_get_minmax_parameteriv_data_length(reply) * sizeof(GLint)); - free(reply); - #else - GLubyte const * pc = __glXSetupSingleRequest(gc, X_GLsop_GetMinmaxParameteriv, cmdlen); -@@ -6578,9 +6578,9 @@ - const GLuint cmdlen = 4 + __GLX_PAD((n * 4)); - if (__builtin_expect((n >= 0) && (dpy != NULL), 1)) { - #ifdef USE_XCB -- XCBConnection *c = XCBConnectionOfDisplay(dpy); -+ xcb_connection_t *c = XGetXCBConnection(dpy); - (void) __glXFlushRenderBuffer(gc, gc->pc); -- XCBGlxDeleteQueriesARB(c, gc->currentContextTag, n, ids); -+ xcb_glx_delete_queries_arb(c, gc->currentContextTag, n, ids); - #else - GLubyte const * pc = __glXSetupSingleRequest(gc, X_GLsop_DeleteQueriesARB, cmdlen); - (void) memcpy((void *)(pc + 0), (void *)(&n), 4); -@@ -6612,10 +6612,10 @@ - const GLuint cmdlen = 4; - if (__builtin_expect((n >= 0) && (dpy != NULL), 1)) { - #ifdef USE_XCB -- XCBConnection *c = XCBConnectionOfDisplay(dpy); -+ xcb_connection_t *c = XGetXCBConnection(dpy); - (void) __glXFlushRenderBuffer(gc, gc->pc); -- XCBGlxGenQueriesARBRep *reply = XCBGlxGenQueriesARBReply(c, XCBGlxGenQueriesARB(c, gc->currentContextTag, n), NULL); -- (void)memcpy(ids, XCBGlxGenQueriesARBData(reply), XCBGlxGenQueriesARBDataLength(reply) * sizeof(GLuint)); -+ xcb_glx_gen_queries_arb_reply_t *reply = xcb_glx_gen_queries_arb_reply(c, xcb_glx_gen_queries_arb(c, gc->currentContextTag, n), NULL); -+ (void)memcpy(ids, xcb_glx_gen_queries_arb_data(reply), xcb_glx_gen_queries_arb_data_length(reply) * sizeof(GLuint)); - free(reply); - #else - GLubyte const * pc = __glXSetupSingleRequest(gc, X_GLsop_GenQueriesARB, cmdlen); -@@ -6636,13 +6636,13 @@ - const GLuint cmdlen = 8; - if (__builtin_expect(dpy != NULL, 1)) { - #ifdef USE_XCB -- XCBConnection *c = XCBConnectionOfDisplay(dpy); -+ xcb_connection_t *c = XGetXCBConnection(dpy); - (void) __glXFlushRenderBuffer(gc, gc->pc); -- XCBGlxGetQueryObjectivARBRep *reply = XCBGlxGetQueryObjectivARBReply(c, XCBGlxGetQueryObjectivARB(c, gc->currentContextTag, id, pname), NULL); -- if (XCBGlxGetQueryObjectivARBDataLength(reply) == 0) -+ xcb_glx_get_query_objectiv_arb_reply_t *reply = xcb_glx_get_query_objectiv_arb_reply(c, xcb_glx_get_query_objectiv_arb(c, gc->currentContextTag, id, pname), NULL); -+ if (xcb_glx_get_query_objectiv_arb_data_length(reply) == 0) - (void)memcpy(params, &reply->datum, sizeof(reply->datum)); - else -- (void)memcpy(params, XCBGlxGetQueryObjectivARBData(reply), XCBGlxGetQueryObjectivARBDataLength(reply) * sizeof(GLint)); -+ (void)memcpy(params, xcb_glx_get_query_objectiv_arb_data(reply), xcb_glx_get_query_objectiv_arb_data_length(reply) * sizeof(GLint)); - free(reply); - #else - GLubyte const * pc = __glXSetupSingleRequest(gc, X_GLsop_GetQueryObjectivARB, cmdlen); -@@ -6664,13 +6664,13 @@ - const GLuint cmdlen = 8; - if (__builtin_expect(dpy != NULL, 1)) { - #ifdef USE_XCB -- XCBConnection *c = XCBConnectionOfDisplay(dpy); -+ xcb_connection_t *c = XGetXCBConnection(dpy); - (void) __glXFlushRenderBuffer(gc, gc->pc); -- XCBGlxGetQueryObjectuivARBRep *reply = XCBGlxGetQueryObjectuivARBReply(c, XCBGlxGetQueryObjectuivARB(c, gc->currentContextTag, id, pname), NULL); -- if (XCBGlxGetQueryObjectuivARBDataLength(reply) == 0) -+ xcb_glx_get_query_objectuiv_arb_reply_t *reply = xcb_glx_get_query_objectuiv_arb_reply(c, xcb_glx_get_query_objectuiv_arb(c, gc->currentContextTag, id, pname), NULL); -+ if (xcb_glx_get_query_objectuiv_arb_data_length(reply) == 0) - (void)memcpy(params, &reply->datum, sizeof(reply->datum)); - else -- (void)memcpy(params, XCBGlxGetQueryObjectuivARBData(reply), XCBGlxGetQueryObjectuivARBDataLength(reply) * sizeof(GLuint)); -+ (void)memcpy(params, xcb_glx_get_query_objectuiv_arb_data(reply), xcb_glx_get_query_objectuiv_arb_data_length(reply) * sizeof(GLuint)); - free(reply); - #else - GLubyte const * pc = __glXSetupSingleRequest(gc, X_GLsop_GetQueryObjectuivARB, cmdlen); -@@ -6692,13 +6692,13 @@ - const GLuint cmdlen = 8; - if (__builtin_expect(dpy != NULL, 1)) { - #ifdef USE_XCB -- XCBConnection *c = XCBConnectionOfDisplay(dpy); -+ xcb_connection_t *c = XGetXCBConnection(dpy); - (void) __glXFlushRenderBuffer(gc, gc->pc); -- XCBGlxGetQueryivARBRep *reply = XCBGlxGetQueryivARBReply(c, XCBGlxGetQueryivARB(c, gc->currentContextTag, target, pname), NULL); -- if (XCBGlxGetQueryivARBDataLength(reply) == 0) -+ xcb_glx_get_queryiv_arb_reply_t *reply = xcb_glx_get_queryiv_arb_reply(c, xcb_glx_get_queryiv_arb(c, gc->currentContextTag, target, pname), NULL); -+ if (xcb_glx_get_queryiv_arb_data_length(reply) == 0) - (void)memcpy(params, &reply->datum, sizeof(reply->datum)); - else -- (void)memcpy(params, XCBGlxGetQueryivARBData(reply), XCBGlxGetQueryivARBDataLength(reply) * sizeof(GLint)); -+ (void)memcpy(params, xcb_glx_get_queryiv_arb_data(reply), xcb_glx_get_queryiv_arb_data_length(reply) * sizeof(GLint)); - free(reply); - #else - GLubyte const * pc = __glXSetupSingleRequest(gc, X_GLsop_GetQueryivARB, cmdlen); -@@ -6721,9 +6721,9 @@ - const GLuint cmdlen = 4; - if (__builtin_expect(dpy != NULL, 1)) { - #ifdef USE_XCB -- XCBConnection *c = XCBConnectionOfDisplay(dpy); -+ xcb_connection_t *c = XGetXCBConnection(dpy); - (void) __glXFlushRenderBuffer(gc, gc->pc); -- XCBGlxIsQueryARBRep *reply = XCBGlxIsQueryARBReply(c, XCBGlxIsQueryARB(c, gc->currentContextTag, id), NULL); -+ xcb_glx_is_query_arb_reply_t *reply = xcb_glx_is_query_arb_reply(c, xcb_glx_is_query_arb(c, gc->currentContextTag, id), NULL); - retval = reply->ret_val; - free(reply); - #else -Index: src/glx/x11/glxext.c -=================================================================== -RCS file: /cvs/mesa/Mesa/src/glx/x11/glxext.c,v -retrieving revision 1.24 -retrieving revision 1.25 -diff -u -b -B -r1.24 -r1.25 ---- src/glx/x11/glxext.c 29 Aug 2006 15:38:19 -0000 1.24 -+++ src/glx/x11/glxext.c 26 Sep 2006 23:56:20 -0000 1.25 -@@ -65,8 +65,8 @@ - - #ifdef USE_XCB --#include <X11/xcl.h> --#include <X11/XCB/xcb.h> --#include <X11/XCB/glx.h> -+#include <X11/Xlib-xcb.h> -+#include <xcb/xcb.h> -+#include <xcb/glx.h> - #endif - - #include <assert.h> -@@ -1284,7 +1284,7 @@ - { - Display * const dpy = ctx->currentDpy; - #ifdef USE_XCB -- XCBConnection *c = XCBConnectionOfDisplay(dpy); -+ xcb_connection_t *c = XGetXCBConnection(dpy); - #else - xGLXRenderReq *req; - #endif /* USE_XCB */ -@@ -1292,7 +1292,7 @@ - - if ( (dpy != NULL) && (size > 0) ) { - #ifdef USE_XCB -- XCBGlxRender(c, ctx->currentContextTag, size, (char *)ctx->buf); -+ xcb_glx_render(c, ctx->currentContextTag, size, (char *)ctx->buf); - #else - /* Send the entire buffer as an X request */ - LockDisplay(dpy); -@@ -1335,8 +1335,8 @@ - { - Display *dpy = gc->currentDpy; - #ifdef USE_XCB -- XCBConnection *c = XCBConnectionOfDisplay(dpy); -- XCBGlxRenderLarge(c, gc->currentContextTag, requestNumber, totalRequests, dataLen, data); -+ xcb_connection_t *c = XGetXCBConnection(dpy); -+ xcb_glx_render_large(c, gc->currentContextTag, requestNumber, totalRequests, dataLen, data); - #else - xGLXRenderLargeReq *req; - diff --git a/hardened/media-libs/mesa/files/6.5.1-xcb-dont-unlock-twice.patch b/hardened/media-libs/mesa/files/6.5.1-xcb-dont-unlock-twice.patch deleted file mode 100644 index be68fcc..0000000 --- a/hardened/media-libs/mesa/files/6.5.1-xcb-dont-unlock-twice.patch +++ /dev/null @@ -1,20 +0,0 @@ -Index: src/glx/x11/glxext.c -=================================================================== -RCS file: /cvs/mesa/Mesa/src/glx/x11/glxext.c,v -retrieving revision 1.27 -diff -u -b -B -r1.27 glxext.c ---- src/glx/x11/glxext.c 7 Oct 2006 02:52:18 -0000 1.27 -+++ src/glx/x11/glxext.c 9 Oct 2006 00:54:05 -0000 -@@ -1016,11 +1016,11 @@ - if (!_XReply(dpy, (xReply*) &reply, 0, False)) { - /* Something is busted. Punt. */ - UnlockDisplay(dpy); -+ SyncHandle(); - FreeScreenConfigs(priv); - return GL_FALSE; - } - -- UnlockDisplay(dpy); - if (!reply.numVisuals) { - /* This screen does not support GL rendering */ - UnlockDisplay(dpy); diff --git a/hardened/media-libs/mesa/files/64bit-fix-have-dix-config.patch b/hardened/media-libs/mesa/files/64bit-fix-have-dix-config.patch deleted file mode 100644 index 29e6f40..0000000 --- a/hardened/media-libs/mesa/files/64bit-fix-have-dix-config.patch +++ /dev/null @@ -1,18 +0,0 @@ -=================================================================== -RCS file: /cvs/mesa/Mesa/src/mesa/main/glheader.h,v -rcsdiff: /cvs/mesa/Mesa/src/mesa/main/glheader.h,v: warning: Unknown phrases like `commitid ...;' are present. -retrieving revision 1.70 -retrieving revision 1.71 -diff -u -r1.70 -r1.71 ---- Mesa/src/mesa/main/glheader.h 2006/02/11 02:59:38 1.70 -+++ Mesa/src/mesa/main/glheader.h 2006/02/15 21:03:34 1.71 -@@ -46,6 +46,9 @@ - #ifndef GLHEADER_H - #define GLHEADER_H - -+#ifdef HAVE_DIX_CONFIG_H -+#include "dix-config.h" -+#endif - - #if defined(XFree86LOADER) && defined(IN_MODULE) && !defined(NO_LIBCWRAPPER) - #include "xf86_ansic.h" diff --git a/hardened/media-libs/mesa/files/64bit-fix-indirect-vertex-array.patch b/hardened/media-libs/mesa/files/64bit-fix-indirect-vertex-array.patch deleted file mode 100644 index 4e744e9..0000000 --- a/hardened/media-libs/mesa/files/64bit-fix-indirect-vertex-array.patch +++ /dev/null @@ -1,17 +0,0 @@ -=================================================================== -RCS file: /cvs/mesa/Mesa/src/glx/x11/indirect_vertex_array.c,v -rcsdiff: /cvs/mesa/Mesa/src/glx/x11/indirect_vertex_array.c,v: warning: Unknown phrases like `commitid ...;' are present. -retrieving revision 1.6 -retrieving revision 1.7 -diff -u -r1.6 -r1.7 ---- Mesa/src/glx/x11/indirect_vertex_array.c 2005/08/19 18:53:26 1.6 -+++ Mesa/src/glx/x11/indirect_vertex_array.c 2006/02/14 15:04:45 1.7 -@@ -530,7 +530,7 @@ - emit_DrawArrays_header_old( __GLXcontext * gc, - struct array_state_vector * arrays, - size_t * elements_per_request, -- size_t * total_requests, -+ unsigned int * total_requests, - GLenum mode, GLsizei count ) - { - size_t command_size; diff --git a/hardened/media-libs/mesa/files/change-default-dri-driver-dir-X7.1.patch b/hardened/media-libs/mesa/files/change-default-dri-driver-dir-X7.1.patch deleted file mode 100644 index 5ea6924..0000000 --- a/hardened/media-libs/mesa/files/change-default-dri-driver-dir-X7.1.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Mesa-6.3.1.1.orig/src/glx/x11/dri_glx.c 2005-07-27 17:29:51.000000000 -0700 -+++ Mesa-6.3.1.1/src/glx/x11/dri_glx.c 2005-08-14 11:09:54.000000000 -0700 -@@ -58,7 +58,7 @@ - - #ifndef DEFAULT_DRIVER_DIR - /* this is normally defined in the Imakefile */ --#define DEFAULT_DRIVER_DIR "/usr/X11R6/lib/modules/dri" -+#define DEFAULT_DRIVER_DIR "/usr/lib/dri" - #endif - - static __DRIdriver *Drivers = NULL; diff --git a/hardened/media-libs/mesa/files/change-default-dri-driver-dir.patch b/hardened/media-libs/mesa/files/change-default-dri-driver-dir.patch deleted file mode 100644 index 36151d6..0000000 --- a/hardened/media-libs/mesa/files/change-default-dri-driver-dir.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Mesa-6.3.1.1.orig/src/glx/x11/dri_glx.c 2005-07-27 17:29:51.000000000 -0700 -+++ Mesa-6.3.1.1/src/glx/x11/dri_glx.c 2005-08-14 11:09:54.000000000 -0700 -@@ -58,7 +58,7 @@ - - #ifndef DEFAULT_DRIVER_DIR - /* this is normally defined in the Imakefile */ --#define DEFAULT_DRIVER_DIR "/usr/X11R6/lib/modules/dri" -+#define DEFAULT_DRIVER_DIR "/usr/lib/xorg/modules/dri" - #endif - - static __DRIdriver *Drivers = NULL; diff --git a/hardened/media-libs/mesa/files/digest-mesa-6.4.2-r2 b/hardened/media-libs/mesa/files/digest-mesa-6.4.2-r2 deleted file mode 100644 index 13d7ad4..0000000 --- a/hardened/media-libs/mesa/files/digest-mesa-6.4.2-r2 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 7674d2c603b5834259e4e5a820cefd5b MesaLib-6.4.2.tar.bz2 2913009 -RMD160 6bf1afc0d3bd3f5e3b5c1a019838f40603446509 MesaLib-6.4.2.tar.bz2 2913009 -SHA256 bc84da436f9d92485dfa1c6670689c6807950a8372637c9952f689a1e1f9aa86 MesaLib-6.4.2.tar.bz2 2913009 diff --git a/hardened/media-libs/mesa/files/digest-mesa-6.5-r3 b/hardened/media-libs/mesa/files/digest-mesa-6.5-r3 deleted file mode 100644 index 79639c7..0000000 --- a/hardened/media-libs/mesa/files/digest-mesa-6.5-r3 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 61beda590bfc5b4a12e979d5f2d70d7a MesaLib-6.5.tar.bz2 3062363 -RMD160 6006bfdfed8a2425059c31ee699b5aca4d5f57cd MesaLib-6.5.tar.bz2 3062363 -SHA256 dcacf4c18af89b57e66dc7ba39e24c3b74ff6f83b8745bcc1390170a4190eebd MesaLib-6.5.tar.bz2 3062363 diff --git a/hardened/media-libs/mesa/files/digest-mesa-6.5-r4 b/hardened/media-libs/mesa/files/digest-mesa-6.5-r4 deleted file mode 100644 index 79639c7..0000000 --- a/hardened/media-libs/mesa/files/digest-mesa-6.5-r4 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 61beda590bfc5b4a12e979d5f2d70d7a MesaLib-6.5.tar.bz2 3062363 -RMD160 6006bfdfed8a2425059c31ee699b5aca4d5f57cd MesaLib-6.5.tar.bz2 3062363 -SHA256 dcacf4c18af89b57e66dc7ba39e24c3b74ff6f83b8745bcc1390170a4190eebd MesaLib-6.5.tar.bz2 3062363 diff --git a/hardened/media-libs/mesa/files/digest-mesa-6.5.1-r1 b/hardened/media-libs/mesa/files/digest-mesa-6.5.1-r1 deleted file mode 100644 index 45b5cf1..0000000 --- a/hardened/media-libs/mesa/files/digest-mesa-6.5.1-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 c46f2c6646a270911b791dd8e1c2d977 MesaLib-6.5.1.tar.bz2 3138257 -RMD160 23f8714787b053b2c41d020c7af211a02e5beab3 MesaLib-6.5.1.tar.bz2 3138257 -SHA256 e2669c9757e37f9073f539d75ced7f8f7a45b6bbb16081929ca2a306cde59df0 MesaLib-6.5.1.tar.bz2 3138257 diff --git a/hardened/media-libs/mesa/files/digest-mesa-6.5.1-r2 b/hardened/media-libs/mesa/files/digest-mesa-6.5.1-r2 deleted file mode 100644 index 45b5cf1..0000000 --- a/hardened/media-libs/mesa/files/digest-mesa-6.5.1-r2 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 c46f2c6646a270911b791dd8e1c2d977 MesaLib-6.5.1.tar.bz2 3138257 -RMD160 23f8714787b053b2c41d020c7af211a02e5beab3 MesaLib-6.5.1.tar.bz2 3138257 -SHA256 e2669c9757e37f9073f539d75ced7f8f7a45b6bbb16081929ca2a306cde59df0 MesaLib-6.5.1.tar.bz2 3138257 diff --git a/hardened/media-libs/mesa/files/digest-mesa-6.5.1-r4 b/hardened/media-libs/mesa/files/digest-mesa-6.5.1-r4 deleted file mode 100644 index 45b5cf1..0000000 --- a/hardened/media-libs/mesa/files/digest-mesa-6.5.1-r4 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 c46f2c6646a270911b791dd8e1c2d977 MesaLib-6.5.1.tar.bz2 3138257 -RMD160 23f8714787b053b2c41d020c7af211a02e5beab3 MesaLib-6.5.1.tar.bz2 3138257 -SHA256 e2669c9757e37f9073f539d75ced7f8f7a45b6bbb16081929ca2a306cde59df0 MesaLib-6.5.1.tar.bz2 3138257 diff --git a/hardened/media-libs/mesa/files/digest-mesa-6.5.2 b/hardened/media-libs/mesa/files/digest-mesa-6.5.2 deleted file mode 100644 index ee5bf23..0000000 --- a/hardened/media-libs/mesa/files/digest-mesa-6.5.2 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 e4d894181f1859651658b3704633e10d MesaLib-6.5.2.tar.bz2 3295166 -RMD160 9a92d69110c066ae6734bcaafb78f222ac2df6d3 MesaLib-6.5.2.tar.bz2 3295166 -SHA256 137f50a30461d51eb9af5aac737bc788d536354cf47b26129b97bde6e41fb85f MesaLib-6.5.2.tar.bz2 3295166 diff --git a/hardened/media-libs/mesa/files/lib/libGL.la b/hardened/media-libs/mesa/files/lib/libGL.la deleted file mode 100644 index cc2fd24..0000000 --- a/hardened/media-libs/mesa/files/lib/libGL.la +++ /dev/null @@ -1,32 +0,0 @@ -# libGL.la - a libtool library file -# Generated by ltmain.sh - GNU libtool 1.4 (1.920 2001/04/24 23:26:18) -# -# Please DO NOT delete this file! -# It is necessary for linking the library. - -# The name that we can dlopen(3). -dlname='libGL.so.1' - -# Names of this library. -library_names='libGL.so.1.2 libGL.so.1 libGL.so' - -# The name of the static archive. -old_library='' - -# Libraries that this one depends upon. -dependency_libs=' -L/usr/${libdir} -lSM -lICE -lXmu -lXt -lXext -lXi -lX11 -ldl -lpthread ' - -# Version information for libGL. -current=3 -age=2 -revision=0 - -# Is this an already installed library? -installed=yes - -# Files to dlopen/dlpreopen -dlopen='' -dlpreopen='' - -# Directory that this library needs to be installed in: -libdir='/usr/${libdir}' diff --git a/hardened/media-libs/mesa/files/lib/libGLU.la b/hardened/media-libs/mesa/files/lib/libGLU.la deleted file mode 100644 index cc76b4b..0000000 --- a/hardened/media-libs/mesa/files/lib/libGLU.la +++ /dev/null @@ -1,32 +0,0 @@ -# libGLU.la - a libtool library file -# Generated by ltmain.sh - GNU libtool 1.4 (1.920 2001/04/24 23:26:18) -# -# Please DO NOT delete this file! -# It is necessary for linking the library. - -# The name that we can dlopen(3). -dlname='libGLU.so.1' - -# Names of this library. -library_names='libGLU.so.1.3 libGLU.so.1 libGLU.so' - -# The name of the static archive. -old_library='' - -# Libraries that this one depends upon. -dependency_libs=' -L/usr/lib -lGL -lSM -lICE -lXmu -lXt -lXext -lXi -lX11 -ldl -lpthread ' - -# Version information for libGLU. -current=4 -age=3 -revision=0 - -# Is this an already installed library? -installed=yes - -# Files to dlopen/dlpreopen -dlopen='' -dlpreopen='' - -# Directory that this library needs to be installed in: -libdir='/usr/lib' diff --git a/hardened/media-libs/mesa/files/makedepend-location.patch b/hardened/media-libs/mesa/files/makedepend-location.patch deleted file mode 100644 index 7e49dee..0000000 --- a/hardened/media-libs/mesa/files/makedepend-location.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN Mesa-6.3.1.1.orig/configs/linux-dri Mesa-6.3.1.1/configs/linux-dri ---- Mesa-6.3.1.1.orig/configs/linux-dri 2005-07-23 23:29:14.000000000 -0700 -+++ Mesa-6.3.1.1/configs/linux-dri 2005-08-10 14:56:16.000000000 -0700 -@@ -9,7 +9,7 @@ - CC = gcc - CXX = g++ - --MKDEP = /usr/X11R6/bin/makedepend -+MKDEP = /usr/bin/makedepend - #MKDEP = gcc -M - #MKDEP_OPTIONS = -MF depend - diff --git a/hardened/media-libs/mesa/files/radeon-texture-problem.patch b/hardened/media-libs/mesa/files/radeon-texture-problem.patch deleted file mode 100644 index 2774793..0000000 --- a/hardened/media-libs/mesa/files/radeon-texture-problem.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: Mesa-6.4.2/src/mesa/drivers/dri/r200/r200_texmem.c -=================================================================== ---- Mesa-6.4.2.orig/src/mesa/drivers/dri/r200/r200_texmem.c -+++ Mesa-6.4.2/src/mesa/drivers/dri/r200/r200_texmem.c -@@ -427,7 +427,7 @@ static void uploadSubImage( r200ContextP - fprintf(stderr, "DRM_RADEON_TEXTURE: again!\n"); - usleep(1); - } -- } while ( ret && errno == EAGAIN ); -+ } while ( ret == -EAGAIN ); - - UNLOCK_HARDWARE( rmesa ); - |