head 1.9; access; symbols pkgsrc-2013Q2:1.9.0.2 pkgsrc-2013Q2-base:1.9 pkgsrc-2013Q1:1.8.0.30 pkgsrc-2013Q1-base:1.8 pkgsrc-2012Q4:1.8.0.28 pkgsrc-2012Q4-base:1.8 pkgsrc-2012Q3:1.8.0.26 pkgsrc-2012Q3-base:1.8 pkgsrc-2012Q2:1.8.0.24 pkgsrc-2012Q2-base:1.8 pkgsrc-2012Q1:1.8.0.22 pkgsrc-2012Q1-base:1.8 pkgsrc-2011Q4:1.8.0.20 pkgsrc-2011Q4-base:1.8 pkgsrc-2011Q3:1.8.0.18 pkgsrc-2011Q3-base:1.8 pkgsrc-2011Q2:1.8.0.16 pkgsrc-2011Q2-base:1.8 pkgsrc-2011Q1:1.8.0.14 pkgsrc-2011Q1-base:1.8 pkgsrc-2010Q4:1.8.0.12 pkgsrc-2010Q4-base:1.8 pkgsrc-2010Q3:1.8.0.10 pkgsrc-2010Q3-base:1.8 pkgsrc-2010Q2:1.8.0.8 pkgsrc-2010Q2-base:1.8 pkgsrc-2010Q1:1.8.0.6 pkgsrc-2010Q1-base:1.8 pkgsrc-2009Q4:1.8.0.4 pkgsrc-2009Q4-base:1.8 pkgsrc-2009Q3:1.8.0.2 pkgsrc-2009Q3-base:1.8 pkgsrc-2008Q4:1.7.0.6 pkgsrc-2008Q4-base:1.7 pkgsrc-2008Q3:1.7.0.4 pkgsrc-2008Q3-base:1.7 cube-native-xorg:1.7.0.2 cube-native-xorg-base:1.7 pkgsrc-2008Q2:1.6.0.4 pkgsrc-2008Q2-base:1.6 cwrapper:1.6.0.2 pkgsrc-2008Q1:1.5.0.10 pkgsrc-2008Q1-base:1.5 pkgsrc-2007Q4:1.5.0.8 pkgsrc-2007Q4-base:1.5 pkgsrc-2007Q3:1.5.0.6 pkgsrc-2007Q3-base:1.5 pkgsrc-2007Q2:1.5.0.4 pkgsrc-2007Q2-base:1.5 pkgsrc-2007Q1:1.5.0.2 pkgsrc-2007Q1-base:1.5 pkgsrc-2006Q4:1.4.0.2 pkgsrc-2006Q4-base:1.4 pkgsrc-2006Q3:1.3.0.6 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.3.0.4 pkgsrc-2006Q2-base:1.3 pkgsrc-2006Q1:1.3.0.2 pkgsrc-2006Q1-base:1.3; locks; strict; comment @# @; 1.9 date 2013.05.16.05.22.02; author richard; state dead; branches; next 1.8; commitid zN883Sx1YLZWAOPw; 1.8 date 2009.07.08.20.00.58; author hasso; state Exp; branches; next 1.7; 1.7 date 2008.07.27.00.03.42; author bjs; state dead; branches; next 1.6; 1.6 date 2008.04.24.07.40.24; author bjs; state Exp; branches; next 1.5; 1.5 date 2007.01.24.19.55.01; author tv; state Exp; branches; next 1.4; 1.4 date 2006.11.21.21.26.03; author tv; state Exp; branches; next 1.3; 1.3 date 2006.02.09.12.27.42; author adam; state dead; branches; next 1.2; 1.2 date 2006.01.30.08.54.55; author rillig; state Exp; branches; next 1.1; 1.1 date 2006.01.26.15.16.16; author rillig; state Exp; branches; next ; desc @@ 1.9 log @upgrade to MesaLib-7.11.2 @ text @$NetBSD: patch-ak,v 1.8 2009/07/08 20:00:58 hasso Exp $ --- src/mesa/glapi/glapi.c.orig 2009-07-01 20:41:37 +0300 +++ src/mesa/glapi/glapi.c 2009-07-01 20:41:52 +0300 @@@@ -221,7 +221,7 @@@@ PUBLIC void *_glapi_Context = NULL; * We should call this periodically from a function such as glXMakeCurrent * in order to test if multiple threads are being used. */ -void +PUBLIC void _glapi_check_multithread(void) { #if defined(THREADS) && !defined(GLX_USE_TLS) @ 1.8 log @Update to 7.4.4. Make software ratserizer actually work. Add one patch from upstream repo to fix null pointer dereference. Changes in 7.4.4: * Fixed i965/i915 segfault in screen destruction (bug 22408) Changes in 7.4.3: * Fixed texture object reference counting bug (bug 21756) * Allow depth/stencil textures to be attached to GL_STENCIL_ATTACHMENT point (SF bug 2793846) * Added missing glGet case for GL_VERTEX_ARRAY_BINDING_APPLE * Fixed some OSMesa build issues * Fixed a vertex buffer object crash * Fixed broken glTexImage3D() when image type = GL_BITMAP * Fixed some GLSL preprocessor bugs * Fixed framebuffer mem leak in i945/i965 DRI drivers * Fixed texture coordinate repeat bug in swrast (bug 21872) * Fixed incorrect viewport clamping (lower bound is zero, not one) * GLX fix for glean's makeCurrent test case @ text @d1 1 a1 1 $NetBSD$ @ 1.7 log @ Update to Mesa-7.0.4 (the head of the 7.0 branch in GIT). Basically, lots of bug fixes; the intent of my update was mostly to fix problems with i915 and r300 dri drivers and to provide the best environment possible for the xorg server update to the 1.4 branch. Morever, many of our patches from pkgsrc, i.e. those removed in this commit, are now included upstream. Additionally, MesaDemos now builds. NOTES: - MesaLib now requires xf86driproto 2.0.4, as earlier versions install dri_interface.h, which is not correct. - glu now exports its symbols via libtool's -export-symfile. The symfile is generated pre-build--see glu/Makefile. - glxinfo/glxgears do not seem to need to be linked to libpthread, and this seems to cause problems on NetBSD with the new drm code. If I am wrong about this, please let me know. The only program that seems to need libpthread is glthreads in MesaDemos. @ text @d1 1 a1 1 $NetBSD: patch-ak,v 1.6 2008/04/24 07:40:24 bjs Exp $ d3 11 a13 20 --- include/GL/glxext.h.orig 2007-06-21 18:10:53.000000000 -0400 +++ include/GL/glxext.h @@@@ -389,7 +389,7 @@@@ typedef struct { #elif defined(__sun__) || defined(__digital__) #include #if defined(__STDC__) -#if defined(__arch64__) +#if defined(__arch64__) || defined(_LP64) typedef long int int64_t; typedef unsigned long int uint64_t; #else @@@@ -397,7 +397,7 @@@@ typedef long long int int64_t; typedef unsigned long long int uint64_t; #endif /* __arch64__ */ #endif /* __STDC__ */ -#elif defined( __VMS ) +#elif defined( __VMS ) || defined(__sgi) #include #elif defined(__SCO__) || defined(__USLC__) #include @ 1.6 log @ Welcome to Mesa-7.0.3. Changes from 6.4.2 are (obviously) far too numerous to mention! This package brings with it support for the Direct Rendering Infrastructure (DRI) on NetBSD-current; the kernel DRM was committed approximately one year ago. Patches for NetBSD 4.0 are available in the mailing list archives (I think), but are _not supported_. Developers and other interested parties are encouraged to read the TODO file, as well as my remarks in options.mk. There is still a significant amount of work to be done. Users of NetBSD/i386 (-current) shouldn't have much trouble getting mainstream cards (Intel i915 and Radeon 9600- R430 are by far the most tested) to work. I have taken great pains to ensure that this works properly, but inevitably there will be problems--especially on heretofore untested (read: non-x86) hardware. Your questions, comments, problem reports, and of course bug fixes are welcome. NOTE: There are currently problems (on NetBSD, at least) linking some executables, e.g. compiz, due to unresolved symbols for libpthread functions. This is due to libX11's thread stubs, which should not be enabled on NetBSD >= 2.0; see the TODO For more information and the URL of an interim patch. @ text @d1 1 a1 1 $NetBSD$ @ 1.5 log @Fix the Interix fix. gcc 3.3 supplies its own , which shadows the one in the OS (which happens to be where [u]intptr_t is defined). Interix 5.2 should fix this, but to support Interix 3.5, a special case is needed here. Since this changes glheader.h for all platforms, bump PKGREVISION (but only for the MesaLib package). @ text @d3 10 a12 12 --- src/mesa/main/glheader.h.orig 2005-11-27 13:16:31.000000000 -0500 +++ src/mesa/main/glheader.h @@@@ -77,6 +77,12 @@@@ # if _MSC_VER == 1200 typedef UINT_PTR uintptr_t; # endif +#elif defined(__INTERIX) +/* Interix 3.x has a gcc that shadows this. */ +# ifndef _UINTPTR_T_DEFINED + typedef unsigned long uintptr_t; +# define _UINTPTR_T_DEFINED +# endif d14 9 a22 2 # include #endif @ 1.4 log @Interix doesn't have , but is guaranteed to pull in [u]intptr_t. @ text @d5 1 a5 1 @@@@ -77,6 +77,8 @@@@ d10 5 a14 1 +# include @ 1.3 log @ 6.4.2 February 2, 2006 New: - added OSMesaColorClamp() function/feature - added wglGetExtensionStringARB() function Bug fixes: - fixed some problems when building on Windows - GLw header files weren't installed by installmesa script (bug 5396) - GL/glfbdev.h file was missing from tarballs - fixed TNL initialization bug which could lead to crash (bug 5791) @ text @d1 1 a1 1 $NetBSD: patch-ak,v 1.2 2006/01/30 08:54:55 rillig Exp $ d3 11 a13 41 Declarations inside of macros are evil. Even more if they are not preceded by an additional opening brace. --- src/mesa/swrast/s_triangle.c.orig 2005-06-30 15:42:10.000000000 +0200 +++ src/mesa/swrast/s_triangle.c 2006-01-30 09:53:24.000000000 +0100 @@@@ -163,6 +163,7 @@@@ _swrast_culltriangle( GLcontext *ctx, } #define RENDER_SPAN( span ) \ +{ \ GLuint i; \ span.intTex[0] -= FIXED_HALF; /* off-by-one error? */ \ span.intTex[1] -= FIXED_HALF; \ @@@@ -177,7 +178,8 @@@@ _swrast_culltriangle( GLcontext *ctx, span.intTex[0] += span.intTexStep[0]; \ span.intTex[1] += span.intTexStep[1]; \ } \ - rb->PutRowRGB(ctx, rb, span.end, span.x, span.y, span.array->rgb, NULL); + rb->PutRowRGB(ctx, rb, span.end, span.x, span.y, span.array->rgb, NULL); \ +} #include "s_tritemp.h" @@@@ -214,6 +216,7 @@@@ _swrast_culltriangle( GLcontext *ctx, } #define RENDER_SPAN( span ) \ +{ \ GLuint i; \ span.intTex[0] -= FIXED_HALF; /* off-by-one error? */ \ span.intTex[1] -= FIXED_HALF; \ @@@@ -238,7 +241,8 @@@@ _swrast_culltriangle( GLcontext *ctx, span.z += span.zStep; \ } \ rb->PutRowRGB(ctx, rb, span.end, span.x, span.y, \ - span.array->rgb, span.array->mask); + span.array->rgb, span.array->mask); \ +} #include "s_tritemp.h" @ 1.2 log @That evil macro RENDER_SPAN is defined twice -- I only catched one in the first try. @ text @d1 1 a1 1 $NetBSD: patch-ak,v 1.1 2006/01/26 15:16:16 rillig Exp $ @ 1.1 log @Added patch-ak, which fixes the bulk build for NetBSD 1.6.2/i386. @ text @d1 1 a1 1 $NetBSD$ d6 2 a7 2 --- src/mesa/swrast/s_triangle.c.orig 2006-01-23 21:27:28.000000000 +0100 +++ src/mesa/swrast/s_triangle.c 2006-01-23 21:27:06.000000000 +0100 d26 18 @