dist-git conversion

#2781)

.gitignore

@@ -1,8 +1,5 @@
-*.jx
-*.src.rpm
-.build*
-/mesa-*.tar.bz2
-/mesa-*.tar.xz
-x86_64/
-results_mesa/
-mesa-*/
+MesaLib-7.0.1.tar.bz2
+MesaDemos-7.0.1.tar.bz2
+gl-manpages-1.0.1.tar.bz2
+MesaDemos-7.0.2.tar.bz2
+MesaLib-7.0.2.tar.bz2

0001-Link-with-libclang-cpp.patch

@@ -1,37 +0,0 @@
-From c9987fca1fa611e48f85644493edd8d5a30cf403 Mon Sep 17 00:00:00 2001
-From: Tom Stellard <tstellar@redhat.com>
-Date: Fri, 13 Dec 2019 17:42:17 +0000
-Subject: [PATCH] Link with libclang-cpp
-
----
- src/gallium/targets/opencl/meson.build | 14 +-------------
- 1 file changed, 1 insertion(+), 13 deletions(-)
-
-diff --git a/src/gallium/targets/opencl/meson.build b/src/gallium/targets/opencl/meson.build
-index 907cc74337d..031d35b9716 100644
---- a/src/gallium/targets/opencl/meson.build
-+++ b/src/gallium/targets/opencl/meson.build
-@@ -43,19 +43,7 @@ libopencl = shared_library(
-   dependencies : [
-     idep_mesautil,
-     dep_clock, dep_dl, dep_unwind, dep_elf,
--    cpp.find_library('clangCodeGen', dirs : llvm_libdir),
--    cpp.find_library('clangFrontendTool', dirs : llvm_libdir),
--    cpp.find_library('clangFrontend', dirs : llvm_libdir),
--    cpp.find_library('clangDriver', dirs : llvm_libdir),
--    cpp.find_library('clangSerialization', dirs : llvm_libdir),
--    cpp.find_library('clangParse', dirs : llvm_libdir),
--    cpp.find_library('clangSema', dirs : llvm_libdir),
--    cpp.find_library('clangAnalysis', dirs : llvm_libdir),
--    cpp.find_library('clangAST', dirs : llvm_libdir),
--    cpp.find_library('clangASTMatchers', dirs : llvm_libdir),
--    cpp.find_library('clangEdit', dirs : llvm_libdir),
--    cpp.find_library('clangLex', dirs : llvm_libdir),
--    cpp.find_library('clangBasic', dirs : llvm_libdir),
-+    cpp.find_library('clang-cpp', dirs : llvm_libdir),
-   ],
-   version : '@0@.0.0'.format(opencl_version),
-   install : true,
--- 
-2.20.1
-

0003-evergreen-big-endian.patch

@@ -1,26 +0,0 @@
-From 0ec3bdb2264b491fd3f5dc4e638b4c12611ef219 Mon Sep 17 00:00:00 2001
-From: Igor Gnatenko <i.gnatenko.brain@gmail.com>
-Date: Sun, 20 Mar 2016 13:27:45 +0100
-Subject: [PATCH 3/4] evergreen big endian
-
-Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
----
- src/gallium/drivers/r600/r600_state_common.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/gallium/drivers/r600/r600_state_common.c b/src/gallium/drivers/r600/r600_state_common.c
-index cac240e..4b620a1 100644
---- a/src/gallium/drivers/r600/r600_state_common.c
-+++ b/src/gallium/drivers/r600/r600_state_common.c
-@@ -2716,7 +2716,7 @@ uint32_t r600_translate_colorformat(enum chip_class chip, enum pipe_format forma
- 
- uint32_t r600_colorformat_endian_swap(uint32_t colorformat, bool do_endian_swap)
- {
--	if (R600_BIG_ENDIAN) {
-+	if (0 && R600_BIG_ENDIAN) {
- 		switch(colorformat) {
- 		/* 8-bit buffers. */
- 		case V_0280A0_COLOR_4_4:
--- 
-2.7.4
-

Mesa-MLAA-License-Clarification-Email.txt

@@ -1,117 +0,0 @@
-
-Subject: RE: Question about Mesa MLAA license
-From: Jorge Jimenez <iryoku@gmail.com>
-Date: 01/08/2013 12:50 PM
-To: Tom Callaway <tcallawa@redhat.com>
-CC: "jorge@iryoku.com" <jorge@iryoku.com>
-
-Yes to both questions.
- 
-Thanks,
-Jorge
- 
-From: Tom Callaway <tcallawa@redhat.com>
-Sent: January 8, 2013 6:49 PM
-To: Jorge Jimenez <iryoku@gmail.com>
-CC: jorge@iryoku.com
-Subject: Re: Question about Mesa MLAA license
- 
-On 01/08/2013 12:39 PM, Jorge Jimenez wrote:
-> Hi Tom,
->
-> What we meant with that is that we made an exception for clause 2.
-> Instead of clause 2, in the case of the Mesa project, you have to name
-> the technique Jimenez's MLAA in the config options of Mesa. We did that
-> just to allow them to solve license issues. This exception should be for
-> the Mesa project, and any project using Mesa, like Fedora.
->
-> We want to widespread usage of our MLAA, so we want to avoid any kind of
-> license complications. Hope current one is good for Fedora, if not
-> please tell, and we'll see what we can do!
-
-Okay, a few more questions:
-
-* If Fedora decides to simply reproduce the quoted statement:
-"Uses Jimenez's MLAA. Copyright (C) 2010 by Jorge Jimenez, Belen Masia,
-Jose I. Echevarria, Fernando Navarro and Diego Gutierrez."
-
-Specifically, if this is done as part of documentation included with
-Mesa, is that sufficient to meet clause 2 even if the Mesa config option
-is not set as described in your exception?
-
-* Currently, the Mesa config option for MLAA says: "Morphological
-anti-aliasing based on Jimenez\' MLAA. 0 to disable, 8 for default
-quality". Is this in compliance with your exception?
-
-Thanks again,
-
-~tom
-
-==
-Fedora Project
-
-Subject: RE: Question about Mesa MLAA license
-From: Jorge Jimenez <iryoku@gmail.com>
-Date: 01/08/2013 12:39 PM
-To: "jorge@iryoku.com" <jorge@iryoku.com>, Tom Callaway <tcallawa@redhat.com>
-
-Hi Tom,
- 
-What we meant with that is that we made an exception for clause 2. 
-Instead of clause 2, in the case of the Mesa project, you have to name 
-the technique Jimenez's MLAA in the config options of Mesa. We did that 
-just to allow them to solve license issues. This exception should be for 
-the Mesa project, and any project using Mesa, like Fedora.
- 
-We want to widespread usage of our MLAA, so we want to avoid any kind of 
-license complications. Hope current one is good for Fedora, if not 
-please tell, and we'll see what we can do!
- 
-Cheers,
-Jorge
- 
-From: Tom Callaway <tcallawa@redhat.com>
-Sent: January 8, 2013 6:30 PM
-To: jorge@iryoku.com
-Subject: Question about Mesa MLAA license
- 
-Jorge,
-
-Thanks for all of your fantastic graphics work! I have been auditing
-Fedora (a popular distribution of Linux) for license compliance and I
-came across your MLAA code in Mesa.
-
-The license says:
-
- *    2. Redistributions in binary form must reproduce the following
-statement:
- *
- *       "Uses Jimenez's MLAA. Copyright (C) 2010 by Jorge Jimenez, Belen Masia,
- *        Jose I. Echevarria, Fernando Navarro and Diego Gutierrez."
- *
- *       Only for use in the Mesa project, this point 2 is filled by naming the
- *       technique Jimenez's MLAA in the Mesa config options.
-
-That wording is unclear. When you say "Only for use in the Mesa
-project...", it seems like you could either be saying:
-
-- This code may only be used as part of Mesa.
-
-OR
-
-- In Mesa, you can comply with clause 2 by simply selecting "Jimenez's
-MLAA" in the Mesa config options.
-
-*****
-
-If the first item is true, then we may have to remove the MLAA code from
-Fedora's copy of Mesa. However, looking at the license on your SMAA
-code, I do not believe it to be the case. Please let me know either way!
-
-Thanks in advance,
-
-Tom Callaway
-Fedora Legal
-
-==
-Fedora Project

mesa-6.5-dont-libglut-me-harder-ok-thx-bye.patch

@@ -0,0 +1,17 @@
+--- progs/xdemos/Makefile.dont-libglut-me-harder-ok-thx-bye	2006-07-25 05:27:36.000000000 -0400
++++ progs/xdemos/Makefile	2006-07-25 05:33:57.000000000 -0400
+@@ -49,8 +49,13 @@
+ 	-rm -f $(PROGS)
+ 	-rm -f *.o *~
+ 
+-
+ # special cases
++glxgears:
++	$(CC) $(CFLAGS) glxgears.c -lGL -o $@
++
++glxinfo:
++	$(CC) $(CFLAGS) -I$(INCDIR) glxinfo.c -L$(TOP)/lib -L$(TOP)/lib64 -lGL -lGLU -o $@
++
+ pbinfo: pbinfo.o pbutil.o
+ 	$(CC) $(CFLAGS) pbinfo.o pbutil.o $(APP_LIB_DEPS) -o $@
+ 

mesa-6.5.2-bindcontext-paranoia.patch

@@ -0,0 +1,11 @@
+--- Mesa-6.5.2/src/mesa/drivers/dri/common/dri_util.c.jx	2006-12-02 13:14:16.000000000 -0500
++++ Mesa-6.5.2/src/mesa/drivers/dri/common/dri_util.c	2007-04-04 12:41:08.000000000 -0400
+@@ -271,6 +271,8 @@
+     __DRIdrawablePrivate *prp;
+     __DRIcontextPrivate * const pcp = ctx->private;
+ 
++    if (!pcp)
++	return GL_FALSE;
+ 
+     /* Find the _DRIdrawable which corresponds to the writing drawable. */
+     pdraw = __driFindDrawable(psp->drawHash, draw);

mesa-6.5.2-xserver-1.1-source-compat.patch

@@ -0,0 +1,12 @@
+--- Mesa-6.5.2/src/mesa/glapi/dispatch.h.jx	2006-12-12 18:02:22.000000000 -0500
++++ Mesa-6.5.2/src/mesa/glapi/dispatch.h	2006-12-12 18:03:04.000000000 -0500
+@@ -3840,4 +3840,9 @@
+ 
+ #endif /* !defined(IN_DRI_DRIVER) */
+ 
++/* backwards compatibility for X server 1.1.1 */
++#define CALL_IsTextureEXT(a, b) CALL_IsTexture(a, b)
++#define CALL_GenTexturesEXT(a, b) CALL_GenTextures(a, b)
++#define CALL_AreTexturesResidentEXT(a, b) CALL_AreTexturesResident(a, b)
++
+ #endif /* !defined( _DISPATCH_H_ ) */

mesa-7.0-build-config.patch

@@ -0,0 +1,223 @@
+diff -up Mesa-7.0.2/configs/linux.da Mesa-7.0.2/configs/linux
+--- Mesa-7.0.2/configs/linux.da	2007-11-02 05:09:01.000000000 +1000
++++ Mesa-7.0.2/configs/linux	2008-01-02 02:24:07.000000000 +1000
+@@ -8,7 +8,9 @@ CONFIG_NAME = linux
+ CC = gcc
+ CXX = g++
+ 
+-OPT_FLAGS  = -O3 -g
++MKDEP = true
++
++OPT_FLAGS ?= -O3 -g
+ PIC_FLAGS  = -fPIC
+ 
+ # Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support.  Add -m32
+diff -up Mesa-7.0.2/configs/linux-indirect.da Mesa-7.0.2/configs/linux-indirect
+--- Mesa-7.0.2/configs/linux-indirect.da	2007-11-02 05:09:01.000000000 +1000
++++ Mesa-7.0.2/configs/linux-indirect	2008-01-02 02:24:07.000000000 +1000
+@@ -15,7 +15,7 @@ CXX = g++
+ #MKDEP_OPTIONS = -MF depend
+ 
+ WARN_FLAGS = -Wall
+-OPT_FLAGS  = -O -g
++OPT_FLAGS  ?= -O -g
+ PIC_FLAGS  = -fPIC
+ 
+ # Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support.
+@@ -47,7 +47,7 @@ GL_LIB_DEPS   = $(EXTRA_LIB_PATH) -lX11 
+ 
+ 
+ # Directories
+-SRC_DIRS = glx/x11 glu glut/glx glw
++SRC_DIRS = glx/x11 glu
+ DRIVER_DIRS =
+ PROGRAM_DIRS = 
+ WINDOW_SYSTEM=dri
+diff -up Mesa-7.0.2/configs/linux-dri.da Mesa-7.0.2/configs/linux-dri
+--- Mesa-7.0.2/configs/linux-dri.da	2007-11-02 05:09:01.000000000 +1000
++++ Mesa-7.0.2/configs/linux-dri	2008-01-02 02:24:07.000000000 +1000
+@@ -12,8 +12,9 @@ CXX = g++
+ #MKDEP = /usr/X11R6/bin/makedepend
+ #MKDEP = gcc -M
+ #MKDEP_OPTIONS = -MF depend
++MKDEP = true
+ 
+-OPT_FLAGS  = -O -g
++OPT_FLAGS ?= -O -g
+ PIC_FLAGS  = -fPIC
+ 
+ # Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support.
+@@ -25,8 +26,6 @@ DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOU
+ 	-DGLX_DIRECT_RENDERING -DGLX_INDIRECT_RENDERING \
+ 	-DHAVE_ALIAS -DHAVE_POSIX_MEMALIGN
+ 
+-X11_INCLUDES = -I/usr/X11R6/include
+-
+ CFLAGS = -Wall -Wmissing-prototypes -std=c99 -ffast-math \
+ 	$(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) $(ASM_FLAGS)
+ 
+@@ -41,7 +40,7 @@ CXXFLAGS += -fno-strict-aliasing
+ ASM_SOURCES = 
+ 
+ # Library/program dependencies
+-EXTRA_LIB_PATH=-L/usr/X11R6/lib
++EXTRA_LIB_PATH =
+ 
+ LIBDRM_CFLAGS = `pkg-config --cflags libdrm`
+ LIBDRM_LIB = `pkg-config --libs libdrm`
+@@ -59,10 +58,10 @@ USING_EGL=0
+ 
+ # Directories
+ ifeq ($(USING_EGL), 1)
+-SRC_DIRS = egl glx/x11 mesa glu glut/glx glw
++SRC_DIRS = egl glx/x11 mesa glu glut/glx
+ PROGRAM_DIRS = egl xdemos
+ else
+-SRC_DIRS = glx/x11 mesa glu glut/glx glw
++SRC_DIRS = glx/x11 mesa glu
+ PROGRAM_DIRS = xdemos
+ endif
+ 
+@@ -72,4 +71,4 @@ WINDOW_SYSTEM=dri
+ # gamma are missing because they have not been converted to use the new
+ # interface.
+ DRI_DIRS = i810 i915tex i915 i965 mach64 mga r128 r200 r300 radeon s3v \
+-	savage sis tdfx trident unichrome ffb
++	savage tdfx trident unichrome ffb # sis
+diff -up Mesa-7.0.2/configs/default.da Mesa-7.0.2/configs/default
+--- Mesa-7.0.2/configs/default.da	2007-11-02 01:30:52.000000000 +1000
++++ Mesa-7.0.2/configs/default	2008-01-02 02:25:54.000000000 +1000
+@@ -59,8 +59,8 @@ GLW_SOURCES = GLwDrawA.c
+ 
+ 
+ # Directories to build
+-LIB_DIR = lib
+-SRC_DIRS = mesa glu glut/glx glw
++LIB_DIR ?= lib
++SRC_DIRS = mesa glu
+ GLU_DIRS = sgi
+ DRIVER_DIRS = x11 osmesa
+ # Which subdirs under $(TOP)/progs/ to enter:
+@@ -73,7 +73,7 @@ GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -l
+ OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB)
+ GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm
+ GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lX11 -lXmu -lXt -lXi -lm
+-GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lXt -lX11
++GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lXm $(EXTRA_LIB_PATH) -lXt -lX11
+ 
+ # Program dependencies - specific GL/glut libraries added in Makefiles
+ APP_LIB_DEPS = -lm
+@@ -82,7 +82,7 @@ APP_LIB_DEPS = -lm
+ 
+ # Installation directories (for make install)
+ INSTALL_DIR = /usr/local
+-DRI_DRIVER_INSTALL_DIR = /usr/X11R6/lib/modules/dri
++DRI_DRIVER_INSTALL_DIR = $(DRI_DRIVER_DIR)
+ 
+ # Where libGL will look for DRI hardware drivers
+ DRI_DRIVER_SEARCH_DIR = $(DRI_DRIVER_INSTALL_DIR)
+diff -up Mesa-7.0.2/configs/linux-dri-ppc.da Mesa-7.0.2/configs/linux-dri-ppc
+--- Mesa-7.0.2/configs/linux-dri-ppc.da	2007-06-22 08:10:53.000000000 +1000
++++ Mesa-7.0.2/configs/linux-dri-ppc	2008-01-02 02:24:07.000000000 +1000
+@@ -5,7 +5,7 @@ include $(TOP)/configs/linux-dri
+ 
+ CONFIG_NAME = linux-dri-ppc
+ 
+-OPT_FLAGS = -Os -mcpu=603
++OPT_FLAGS ?= -Os -mcpu=603
+ PIC_FLAGS = -fPIC
+ 
+ ASM_FLAGS = -DUSE_PPC_ASM -DUSE_VMX_ASM
+diff -up Mesa-7.0.2/configs/linux-osmesa16.da Mesa-7.0.2/configs/linux-osmesa16
+--- Mesa-7.0.2/configs/linux-osmesa16.da	2007-11-02 05:09:01.000000000 +1000
++++ Mesa-7.0.2/configs/linux-osmesa16	2008-01-02 02:24:07.000000000 +1000
+@@ -7,8 +7,10 @@ CONFIG_NAME = linux-osmesa16
+ # Compiler and flags
+ CC = gcc
+ CXX = g++
+-CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include -DCHAN_BITS=16 -DDEFAULT_SOFTWARE_DEPTH_BITS=31
+-CXXFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
++DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
++OPT_FLAGS ?= -O3 -ansi -pendantic -fPIC -ffast-math
++CFLAGS = $(OPT_FLAGS) $(DEFINES) -DCHAN_BITS=16 -DDEFAULT_SOFTWARE_DEPTH_BITS=31
++CXXFLAGS = $(OPT_FLAGS) $(DEFINES) 
+ 
+ # Work around aliasing bugs - developers should comment this out
+ CFLAGS += -fno-strict-aliasing
+@@ -20,12 +22,12 @@ OSMESA_LIB_NAME = libOSMesa16.so
+ 
+ 
+ # Directories
+-SRC_DIRS = mesa glu
++SRC_DIRS = mesa
+ DRIVER_DIRS = osmesa
+ PROGRAM_DIRS = 
+ 
+ 
+ # Dependencies
+-OSMESA_LIB_DEPS = -lm -lpthread
++OSMESA_LIB_DEPS = -lm -lpthread -lselinux
+ GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(OSMESA_LIB)
+ APP_LIB_DEPS = -lOSMesa16
+diff -up Mesa-7.0.2/configs/linux-osmesa32.da Mesa-7.0.2/configs/linux-osmesa32
+--- Mesa-7.0.2/configs/linux-osmesa32.da	2007-11-02 05:09:01.000000000 +1000
++++ Mesa-7.0.2/configs/linux-osmesa32	2008-01-02 02:24:07.000000000 +1000
+@@ -7,8 +7,10 @@ CONFIG_NAME = linux-osmesa32
+ # Compiler and flags
+ CC = gcc
+ CXX = g++
+-CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include -DCHAN_BITS=32 -DDEFAULT_SOFTWARE_DEPTH_BITS=31
+-CXXFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
++DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
++OPT_FLAGS ?= -O3 -ansi -pendantic -fPIC -ffast-math
++CFLAGS = $(OPT_FLAGS) $(DEFINES) -DCHAN_BITS=32 -DDEFAULT_SOFTWARE_DEPTH_BITS=31
++CXXFLAGS = $(OPT_FLAGS) $(DEFINES) 
+ 
+ # Work around aliasing bugs - developers should comment this out
+ CFLAGS += -fno-strict-aliasing
+@@ -20,12 +22,12 @@ OSMESA_LIB_NAME = libOSMesa32.so
+ 
+ 
+ # Directories
+-SRC_DIRS = mesa glu
++SRC_DIRS = mesa
+ DRIVER_DIRS = osmesa
+ PROGRAM_DIRS = 
+ 
+ 
+ # Dependencies
+-OSMESA_LIB_DEPS = -lm -lpthread
++OSMESA_LIB_DEPS = -lm -lpthread -lselinux
+ GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(OSMESA_LIB)
+ APP_LIB_DEPS = -lOSMesa32
+diff -up Mesa-7.0.2/configs/linux-osmesa.da Mesa-7.0.2/configs/linux-osmesa
+--- Mesa-7.0.2/configs/linux-osmesa.da	2007-11-02 05:09:01.000000000 +1000
++++ Mesa-7.0.2/configs/linux-osmesa	2008-01-02 02:27:46.000000000 +1000
+@@ -9,20 +9,22 @@ CONFIG_NAME = linux-osmesa
+ # Compiler and flags
+ CC = gcc
+ CXX = g++
+-CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DPTHREADS
+-CXXFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
++DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
++OPT_FLAGS ?= -O3 -ansi -pendantic -fPIC -ffast-math
++CFLAGS = $(OPT_FLAGS) $(DEFINES)
++CXXFLAGS = $(OPT_FLAGS) $(DEFINES)
+ 
+ # Work around aliasing bugs - developers should comment this out
+ CFLAGS += -fno-strict-aliasing
+ CXXFLAGS += -fno-strict-aliasing
+ 
+ # Directories
+-SRC_DIRS = mesa glu
++SRC_DIRS = mesa
+ DRIVER_DIRS = osmesa
+-PROGRAM_DIRS = osdemos
++PROGRAM_DIRS =
+ 
+ 
+ # Dependencies
+-OSMESA_LIB_DEPS = -lm -lpthread
++OSMESA_LIB_DEPS = -lm -lpthread -lselinux
+ GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(OSMESA_LIB)
+ APP_LIB_DEPS = -lOSMesa -lGLU

mesa-7.0-selinux-awareness.patch

@@ -0,0 +1,71 @@
+diff -up Mesa-7.0/src/mesa/main/execmem.c.jx Mesa-7.0/src/mesa/main/execmem.c
+--- Mesa-7.0/src/mesa/main/execmem.c.jx	2007-06-21 18:10:54.000000000 -0400
++++ Mesa-7.0/src/mesa/main/execmem.c	2007-07-23 16:02:30.000000000 -0400
+@@ -46,6 +46,7 @@
+ #include <unistd.h>
+ #include <sys/mman.h>
+ #include "mm.h"
++#include <selinux/selinux.h>
+ 
+ #define EXEC_HEAP_SIZE (10*1024*1024)
+ 
+@@ -55,9 +56,16 @@ static struct mem_block *exec_heap = NUL
+ static unsigned char *exec_mem = NULL;
+ 
+ 
+-static void
++static int
+ init_heap(void)
+ {
++
++   if (is_selinux_enabled()) {
++      if (!security_get_boolean_active("allow_execmem") ||
++	  !security_get_boolean_pending("allow_execmem"))
++      return 0;
++   }
++
+    if (!exec_heap)
+       exec_heap = mmInit( 0, EXEC_HEAP_SIZE );
+    
+@@ -65,6 +73,8 @@ init_heap(void)
+       exec_mem = (unsigned char *) mmap(0, EXEC_HEAP_SIZE, 
+ 					PROT_EXEC | PROT_READ | PROT_WRITE, 
+ 					MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
++
++   return (exec_mem != NULL);
+ }
+ 
+ 
+@@ -76,7 +86,8 @@ _mesa_exec_malloc(GLuint size)
+ 
+    _glthread_LOCK_MUTEX(exec_mutex);
+ 
+-   init_heap();
++   if (!init_heap())
++      goto bail;
+ 
+    if (exec_heap) {
+       size = (size + 31) & ~31;
+@@ -87,7 +98,8 @@ _mesa_exec_malloc(GLuint size)
+       addr = exec_mem + block->ofs;
+    else 
+       _mesa_printf("_mesa_exec_malloc failed\n");
+-   
++
++bail: 
+    _glthread_UNLOCK_MUTEX(exec_mutex);
+    
+    return addr;
+diff -up Mesa-7.0/configs/linux-dri.jx Mesa-7.0/configs/linux-dri
+--- Mesa-7.0/configs/linux-dri.jx	2007-07-23 15:59:07.000000000 -0400
++++ Mesa-7.0/configs/linux-dri	2007-07-23 17:37:36.000000000 -0400
+@@ -39,7 +39,8 @@ EXTRA_LIB_PATH =
+ 
+ LIBDRM_CFLAGS = `pkg-config --cflags libdrm`
+ LIBDRM_LIB = `pkg-config --libs libdrm`
+-DRI_LIB_DEPS  = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB)
++DRI_LIB_DEPS  = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB) \
++		-lselinux
+ GL_LIB_DEPS   = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \
+ 		-lm -lpthread -ldl \
+                 $(LIBDRM_LIB)

mesa-7.0-symlinks-before-depend.patch

@@ -0,0 +1,12 @@
+diff -up mesa-20070725/src/mesa/drivers/dri/Makefile.template.jx mesa-20070725/src/mesa/drivers/dri/Makefile.template
+--- mesa-20070725/src/mesa/drivers/dri/Makefile.template.jx	2007-07-25 09:36:04.000000000 -0400
++++ mesa-20070725/src/mesa/drivers/dri/Makefile.template	2007-07-26 10:09:54.000000000 -0400
+@@ -70,7 +70,7 @@ SHARED_INCLUDES = \
+ 
+ ##### TARGETS #####
+ 
+-default: depend symlinks $(LIBNAME) $(TOP)/$(LIB_DIR)/$(LIBNAME)
++default: symlinks depend $(LIBNAME) $(TOP)/$(LIB_DIR)/$(LIBNAME)
+ 
+ 
+ $(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile $(TOP)/src/mesa/drivers/dri/Makefile.template

mesa-7.0.1-r300-fix-writemask.patch

@@ -0,0 +1,36 @@
+From 32699696e31234c8d4e4b08f255ba2134ec12db5 Mon Sep 17 00:00:00 2001
+From: Jerome Glisse <glisse@freedesktop.org>
+Date: Sun, 7 Oct 2007 22:49:56 +0200
+Subject: [PATCH] r300: fragprog tex instruction now take writemask into acount.
+
+---
+ src/mesa/drivers/dri/r300/r300_fragprog.c |    6 +++++-
+ 1 files changed, 5 insertions(+), 1 deletions(-)
+
+diff --git a/src/mesa/drivers/dri/r300/r300_fragprog.c b/src/mesa/drivers/dri/r300/r300_fragprog.c
+index cce8e68..78ed44b 100644
+--- a/src/mesa/drivers/dri/r300/r300_fragprog.c
++++ b/src/mesa/drivers/dri/r300/r300_fragprog.c
+@@ -951,6 +951,10 @@ static void emit_tex(struct r300_fragment_program *fp,
+ 		if (REG_GET_TYPE(dest) == REG_TYPE_OUTPUT) {
+ 			rdest = dest;
+ 			dest = get_temp_reg_tex(fp);
++		} else if (fpi->DstReg.WriteMask != WRITEMASK_XYZW) {
++			/* in case write mask isn't XYZW */
++			rdest = dest;
++			dest = get_temp_reg_tex(fp);
+ 		}
+ 		hwdest =
+ 		    t_hw_dst(fp, dest, GL_TRUE,
+@@ -1016,7 +1020,7 @@ static void emit_tex(struct r300_fragment_program *fp,
+ 
+ 	/* Copy from temp to output if needed */
+ 	if (REG_GET_VALID(rdest)) {
+-		emit_arith(fp, PFS_OP_MAD, rdest, WRITEMASK_XYZW, dest,
++		emit_arith(fp, PFS_OP_MAD, rdest, fpi->DstReg.WriteMask, dest,
+ 			   pfs_one, pfs_zero, 0);
+ 		free_temp(fp, dest);
+ 	}
+-- 
+1.5.2.4
+

mesa-7.0.2-e7221.patch

@@ -0,0 +1,34 @@
+diff -up Mesa-7.0.2/src/mesa/drivers/dri/i915/intel_screen.c.e7221 Mesa-7.0.2/src/mesa/drivers/dri/i915/intel_screen.c
+--- Mesa-7.0.2/src/mesa/drivers/dri/i915/intel_screen.c.e7221	2007-11-01 11:30:52.000000000 -0400
++++ Mesa-7.0.2/src/mesa/drivers/dri/i915/intel_screen.c	2008-01-22 13:30:47.000000000 -0500
+@@ -511,6 +511,7 @@ static GLboolean intelCreateContext( con
+ 				sharedContextPrivate );
+ 
+    case PCI_CHIP_I915_G:
++   case PCI_CHIP_E7221_G:
+    case PCI_CHIP_I915_GM:
+    case PCI_CHIP_I945_G:
+    case PCI_CHIP_I945_GM:
+diff -up Mesa-7.0.2/src/mesa/drivers/dri/i915/intel_context.h.e7221 Mesa-7.0.2/src/mesa/drivers/dri/i915/intel_context.h
+--- Mesa-7.0.2/src/mesa/drivers/dri/i915/intel_context.h.e7221	2007-11-01 11:30:52.000000000 -0400
++++ Mesa-7.0.2/src/mesa/drivers/dri/i915/intel_context.h	2008-01-22 13:30:47.000000000 -0500
+@@ -451,6 +451,7 @@ extern int INTEL_DEBUG;
+ #define PCI_CHIP_I855_GM		0x3582
+ #define PCI_CHIP_I865_G			0x2572
+ #define PCI_CHIP_I915_G			0x2582
++#define PCI_CHIP_E7221_G               0x258A
+ #define PCI_CHIP_I915_GM		0x2592
+ #define PCI_CHIP_I945_G			0x2772
+ #define PCI_CHIP_I945_GM		0x27A2
+diff -up Mesa-7.0.2/src/mesa/drivers/dri/i915/intel_context.c.e7221 Mesa-7.0.2/src/mesa/drivers/dri/i915/intel_context.c
+--- Mesa-7.0.2/src/mesa/drivers/dri/i915/intel_context.c.e7221	2007-11-01 11:30:52.000000000 -0400
++++ Mesa-7.0.2/src/mesa/drivers/dri/i915/intel_context.c	2008-01-22 13:34:50.000000000 -0500
+@@ -117,6 +117,8 @@ const GLubyte *intelGetString( GLcontext
+ 	 chipset = "Intel(R) 865G"; break;
+       case PCI_CHIP_I915_G:
+ 	 chipset = "Intel(R) 915G"; break;
++      case PCI_CHIP_E7221_G:
++  	 chipset = "Intel(R) E7221G (i915)"; break;
+       case PCI_CHIP_I915_GM:
+ 	 chipset = "Intel(R) 915GM"; break;
+       case PCI_CHIP_I945_G:

mesa-7.0.2-rx00-vertprog-num-temps-off-by-one.patch

@@ -0,0 +1,44 @@
+--- Mesa-7.0.2/src/mesa/drivers/dri/r200/r200_vertprog.c~	2007-12-28 22:41:51.000000000 +0100
++++ Mesa-7.0.2/src/mesa/drivers/dri/r200/r200_vertprog.c	2007-12-28 22:41:51.000000000 +0100
+@@ -408,6 +408,7 @@ static GLboolean r200_translate_vertex_p
+    int fog_temp_i = 0;
+    int free_inputs;
+    int array_count = 0;
++   int u_temp_used;
+ 
+    vp->native = GL_FALSE;
+    vp->translated = GL_TRUE;
+@@ -1051,14 +1052,15 @@ else {
+          dofogfix = 0;
+       }
+ 
++      u_temp_used = (R200_VSF_MAX_TEMPS - 1) - u_temp_i;
+       if (mesa_vp->Base.NumNativeTemporaries <
+-	 (mesa_vp->Base.NumTemporaries + (R200_VSF_MAX_TEMPS - 1 - u_temp_i))) {
++	 (mesa_vp->Base.NumTemporaries + u_temp_used)) {
+ 	 mesa_vp->Base.NumNativeTemporaries =
+-	    mesa_vp->Base.NumTemporaries + (R200_VSF_MAX_TEMPS - 1 - u_temp_i);
++	    mesa_vp->Base.NumTemporaries + u_temp_used;
+       }
+-      if (u_temp_i < mesa_vp->Base.NumTemporaries) {
++      if ((mesa_vp->Base.NumTemporaries + u_temp_used) > R200_VSF_MAX_TEMPS) {
+ 	 if (R200_DEBUG & DEBUG_FALLBACKS) {
+-	    fprintf(stderr, "Ran out of temps, num temps %d, us %d\n", mesa_vp->Base.NumTemporaries, u_temp_i);
++	    fprintf(stderr, "Ran out of temps, num temps %d, us %d\n", mesa_vp->Base.NumTemporaries, u_temp_used);
+ 	 }
+ 	 return GL_FALSE;
+       }
+--- Mesa-7.0.2/src/mesa/drivers/dri/r300/r300_vertprog.c~	2007-12-28 22:42:19.000000000 +0100
++++ Mesa-7.0.2/src/mesa/drivers/dri/r300/r300_vertprog.c	2007-12-28 22:42:19.000000000 +0100
+@@ -101,8 +101,9 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
+ 
+ #define FREE_TEMPS() \
+ 	do { \
+-		if(u_temp_i < vp->num_temporaries) { \
+-			WARN_ONCE("Ran out of temps, num temps %d, us %d\n", vp->num_temporaries, u_temp_i); \
++		int u_temp_used = (VSF_MAX_FRAGMENT_TEMPS - 1) - u_temp_i; \
++		if((vp->num_temporaries + u_temp_used) > VSF_MAX_FRAGMENT_TEMPS) { \
++			WARN_ONCE("Ran out of temps, num temps %d, us %d\n", vp->num_temporaries, u_temp_used); \
+ 			vp->native = GL_FALSE; \
+ 		} \
+ 		u_temp_i=VSF_MAX_FRAGMENT_TEMPS-1; \

mesa-7.0.2-t_vp_build-use-less-temps.patch

@@ -0,0 +1,81 @@
+--- Mesa-7.0.2/src/mesa/tnl/t_vp_build.c	2007-10-23 18:52:25.000000000 +0200
++++ Mesa-7.0.2.new/src/mesa/tnl/t_vp_build.c	2007-12-28 20:36:50.000000000 +0100
+@@ -890,7 +890,6 @@
+    {
+       struct ureg shininess = get_material(p, 0, STATE_SHININESS);
+       emit_op1(p, OPCODE_MOV, dots,  WRITEMASK_W, swizzle1(shininess,X));
+-      release_temp(p, shininess);
+ 
+       _col0 = make_temp(p, get_scenecolor(p, 0));
+       if (separate)
+@@ -904,7 +903,6 @@
+       struct ureg shininess = get_material(p, 1, STATE_SHININESS);
+       emit_op1(p, OPCODE_MOV, dots, WRITEMASK_Z, 
+ 	       negate(swizzle1(shininess,X)));
+-      release_temp(p, shininess);
+ 
+       _bfc0 = make_temp(p, get_scenecolor(p, 1));
+       if (separate)
+@@ -972,7 +970,6 @@
+ 	    struct ureg tmpPpli = get_temp(p);
+ 
+ 	    VPpli = get_temp(p); 
+-	    half = get_temp(p);
+  
+             /* In homogeneous object coordinates
+              */
+@@ -983,6 +980,9 @@
+ 	     */
+ 	    emit_op2(p, OPCODE_SUB, VPpli, 0, tmpPpli, V); 
+ 
++            /* we're done with tmpPpli now */
++	    release_temp(p, tmpPpli);
++
+ 	    /* Normalize VPpli.  The dist value also used in
+ 	     * attenuation below.
+ 	     */
+@@ -997,10 +997,14 @@
+ 		p->state->unit[i].light_attenuated) {
+ 	       att = calculate_light_attenuation(p, i, VPpli, dist);
+ 	    }
++	    
++	    /* We're done with dist now */
++	    release_temp(p, dist);
+ 	 
+       
+ 	    /* Calculate viewer direction, or use infinite viewer:
+ 	     */
++	    half = get_temp(p);
+ 	    if (p->state->light_local_viewer) {
+ 	       struct ureg eye_hat = get_eye_position_normalized(p);
+ 	       emit_op2(p, OPCODE_SUB, half, 0, VPpli, eye_hat);
+@@ -1011,9 +1015,6 @@
+ 	    }
+ 
+ 	    emit_normalize_vec3(p, half, half);
+-
+-	    release_temp(p, dist);
+-	    release_temp(p, tmpPpli);
+ 	 }
+ 
+ 	 /* Calculate dot products:
+@@ -1021,6 +1022,10 @@
+ 	 emit_op2(p, OPCODE_DP3, dots, WRITEMASK_X, normal, VPpli);
+ 	 emit_op2(p, OPCODE_DP3, dots, WRITEMASK_Y, normal, half);
+ 
++	 /* we're done with VPpli and half now, so free them as to not drive up
++	    our temp usage unnecessary */
++	 release_temp(p, VPpli);
++	 release_temp(p, half);
+ 	
+ 	 /* Front face lighting:
+ 	  */
+@@ -1109,8 +1114,6 @@
+ 	    release_temp(p, specular);
+ 	 }
+ 
+-	 release_temp(p, half);
+-	 release_temp(p, VPpli);
+ 	 release_temp(p, att);
+       }
+    }

mesa-r300-fix-compiz.patch

@@ -0,0 +1,43 @@
+diff --git a/src/mesa/drivers/dri/r300/r300_state.c b/src/mesa/drivers/dri/r300/r300_state.c
+index ae5d8a8..aa0de4e 100644
+--- a/src/mesa/drivers/dri/r300/r300_state.c
++++ b/src/mesa/drivers/dri/r300/r300_state.c
+@@ -2129,10 +2129,11 @@ void r300UpdateShaders(r300ContextPtr rmesa)
+ 			hw_tcl_on = future_hw_tcl_on = 0;
+ 			r300ResetHwState(rmesa);
+ 
++			r300UpdateStateParameters(ctx, _NEW_PROGRAM);
+ 			return;
+ 		}
+-		r300UpdateStateParameters(ctx, _NEW_PROGRAM);
+ 	}
++	r300UpdateStateParameters(ctx, _NEW_PROGRAM);
+ }
+ 
+ static void r300SetupPixelShader(r300ContextPtr rmesa)
+diff --git a/src/mesa/drivers/dri/r300/r300_swtcl.c b/src/mesa/drivers/dri/r300/r300_swtcl.c
+index a732bdb..1452ed5 100644
+--- a/src/mesa/drivers/dri/r300/r300_swtcl.c
++++ b/src/mesa/drivers/dri/r300/r300_swtcl.c
+@@ -591,6 +591,7 @@ static void r300RenderStart(GLcontext *ctx)
+ 	r300ChooseRenderState(ctx);	
+ 	r300SetVertexFormat(ctx);
+ 
++	r300UpdateShaders(rmesa);
+ 	r300UpdateShaderStates(rmesa);
+ 
+ 	r300EmitCacheFlush(rmesa);
+diff --git a/src/mesa/drivers/dri/radeon/radeon_screen.c b/src/mesa/drivers/dri/radeon/radeon_screen.c
+index 6107577..5cf7f89 100644
+--- a/src/mesa/drivers/dri/radeon/radeon_screen.c
++++ b/src/mesa/drivers/dri/radeon/radeon_screen.c
+@@ -697,6 +697,9 @@ radeonCreateScreen( __DRIscreenPrivate *sPriv )
+       return NULL;
+    }
+ 
++   if (getenv("R300_NO_TCL"))
++     screen->chip_flags &= ~RADEON_CHIPSET_TCL;
++
+    if (screen->chip_family <= CHIP_FAMILY_RS200)
+       screen->chip_flags |= RADEON_CLASS_R100;
+    else if (screen->chip_family <= CHIP_FAMILY_RV280)

sources

@@ -1 +1,3 @@
-SHA512 (mesa-20.0.2.tar.xz) = d6ffc29bbc5b908cb0f08fa1b5a83e029b76c7b697c488a73e6bb60990a55beeb3ecdba1745868f6885ee2f660975f5debf7d2c9418e0a96e2f7049e83fd89ab
+6ae05158e678f4594343f32c2ca50515  gl-manpages-1.0.1.tar.bz2
+11a10410bae7be85cf25bc7119966468  MesaDemos-7.0.2.tar.bz2
+93e6ed7924ff069a4f883b4fce5349dc  MesaLib-7.0.2.tar.bz2