diff options
author | hasso <hasso@pkgsrc.org> | 2009-07-08 20:00:57 +0000 |
---|---|---|
committer | hasso <hasso@pkgsrc.org> | 2009-07-08 20:00:57 +0000 |
commit | f9627f96d13992c46f70deb27c95d7f45b7ffe20 (patch) | |
tree | dec80c2d65e6d94b3bb326d022352373ea629acd /graphics/MesaLib | |
parent | 10a7d7eb5b02620a6502759b4acd2049d980cb96 (diff) | |
download | pkgsrc-f9627f96d13992c46f70deb27c95d7f45b7ffe20.tar.gz |
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
Diffstat (limited to 'graphics/MesaLib')
-rw-r--r-- | graphics/MesaLib/Makefile | 3 | ||||
-rw-r--r-- | graphics/MesaLib/distinfo | 26 | ||||
-rw-r--r-- | graphics/MesaLib/patches/patch-ak | 13 | ||||
-rw-r--r-- | graphics/MesaLib/patches/patch-al | 15 | ||||
-rw-r--r-- | graphics/MesaLib/patches/patch-bc | 15 | ||||
-rw-r--r-- | graphics/MesaLib/patches/patch-bd | 24 | ||||
-rw-r--r-- | graphics/MesaLib/patches/patch-be | 44 |
7 files changed, 55 insertions, 85 deletions
diff --git a/graphics/MesaLib/Makefile b/graphics/MesaLib/Makefile index b2ef1da5e96..538b3d6c52a 100644 --- a/graphics/MesaLib/Makefile +++ b/graphics/MesaLib/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.79 2009/06/19 18:19:15 hasso Exp $ +# $NetBSD: Makefile,v 1.80 2009/07/08 20:00:57 hasso Exp $ PKGNAME= MesaLib-${MESA_PKGVERSION} -PKGREVISION= 3 COMMENT= Graphics library similar to SGI's OpenGL MESA_HEADERS= gl.h gl_mangle.h glext.h glx.h glxext.h \ diff --git a/graphics/MesaLib/distinfo b/graphics/MesaLib/distinfo index cc5021750f1..f13c147020a 100644 --- a/graphics/MesaLib/distinfo +++ b/graphics/MesaLib/distinfo @@ -1,14 +1,14 @@ -$NetBSD: distinfo,v 1.66 2009/06/19 18:19:15 hasso Exp $ +$NetBSD: distinfo,v 1.67 2009/07/08 20:00:58 hasso Exp $ -SHA1 (Mesa-7.4.2/MesaDemos-7.4.2.tar.bz2) = cbba586829c76a5e7a54a906567b4b2174d6e1aa -RMD160 (Mesa-7.4.2/MesaDemos-7.4.2.tar.bz2) = c6434d325897540618130e97891f391721b543b5 -Size (Mesa-7.4.2/MesaDemos-7.4.2.tar.bz2) = 1367293 bytes -SHA1 (Mesa-7.4.2/MesaGLUT-7.4.2.tar.bz2) = 85f357345d71dfe60b785f0cbb03d1e070841c2d -RMD160 (Mesa-7.4.2/MesaGLUT-7.4.2.tar.bz2) = caa69b7f2aa7136377cda2f690699415396c64ab -Size (Mesa-7.4.2/MesaGLUT-7.4.2.tar.bz2) = 328646 bytes -SHA1 (Mesa-7.4.2/MesaLib-7.4.2.tar.bz2) = fe70945ccf2c08d18ae4e83000018f0400352065 -RMD160 (Mesa-7.4.2/MesaLib-7.4.2.tar.bz2) = e70b8fd203325e676d90485632bf266e39d46a7e -Size (Mesa-7.4.2/MesaLib-7.4.2.tar.bz2) = 3371577 bytes +SHA1 (Mesa-7.4.4/MesaDemos-7.4.4.tar.bz2) = 190b51dd1e456f12c70cd428ec47ca8de0ed72fe +RMD160 (Mesa-7.4.4/MesaDemos-7.4.4.tar.bz2) = 492850ff48aa54d35f1acdd09ac90e61a9d93bc1 +Size (Mesa-7.4.4/MesaDemos-7.4.4.tar.bz2) = 1367659 bytes +SHA1 (Mesa-7.4.4/MesaGLUT-7.4.4.tar.bz2) = 41635a1c5b3bfe4bff4f9a086fb0b17fd441c431 +RMD160 (Mesa-7.4.4/MesaGLUT-7.4.4.tar.bz2) = 33a9e1a7b014d284ea4ec785c1912baccc5b2176 +Size (Mesa-7.4.4/MesaGLUT-7.4.4.tar.bz2) = 328900 bytes +SHA1 (Mesa-7.4.4/MesaLib-7.4.4.tar.bz2) = 1cdcef24900489bc0a879013b2138c0d9aedffe3 +RMD160 (Mesa-7.4.4/MesaLib-7.4.4.tar.bz2) = 9c9a5e8b7f8d2fd175cc8542e2aecf48edf8c084 +Size (Mesa-7.4.4/MesaLib-7.4.4.tar.bz2) = 3375615 bytes SHA1 (patch-aa) = 9afc2758ebbef3737f8c858f74f0c93d86bb0861 SHA1 (patch-ab) = 27b44d856602d590d2596f41cd17cdaf18bdc96e SHA1 (patch-ac) = ed3ec49ea2aacf231bbcb38093f3dc01a0cb2468 @@ -19,6 +19,8 @@ SHA1 (patch-ag) = da4de00aaebf226489ca3f5c25470fe3ed41e3b7 SHA1 (patch-ah) = 2ecaee79c6b139272ef247d97d2a9f5834550a9f SHA1 (patch-ai) = 620c80ffbca1249469138f0af28eec575c546b87 SHA1 (patch-aj) = 3749b279b500b1a93e45985ae956e8a70d854d9c +SHA1 (patch-ak) = d991d27d0ef5f3a4d98dbddfd973a3ff752745d4 +SHA1 (patch-al) = 0970dfcc87f464df6ab979a272aeac3d7f869388 SHA1 (patch-am) = 744f13b6a2fc79746bcacecf11461e78de7bf1ef SHA1 (patch-aq) = 0e6099b0d23f5931b5d6ee80debc2231f9a58de5 SHA1 (patch-at) = a6ec9a663b8d1634ae20216fc3e6a0b52220e905 @@ -29,8 +31,6 @@ SHA1 (patch-ax) = 9a1c488526ba1a7a0cdd0f34c85861edcd5976e3 SHA1 (patch-ay) = 8a5eb2d874026032f9b9c15e06abb40863a21a8a SHA1 (patch-ba) = 44e258235ac949713c4fcead25cb7ab7498cbb7f SHA1 (patch-bb) = 4fd8a770bd0275c3467447f77f51e957996c93ac -SHA1 (patch-bc) = 6b8df3762d666c2e7720183b6d292053bda86f5a -SHA1 (patch-bd) = 61cb50ef49e64ecc0f87750d60244f1ff7b44bd4 -SHA1 (patch-be) = 5407ae34110aa37b8d05801723f2b4739fd95021 +SHA1 (patch-be) = 28caa14529347138ff1a86fa64964fe253989cb5 SHA1 (patch-cb) = 83789d71de41aed2ba81a8239fb035a4cd295477 SHA1 (patch-cc) = 737d8b474b1c296f3ceb4de515dd385aae072394 diff --git a/graphics/MesaLib/patches/patch-ak b/graphics/MesaLib/patches/patch-ak new file mode 100644 index 00000000000..120781df6b5 --- /dev/null +++ b/graphics/MesaLib/patches/patch-ak @@ -0,0 +1,13 @@ +$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) diff --git a/graphics/MesaLib/patches/patch-al b/graphics/MesaLib/patches/patch-al new file mode 100644 index 00000000000..fe35b7c9194 --- /dev/null +++ b/graphics/MesaLib/patches/patch-al @@ -0,0 +1,15 @@ +$NetBSD: patch-al,v 1.6 2009/07/08 20:00:58 hasso Exp $ + +http://cgit.freedesktop.org/mesa/mesa/commit/?id=32c44fb8 + +--- src/glx/x11/glxcmds.c.orig 2009-07-08 21:22:47 +0300 ++++ src/glx/x11/glxcmds.c 2009-07-08 21:23:31 +0300 +@@ -164,7 +164,7 @@ GetGLXScreenConfigs(Display *dpy, int sc + { + __GLXdisplayPrivate * const priv = __glXInitialize(dpy); + +- return (priv->screenConfigs != NULL) ? &priv->screenConfigs[scrn] : NULL; ++ return (priv && priv->screenConfigs != NULL) ? &priv->screenConfigs[scrn] : NULL; + } + + diff --git a/graphics/MesaLib/patches/patch-bc b/graphics/MesaLib/patches/patch-bc deleted file mode 100644 index 64a09341d4b..00000000000 --- a/graphics/MesaLib/patches/patch-bc +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-bc,v 1.1 2009/06/05 11:10:35 wiz Exp $ - -http://bugs.freedesktop.org/show_bug.cgi?id=21053 - ---- src/glx/x11/drisw_glx.c.orig 2009-05-19 12:00:40 +0300 -+++ src/glx/x11/drisw_glx.c 2009-05-19 12:01:16 +0300 -@@ -405,6 +405,8 @@ driCreateScreen(__GLXscreenConfigs * psc - psp->createContext = driCreateContext; - psp->createDrawable = driCreateDrawable; - psp->swapBuffers = driSwapBuffers; -+ psp->waitX = NULL; -+ psp->waitGL = NULL; - - return psp; - diff --git a/graphics/MesaLib/patches/patch-bd b/graphics/MesaLib/patches/patch-bd deleted file mode 100644 index cccf7b7a945..00000000000 --- a/graphics/MesaLib/patches/patch-bd +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-bd,v 1.1 2009/06/10 10:47:23 hasso Exp $ - -Fix "freeze on exit" issue with many games. The patch taken from upstream -bugzilla: http://bugs.freedesktop.org/show_bug.cgi?id=21756 - ---- src/mesa/main/texstate.c.orig 2009-06-10 12:59:19 +0300 -+++ src/mesa/main/texstate.c 2009-06-10 13:00:26 +0300 -@@ -429,7 +429,7 @@ texture_override(GLcontext *ctx, - } - if (texObj->_Complete) { - texUnit->_ReallyEnabled = textureBit; -- texUnit->_Current = texObj; -+ _mesa_reference_texobj(&texUnit->_Current, texObj); - update_texture_compare_function(ctx, texObj); - } - } -@@ -485,7 +485,6 @@ update_texture_state( GLcontext *ctx ) - GLbitfield enableBits; - GLuint tex; - -- texUnit->_Current = NULL; - texUnit->_ReallyEnabled = 0; - texUnit->_GenFlags = 0; - diff --git a/graphics/MesaLib/patches/patch-be b/graphics/MesaLib/patches/patch-be index fad67dd644a..81df6577450 100644 --- a/graphics/MesaLib/patches/patch-be +++ b/graphics/MesaLib/patches/patch-be @@ -1,17 +1,16 @@ -$NetBSD: patch-be,v 1.1 2009/06/19 18:19:15 hasso Exp $ +$NetBSD: patch-be,v 1.2 2009/07/08 20:00:58 hasso Exp $ ---- src/mesa/drivers/osmesa/Makefile.orig 2009-06-19 13:36:30 +0300 -+++ src/mesa/drivers/osmesa/Makefile 2009-06-19 13:45:04 +0300 -@@ -19,7 +19,7 @@ INCLUDE_DIRS = \ - -I$(TOP)/src/mesa \ - -I$(TOP)/src/mesa/main +--- src/mesa/drivers/osmesa/Makefile.orig 2009-06-17 20:30:03 +0300 ++++ src/mesa/drivers/osmesa/Makefile 2009-06-22 07:52:00 +0300 +@@ -21,14 +21,15 @@ INCLUDE_DIRS = \ + # Standalone osmesa needs to be linked with core Mesa APIs + ifeq ($(DRIVER_DIRS), osmesa) -CORE_MESA = $(TOP)/src/mesa/libmesa.a $(TOP)/src/mesa/libglapi.a +CORE_MESA = $(TOP)/src/mesa/libmesa.la $(TOP)/src/mesa/libglapi.la - - - .PHONY: osmesa8 -@@ -27,7 +27,8 @@ CORE_MESA = $(TOP)/src/mesa/libmesa.a $( + else + CORE_MESA = + endif .c.o: @@ -21,27 +20,10 @@ $NetBSD: patch-be,v 1.1 2009/06/19 18:19:15 hasso Exp $ default: $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME) -@@ -44,11 +45,11 @@ default: $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_ - osmesa8: $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME) - - $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME): $(OBJECTS) -- $(MKLIB) -o $(OSMESA_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \ -- -major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \ -- -install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \ -- -id $(INSTALL_LIB_DIR)/lib$(OSMESA_LIB).$(MESA_MAJOR).dylib \ -- $(OSMESA_LIB_DEPS) $(OBJECTS) -+ $(LIBTOOL) --mode=link $(CC) \ -+ -o $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME:.so=.la) $(LDFLAGS) \ -+ -rpath $(PREFIX)/lib \ -+ -version-info $(MESA_MAJOR):$(MESA_MINOR):0 \ -+ $(OSMESA_LIB_DEPS) $(OBJECTS:.o=.lo) - - - -@@ -56,11 +57,11 @@ $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME): $( - # The libOSMesa16/libOSMesa32 libraries do not use libGL but rather are built - # with all the other Mesa sources (compiled with -DCHAN_BITS=16/32 - osmesa16: $(OBJECTS) $(CORE_MESA) +@@ -38,11 +39,11 @@ default: $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_ + # sources. We can also build libOSMesa16/libOSMesa32 by setting + # -DCHAN_BITS=16/32. + $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME): $(OBJECTS) $(CORE_MESA) - $(MKLIB) -o $(OSMESA_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \ - -major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \ - -install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \ |