mesa: set version string to 7.7-rc3

Conflicts:
	src/mesa/drivers/dri/unichrome/via_ioctl.c
	src/mesa/drivers/dri/unichrome/via_screen.c
	src/mesa/main/version.h
	src/mesa/state_tracker/st_atom.c

.gitignore

@@ -4,7 +4,6 @@
 *.ilk
 *.o
 *.obj
-*.os
 *.pc
 *.pdb
 *.pyc

Makefile

@@ -48,7 +48,7 @@ install:
 	done
 
 
-.PHONY: default doxygen clean realclean distclean install
+.PHONY: default doxygen clean realclean distclean install linux-directfb-install
 
 # If there's no current configuration file
 $(TOP)/configs/current:
@@ -80,6 +80,8 @@ catamount-osmesa-pgi \
 darwin \
 darwin-fat-32bit \
 darwin-fat-all \
+darwin-static \
+darwin-static-x86ppc \
 freebsd \
 freebsd-dri \
 freebsd-dri-amd64 \
@@ -103,12 +105,12 @@ irix6-n32-static \
 irix6-o32 \
 irix6-o32-static \
 linux \
-linux-i965 \
 linux-alpha \
 linux-alpha-static \
 linux-cell \
 linux-cell-debug \
 linux-debug \
+linux-directfb \
 linux-dri \
 linux-dri-debug \
 linux-dri-x86 \
@@ -118,13 +120,12 @@ linux-dri-xcb \
 linux-egl \
 linux-indirect \
 linux-fbdev \
+linux-glide \
 linux-ia64-icc \
 linux-ia64-icc-static \
 linux-icc \
 linux-icc-static \
 linux-llvm \
-linux-llvm-debug \
-linux-opengl-es \
 linux-osmesa \
 linux-osmesa-static \
 linux-osmesa16 \
@@ -133,6 +134,9 @@ linux-osmesa32 \
 linux-ppc \
 linux-ppc-static \
 linux-profile \
+linux-solo \
+linux-solo-x86 \
+linux-solo-ia64 \
 linux-sparc \
 linux-sparc5 \
 linux-static \
@@ -145,6 +149,7 @@ linux-x86-64 \
 linux-x86-64-debug \
 linux-x86-64-profile \
 linux-x86-64-static \
+linux-x86-glide \
 linux-x86-profile \
 linux-x86-static \
 netbsd \
@@ -167,20 +172,17 @@ sunos5-v9 \
 sunos5-v9-static \
 sunos5-v9-cc-g++ \
 ultrix-gcc:
-	@ if test -f configs/current -o -L configs/current; then \
-		if ! cmp configs/$@ configs/current > /dev/null; then \
-			echo "Please run 'make realclean' before changing configs" ; \
-			exit 1 ; \
-		fi ; \
-	else \
-		cd configs && rm -f current && ln -s $@ current ; \
+	@ if test -f configs/current || test -L configs/current ; then \
+		echo "Please run 'make realclean' before changing configs" ; \
+		exit 1 ; \
 	fi
+	(cd configs && rm -f current && ln -s $@ current)
 	$(MAKE) default
 
 
 # Rules for making release tarballs
 
-VERSION=7.8.2
+VERSION=7.7
 DIRECTORY = Mesa-$(VERSION)
 LIB_NAME = MesaLib-$(VERSION)
 DEMO_NAME = MesaDemos-$(VERSION)
@@ -205,6 +207,8 @@ MAIN_FILES = \
 	$(DIRECTORY)/docs/RELNOTES*					\
 	$(DIRECTORY)/docs/*.spec					\
 	$(DIRECTORY)/include/GL/internal/glcore.h			\
+	$(DIRECTORY)/include/GL/dmesa.h					\
+	$(DIRECTORY)/include/GL/ggimesa.h				\
 	$(DIRECTORY)/include/GL/gl.h					\
 	$(DIRECTORY)/include/GL/glext.h					\
 	$(DIRECTORY)/include/GL/gl_mangle.h				\
@@ -217,16 +221,10 @@ MAIN_FILES = \
 	$(DIRECTORY)/include/GL/mesa_wgl.h				\
 	$(DIRECTORY)/include/GL/mglmesa.h				\
 	$(DIRECTORY)/include/GL/osmesa.h				\
+	$(DIRECTORY)/include/GL/svgamesa.h				\
 	$(DIRECTORY)/include/GL/vms_x_fix.h				\
 	$(DIRECTORY)/include/GL/wglext.h				\
 	$(DIRECTORY)/include/GL/wmesa.h					\
-	$(DIRECTORY)/include/VG/*.h					\
-	$(DIRECTORY)/include/KHR/*.h					\
-	$(DIRECTORY)/src/glsl/Makefile					\
-	$(DIRECTORY)/src/glsl/Makefile.template				\
-	$(DIRECTORY)/src/glsl/SConscript				\
-	$(DIRECTORY)/src/glsl/*/Makefile				\
-	$(DIRECTORY)/src/glsl/*/*.[ch]					\
 	$(DIRECTORY)/src/Makefile					\
 	$(DIRECTORY)/src/mesa/Makefile*					\
 	$(DIRECTORY)/src/mesa/sources.mak				\
@@ -242,9 +240,12 @@ MAIN_FILES = \
 	$(DIRECTORY)/src/mesa/shader/*.[chly]				\
 	$(DIRECTORY)/src/mesa/shader/Makefile				\
 	$(DIRECTORY)/src/mesa/shader/descrip.mms			\
+	$(DIRECTORY)/src/mesa/shader/grammar/*.[ch]			\
 	$(DIRECTORY)/src/mesa/shader/slang/*.[ch]			\
 	$(DIRECTORY)/src/mesa/shader/slang/descrip.mms			\
+	$(DIRECTORY)/src/mesa/shader/slang/library/*.[ch]		\
 	$(DIRECTORY)/src/mesa/shader/slang/library/*.gc			\
+	$(DIRECTORY)/src/mesa/shader/slang/library/*.syn		\
 	$(DIRECTORY)/src/mesa/shader/slang/library/Makefile		\
 	$(DIRECTORY)/src/mesa/swrast/*.[ch]				\
 	$(DIRECTORY)/src/mesa/swrast/descrip.mms			\
@@ -262,13 +263,25 @@ MAIN_FILES = \
 	$(DIRECTORY)/src/mesa/drivers/beos/Makefile			\
 	$(DIRECTORY)/src/mesa/drivers/common/*.[ch]			\
 	$(DIRECTORY)/src/mesa/drivers/common/descrip.mms		\
+	$(DIRECTORY)/src/mesa/drivers/directfb/*.[ch]			\
+	$(DIRECTORY)/src/mesa/drivers/directfb/Makefile			\
+	$(DIRECTORY)/src/mesa/drivers/dos/*.[chS]			\
 	$(DIRECTORY)/src/mesa/drivers/fbdev/Makefile			\
 	$(DIRECTORY)/src/mesa/drivers/fbdev/glfbdev.c			\
+	$(DIRECTORY)/src/mesa/drivers/glide/*.[ch]			\
+	$(DIRECTORY)/src/mesa/drivers/ggi/*.[ch]			\
+	$(DIRECTORY)/src/mesa/drivers/ggi/ggimesa.conf.in		\
+	$(DIRECTORY)/src/mesa/drivers/ggi/default/*.c			\
+	$(DIRECTORY)/src/mesa/drivers/ggi/default/genkgi.conf.in	\
+	$(DIRECTORY)/src/mesa/drivers/ggi/display/*.c			\
+	$(DIRECTORY)/src/mesa/drivers/ggi/display/fbdev.conf.in		\
+	$(DIRECTORY)/src/mesa/drivers/ggi/include/ggi/mesa/*.h		\
 	$(DIRECTORY)/src/mesa/drivers/osmesa/Makefile			\
 	$(DIRECTORY)/src/mesa/drivers/osmesa/Makefile.win		\
 	$(DIRECTORY)/src/mesa/drivers/osmesa/descrip.mms		\
 	$(DIRECTORY)/src/mesa/drivers/osmesa/osmesa.def			\
 	$(DIRECTORY)/src/mesa/drivers/osmesa/*.[ch]			\
+	$(DIRECTORY)/src/mesa/drivers/svga/*.[ch]			\
 	$(DIRECTORY)/src/mesa/drivers/windows/*/*.[ch]			\
 	$(DIRECTORY)/src/mesa/drivers/windows/*/*.def			\
 	$(DIRECTORY)/src/mesa/drivers/x11/Makefile			\
@@ -290,28 +303,12 @@ MAIN_FILES = \
 	$(DIRECTORY)/progs/util/sampleMakefile				\
 	$(DIRECTORY)/windows/VC8/
 
-ES_FILES = \
-	$(DIRECTORY)/include/GLES/*.h					\
-	$(DIRECTORY)/include/GLES2/*.h					\
-	$(DIRECTORY)/src/mesa/glapi/gen/*.xml				\
-	$(DIRECTORY)/src/mesa/glapi/gen/*.py				\
-	$(DIRECTORY)/src/mesa/glapi/gen/*.dtd				\
-	$(DIRECTORY)/src/mesa/es/glapi/Makefile				\
-	$(DIRECTORY)/src/mesa/es/glapi/*.xml				\
-	$(DIRECTORY)/src/mesa/es/glapi/*.py				\
-	$(DIRECTORY)/src/mesa/es/state_tracker/*.[ch]			\
-	$(DIRECTORY)/src/mesa/es/main/*.[ch]				\
-	$(DIRECTORY)/src/mesa/es/main/*.xml				\
-	$(DIRECTORY)/src/mesa/es/main/*.py				\
-	$(DIRECTORY)/src/mesa/es/main/*.dtd				\
-	$(DIRECTORY)/src/mesa/es/Makefile				\
-	$(DIRECTORY)/src/mesa/es/sources.mak				\
-
 EGL_FILES = \
 	$(DIRECTORY)/include/EGL/*.h					\
+	$(DIRECTORY)/include/GLES/*.h					\
+	$(DIRECTORY)/include/GLES2/*.h					\
 	$(DIRECTORY)/src/egl/Makefile					\
 	$(DIRECTORY)/src/egl/*/Makefile					\
-	$(DIRECTORY)/src/egl/*/Makefile.template			\
 	$(DIRECTORY)/src/egl/*/*.[ch]					\
 	$(DIRECTORY)/src/egl/*/*/Makefile				\
 	$(DIRECTORY)/src/egl/*/*/*.[ch]					\
@@ -324,7 +321,6 @@ GALLIUM_FILES = \
 	$(DIRECTORY)/src/gallium/*/Makefile				\
 	$(DIRECTORY)/src/gallium/*/SConscript				\
 	$(DIRECTORY)/src/gallium/*/*/Makefile				\
-	$(DIRECTORY)/src/gallium/*/*/Makefile.egl			\
 	$(DIRECTORY)/src/gallium/*/*/Makefile.template			\
 	$(DIRECTORY)/src/gallium/*/*/SConscript				\
 	$(DIRECTORY)/src/gallium/*/*/*.[ch]				\
@@ -343,8 +339,8 @@ DRI_FILES = \
 	$(DIRECTORY)/include/GL/internal/glcore.h			\
 	$(DIRECTORY)/include/GL/internal/sarea.h			\
 	$(DIRECTORY)/src/glx/Makefile					\
-	$(DIRECTORY)/src/glx/Makefile					\
-	$(DIRECTORY)/src/glx/*.[ch]					\
+	$(DIRECTORY)/src/glx/x11/Makefile				\
+	$(DIRECTORY)/src/glx/x11/*.[ch]					\
 	$(DIRECTORY)/src/mesa/drivers/dri/Makefile			\
 	$(DIRECTORY)/src/mesa/drivers/dri/Makefile.template		\
 	$(DIRECTORY)/src/mesa/drivers/dri/dri.pc.in			\
@@ -380,6 +376,15 @@ SGI_GLU_FILES = \
 	$(DIRECTORY)/src/glu/sgi/libtess/*.[ch]				\
 	$(DIRECTORY)/src/glu/sgi/libutil/*.[ch]
 
+MESA_GLU_FILES = \
+	$(DIRECTORY)/src/glu/mesa/README[12]		\
+	$(DIRECTORY)/src/glu/mesa/Makefile*		\
+	$(DIRECTORY)/src/glu/mesa/descrip.mms		\
+	$(DIRECTORY)/src/glu/mesa/mms_depend		\
+	$(DIRECTORY)/src/glu/mesa/*.def			\
+	$(DIRECTORY)/src/glu/mesa/depend		\
+	$(DIRECTORY)/src/glu/mesa/*.[ch]
+
 GLW_FILES = \
 	$(DIRECTORY)/src/glw/*.[ch]			\
 	$(DIRECTORY)/src/glw/Makefile*			\
@@ -408,14 +413,6 @@ DEMO_FILES = \
 	$(DIRECTORY)/progs/demos/*.cxx			\
 	$(DIRECTORY)/progs/demos/*.dat			\
 	$(DIRECTORY)/progs/demos/README			\
-	$(DIRECTORY)/progs/egl/Makefile			\
-	$(DIRECTORY)/progs/egl/*.[ch]			\
-	$(DIRECTORY)/progs/es1/*/Makefile		\
-	$(DIRECTORY)/progs/es1/*/*.[ch]			\
-	$(DIRECTORY)/progs/es2/*/Makefile		\
-	$(DIRECTORY)/progs/es2/*/*.[ch]			\
-	$(DIRECTORY)/progs/openvg/*/Makefile		\
-	$(DIRECTORY)/progs/openvg/*/*.[ch]		\
 	$(DIRECTORY)/progs/fbdev/Makefile		\
 	$(DIRECTORY)/progs/fbdev/glfbdevtest.c		\
 	$(DIRECTORY)/progs/objviewer/*.[ch]		\
@@ -438,7 +435,11 @@ DEMO_FILES = \
 	$(DIRECTORY)/progs/glsl/*.c			\
 	$(DIRECTORY)/progs/glsl/*.frag			\
 	$(DIRECTORY)/progs/glsl/*.vert			\
-	$(DIRECTORY)/progs/glsl/*.shtest
+	$(DIRECTORY)/progs/glsl/*.shtest		\
+	$(DIRECTORY)/progs/windml/Makefile.ugl		\
+	$(DIRECTORY)/progs/windml/*.c			\
+	$(DIRECTORY)/progs/windml/*.bmp			\
+	$(DIRECTORY)/progs/ggi/*.c
 
 GLUT_FILES = \
 	$(DIRECTORY)/include/GL/glut.h			\
@@ -450,11 +451,22 @@ GLUT_FILES = \
 	$(DIRECTORY)/src/glut/glx/*.[ch]		\
 	$(DIRECTORY)/src/glut/beos/*.[ch]		\
 	$(DIRECTORY)/src/glut/beos/*.cpp		\
-	$(DIRECTORY)/src/glut/beos/Makefile
+	$(DIRECTORY)/src/glut/beos/Makefile		\
+	$(DIRECTORY)/src/glut/dos/*.[ch]		\
+	$(DIRECTORY)/src/glut/dos/PC_HW/*.[chS]		\
+	$(DIRECTORY)/src/glut/ggi/*.[ch]		\
+	$(DIRECTORY)/src/glut/ggi/Makefile		\
+	$(DIRECTORY)/src/glut/fbdev/Makefile		\
+	$(DIRECTORY)/src/glut/fbdev/*[ch]		\
+	$(DIRECTORY)/src/glut/mini/*[ch]		\
+	$(DIRECTORY)/src/glut/mini/glut.pc.in		\
+	$(DIRECTORY)/src/glut/directfb/Makefile		\
+	$(DIRECTORY)/src/glut/directfb/NOTES		\
+	$(DIRECTORY)/src/glut/directfb/*[ch]
 
 DEPEND_FILES = \
 	$(TOP)/src/mesa/depend		\
-	$(TOP)/src/glx/depend		\
+	$(TOP)/src/glx/x11/depend	\
 	$(TOP)/src/glw/depend		\
 	$(TOP)/src/glut/glx/depend	\
 	$(TOP)/src/glu/sgi/depend
@@ -462,7 +474,6 @@ DEPEND_FILES = \
 
 LIB_FILES = \
 	$(MAIN_FILES)		\
-	$(ES_FILES)		\
 	$(EGL_FILES)		\
 	$(GALLIUM_FILES)	\
 	$(DRI_FILES)		\

SConstruct

@@ -23,7 +23,6 @@
 import os
 import os.path
 import sys
-import SCons.Util
 
 import common
 
@@ -33,14 +32,11 @@ import common
 default_statetrackers = 'mesa'
 
 if common.default_platform in ('linux', 'freebsd', 'darwin'):
-	default_drivers = 'softpipe,failover,svga,i915,i965,trace,identity,llvmpipe'
+	default_drivers = 'softpipe,failover,svga,i915,trace,identity,llvmpipe'
 	default_winsys = 'xlib'
 elif common.default_platform in ('winddk',):
-	default_drivers = 'softpipe,svga,i915,i965,trace,identity'
+	default_drivers = 'softpipe,svga,i915,trace,identity'
 	default_winsys = 'all'
-elif common.default_platform in ('embedded',):
-	default_drivers = 'softpipe,llvmpipe'
-	default_winsys = 'xlib'
 else:
 	default_drivers = 'all'
 	default_winsys = 'all'
@@ -50,9 +46,9 @@ common.AddOptions(opts)
 opts.Add(ListVariable('statetrackers', 'state trackers to build', default_statetrackers,
                      ['mesa', 'python', 'xorg']))
 opts.Add(ListVariable('drivers', 'pipe drivers to build', default_drivers,
-                     ['softpipe', 'failover', 'svga', 'i915', 'i965', 'trace', 'r300', 'identity', 'llvmpipe']))
+                     ['softpipe', 'failover', 'svga', 'i915', 'cell', 'trace', 'r300', 'identity', 'llvmpipe']))
 opts.Add(ListVariable('winsys', 'winsys drivers to build', default_winsys,
-                     ['xlib', 'vmware', 'intel', 'i965', 'gdi', 'radeon']))
+                     ['xlib', 'vmware', 'intel', 'gdi', 'radeon']))
 
 opts.Add(EnumVariable('MSVS_VERSION', 'MS Visual C++ version', None, allowed_values=('7.1', '8.0', '9.0')))
 
@@ -63,36 +59,19 @@ env = Environment(
 	ENV = os.environ,
 )
 
-if os.environ.has_key('CC'):
-	env['CC'] = os.environ['CC']
-if os.environ.has_key('CFLAGS'):
-	env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS'])
-if os.environ.has_key('CXX'):
-	env['CXX'] = os.environ['CXX']
-if os.environ.has_key('CXXFLAGS'):
-	env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS'])
-if os.environ.has_key('LDFLAGS'):
-	env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS'])
-
 Help(opts.GenerateHelpText(env))
 
 # replicate options values in local variables
 debug = env['debug']
 dri = env['dri']
+llvm = env['llvm']
 machine = env['machine']
 platform = env['platform']
-drawllvm = 'llvmpipe' in env['drivers']
-
-# LLVM support in the Draw module
-if drawllvm:
-        env.Tool('llvm')
-        if not env.has_key('LLVM_VERSION'):
-           drawllvm = False
 
 # derived options
 x86 = machine == 'x86'
 ppc = machine == 'ppc'
-gcc = platform in ('linux', 'freebsd', 'darwin', 'embedded')
+gcc = platform in ('linux', 'freebsd', 'darwin')
 msvc = platform in ('windows', 'winddk')
 
 Export([
@@ -100,7 +79,7 @@ Export([
 	'x86', 
 	'ppc', 
 	'dri', 
-	'drawllvm',
+	'llvm',
 	'platform',
 	'gcc',
 	'msvc',
@@ -110,10 +89,6 @@ Export([
 #######################################################################
 # Environment setup
 
-# Always build trace driver
-if 'trace' not in env['drivers']:
-    env['drivers'].append('trace')
-
 # Includes
 env.Append(CPPPATH = [
 	'#/include',
@@ -122,25 +97,6 @@ env.Append(CPPPATH = [
 	'#/src/gallium/drivers',
 ])
 
-if env['msvc']:
-    env.Append(CPPPATH = ['#include/c99'])
-
-# Embedded
-if platform == 'embedded':
-	env.Append(CPPDEFINES = [
-		'_POSIX_SOURCE',
-		('_POSIX_C_SOURCE', '199309L'), 
-		'_SVID_SOURCE',
-		'_BSD_SOURCE', 
-		'_GNU_SOURCE',
-		
-		'PTHREADS',
-	])
-	env.Append(LIBS = [
-		'm',
-		'pthread',
-		'dl',
-	])
 
 # Posix
 if platform in ('posix', 'linux', 'freebsd', 'darwin'):
@@ -154,8 +110,6 @@ if platform in ('posix', 'linux', 'freebsd', 'darwin'):
 		'PTHREADS',
 		'HAVE_POSIX_MEMALIGN',
 	])
-	if platform == 'darwin':
-		env.Append(CPPDEFINES = ['_DARWIN_C_SOURCE'])
 	env.Append(CPPPATH = ['/usr/X11R6/include'])
 	env.Append(LIBPATH = ['/usr/X11R6/lib'])
 	env.Append(LIBS = [
@@ -165,6 +119,7 @@ if platform in ('posix', 'linux', 'freebsd', 'darwin'):
 		'dl',
 	])
 
+
 # DRI
 if dri:
 	env.ParseConfig('pkg-config --cflags --libs libdrm')
@@ -175,9 +130,13 @@ if dri:
 		'GLX_INDIRECT_RENDERING',
 	])
 
-# LLVM support in the Draw module
-if drawllvm:
-    env.Append(CPPDEFINES = ['DRAW_LLVM'])
+# LLVM
+if llvm:
+	# See also http://www.scons.org/wiki/UsingPkgConfig
+	env.ParseConfig('llvm-config --cflags --ldflags --libs backend bitreader engine instrumentation interpreter ipo')
+	env.Append(CPPDEFINES = ['MESA_LLVM'])
+        # Force C++ linkage
+	env['LINK'] = env['CXX']
 
 # libGL
 if platform in ('linux', 'freebsd', 'darwin'):
@@ -201,38 +160,8 @@ Export('env')
 # TODO: Build several variants at the same time?
 # http://www.scons.org/wiki/SimultaneousVariantBuilds
 
-if env['platform'] != common.default_platform:
-    # GLSL code has to be built twice -- one for the host OS, another for the target OS...
-
-    host_env = Environment(
-        # options are ignored
-        # default tool is used
-        tools = ['default', 'custom'],
-        toolpath = ['#scons'],	
-        ENV = os.environ,
-    )
-
-    host_env['platform'] = common.default_platform
-    host_env['machine'] = common.default_machine
-    host_env['debug'] = env['debug']
-
-    SConscript(
-        'src/glsl/SConscript',
-        variant_dir = os.path.join(env['build'], 'host'),
-        duplicate = 0, # http://www.scons.org/doc/0.97/HTML/scons-user/x2261.html
-        exports={'env':host_env},
-    )
-
 SConscript(
 	'src/SConscript',
 	variant_dir = env['build'],
 	duplicate = 0 # http://www.scons.org/doc/0.97/HTML/scons-user/x2261.html
 )
-
-env.Default('src')
-
-SConscript(
-    'progs/SConscript',
-    variant_dir = os.path.join('progs', env['build']),
-    duplicate = 0 # http://www.scons.org/doc/0.97/HTML/scons-user/x2261.html
-)

bin/mklib

@@ -25,109 +25,6 @@
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 
-# Clear CDPATH as the 'cd' command will echo stuff
-# to stdout if it is set
-unset CDPATH
-
-# Given a list of files, look for .a archives and unpack them.
-# Return the original list of files minus the .a files plus the unpacked files.
-# first param:  name of a temp directory (to be deleted when finished)
-# remaining params:  list of .o and .a files
-expand_archives() {
-    DIR=$1
-    shift
-    FILES=$@
-    NEWFILES=""
-    ORIG_DIR=`pwd`
-    mkdir -p "$DIR"
-    cd "$DIR"
-    for FILE in $FILES ; do
-        case $FILE in
-            *.a)
-                # extract the .o files from this .a archive
-                case $FILE in
-                    /*) ;;
-                    *)  FILE="$ORIG_DIR/$FILE" ;;
-                esac
-                MEMBERS=`ar t $FILE`
-                ar x $FILE
-                for MEMBER in $MEMBERS ; do
-                    NEWFILES="$NEWFILES $DIR/$MEMBER"
-                done
-                ;;
-            *)
-                # other file type, just add to list
-                NEWFILES="$NEWFILES $FILE"
-                ;;
-        esac
-    done
-    cd "$ORIG_DIR"
-    echo $NEWFILES
-}
-
-
-# Make static library with 'ar'
-# params:
-#    options to ar
-#    1 or 0 to indicate if ranlib should be run
-#    libname to make
-#    list of object files
-# Return name of library we made
-# Example: "make_ar_static_lib -ru 1 libfoo.a foo.o bar.o"
-make_ar_static_lib() {
-    OPTS=$1
-    shift;
-    RANLIB=$1
-    shift;
-    LIBNAME=$1
-    shift;
-    OBJECTS=$@
-
-    # remove existing lib, if present
-    rm -f ${LIBNAME}
-
-    # make static lib
-    ar ${OPTS} ${LIBNAME} ${OBJECTS}
-
-    # run ranlib
-    if [ ${RANLIB} = 1 ] ; then
-        ranlib ${LIBNAME}
-    fi
-
-    echo ${LIBNAME}
-}
-
-
-# Print usage info.
-usage() {
-    echo 'Usage: mklib [options] objects'
-    echo 'Create a shared library from object files.'
-    echo '  -o LIBRARY    specifies the name of the resulting library, without'
-    echo '                the leading "lib" or any suffix.'
-    echo '                (eg: "-o GL" might result in "libGL.so" being made)'
-    echo '  -major N      specifies major version number (default is 1)'
-    echo '  -minor N      specifies minor version number (default is 0)'
-    echo '  -patch N      specifies patch version number (default is 0)'
-    echo '  -lLIBRARY     specifies a dependency on LIBRARY'
-    echo '  -LDIR         search in DIR for library dependencies at build time'
-    echo '  -RDIR         search in DIR for library dependencies at run time'
-    echo '  -linker L     explicity specify the linker program to use (eg: gcc, g++)'
-    echo '                Not observed on all systems at this time.'
-    echo '  -ldflags OPT  specify any additional linker flags in OPT'
-    echo '  -cplusplus    link with C++ runtime'
-    echo '  -static       make a static library (default is dynamic/shared)'
-    echo '  -dlopen       make a shared library suitable for dynamic loading'
-    echo '  -install DIR  put resulting library file(s) in DIR'
-    echo '  -arch ARCH    override using `uname` to determine host system'
-    echo '  -archopt OPT  specify an extra achitecture-specific option OPT'
-    echo '  -altopts OPTS alternate options to override all others'
-    echo "  -noprefix     don't prefix library name with 'lib' nor add any suffix"
-    echo '  -exports FILE only export the symbols listed in FILE'
-    echo '  -id NAME      Sets the id of the dylib (Darwin)'
-    echo '  -h, --help    display this information and exit'
-}
-
-
 #
 # Option defaults
 #
@@ -155,7 +52,31 @@ while true
 do
     case $1 in
 	'-h' | '--help')
-	    usage
+	    echo 'Usage: mklib [options] objects'
+	    echo 'Create a shared library from object files.'
+	    echo '  -o LIBRARY    specifies the name of the resulting library, without'
+	    echo '                the leading "lib" or any suffix.'
+	    echo '                (eg: "-o GL" might result in "libGL.so" being made)'
+	    echo '  -major N      specifies major version number (default is 1)'
+	    echo '  -minor N      specifies minor version number (default is 0)'
+	    echo '  -patch N      specifies patch version number (default is 0)'
+	    echo '  -lLIBRARY     specifies a dependency on LIBRARY'
+	    echo '  -LDIR         search in DIR for library dependencies at build time'
+	    echo '  -RDIR         search in DIR for library dependencies at run time'
+	    echo '  -linker L     explicity specify the linker program to use (eg: gcc, g++)'
+	    echo '                Not observed on all systems at this time.'
+	    echo '  -ldflags OPT  specify any additional linker flags in OPT'
+	    echo '  -cplusplus    link with C++ runtime'
+	    echo '  -static       make a static library (default is dynamic/shared)'
+	    echo '  -dlopen       make a shared library suitable for dynamic loading'
+	    echo '  -install DIR  put resulting library file(s) in DIR'
+	    echo '  -arch ARCH    override using `uname` to determine host system'
+	    echo '  -archopt OPT  specify an extra achitecture-specific option OPT'
+	    echo '  -altopts OPTS alternate options to override all others'
+	    echo "  -noprefix     don't prefix library name with 'lib' nor add any suffix"
+	    echo '  -exports FILE only export the symbols listed in FILE'
+	    echo '  -id NAME      Sets the id of the dylib (Darwin)'
+	    echo '  -h, --help    display this information and exit'
 	    exit 1
 	    ;;
 	'-o')
@@ -276,11 +197,11 @@ fi
 # Error checking
 #
 if [ "x${LIBNAME}" = "x" ] ; then
-    echo "mklib: Error: no library name specified (-h for help)"
+    echo "mklib: Error: no library name specified"
     exit 1
 fi
 if [ "x${OBJECTS}" = "x" ] ; then
-    echo "mklib: Error: no object files specified (-h for help)"
+    echo "mklib: Error: no object files specified"
     exit 1
 fi
 
@@ -348,24 +269,45 @@ case $ARCH in
             # finish up
             FINAL_LIBS="${LIBNAME}"
         elif [ $STATIC = 1 ] ; then
-	    # make a static .a library
             LIBNAME="lib${LIBNAME}.a"     # prefix with "lib", suffix with ".a"
             echo "mklib: Making" $ARCH "static library: " ${LIBNAME}
+            LINK="ar"
             OPTS="-ru"
             if [ "${ALTOPTS}" ] ; then
                 OPTS=${ALTOPTS}
             fi
+            rm -f ${LIBNAME}
 
-	    # expand .a into .o files
-	    NEW_OBJECTS=`expand_archives ${LIBNAME}.obj $OBJECTS`
+	    # expand any .a objects into constituent .o files.
+	    NEWOBJECTS=""
+	    DELETIA=""
+	    for OBJ in $OBJECTS ; do
+		case $OBJ in
+		    *.a)
+			# extract the .o files from this .a archive
+			FILES=`ar t $OBJ`
+			ar x $OBJ
+			NEWOBJECTS="$NEWOBJECTS $FILES"
+			# keep track of temporary .o files and delete them below
+			DELETIA="$DELETIA $FILES"
+			;;
+		    *)
+			# ordinary .o file
+			NEWOBJECTS="$NEWOBJECTS $OBJ"
+			;;
+		esac
+	    done
 
-            # make static lib
-	    FINAL_LIBS=`make_ar_static_lib ${OPTS} 1 ${LIBNAME} ${NEW_OBJECTS}`
+            # make lib
+            ${LINK} ${OPTS} ${LIBNAME} ${NEWOBJECTS}
+            ranlib ${LIBNAME}
 
 	    # remove temporary extracted .o files
-	    rm -rf ${LIBNAME}.obj
+	    rm -f ${DELETIA}
+
+            # finish up
+            FINAL_LIBS=${LIBNAME}
         else
-	    # make dynamic library
 	    LIBNAME="lib${LIBNAME}"     # prefix with "lib"
 	    case $ARCH in 'Linux' | 'GNU' | GNU/*)
 		OPTS="-Xlinker -Bsymbolic -shared -Wl,-soname,${LIBNAME}.so.${MAJOR}"
@@ -426,7 +368,9 @@ case $ARCH in
         if [ $STATIC = 1 ] ; then
 	    LIBNAME="lib${LIBNAME}.a"
 	    echo "mklib: Making SunOS static library: " ${LIBNAME}
-	    FINAL_LIBS=`make_ar_static_lib -ruc 0 ${LIBNAME} ${OBJECTS}`
+	    rm -f ${LIBNAME}
+	    ar -ruv ${LIBNAME} ${OBJECTS}
+	    FINAL_LIBS=${LIBNAME}
 	else
 	    if [ $NOPREFIX = 0 ] ; then
 		LIBNAME="lib${LIBNAME}.so"
@@ -545,19 +489,13 @@ case $ARCH in
 	    ${LINK} ${OPTS} ${LDFLAGS} -o ${LIBNAME} ${OBJECTS} ${DEPS}
 	    FINAL_LIBS=${LIBNAME}
         elif [ $STATIC = 1 ] ; then
-	    # make a static .a library
 	    STLIB="lib${LIBNAME}.a"
 	    echo "mklib: Making FreeBSD static library: " ${STLIB}
-
-	    # expand .a into .o files
-	    NEW_OBJECTS=`expand_archives ${STLIB}.obj $OBJECTS`
-
-	    FINAL_LIBS=`make_ar_static_lib cq 1 ${STLIB} ${NEW_OBJECTS}`
-
-	    # remove temporary extracted .o files
-	    rm -rf ${STLIB}.obj
+	    rm -f ${STLIB}
+	    ar cq ${STLIB} ${OBJECTS}
+	    ranlib ${STLIB}
+	    FINAL_LIBS=${STLIB}
 	else
-	    # make dynamic library
 	    SHLIB="lib${LIBNAME}.so.${MAJOR}"
 	    OPTS="-shared -Wl,-soname,${SHLIB}"
             if [ "${ALTOPTS}" ] ; then
@@ -575,7 +513,10 @@ case $ARCH in
         if [ $STATIC = 1 ] ; then
 	    LIBNAME="lib${LIBNAME}_pic.a"
 	    echo "mklib: Making NetBSD PIC static library: " ${LIBNAME}
-	    FINAL_LIBS=`make_ar_static_lib cq 1 ${LIBNAME} ${OBJECTS}`
+	    rm -f ${LIBNAME}
+	    ar cq ${LIBNAME} ${OBJECTS}
+	    ranlib ${LIBNAME}
+	    FINAL_LIBS=${LIBNAME}
 	else
 	    LIBNAME="lib${LIBNAME}.so.${MAJOR}.${MINOR}"
 	    echo "mklib: Making NetBSD PIC shared library: " ${LIBNAME}
@@ -588,7 +529,9 @@ case $ARCH in
     'IRIX' | 'IRIX64')
         if [ $STATIC = 1 ] ; then
 	    LIBNAME="lib${LIBNAME}.a"
-	    FINAL_LIBS=`make_ar_static_lib rc 0 ${LIBNAME} ${OBJECTS}`
+	    rm -f ${LIBNAME}
+	    ar rc ${LIBNAME} ${OBJECTS}
+	    FINAL_LIBS=${LIBNAME}
 	else
 	    LIBNAME="lib${LIBNAME}.so"  # prefix with "lib", suffix with ".so"
 
@@ -639,7 +582,9 @@ case $ARCH in
         if [ $STATIC = 1 ] ; then
 	    LIBNAME="lib${LIBNAME}.a"
 	    echo "mklib: Making HP-UX static library: " ${LIBNAME}
-    	    FINAL_LIBS=`make_ar_static_lib -ruv 0 ${LIBNAME} ${OBJECTS}`
+	    rm -f ${LIBNAME}
+	    ar -ruv ${LIBNAME} ${OBJECTS}
+	    FINAL_LIBS=${LIBNAME}
 	else
             # HP uses a .2 for their current GL/GLU libraries
 	    if [ ${LIBNAME} = "GL" -o ${LIBNAME} = "GLU" ] ; then
@@ -669,7 +614,8 @@ case $ARCH in
 	if [ $STATIC = 1 ] ; then
 	    LIBNAME="lib${LIBNAME}.a"
 	    echo "mklib: Making AIX static library: " ${LIBNAME}
-    	    FINAL_LIBS=`make_ar_static_lib -ruv 0 ${LIBNAME} ${OBJECTS}`
+	    ar -ruv ${X64} ${LIBNAME} ${OBJECTS}
+	    FINAL_LIBS=${LIBNAME}
 	else
 	    EXPFILE="lib${LIBNAME}.exp"
 	    LIBNAME="lib${LIBNAME}.a"  # shared objects are still stored in the .a libraries
@@ -720,7 +666,9 @@ case $ARCH in
         if [ $STATIC = 1 ] ; then
 	    LIBNAME="lib${LIBNAME}.a"
 	    echo "mklib: Making OSF/1 static library: " ${LIBNAME}
-    	    FINAL_LIBS=`make_ar_static_lib -ruv 0 ${LIBNAME} ${OBJECTS}`
+	    rm -f ${LIBNAME}
+	    ar -ruv ${LIBNAME} ${OBJECTS}
+	    FINAL_LIBS=${LIBNAME}
 	else
 	    VERSION="${MAJOR}.${MINOR}"
 	    LIBNAME="lib${LIBNAME}.so"
@@ -743,20 +691,12 @@ case $ARCH in
         if [ $STATIC = 1 ] ; then
             LIBNAME="lib${LIBNAME}.a"
             echo "mklib: Making Darwin static library: " ${LIBNAME}
+            LINK="ar"
             OPTS="-ruvs"
             if [ "${ALTOPTS}" ] ; then
                 OPTS=${ALTOPTS}
             fi
-
-            # expand .a into .o files
-            NEW_OBJECTS=`expand_archives ${LIBNAME}.obj $OBJECTS`
-
-            # make static lib
-            FINAL_LIBS=`make_ar_static_lib ${OPTS} 1 ${LIBNAME} ${NEW_OBJECTS}`
-
-            # remove temporary extracted .o files
-            rm -rf ${LIBNAME}.obj
-
+            ${LINK} ${OPTS} ${LIBNAME} ${OBJECTS}
             FINAL_LIBS=${LIBNAME}
         else
             # On Darwin a .bundle is used for a library that you want to dlopen
@@ -784,10 +724,22 @@ case $ARCH in
 
 	    # examine first object to determine ABI
     	    set ${OBJECTS}
-            ABIS=`lipo -info $1 | sed s/.*://`
-            for ABI in $ABIS; do
-                OPTS="${OPTS} -arch ${ABI}"
-            done
+            ABI_PPC=`file $1 | grep ' ppc'`
+            ABI_I386=`file $1 | grep ' i386'`
+            ABI_PPC64=`file $1 | grep ' ppc64'`
+            ABI_X86_64=`file $1 | grep ' x86_64'`
+            if [ "${ABI_PPC}" ] ; then
+                OPTS="${OPTS} -arch ppc"
+            fi
+            if [ "${ABI_I386}" ] ; then
+                OPTS="${OPTS} -arch i386"
+            fi
+            if [ "${ABI_PPC64}" ] ; then
+                OPTS="${OPTS} -arch ppc64"
+            fi
+            if [ "${ABI_X86_64}" ] ; then
+                OPTS="${OPTS} -arch x86_64"
+            fi
 
             if [ "${ALTOPTS}" ] ; then
                 OPTS=${ALTOPTS}
@@ -815,14 +767,16 @@ case $ARCH in
     'LynxOS')
 	LIBNAME="lib${LIBNAME}.a"
 	echo "mklib: Making LynxOS static library: " ${LIBNAME}
-        FINAL_LIBS=`make_ar_static_lib -ru 0 ${LIBNAME} ${OBJECTS}`
+	rm -f ${LIBNAME}
+	ar ru ${LIBNAME} ${OBJECTS}
+	FINAL_LIBS=${LIBNAME}
 	;;
 
     'BeOS')
         if [ $STATIC = 1 ] ; then
             LIBNAME="lib${LIBNAME}.a"
             echo "mklib: Making BeOS static library: " ${LIBNAME}
-            FINAL_LIBS=`make_ar_static_lib -cru 0 ${LIBNAME} ${OBJECTS}`
+            ar -cru "${LIBNAME}" ${OBJECTS}
         else
 	    LIBNAME="lib${LIBNAME}.so"
 	    echo "mklib: Making BeOS shared library: " ${LIBNAME}
@@ -901,7 +855,9 @@ case $ARCH in
         if [ $STATIC = 1 ] ; then
 	    LIBNAME="lib${LIBNAME}.a"
 	    echo "mklib: Making AIX GCC static library: " ${LIBNAME}
-            FINAL_LIBS=`make_ar_static_lib ru 0 ${LIBNAME} ${OBJECTS}`
+	    rm -f ${LIBNAME}
+	    ar ru ${LIBNAME} ${OBJECTS}
+	    FINAL_LIBS=${LIBNAME}
 	else
 	    LIBNAME="lib${LIBNAME}.so"  # prefix with "lib", suffix with ".so"
 	    echo "mklib: Making AIX GCC shared library: " ${LIBNAME}
@@ -922,7 +878,9 @@ case $ARCH in
 	fi
 	LIBNAME="lib${LIBNAME}.a"
 	echo "mklib: Making static library for Ultrix: " ${LIBNAME}
-        FINAL_LIBS=`make_ar_static_lib ru 0 ${LIBNAME} ${OBJECTS}`
+	rm -f ${LIBNAME}
+	ar ru ${LIBNAME} ${OBJECTS}
+	FINAL_LIBS="${LIBNAME}"
 	;;
 
      CYGWIN*)
@@ -942,20 +900,17 @@ case $ARCH in
 	LIBNAME="lib${LIBNAME}"     # prefix with "lib"
 
         if [ $STATIC = 1 ] ; then
-	    LIBNAME=${LIBNAME}.a
-            echo "mklib: Making" $ARCH "static library: " ${LIBNAME}
+            echo "mklib: Making" $ARCH "static library: " ${LIBNAME}.a
+            LINK="ar"
             OPTS="-ru"
             if [ "${ALTOPTS}" ] ; then
                 OPTS=${ALTOPTS}
             fi
-
-            # expand .a into .o files
-            NEW_OBJECTS=`expand_archives ${LIBNAME}.obj $OBJECTS`
-
-            FINAL_LIBS=`make_ar_static_lib ${OPTS} 1 ${LIBNAME} ${NEW_OBJECTS}`
-
-            # remove temporary extracted .o files
-            rm -rf ${LIBNAME}.obj
+            # make lib
+            ${LINK} ${OPTS} ${LIBNAME}.a ${OBJECTS}
+	    ranlib ${LIBNAME}.a
+            # finish up
+            FINAL_LIBS=${LIBNAME}.a
         else
 	    OPTS="-shared -Wl,--enable-auto-image-base -Wl,-export-all -Wl,--out-implib=${LIBNAME}-${MAJOR}.dll.a"
             if [ "${ALTOPTS}" ] ; then
@@ -977,11 +932,6 @@ case $ARCH in
 
             # make lib
             ${LINK} ${OPTS} ${LDFLAGS} -o ${CYGNAME}-${MAJOR}.dll ${OBJECTS} ${DEPS}
-            # make build fail if link failed
-            es=$?
-            if [ "$es" -ne "0" ]; then
-                exit $es
-            fi
             # make usual symlinks
             ln -s ${LIBNAME}-${MAJOR}.dll.a ${LIBNAME}.dll.a
             # finish up
@@ -998,7 +948,9 @@ case $ARCH in
         if [ $STATIC = 1 ] ; then
 	    LIBNAME="lib${LIBNAME}.a"
 	    echo "mklib: Making static library for example arch: " ${LIBNAME}
-            FINAL_LIBS=`make_ar_static_lib rv 0 ${LIBNAME} ${OBJECTS}`
+	    rm -f ${LIBNAME}
+	    ar rv ${LIBNAME} ${OBJECTS}
+	    FINAL_LIBS="${LIBNAME}"
 	else
 	    LIBNAME="lib${LIBNAME}.so"  # prefix with "lib", suffix with ".so"
 	    echo "mklib: Making shared library for example arch: " ${LIBNAME}

bin/raw2png.py

@@ -0,0 +1,366 @@
+#!/usr/bin/env python
+##########################################################################
+# 
+# Copyright 2008 Tungsten Graphics, Inc., Cedar Park, Texas.
+# All Rights Reserved.
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sub license, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+# 
+# The above copyright notice and this permission notice (including the
+# next paragraph) shall be included in all copies or substantial portions
+# of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+# IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
+# ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+# 
+##########################################################################
+
+
+import os.path
+import sys
+import struct
+import Image # http://www.pythonware.com/products/pil/
+
+PIPE_FORMAT_LAYOUT_RGBAZS   = 0
+PIPE_FORMAT_LAYOUT_YCBCR    = 1
+PIPE_FORMAT_LAYOUT_DXT      = 2
+PIPE_FORMAT_LAYOUT_MIXED    = 3
+
+PIPE_FORMAT_COMP_R    = 0
+PIPE_FORMAT_COMP_G    = 1
+PIPE_FORMAT_COMP_B    = 2
+PIPE_FORMAT_COMP_A    = 3
+PIPE_FORMAT_COMP_0    = 4
+PIPE_FORMAT_COMP_1    = 5
+PIPE_FORMAT_COMP_Z    = 6
+PIPE_FORMAT_COMP_S    = 7
+
+PIPE_FORMAT_TYPE_UNKNOWN = 0
+PIPE_FORMAT_TYPE_FLOAT   = 1
+PIPE_FORMAT_TYPE_UNORM   = 2
+PIPE_FORMAT_TYPE_SNORM   = 3
+PIPE_FORMAT_TYPE_USCALED = 4
+PIPE_FORMAT_TYPE_SSCALED = 5
+PIPE_FORMAT_TYPE_SRGB    = 6
+PIPE_FORMAT_TYPE_FIXED   = 7
+
+def _PIPE_FORMAT_RGBAZS( SWZ, SIZEX, SIZEY, SIZEZ, SIZEW, EXP2, TYPE ):
+   return ((PIPE_FORMAT_LAYOUT_RGBAZS << 0) |\
+   ((SWZ) << 2) |\
+   ((SIZEX) << 14) |\
+   ((SIZEY) << 17) |\
+   ((SIZEZ) << 20) |\
+   ((SIZEW) << 23) |\
+   ((EXP2) << 26) |\
+   ((TYPE) << 29) )
+
+def _PIPE_FORMAT_SWZ( SWZX, SWZY, SWZZ, SWZW ):
+	return (((SWZX) << 0) | ((SWZY) << 3) | ((SWZZ) << 6) | ((SWZW) << 9))
+
+def _PIPE_FORMAT_RGBAZS_1( SWZ, SIZEX, SIZEY, SIZEZ, SIZEW, TYPE ):
+	return _PIPE_FORMAT_RGBAZS( SWZ, SIZEX, SIZEY, SIZEZ, SIZEW, 0, TYPE )
+
+def _PIPE_FORMAT_RGBAZS_2( SWZ, SIZEX, SIZEY, SIZEZ, SIZEW, TYPE ):
+    _PIPE_FORMAT_RGBAZS( SWZ, SIZEX, SIZEY, SIZEZ, SIZEW, 1, TYPE )
+
+def _PIPE_FORMAT_RGBAZS_8( SWZ, SIZEX, SIZEY, SIZEZ, SIZEW, TYPE ):
+	return _PIPE_FORMAT_RGBAZS( SWZ, SIZEX, SIZEY, SIZEZ, SIZEW, 3, TYPE )
+
+def _PIPE_FORMAT_RGBAZS_64( SWZ, SIZEX, SIZEY, SIZEZ, SIZEW, TYPE ):
+	return _PIPE_FORMAT_RGBAZS( SWZ, SIZEX, SIZEY, SIZEZ, SIZEW, 6, TYPE )
+
+def _PIPE_FORMAT_MIXED( SWZ, SIZEX, SIZEY, SIZEZ, SIZEW, SIGNX, SIGNY, SIGNZ, SIGNW, NORMALIZED, SCALE8 ):
+    return ((PIPE_FORMAT_LAYOUT_MIXED << 0) |\
+    ((SWZ) << 2) |\
+    ((SIZEX) << 14) |\
+    ((SIZEY) << 17) |\
+    ((SIZEZ) << 20) |\
+    ((SIZEW) << 23) |\
+    ((SIGNX) << 26) |\
+    ((SIGNY) << 27) |\
+    ((SIGNZ) << 28) |\
+    ((SIGNW) << 29) |\
+    ((NORMALIZED) << 30) |\
+    ((SCALE8) << 31) )
+
+
+_PIPE_FORMAT_R001 = _PIPE_FORMAT_SWZ( PIPE_FORMAT_COMP_R, PIPE_FORMAT_COMP_0, PIPE_FORMAT_COMP_0, PIPE_FORMAT_COMP_1 )
+_PIPE_FORMAT_RG01 = _PIPE_FORMAT_SWZ( PIPE_FORMAT_COMP_R, PIPE_FORMAT_COMP_G, PIPE_FORMAT_COMP_0, PIPE_FORMAT_COMP_1 )
+_PIPE_FORMAT_RGB1 = _PIPE_FORMAT_SWZ( PIPE_FORMAT_COMP_R, PIPE_FORMAT_COMP_G, PIPE_FORMAT_COMP_B, PIPE_FORMAT_COMP_1 )
+_PIPE_FORMAT_RGBA = _PIPE_FORMAT_SWZ( PIPE_FORMAT_COMP_R, PIPE_FORMAT_COMP_G, PIPE_FORMAT_COMP_B, PIPE_FORMAT_COMP_A )
+_PIPE_FORMAT_ARGB = _PIPE_FORMAT_SWZ( PIPE_FORMAT_COMP_A, PIPE_FORMAT_COMP_R, PIPE_FORMAT_COMP_G, PIPE_FORMAT_COMP_B )
+_PIPE_FORMAT_ABGR = _PIPE_FORMAT_SWZ( PIPE_FORMAT_COMP_A, PIPE_FORMAT_COMP_B, PIPE_FORMAT_COMP_G, PIPE_FORMAT_COMP_R )
+_PIPE_FORMAT_BGRA = _PIPE_FORMAT_SWZ( PIPE_FORMAT_COMP_B, PIPE_FORMAT_COMP_G, PIPE_FORMAT_COMP_R, PIPE_FORMAT_COMP_A )
+_PIPE_FORMAT_1RGB = _PIPE_FORMAT_SWZ( PIPE_FORMAT_COMP_1, PIPE_FORMAT_COMP_R, PIPE_FORMAT_COMP_G, PIPE_FORMAT_COMP_B )
+_PIPE_FORMAT_1BGR = _PIPE_FORMAT_SWZ( PIPE_FORMAT_COMP_1, PIPE_FORMAT_COMP_B, PIPE_FORMAT_COMP_G, PIPE_FORMAT_COMP_R )
+_PIPE_FORMAT_BGR1 = _PIPE_FORMAT_SWZ( PIPE_FORMAT_COMP_B, PIPE_FORMAT_COMP_G, PIPE_FORMAT_COMP_R, PIPE_FORMAT_COMP_1 )
+_PIPE_FORMAT_0000 = _PIPE_FORMAT_SWZ( PIPE_FORMAT_COMP_0, PIPE_FORMAT_COMP_0, PIPE_FORMAT_COMP_0, PIPE_FORMAT_COMP_0 )
+_PIPE_FORMAT_000R = _PIPE_FORMAT_SWZ( PIPE_FORMAT_COMP_0, PIPE_FORMAT_COMP_0, PIPE_FORMAT_COMP_0, PIPE_FORMAT_COMP_R )
+_PIPE_FORMAT_RRR1 = _PIPE_FORMAT_SWZ( PIPE_FORMAT_COMP_R, PIPE_FORMAT_COMP_R, PIPE_FORMAT_COMP_R, PIPE_FORMAT_COMP_1 )
+_PIPE_FORMAT_RRRR = _PIPE_FORMAT_SWZ( PIPE_FORMAT_COMP_R, PIPE_FORMAT_COMP_R, PIPE_FORMAT_COMP_R, PIPE_FORMAT_COMP_R )
+_PIPE_FORMAT_RRRG = _PIPE_FORMAT_SWZ( PIPE_FORMAT_COMP_R, PIPE_FORMAT_COMP_R, PIPE_FORMAT_COMP_R, PIPE_FORMAT_COMP_G )
+_PIPE_FORMAT_Z000 = _PIPE_FORMAT_SWZ( PIPE_FORMAT_COMP_Z, PIPE_FORMAT_COMP_0, PIPE_FORMAT_COMP_0, PIPE_FORMAT_COMP_0 )
+_PIPE_FORMAT_0Z00 = _PIPE_FORMAT_SWZ( PIPE_FORMAT_COMP_0, PIPE_FORMAT_COMP_Z, PIPE_FORMAT_COMP_0, PIPE_FORMAT_COMP_0 )
+_PIPE_FORMAT_SZ00 = _PIPE_FORMAT_SWZ( PIPE_FORMAT_COMP_S, PIPE_FORMAT_COMP_Z, PIPE_FORMAT_COMP_0, PIPE_FORMAT_COMP_0 )
+_PIPE_FORMAT_ZS00 = _PIPE_FORMAT_SWZ( PIPE_FORMAT_COMP_Z, PIPE_FORMAT_COMP_S, PIPE_FORMAT_COMP_0, PIPE_FORMAT_COMP_0 )
+_PIPE_FORMAT_S000 = _PIPE_FORMAT_SWZ( PIPE_FORMAT_COMP_S, PIPE_FORMAT_COMP_0, PIPE_FORMAT_COMP_0, PIPE_FORMAT_COMP_0 )
+
+def _PIPE_FORMAT_YCBCR( REV ):
+   return ((PIPE_FORMAT_LAYOUT_YCBCR << 0) |\
+   ((REV) << 2) )
+
+def _PIPE_FORMAT_DXT( LEVEL, RSIZE, GSIZE, BSIZE, ASIZE ):
+    return ((PIPE_FORMAT_LAYOUT_DXT << 0) | \
+    ((LEVEL) << 2) | \
+    ((RSIZE) << 5) | \
+    ((GSIZE) << 8) | \
+    ((BSIZE) << 11) | \
+    ((ASIZE) << 14) )
+
+PIPE_FORMAT_NONE                  = _PIPE_FORMAT_RGBAZS_1 ( _PIPE_FORMAT_0000, 0, 0, 0, 0, PIPE_FORMAT_TYPE_UNKNOWN )
+PIPE_FORMAT_A8R8G8B8_UNORM        = _PIPE_FORMAT_RGBAZS_8 ( _PIPE_FORMAT_ARGB, 1, 1, 1, 1, PIPE_FORMAT_TYPE_UNORM )
+PIPE_FORMAT_X8R8G8B8_UNORM        = _PIPE_FORMAT_RGBAZS_8 ( _PIPE_FORMAT_1RGB, 1, 1, 1, 1, PIPE_FORMAT_TYPE_UNORM )
+PIPE_FORMAT_B8G8R8A8_UNORM        = _PIPE_FORMAT_RGBAZS_8 ( _PIPE_FORMAT_BGRA, 1, 1, 1, 1, PIPE_FORMAT_TYPE_UNORM )
+PIPE_FORMAT_B8G8R8X8_UNORM        = _PIPE_FORMAT_RGBAZS_8 ( _PIPE_FORMAT_BGR1, 1, 1, 1, 1, PIPE_FORMAT_TYPE_UNORM )
+PIPE_FORMAT_A1R5G5B5_UNORM        = _PIPE_FORMAT_RGBAZS_1 ( _PIPE_FORMAT_ARGB, 1, 5, 5, 5, PIPE_FORMAT_TYPE_UNORM )
+PIPE_FORMAT_A4R4G4B4_UNORM        = _PIPE_FORMAT_RGBAZS_1 ( _PIPE_FORMAT_ARGB, 4, 4, 4, 4, PIPE_FORMAT_TYPE_UNORM )
+PIPE_FORMAT_R5G6B5_UNORM          = _PIPE_FORMAT_RGBAZS_1 ( _PIPE_FORMAT_RGB1, 5, 6, 5, 0, PIPE_FORMAT_TYPE_UNORM )
+PIPE_FORMAT_A2B10G10R10_UNORM     = _PIPE_FORMAT_RGBAZS_2 ( _PIPE_FORMAT_ABGR, 1, 5, 5, 5, PIPE_FORMAT_TYPE_UNORM )
+PIPE_FORMAT_L8_UNORM              = _PIPE_FORMAT_RGBAZS_8 ( _PIPE_FORMAT_RRR1, 1, 1, 1, 0, PIPE_FORMAT_TYPE_UNORM )
+PIPE_FORMAT_A8_UNORM              = _PIPE_FORMAT_RGBAZS_8 ( _PIPE_FORMAT_000R, 0, 0, 0, 1, PIPE_FORMAT_TYPE_UNORM )
+PIPE_FORMAT_I8_UNORM              = _PIPE_FORMAT_RGBAZS_8 ( _PIPE_FORMAT_RRRR, 1, 1, 1, 1, PIPE_FORMAT_TYPE_UNORM )
+PIPE_FORMAT_A8L8_UNORM            = _PIPE_FORMAT_RGBAZS_8 ( _PIPE_FORMAT_RRRG, 1, 1, 1, 1, PIPE_FORMAT_TYPE_UNORM )
+PIPE_FORMAT_L16_UNORM             = _PIPE_FORMAT_RGBAZS_8 ( _PIPE_FORMAT_RRR1, 2, 2, 2, 0, PIPE_FORMAT_TYPE_UNORM )
+PIPE_FORMAT_YCBCR                 = _PIPE_FORMAT_YCBCR( 0 )
+PIPE_FORMAT_YCBCR_REV             = _PIPE_FORMAT_YCBCR( 1 )
+PIPE_FORMAT_Z16_UNORM             = _PIPE_FORMAT_RGBAZS_8 ( _PIPE_FORMAT_Z000, 2, 0, 0, 0, PIPE_FORMAT_TYPE_UNORM )
+PIPE_FORMAT_Z32_UNORM             = _PIPE_FORMAT_RGBAZS_8 ( _PIPE_FORMAT_Z000, 4, 0, 0, 0, PIPE_FORMAT_TYPE_UNORM )
+PIPE_FORMAT_Z32_FLOAT             = _PIPE_FORMAT_RGBAZS_8 ( _PIPE_FORMAT_Z000, 4, 0, 0, 0, PIPE_FORMAT_TYPE_FLOAT )
+PIPE_FORMAT_S8Z24_UNORM           = _PIPE_FORMAT_RGBAZS_8 ( _PIPE_FORMAT_SZ00, 1, 3, 0, 0, PIPE_FORMAT_TYPE_UNORM )
+PIPE_FORMAT_Z24S8_UNORM           = _PIPE_FORMAT_RGBAZS_8 ( _PIPE_FORMAT_ZS00, 3, 1, 0, 0, PIPE_FORMAT_TYPE_UNORM )
+PIPE_FORMAT_X8Z24_UNORM           = _PIPE_FORMAT_RGBAZS_8 ( _PIPE_FORMAT_0Z00, 1, 3, 0, 0, PIPE_FORMAT_TYPE_UNORM )
+PIPE_FORMAT_Z24X8_UNORM           = _PIPE_FORMAT_RGBAZS_8 ( _PIPE_FORMAT_Z000, 3, 1, 0, 0, PIPE_FORMAT_TYPE_UNORM )
+PIPE_FORMAT_S8_UNORM              = _PIPE_FORMAT_RGBAZS_8 ( _PIPE_FORMAT_S000, 1, 0, 0, 0, PIPE_FORMAT_TYPE_UNORM )
+PIPE_FORMAT_R64_FLOAT             = _PIPE_FORMAT_RGBAZS_64( _PIPE_FORMAT_R001, 1, 0, 0, 0, PIPE_FORMAT_TYPE_FLOAT )
+PIPE_FORMAT_R64G64_FLOAT          = _PIPE_FORMAT_RGBAZS_64( _PIPE_FORMAT_RG01, 1, 1, 0, 0, PIPE_FORMAT_TYPE_FLOAT )
+PIPE_FORMAT_R64G64B64_FLOAT       = _PIPE_FORMAT_RGBAZS_64( _PIPE_FORMAT_RGB1, 1, 1, 1, 0, PIPE_FORMAT_TYPE_FLOAT )
+PIPE_FORMAT_R64G64B64A64_FLOAT    = _PIPE_FORMAT_RGBAZS_64( _PIPE_FORMAT_RGBA, 1, 1, 1, 1, PIPE_FORMAT_TYPE_FLOAT )
+PIPE_FORMAT_R32_FLOAT             = _PIPE_FORMAT_RGBAZS_8 ( _PIPE_FORMAT_R001, 4, 0, 0, 0, PIPE_FORMAT_TYPE_FLOAT )
+PIPE_FORMAT_R32G32_FLOAT          = _PIPE_FORMAT_RGBAZS_8 ( _PIPE_FORMAT_RG01, 4, 4, 0, 0, PIPE_FORMAT_TYPE_FLOAT )
+PIPE_FORMAT_R32G32B32_FLOAT       = _PIPE_FORMAT_RGBAZS_8 ( _PIPE_FORMAT_RGB1, 4, 4, 4, 0, PIPE_FORMAT_TYPE_FLOAT )
+PIPE_FORMAT_R32G32B32A32_FLOAT    = _PIPE_FORMAT_RGBAZS_8 ( _PIPE_FORMAT_RGBA, 4, 4, 4, 4, PIPE_FORMAT_TYPE_FLOAT )
+PIPE_FORMAT_R32_UNORM             = _PIPE_FORMAT_RGBAZS_8 ( _PIPE_FORMAT_R001, 4, 0, 0, 0, PIPE_FORMAT_TYPE_UNORM )
+PIPE_FORMAT_R32G32_UNORM          = _PIPE_FORMAT_RGBAZS_8 ( _PIPE_FORMAT_RG01, 4, 4, 0, 0, PIPE_FORMAT_TYPE_UNORM )
+PIPE_FORMAT_R32G32B32_UNORM       = _PIPE_FORMAT_RGBAZS_8 ( _PIPE_FORMAT_RGB1, 4, 4, 4, 0, PIPE_FORMAT_TYPE_UNORM )
+PIPE_FORMAT_R32G32B32A32_UNORM    = _PIPE_FORMAT_RGBAZS_8 ( _PIPE_FORMAT_RGBA, 4, 4, 4, 4, PIPE_FORMAT_TYPE_UNORM )
+PIPE_FORMAT_R32_USCALED           = _PIPE_FORMAT_RGBAZS_8 ( _PIPE_FORMAT_R001, 4, 0, 0, 0, PIPE_FORMAT_TYPE_USCALED )
+PIPE_FORMAT_R32G32_USCALED        = _PIPE_FORMAT_RGBAZS_8 ( _PIPE_FORMAT_RG01, 4, 4, 0, 0, PIPE_FORMAT_TYPE_USCALED )
+PIPE_FORMAT_R32G32B32_USCALED     = _PIPE_FORMAT_RGBAZS_8 ( _PIPE_FORMAT_RGB1, 4, 4, 4, 0, PIPE_FORMAT_TYPE_USCALED )
+PIPE_FORMAT_R32G32B32A32_USCALED  = _PIPE_FORMAT_RGBAZS_8 ( _PIPE_FORMAT_RGBA, 4, 4, 4, 4, PIPE_FORMAT_TYPE_USCALED )
+PIPE_FORMAT_R32_SNORM             = _PIPE_FORMAT_RGBAZS_8 ( _PIPE_FORMAT_R001, 4, 0, 0, 0, PIPE_FORMAT_TYPE_SNORM )
+PIPE_FORMAT_R32G32_SNORM          = _PIPE_FORMAT_RGBAZS_8 ( _PIPE_FORMAT_RG01, 4, 4, 0, 0, PIPE_FORMAT_TYPE_SNORM )
+PIPE_FORMAT_R32G32B32_SNORM       = _PIPE_FORMAT_RGBAZS_8 ( _PIPE_FORMAT_RGB1, 4, 4, 4, 0, PIPE_FORMAT_TYPE_SNORM )
+PIPE_FORMAT_R32G32B32A32_SNORM    = _PIPE_FORMAT_RGBAZS_8 ( _PIPE_FORMAT_RGBA, 4, 4, 4, 4, PIPE_FORMAT_TYPE_SNORM )
+PIPE_FORMAT_R32_SSCALED           = _PIPE_FORMAT_RGBAZS_8 ( _PIPE_FORMAT_R001, 4, 0, 0, 0, PIPE_FORMAT_TYPE_SSCALED )
+PIPE_FORMAT_R32G32_SSCALED        = _PIPE_FORMAT_RGBAZS_8 ( _PIPE_FORMAT_RG01, 4, 4, 0, 0, PIPE_FORMAT_TYPE_SSCALED )
+PIPE_FORMAT_R32G32B32_SSCALED     = _PIPE_FORMAT_RGBAZS_8 ( _PIPE_FORMAT_RGB1, 4, 4, 4, 0, PIPE_FORMAT_TYPE_SSCALED )
+PIPE_FORMAT_R32G32B32A32_SSCALED  = _PIPE_FORMAT_RGBAZS_8 ( _PIPE_FORMAT_RGBA, 4, 4, 4, 4, PIPE_FORMAT_TYPE_SSCALED )
+PIPE_FORMAT_R16_UNORM             = _PIPE_FORMAT_RGBAZS_8 ( _PIPE_FORMAT_R001, 2, 0, 0, 0, PIPE_FORMAT_TYPE_UNORM )
+PIPE_FORMAT_R16G16_UNORM          = _PIPE_FORMAT_RGBAZS_8 ( _PIPE_FORMAT_RG01, 2, 2, 0, 0, PIPE_FORMAT_TYPE_UNORM )
+PIPE_FORMAT_R16G16B16_UNORM       = _PIPE_FORMAT_RGBAZS_8 ( _PIPE_FORMAT_RGB1, 2, 2, 2, 0, PIPE_FORMAT_TYPE_UNORM )
+PIPE_FORMAT_R16G16B16A16_UNORM    = _PIPE_FORMAT_RGBAZS_8 ( _PIPE_FORMAT_RGBA, 2, 2, 2, 2, PIPE_FORMAT_TYPE_UNORM )
+PIPE_FORMAT_R16_USCALED           = _PIPE_FORMAT_RGBAZS_8 ( _PIPE_FORMAT_R001, 2, 0, 0, 0, PIPE_FORMAT_TYPE_USCALED )
+PIPE_FORMAT_R16G16_USCALED        = _PIPE_FORMAT_RGBAZS_8 ( _PIPE_FORMAT_RG01, 2, 2, 0, 0, PIPE_FORMAT_TYPE_USCALED )
+PIPE_FORMAT_R16G16B16_USCALED     = _PIPE_FORMAT_RGBAZS_8 ( _PIPE_FORMAT_RGB1, 2, 2, 2, 0, PIPE_FORMAT_TYPE_USCALED )
+PIPE_FORMAT_R16G16B16A16_USCALED  = _PIPE_FORMAT_RGBAZS_8 ( _PIPE_FORMAT_RGBA, 2, 2, 2, 2, PIPE_FORMAT_TYPE_USCALED )
+PIPE_FORMAT_R16_SNORM             = _PIPE_FORMAT_RGBAZS_8 ( _PIPE_FORMAT_R001, 2, 0, 0, 0, PIPE_FORMAT_TYPE_SNORM )
+PIPE_FORMAT_R16G16_SNORM          = _PIPE_FORMAT_RGBAZS_8 ( _PIPE_FORMAT_RG01, 2, 2, 0, 0, PIPE_FORMAT_TYPE_SNORM )
+PIPE_FORMAT_R16G16B16_SNORM       = _PIPE_FORMAT_RGBAZS_8 ( _PIPE_FORMAT_RGB1, 2, 2, 2, 0, PIPE_FORMAT_TYPE_SNORM )
+PIPE_FORMAT_R16G16B16A16_SNORM    = _PIPE_FORMAT_RGBAZS_8 ( _PIPE_FORMAT_RGBA, 2, 2, 2, 2, PIPE_FORMAT_TYPE_SNORM )
+PIPE_FORMAT_R16_SSCALED           = _PIPE_FORMAT_RGBAZS_8 ( _PIPE_FORMAT_R001, 2, 0, 0, 0, PIPE_FORMAT_TYPE_SSCALED )
+PIPE_FORMAT_R16G16_SSCALED        = _PIPE_FORMAT_RGBAZS_8 ( _PIPE_FORMAT_RG01, 2, 2, 0, 0, PIPE_FORMAT_TYPE_SSCALED )
+PIPE_FORMAT_R16G16B16_SSCALED     = _PIPE_FORMAT_RGBAZS_8 ( _PIPE_FORMAT_RGB1, 2, 2, 2, 0, PIPE_FORMAT_TYPE_SSCALED )
+PIPE_FORMAT_R16G16B16A16_SSCALED  = _PIPE_FORMAT_RGBAZS_8 ( _PIPE_FORMAT_RGBA, 2, 2, 2, 2, PIPE_FORMAT_TYPE_SSCALED )
+PIPE_FORMAT_R8_UNORM              = _PIPE_FORMAT_RGBAZS_8 ( _PIPE_FORMAT_R001, 1, 0, 0, 0, PIPE_FORMAT_TYPE_UNORM )
+PIPE_FORMAT_R8G8_UNORM            = _PIPE_FORMAT_RGBAZS_8 ( _PIPE_FORMAT_RG01, 1, 1, 0, 0, PIPE_FORMAT_TYPE_UNORM )
+PIPE_FORMAT_R8G8B8_UNORM          = _PIPE_FORMAT_RGBAZS_8 ( _PIPE_FORMAT_RGB1, 1, 1, 1, 0, PIPE_FORMAT_TYPE_UNORM )
+PIPE_FORMAT_R8G8B8A8_UNORM        = _PIPE_FORMAT_RGBAZS_8 ( _PIPE_FORMAT_RGBA, 1, 1, 1, 1, PIPE_FORMAT_TYPE_UNORM )
+PIPE_FORMAT_R8G8B8X8_UNORM        = _PIPE_FORMAT_RGBAZS_8 ( _PIPE_FORMAT_RGB1, 1, 1, 1, 1, PIPE_FORMAT_TYPE_UNORM )
+PIPE_FORMAT_R8_USCALED            = _PIPE_FORMAT_RGBAZS_8 ( _PIPE_FORMAT_R001, 1, 0, 0, 0, PIPE_FORMAT_TYPE_USCALED )
+PIPE_FORMAT_R8G8_USCALED          = _PIPE_FORMAT_RGBAZS_8 ( _PIPE_FORMAT_RG01, 1, 1, 0, 0, PIPE_FORMAT_TYPE_USCALED )
+PIPE_FORMAT_R8G8B8_USCALED        = _PIPE_FORMAT_RGBAZS_8 ( _PIPE_FORMAT_RGB1, 1, 1, 1, 0, PIPE_FORMAT_TYPE_USCALED )
+PIPE_FORMAT_R8G8B8A8_USCALED      = _PIPE_FORMAT_RGBAZS_8 ( _PIPE_FORMAT_RGBA, 1, 1, 1, 1, PIPE_FORMAT_TYPE_USCALED )
+PIPE_FORMAT_R8G8B8X8_USCALED      = _PIPE_FORMAT_RGBAZS_8 ( _PIPE_FORMAT_RGB1, 1, 1, 1, 1, PIPE_FORMAT_TYPE_USCALED )
+PIPE_FORMAT_R8_SNORM              = _PIPE_FORMAT_RGBAZS_8 ( _PIPE_FORMAT_R001, 1, 0, 0, 0, PIPE_FORMAT_TYPE_SNORM )
+PIPE_FORMAT_R8G8_SNORM            = _PIPE_FORMAT_RGBAZS_8 ( _PIPE_FORMAT_RG01, 1, 1, 0, 0, PIPE_FORMAT_TYPE_SNORM )
+PIPE_FORMAT_R8G8B8_SNORM          = _PIPE_FORMAT_RGBAZS_8 ( _PIPE_FORMAT_RGB1, 1, 1, 1, 0, PIPE_FORMAT_TYPE_SNORM )
+PIPE_FORMAT_R8G8B8A8_SNORM        = _PIPE_FORMAT_RGBAZS_8 ( _PIPE_FORMAT_RGBA, 1, 1, 1, 1, PIPE_FORMAT_TYPE_SNORM )
+PIPE_FORMAT_R8G8B8X8_SNORM        = _PIPE_FORMAT_RGBAZS_8 ( _PIPE_FORMAT_RGB1, 1, 1, 1, 1, PIPE_FORMAT_TYPE_SNORM )
+PIPE_FORMAT_B6G5R5_SNORM          = _PIPE_FORMAT_RGBAZS_1 ( _PIPE_FORMAT_BGR1, 6, 5, 5, 0, PIPE_FORMAT_TYPE_SNORM )
+PIPE_FORMAT_A8B8G8R8_SNORM        = _PIPE_FORMAT_RGBAZS_8 ( _PIPE_FORMAT_BGRA, 1, 1, 1, 1, PIPE_FORMAT_TYPE_SNORM )
+PIPE_FORMAT_X8B8G8R8_SNORM        = _PIPE_FORMAT_RGBAZS_8 ( _PIPE_FORMAT_RGB1, 1, 1, 1, 1, PIPE_FORMAT_TYPE_SNORM )
+PIPE_FORMAT_R8_SSCALED            = _PIPE_FORMAT_RGBAZS_8 ( _PIPE_FORMAT_R001, 1, 0, 0, 0, PIPE_FORMAT_TYPE_SSCALED )
+PIPE_FORMAT_R8G8_SSCALED          = _PIPE_FORMAT_RGBAZS_8 ( _PIPE_FORMAT_RG01, 1, 1, 0, 0, PIPE_FORMAT_TYPE_SSCALED )
+PIPE_FORMAT_R8G8B8_SSCALED        = _PIPE_FORMAT_RGBAZS_8 ( _PIPE_FORMAT_RGB1, 1, 1, 1, 0, PIPE_FORMAT_TYPE_SSCALED )
+PIPE_FORMAT_R8G8B8A8_SSCALED      = _PIPE_FORMAT_RGBAZS_8 ( _PIPE_FORMAT_RGBA, 1, 1, 1, 1, PIPE_FORMAT_TYPE_SSCALED )
+PIPE_FORMAT_R8G8B8X8_SSCALED      = _PIPE_FORMAT_RGBAZS_8 ( _PIPE_FORMAT_RGB1, 1, 1, 1, 1, PIPE_FORMAT_TYPE_SSCALED )
+PIPE_FORMAT_R32_FIXED             = _PIPE_FORMAT_RGBAZS_8 ( _PIPE_FORMAT_R001, 4, 0, 0, 0, PIPE_FORMAT_TYPE_FIXED )
+PIPE_FORMAT_R32G32_FIXED          = _PIPE_FORMAT_RGBAZS_8 ( _PIPE_FORMAT_RG01, 4, 4, 0, 0, PIPE_FORMAT_TYPE_FIXED )
+PIPE_FORMAT_R32G32B32_FIXED       = _PIPE_FORMAT_RGBAZS_8 ( _PIPE_FORMAT_RGB1, 4, 4, 4, 0, PIPE_FORMAT_TYPE_FIXED )
+PIPE_FORMAT_R32G32B32A32_FIXED    = _PIPE_FORMAT_RGBAZS_8 ( _PIPE_FORMAT_RGBA, 4, 4, 4, 4, PIPE_FORMAT_TYPE_FIXED )
+PIPE_FORMAT_L8_SRGB               = _PIPE_FORMAT_RGBAZS_8 ( _PIPE_FORMAT_RRR1, 1, 1, 1, 0, PIPE_FORMAT_TYPE_SRGB )
+PIPE_FORMAT_A8_L8_SRGB            = _PIPE_FORMAT_RGBAZS_8 ( _PIPE_FORMAT_RRRG, 1, 1, 1, 1, PIPE_FORMAT_TYPE_SRGB )
+PIPE_FORMAT_R8G8B8_SRGB           = _PIPE_FORMAT_RGBAZS_8 ( _PIPE_FORMAT_RGB1, 1, 1, 1, 0, PIPE_FORMAT_TYPE_SRGB )
+PIPE_FORMAT_R8G8B8A8_SRGB         = _PIPE_FORMAT_RGBAZS_8 ( _PIPE_FORMAT_RGBA, 1, 1, 1, 1, PIPE_FORMAT_TYPE_SRGB )
+PIPE_FORMAT_R8G8B8X8_SRGB         = _PIPE_FORMAT_RGBAZS_8 ( _PIPE_FORMAT_RGB1, 1, 1, 1, 1, PIPE_FORMAT_TYPE_SRGB )
+PIPE_FORMAT_X8UB8UG8SR8S_NORM     = _PIPE_FORMAT_MIXED( _PIPE_FORMAT_1BGR, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1 )
+PIPE_FORMAT_B6UG5SR5S_NORM        = _PIPE_FORMAT_MIXED( _PIPE_FORMAT_BGR1, 6, 5, 5, 0, 0, 1, 1, 0, 1, 0 )
+PIPE_FORMAT_DXT1_RGB              = _PIPE_FORMAT_DXT( 1, 8, 8, 8, 0 )
+PIPE_FORMAT_DXT1_RGBA             = _PIPE_FORMAT_DXT( 1, 8, 8, 8, 8 )
+PIPE_FORMAT_DXT3_RGBA             = _PIPE_FORMAT_DXT( 3, 8, 8, 8, 8 )
+PIPE_FORMAT_DXT5_RGBA             = _PIPE_FORMAT_DXT( 5, 8, 8, 8, 8 )
+
+
+formats = {}
+for name, value in globals().items():
+    if name.startswith("PIPE_FORMAT_") and isinstance(value, int):
+        formats[value] = name
+
+
+def clip(g):
+	return min(max(g, 0), 255)
+
+
+def yuv2rgb(y, u, v):
+	C = y - 16
+	D = u - 128
+	E = v - 128
+
+	r = clip(( 298 * C           + 409 * E + 128) >> 8)
+	g = clip(( 298 * C - 100 * D - 208 * E + 128) >> 8)
+	b = clip(( 298 * C + 516 * D           + 128) >> 8)
+	
+	return r, g, b
+
+	
+def translate_r5g6b5(data):
+	value, = struct.unpack_from("H", data)
+	r = ((value >> 11) & 0x1f)*0xff/0x1f
+	g = ((value >>  5) & 0x3f)*0xff/0x3f
+	b = ((value >>  0) & 0x1f)*0xff/0x1f
+	a = 255
+	return [[(r, g, b, a)]]
+
+def translate_a8r8g8b8(data):
+    b, g, r, a = struct.unpack_from("BBBB", data)
+    return [[(r, g, b, a)]]
+
+
+def translate_x8r8g8b8(data):
+    b, g, r, x = struct.unpack_from("BBBB", data)
+    a = 255
+    return [[(r, g, b, a)]]
+
+def translate_r8g8b8a8(data):
+	r, g, b, a = struct.unpack_from("BBBB", data)
+	return [[(r, g, b, a)]]
+
+def translate_ycbcr(data):
+	y1, u, y2, v = struct.unpack_from("BBBB", data)
+	r1, g1, b1 = yuv2rgb(y1, u, v)
+	r2, g2, b2 = yuv2rgb(y1, u, v)
+	return [[(r1, g1, b1, 255), (r2, g2, b2, 255)]]
+
+def translate_ycbcr_rev(data):
+    v, y2, u, y1 = struct.unpack_from("BBBB", data)
+    r1, g1, b1 = yuv2rgb(y1, u, v)
+    r2, g2, b2 = yuv2rgb(y1, u, v)
+    return [[(r1, g1, b1, 255), (r2, g2, b2, 255)]]
+
+def translate_x8z24(data):
+    value, = struct.unpack_from("I", data)
+    r = g = b = (value & 0xffffff)*0xff/0xffffff
+    a = 255
+    return [[(r, g, b, a)]]
+
+def translate_s8z24(data):
+    value, = struct.unpack_from("I", data)
+    r = (value & 0xffffff)*0xff/0xffffff
+    g = value >> 24
+    b = 0
+    a = 255
+    return [[(r, g, b, a)]]
+
+
+translate = {
+	PIPE_FORMAT_A8R8G8B8_UNORM: (4, 1, 1, translate_a8r8g8b8),
+	PIPE_FORMAT_X8R8G8B8_UNORM: (4, 1, 1, translate_x8r8g8b8),
+	PIPE_FORMAT_B8G8R8A8_UNORM: (4, 1, 1, translate_r8g8b8a8),
+	PIPE_FORMAT_B8G8R8X8_UNORM: (4, 1, 1, translate_r8g8b8a8),
+	PIPE_FORMAT_A8B8G8R8_SNORM: (4, 1, 1, translate_r8g8b8a8),
+	PIPE_FORMAT_R5G6B5_UNORM: (2, 1, 1, translate_r5g6b5),
+	PIPE_FORMAT_YCBCR: (4, 2, 1, translate_ycbcr),
+	PIPE_FORMAT_YCBCR_REV: (4, 2, 1, translate_ycbcr_rev),
+    PIPE_FORMAT_S8Z24_UNORM: (4, 1, 1, translate_s8z24),
+    PIPE_FORMAT_X8Z24_UNORM: (4, 1, 1, translate_x8z24),
+}
+
+def read_header(infile):
+	header_fmt = "IIII"
+	header = infile.read(struct.calcsize(header_fmt))
+	return struct.unpack_from(header_fmt, header)
+
+def process(infilename, outfilename):
+	sys.stderr.write("%s -> %s\n" % (infilename, outfilename))
+	infile = open(infilename, "rb")
+	format, cpp, width, height = read_header(infile)
+	sys.stderr.write("  %ux%ux%ubpp %s\n" % (width, height, cpp*8, formats[format]))
+	outimage = Image.new(
+	mode='RGB',
+	size=(width, height),
+	color=(0,0,0))
+	outpixels = outimage.load()
+	try:
+		bsize, bwidth, bheight, translate_func = translate[format]
+	except KeyError:
+		sys.stderr.write('error: unsupported format %s\n' % formats[format])
+		return
+	for y in range(0, height, bheight):
+		for x in range(0, width, bwidth):
+			indata = infile.read(bsize)
+			outdata = translate_func(indata)
+			for j in range(bheight):
+				for i in range(bwidth):
+					r, g, b, a = outdata[j][i]
+					outpixels[x+i, y+j] = r, g, b
+	outimage.save(outfilename, "PNG")
+
+
+def main():
+	if sys.platform == 'win32':
+		# wildcard expansion
+		from glob import glob
+		args = []
+		for arg in sys.argv[1:]:
+			args.extend(glob(arg))
+	else:
+		args = sys.argv[1:]
+	for infilename in args:
+		root, ext = os.path.splitext(infilename)
+		outfilename = root + ".png"
+		process(infilename, outfilename)
+
+
+if __name__ == '__main__':
+	main()

common.py

@@ -12,7 +12,7 @@ import platform as _platform
 
 _platform_map = {
 	'linux2': 'linux',
-	'win32': 'windows',
+	'win32': 'winddk',
 }
 
 default_platform = sys.platform
@@ -59,8 +59,9 @@ def AddOptions(opts):
 	opts.Add(EnumOption('machine', 'use machine-specific assembly code', default_machine,
 											 allowed_values=('generic', 'ppc', 'x86', 'x86_64')))
 	opts.Add(EnumOption('platform', 'target platform', default_platform,
-											 allowed_values=('linux', 'cell', 'windows', 'winddk', 'wince', 'darwin', 'embedded')))
+											 allowed_values=('linux', 'cell', 'windows', 'winddk', 'wince', 'darwin')))
 	opts.Add(EnumOption('toolchain', 'compiler toolchain', 'default',
 											 allowed_values=('default', 'crossmingw', 'winsdk', 'winddk')))
 	opts.Add(BoolOption('llvm', 'use LLVM', 'no'))
 	opts.Add(BoolOption('dri', 'build DRI drivers', default_dri))
+

configs/autoconf.in

@@ -22,10 +22,6 @@ LDFLAGS = @LDFLAGS@
 EXTRA_LIB_PATH = @EXTRA_LIB_PATH@
 RADEON_CFLAGS = @RADEON_CFLAGS@
 RADEON_LDFLAGS = @RADEON_LDFLAGS@
-INTEL_LIBS = @INTEL_LIBS@
-INTEL_CFLAGS = @INTEL_CFLAGS@
-X11_LIBS = @X11_LIBS@
-X11_CFLAGS = @X11_CFLAGS@
 
 # Assembler
 MESA_ASM_SOURCES = @MESA_ASM_SOURCES@
@@ -56,7 +52,6 @@ GLU_LIB_NAME = @GLU_LIB_NAME@
 GLUT_LIB_NAME = @GLUT_LIB_NAME@
 GLW_LIB_NAME = @GLW_LIB_NAME@
 OSMESA_LIB_NAME = @OSMESA_LIB_NAME@
-EGL_LIB_NAME = @EGL_LIB_NAME@
 
 # Globs used to install the lib and all symlinks
 GL_LIB_GLOB = @GL_LIB_GLOB@
@@ -64,20 +59,19 @@ GLU_LIB_GLOB = @GLU_LIB_GLOB@
 GLUT_LIB_GLOB = @GLUT_LIB_GLOB@
 GLW_LIB_GLOB = @GLW_LIB_GLOB@
 OSMESA_LIB_GLOB = @OSMESA_LIB_GLOB@
-EGL_LIB_GLOB = @EGL_LIB_GLOB@
 
 # Directories to build
 LIB_DIR = @LIB_DIR@
 SRC_DIRS = @SRC_DIRS@
 GLU_DIRS = @GLU_DIRS@
 DRIVER_DIRS = @DRIVER_DIRS@
-EGL_DRIVERS_DIRS = @EGL_DRIVERS_DIRS@
 GALLIUM_DIRS = @GALLIUM_DIRS@
+GALLIUM_AUXILIARY_DIRS = @GALLIUM_AUXILIARY_DIRS@
 GALLIUM_DRIVERS_DIRS = @GALLIUM_DRIVERS_DIRS@
 GALLIUM_WINSYS_DIRS = @GALLIUM_WINSYS_DIRS@
 GALLIUM_WINSYS_DRM_DIRS = @GALLIUM_WINSYS_DRM_DIRS@
 GALLIUM_STATE_TRACKERS_DIRS = @GALLIUM_STATE_TRACKERS_DIRS@
-GALLIUM_AUXILIARIES = $(TOP)/src/gallium/auxiliary/libgallium.a
+GALLIUM_AUXILIARIES = $(foreach DIR,$(GALLIUM_AUXILIARY_DIRS),$(TOP)/src/gallium/auxiliary/$(DIR)/lib$(DIR).a)
 GALLIUM_DRIVERS = $(foreach DIR,$(GALLIUM_DRIVERS_DIRS),$(TOP)/src/gallium/drivers/$(DIR)/lib$(DIR).a)
 
 # Which subdirs under $(TOP)/progs/ to enter:
@@ -86,7 +80,7 @@ PROGRAM_DIRS = @PROGRAM_DIRS@
 # Driver specific build vars
 DRI_DIRS = @DRI_DIRS@ 
 WINDOW_SYSTEM = @WINDOW_SYSTEM@
-EGL_DISPLAYS = @EGL_DISPLAYS@
+USING_EGL = @USING_EGL@
 
 # Dependencies
 X11_INCLUDES = @X11_INCLUDES@
@@ -132,9 +126,6 @@ DRI_DRIVER_INSTALL_DIR = @DRI_DRIVER_INSTALL_DIR@
 # Where libGL will look for DRI hardware drivers
 DRI_DRIVER_SEARCH_DIR = @DRI_DRIVER_SEARCH_DIR@
 
-# EGL driver install directory
-EGL_DRIVER_INSTALL_DIR = @EGL_DRIVER_INSTALL_DIR@
-
 # Xorg driver install directory (for xorg state-tracker)
 XORG_DRIVER_INSTALL_DIR = @XORG_DRIVER_INSTALL_DIR@
 
@@ -155,6 +146,3 @@ GLW_PC_LIB_PRIV = @GLW_PC_LIB_PRIV@
 GLW_PC_CFLAGS = @GLW_PC_CFLAGS@
 OSMESA_PC_REQ = @OSMESA_PC_REQ@
 OSMESA_PC_LIB_PRIV = @OSMESA_PC_LIB_PRIV@
-
-EGL_DRI2_CFLAGS = @EGL_DRI2_CFLAGS@
-EGL_DRI2_LIBS = @EGL_DRI2_LIBS@

configs/darwin

@@ -12,14 +12,11 @@ X11_DIR = $(INSTALL_DIR)
 CC = gcc
 CXX = g++
 PIC_FLAGS = -fPIC
-DEFINES =  -D_DARWIN_C_SOURCE -DPTHREADS -D_GNU_SOURCE \
-	   -DGLX_ALIAS_UNSUPPORTED \
-	   -DGLX_DIRECT_RENDERING -DGLX_USE_APPLEGL
+DEFINES =  -D_DARWIN_C_SOURCE -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L \
+	   -D_BSD_SOURCE -D_SVID_SOURCE -D_GNU_SOURCE -DPTHREADS \
+	   -DGLX_ALIAS_UNSUPPORTED -DGLX_INDIRECT_RENDERING
 
-# -DGLX_INDIRECT_RENDERING \
-
-# -D_GNU_SOURCE          - for src/mesa/main ...
-# -DGLX_DIRECT_RENDERING - pulls in libdrm stuff in glx
+# -DGLX_DIRECT_RENDERING - pulls in libdrm stuff in glx/x11
 # -DGLX_USE_APPLEGL      - supposed to be used with GLX_DIRECT_RENDERING to use AGL rather than DRM, but doesn't compile
 # -DIN_DRI_DRIVER
 
@@ -52,7 +49,7 @@ GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L$(INSTALL_DIR)/$(LIB_DIR) -L$(X
 APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L$(INSTALL_DIR)/$(LIB_DIR) -L$(X11_DIR)/$(LIB_DIR) -lX11 -lXmu -lXt -lXi -lm
 
 # omit glw lib for now:
-SRC_DIRS = glsl glx/apple mesa gallium glu glut/glx glew
+SRC_DIRS = glx/x11 mesa glu glut/glx glew
 GLU_DIRS = sgi
 DRIVER_DIRS = osmesa
 #DRIVER_DIRS = dri

configs/darwin-x86ppc

@@ -0,0 +1,33 @@
+# Configuration for Darwin / MacOS X, making dynamic libs
+
+include $(TOP)/configs/default
+
+CONFIG_NAME = darwin
+
+# Compiler and flags
+CC = cc
+CXX = cc
+CFLAGS = -arch ppc -arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk \
+         -I/usr/X11R6/include -O3 -fPIC -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin
+CXXFLAGS = -arch ppc -arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk \
+         -I/usr/X11R6/include -O3 -fPIC -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin
+
+MKLIB_OPTIONS = -archopt "-isysroot /Developer/SDKs/MacOSX10.4u.sdk"
+
+# Library names (actual file names)
+GL_LIB_NAME = libGL.dylib
+GLU_LIB_NAME = libGLU.dylib
+GLUT_LIB_NAME = libglut.dylib
+GLW_LIB_NAME = libGLw.dylib
+OSMESA_LIB_NAME = libOSMesa.dylib
+
+GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
+OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -lGL
+GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -lGL
+GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -lGL -lGLU -L/usr/X11R6/lib -lX11 -lXmu -lXi -lXext
+GLW_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXt $(TOP)/lib/GL.dylib
+APP_LIB_DEPS = -L$(TOP)/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
+
+# omit glw lib for now:
+SRC_DIRS = gallium mesa glu glut/glx glew
+

configs/default

@@ -9,8 +9,8 @@ CONFIG_NAME = default
 
 # Version info
 MESA_MAJOR=7
-MESA_MINOR=8
-MESA_TINY=2
+MESA_MINOR=7
+MESA_TINY=0
 MESA_VERSION = $(MESA_MAJOR).$(MESA_MINOR).$(MESA_TINY)
 
 # external projects.  This should be useless now that we use libdrm.
@@ -55,7 +55,6 @@ GLUT_LIB = glut
 GLEW_LIB = GLEW
 GLW_LIB = GLw
 OSMESA_LIB = OSMesa
-EGL_LIB = EGL
 
 
 # Library names (actual file names)
@@ -65,7 +64,6 @@ GLUT_LIB_NAME = lib$(GLUT_LIB).so
 GLEW_LIB_NAME = lib$(GLEW_LIB).a
 GLW_LIB_NAME = lib$(GLW_LIB).so
 OSMESA_LIB_NAME = lib$(OSMESA_LIB).so
-EGL_LIB_NAME = lib$(EGL_LIB).so
 
 # globs used to install the lib and all symlinks
 GL_LIB_GLOB = $(GL_LIB_NAME)*
@@ -73,7 +71,6 @@ GLU_LIB_GLOB = $(GLU_LIB_NAME)*
 GLUT_LIB_GLOB = $(GLUT_LIB_NAME)*
 GLW_LIB_GLOB = $(GLW_LIB_NAME)*
 OSMESA_LIB_GLOB = $(OSMESA_LIB_NAME)*
-EGL_LIB_GLOB = $(EGL_LIB_NAME)*
 
 # Optional assembly language optimization files for libGL
 MESA_ASM_SOURCES = 
@@ -86,26 +83,25 @@ MOTIF_CFLAGS = -I/usr/include/Motif1.2
 
 # Directories to build
 LIB_DIR = lib
-SRC_DIRS = glsl mesa gallium egl gallium/winsys glu glut/glx glew glw
+SRC_DIRS = mesa gallium egl gallium/winsys glu glut/glx glew glw
 GLU_DIRS = sgi
 DRIVER_DIRS = x11 osmesa
 # Which subdirs under $(TOP)/progs/ to enter:
 PROGRAM_DIRS = demos redbook samples glsl objviewer xdemos
 
-# EGL drivers to build
-EGL_DRIVERS_DIRS = glx
+# EGL directories
+EGL_DRIVERS_DIRS = demo
 
 # Gallium directories and 
 GALLIUM_DIRS = auxiliary drivers state_trackers
-GALLIUM_AUXILIARIES = $(TOP)/src/gallium/auxiliary/libgallium.a
-GALLIUM_DRIVERS_DIRS = softpipe failover svga i915 i965 r300 trace identity
+GALLIUM_AUXILIARY_DIRS = rbug draw translate cso_cache pipebuffer tgsi sct rtasm util indices vl
+GALLIUM_AUXILIARIES = $(foreach DIR,$(GALLIUM_AUXILIARY_DIRS),$(TOP)/src/gallium/auxiliary/$(DIR)/lib$(DIR).a)
+GALLIUM_DRIVERS_DIRS = softpipe failover svga i915 trace identity
 GALLIUM_DRIVERS = $(foreach DIR,$(GALLIUM_DRIVERS_DIRS),$(TOP)/src/gallium/drivers/$(DIR)/lib$(DIR).a)
-GALLIUM_WINSYS_DIRS = drm xlib
-GALLIUM_WINSYS_DRM_DIRS = swrast
-GALLIUM_STATE_TRACKERS_DIRS = glx vega
+GALLIUM_WINSYS_DIRS = xlib egl_xlib
+GALLIUM_WINSYS_DRM_DIRS =
+GALLIUM_STATE_TRACKERS_DIRS = glx
 
-# native displays EGL should support
-EGL_DISPLAYS = x11
 
 # Library dependencies
 #EXTRA_LIB_PATH ?=
@@ -119,7 +115,7 @@ APP_LIB_DEPS    = $(EXTRA_LIB_PATH) -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LI
 
 # Program dependencies - specific GL/glut libraries added in Makefiles
 APP_LIB_DEPS = -lm
-X11_LIBS = -lX11
+
 
 # Installation directories (for make install)
 INSTALL_DIR = /usr/local
@@ -130,9 +126,6 @@ DRI_DRIVER_INSTALL_DIR = $(INSTALL_LIB_DIR)/dri
 # Where libGL will look for DRI hardware drivers
 DRI_DRIVER_SEARCH_DIR = $(DRI_DRIVER_INSTALL_DIR)
 
-# EGL driver install directory
-EGL_DRIVER_INSTALL_DIR = $(INSTALL_LIB_DIR)/egl
-
 # Xorg driver install directory (for xorg state-tracker)
 XORG_DRIVER_INSTALL_DIR = $(INSTALL_LIB_DIR)/xorg/modules/drivers
 

configs/freebsd-dri

@@ -41,13 +41,15 @@ GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/local/lib -lGL -lXt -lX11
 
 
 # Directories
-SRC_DIRS = glx gallium mesa glu glut/glx glew glw
+SRC_DIRS = glx/x11 gallium mesa glu glut/glx glew glw
 DRIVER_DIRS = dri
 PROGRAM_DIRS = 
 WINDOW_SYSTEM=dri
 
 DRM_SOURCE_PATH=$(TOP)/../drm
 
+# ffb and gamma are missing because they have not been converted to use the new
+# interface.
 DRI_DIRS = i810 i915 i965 mach64 mga r128 r200 r300 radeon tdfx \
 	   unichrome savage sis
 

configs/linux-cell

@@ -1,6 +1,6 @@
 # linux-cell  (non-debug build)
 
-include $(TOP)/configs/linux
+include $(TOP)/configs/default
 
 CONFIG_NAME = linux-cell
 
@@ -25,19 +25,15 @@ OPT_FLAGS = -O3
 SDK = /opt/cell/sdk/usr
 
 
-
-COMMON_C_CPP_FLAGS = $(OPT_FLAGS) -Wall -Winline \
-	-fPIC -m32 -mabi=altivec -maltivec \
+CFLAGS = $(OPT_FLAGS) -Wall -Winline -Wmissing-prototypes \
+	-fPIC -m32 -std=c99 -mabi=altivec -maltivec \
 	-I. -I$(SDK)/include \
-	-DGALLIUM_CELL $(DEFINES)
-
-CFLAGS = $(COMMON_C_CPP_FLAGS) -Wmissing-prototypes -std=c99
-
-CXXFLAGS = $(COMMON_C_CPP_FLAGS)
+	-DGALLIUM_CELL -DUSE_XSHM -D_BSD_SOURCE -D_SVID_SOURCE
 
+CXXFLAGS = $(CFLAGS)
 
 # Omitting glw here:
-SRC_DIRS = glsl mesa gallium gallium/winsys glu glut/glx glew
+SRC_DIRS = gallium mesa gallium/winsys glu glut/glx glew
 
 # Build no traditional Mesa drivers:
 DRIVER_DIRS =

configs/linux-debug

@@ -5,5 +5,5 @@ include $(TOP)/configs/linux
 CONFIG_NAME = linux-debug
 
 OPT_FLAGS = -g
-CFLAGS += -pedantic
+CFLAGS += -ansi -pedantic
 DEFINES += -DDEBUG -DDEBUG_MATH

configs/linux-directfb

@@ -0,0 +1,38 @@
+# Configuration for DirectFB
+
+include $(TOP)/configs/default
+
+CONFIG_NAME = linux-directfb
+
+# Compiler and flags
+CC  = gcc
+CXX = g++
+
+CFLAGS   = -Wall -O3 -ffast-math -fPIC -std=c99 -D_GNU_SOURCE -D_POSIX_SOURCE -D_SVID_SOURCE \
+         -D_POSIX_C_SOURCE=199309L -D_BSD_SOURCE -DPTHREADS
+
+CXXFLAGS = -Wall -O3 -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE   
+
+# Work around aliasing bugs - developers should comment this out
+CFLAGS += -fno-strict-aliasing
+CXXFLAGS += -fno-strict-aliasing
+
+HAVE_X86 = $(shell uname -m | grep 'i[3-6]86' >/dev/null && echo yes)
+ifeq ($(HAVE_X86), yes)
+     CFLAGS   += -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
+     CXXFLAGS += -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
+     MESA_ASM_SOURCES = $(X86_SOURCES)
+     GLAPI_ASM_SOURCES = $(X86_API)
+endif
+
+# Directories
+SRC_DIRS     = gallium mesa glu glut/directfb glew
+GLU_DIRS     = sgi
+DRIVER_DIRS  = directfb
+PROGRAM_DIRS = demos directfb
+
+# Library/program dependencies
+GL_LIB_DEPS   = -lm -lpthread
+GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -l$(GLU_LIB)
+APP_LIB_DEPS  = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -l$(GLU_LIB) -l$(GLUT_LIB)
+

configs/linux-dri

@@ -51,23 +51,17 @@ GL_LIB_DEPS   = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \
 
 
 # Directories
-SRC_DIRS := glx egl $(SRC_DIRS)
+SRC_DIRS := glx/x11 egl $(SRC_DIRS)
 PROGRAM_DIRS := egl $(PROGRAM_DIRS)
 
 # EGL directories
-EGL_DRIVERS_DIRS = glx
+EGL_DRIVERS_DIRS = demo glx
 
 DRIVER_DIRS = dri
 WINDOW_SYSTEM = dri
 GALLIUM_WINSYS_DIRS = drm
-GALLIUM_WINSYS_DRM_DIRS = vmware intel i965
+GALLIUM_WINSYS_DRM_DIRS = vmware intel
 GALLIUM_STATE_TRACKERS_DIRS = egl
 
 DRI_DIRS = i810 i915 i965 mach64 mga r128 r200 r300 radeon \
-	savage sis tdfx unichrome swrast
-
-INTEL_LIBS = `pkg-config --libs libdrm_intel`
-INTEL_CFLAGS = `pkg-config --cflags libdrm_intel`
-
-RADEON_LIBS = `pkg-config --libs libdrm_radeon`
-RADEON_CFLAGS = `pkg-config --cflags libdrm_radeon`
+	savage sis tdfx unichrome ffb swrast

configs/linux-dri-x86-64

@@ -16,7 +16,7 @@ LIB_DIR = lib64
 # Library/program dependencies
 EXTRA_LIB_PATH=-L/usr/X11R6/lib64
 
-# sis is missing because it has not been converted to use
+# ffb, gamma, and sis are missing because they have not be converted to use
 # the new interface.  i810 are missing because there is no x86-64
 # system where they could *ever* be used.
 #

configs/linux-dri-xcb

@@ -47,11 +47,26 @@ DRI_LIB_DEPS  = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB)
 GL_LIB_DEPS   = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lm -lpthread -ldl \
                 $(LIBDRM_LIB) $(shell pkg-config --libs xcb) $(shell pkg-config --libs x11-xcb) $(shell pkg-config --libs xcb-glx)
 
-SRC_DIRS = glx gallium mesa glu glut/glx glew glw
+
+# This is now 0 by default since it seems to confuse the hell out of people
+# and generate a lot of extra noise on bugzilla.  If you need to build with
+# EGL, do 'make linux-dri USING_EGL=1'
+
+USING_EGL=0
+
+# Directories
+ifeq ($(USING_EGL), 1)
+SRC_DIRS = egl glx/x11 gallium mesa glu glut/glx glew glw
+PROGRAM_DIRS = egl
+else
+SRC_DIRS = glx/x11 gallium mesa glu glut/glx glew glw
 PROGRAM_DIRS = xdemos
+endif
 
 DRIVER_DIRS = dri
 WINDOW_SYSTEM=dri
 
+# gamma are missing because they have not been converted to use the new
+# interface.
 DRI_DIRS = i810 i915 mach64 mga r128 r200 r300 radeon \
-	savage sis tdfx unichrome
+	savage sis tdfx unichrome ffb 

configs/linux-egl

@@ -46,6 +46,12 @@ GL_LIB_DEPS   = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \
                 $(LIBDRM_LIB)
 
 
+# This is now 0 by default since it seems to confuse the hell out of people
+# and generate a lot of extra noise on bugzilla.  If you need to build with
+# EGL, do 'make linux-dri USING_EGL=1'
+
+USING_EGL=0
+
 # Directories
 SRC_DIRS = gallium mesa gallium/winsys glu egl
 PROGRAM_DIRS = egl
@@ -54,4 +60,6 @@ DRIVER_DIRS = dri
 WINDOW_SYSTEM = dri
 GALLIUM_WINSYS_DIRS = egl_drm
 
+# gamma are missing because they have not been converted to use the new
+# interface.
 DRI_DIRS = intel 

configs/linux-glide

@@ -0,0 +1,23 @@
+# Configuration for generic Linux with 3Dfx Glide driver
+
+include $(TOP)/configs/default
+
+CONFIG_NAME = linux-glide
+
+# 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 -DFX -I/usr/include/glide -I/usr/local/glide/include
+CXXFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
+GLUT_CFLAGS = -fexceptions
+
+# Work around aliasing bugs - developers should comment this out
+CFLAGS += -fno-strict-aliasing
+CXXFLAGS += -fno-strict-aliasing
+
+# Library/program dependencies
+GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -L/usr/local/glide/lib -lglide3x -lm -lpthread
+GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
+GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11
+APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/local/glide/lib -lglide3x -lm

configs/linux-i965

@@ -1,8 +0,0 @@
-# Configuration for standalone mode i965 debug
-
-include $(TOP)/configs/linux-debug
-
-CONFIG_NAME = linux-i965
-
-GALLIUM_DRIVER_DIRS = i965
-GALLIUM_WINSYS_DIRS = drm/i965/xlib

configs/linux-indirect

@@ -47,7 +47,7 @@ GL_LIB_DEPS   = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lm -lpthread -ldl
 
 
 # Directories
-SRC_DIRS = glx glu glut/glx glew glw
+SRC_DIRS = glx/x11 glu glut/glx glew glw
 DRIVER_DIRS =
 PROGRAM_DIRS = 
 WINDOW_SYSTEM=dri

configs/linux-llvm

@@ -1,18 +1,18 @@
 # -*-makefile-*-
-# Configuration for Linux and LLVM with optimizations
+# Configuration for Linux and LLVM with debugging info
 # Builds the llvmpipe gallium driver
 
 include $(TOP)/configs/linux
 
 CONFIG_NAME = linux-llvm
 
+#GALLIUM_AUXILIARY_DIRS += gallivm
+
 # Add llvmpipe driver
 GALLIUM_DRIVERS_DIRS += llvmpipe
 
-OPT_FLAGS = -O3 -ansi -pedantic
-ARCH_FLAGS = -m32 -mmmx -msse -msse2 -mstackrealign
-
-DEFINES += -DNDEBUG -DGALLIUM_LLVMPIPE -DDRAW_LLVM -DHAVE_UDIS86
+OPT_FLAGS = -g -ansi -pedantic
+DEFINES += -DDEBUG -DDEBUG_MATH -DGALLIUM_LLVMPIPE -DHAVE_UDIS86
 
 # override -std=c99
 CFLAGS += -std=gnu99
@@ -31,7 +31,7 @@ ifeq ($(MESA_LLVM),1)
 #  LLVM_CFLAGS=`llvm-config --cflags`
   LLVM_CXXFLAGS=`llvm-config --cxxflags backend bitreader engine ipo interpreter instrumentation` -Wno-long-long
   LLVM_LDFLAGS = $(shell llvm-config --ldflags backend bitreader engine ipo interpreter instrumentation)
-  LLVM_LIBS = $(shell llvm-config --libs backend bitwriter bitreader engine ipo interpreter instrumentation)
+  LLVM_LIBS = $(shell llvm-config --libs backend bitreader engine ipo interpreter instrumentation)
   MKLIB_OPTIONS=-cplusplus
 else
   LLVM_CFLAGS=

configs/linux-llvm-debug

@@ -1,12 +0,0 @@
-# -*-makefile-*-
-# Configuration for Linux and LLVM with debugging info
-# Builds the llvmpipe gallium driver
-
-include $(TOP)/configs/linux-llvm
-
-CONFIG_NAME = linux-llvm-debug
-
-OPT_FLAGS = -g -ansi -pedantic
-
-DEFINES += -DDEBUG -UNDEBUG
-

configs/linux-opengl-es

@@ -1,28 +0,0 @@
-# Configuration for OpenGL ES on Linux
-
-include $(TOP)/configs/linux
-
-CONFIG_NAME = linux-opengl-es
-
-# Directories to build
-LIB_DIR = lib
-SRC_DIRS = egl glsl mesa/es gallium gallium/winsys
-PROGRAM_DIRS = es1/screen es1/xegl es2/xegl
-
-# egl st needs this
-DEFINES += -DGLX_DIRECT_RENDERING
-
-# no mesa or egl drivers
-DRIVER_DIRS =
-EGL_DRIVERS_DIRS =
-
-GALLIUM_DRIVERS_DIRS = softpipe
-
-# build libGLES*.so
-GALLIUM_STATE_TRACKERS_DIRS = es
-
-# build egl_x11_{swrast,i915}.so
-GALLIUM_DRIVERS_DIRS += trace i915
-GALLIUM_STATE_TRACKERS_DIRS += egl
-GALLIUM_WINSYS_DIRS += drm
-GALLIUM_WINSYS_DRM_DIRS += intel swrast

configs/linux-osmesa

@@ -9,7 +9,7 @@ CONFIG_NAME = linux-osmesa
 # Compiler and flags
 CC = gcc
 CXX = g++
-CFLAGS = -g -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -D_GNU_SOURCE -DPTHREADS
+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
 
 # Work around aliasing bugs - developers should comment this out
@@ -17,12 +17,12 @@ CFLAGS += -fno-strict-aliasing
 CXXFLAGS += -fno-strict-aliasing
 
 # Directories
-SRC_DIRS = glsl mesa glu
+SRC_DIRS = gallium mesa glu
 DRIVER_DIRS = osmesa
 PROGRAM_DIRS = osdemos
 
 
 # Dependencies
-OSMESA_LIB_DEPS = -lm -lpthread -ldl
+OSMESA_LIB_DEPS = -lm -lpthread
 GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(OSMESA_LIB)
 APP_LIB_DEPS = -lm -lpthread

configs/linux-osmesa16

@@ -20,7 +20,7 @@ OSMESA_LIB_NAME = libOSMesa16.so
 
 
 # Directories
-SRC_DIRS = glsl mesa glu
+SRC_DIRS = gallium mesa glu
 DRIVER_DIRS = osmesa
 PROGRAM_DIRS = 
 

configs/linux-osmesa32

@@ -20,7 +20,7 @@ OSMESA_LIB_NAME = libOSMesa32.so
 
 
 # Directories
-SRC_DIRS = glsl mesa glu
+SRC_DIRS = gallium mesa glu
 DRIVER_DIRS = osmesa
 PROGRAM_DIRS = 
 

configs/linux-solo

@@ -0,0 +1,54 @@
+# Configuration for linux-solo: Linux DRI hardware drivers for fbdev
+
+include $(TOP)/configs/default
+
+CONFIG_NAME = linux-solo
+
+# Compiler and flags
+CC = gcc
+CXX = g++
+
+WARN_FLAGS = -Wall -Wundef
+OPT_FLAGS  = -O3 -g
+PIC_FLAGS  = -fPIC
+
+# Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support.
+ARCH_FLAGS ?=
+
+# DRM and pciaccess
+LIBDRM_CFLAGS = $(shell pkg-config --cflags libdrm)
+LIBDRM_LIB = $(shell pkg-config --libs libdrm)
+PCIACCESS_CFLAGS = $(shell pkg-config --cflags pciaccess)
+PCIACCESS_LIB = $(shell pkg-config --libs pciaccess)
+
+
+DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \
+	-D_BSD_SOURCE -D_GNU_SOURCE -DHAVE_POSIX_MEMALIGN \
+	-DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER \
+	-DHAVE_ALIAS
+
+CFLAGS   = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) \
+	$(ASM_FLAGS) -std=c99 -ffast-math 
+
+CXXFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES)
+
+# Work around aliasing bugs - developers should comment this out
+CFLAGS += -fno-strict-aliasing
+CXXFLAGS += -fno-strict-aliasing
+
+MESA_ASM_SOURCES = 
+
+# Library/program dependencies
+DRI_LIB_DEPS = -lm -lpthread -lexpat -ldl -L$(TOP)/$(LIB_DIR) $(PCIACCESS_LIB)
+GL_LIB_DEPS = -lm -lpthread -ldl
+GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm
+GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lm
+APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm -lpthread
+
+# Directories
+SRC_DIRS = glx/mini gallium mesa glu glut/mini glew
+DRIVER_DIRS = dri
+PROGRAM_DIRS = miniglx
+
+#DRI_DIRS = ffb gamma sis savage tdfx unichrome fb
+DRI_DIRS = i810 i915tex i915 mach64 mga r128 r200 radeon

configs/linux-solo-ia64

@@ -0,0 +1,7 @@
+# Configuration for linux-solo-ia64: Linux DRI hardware drivers for fbdev
+
+include $(TOP)/configs/linux-solo
+
+CONFIG_NAME = linux-solo-ia64
+
+DRI_DIRS = fb mach64 mga r128 r200 radeon sis tdfx unichrome

configs/linux-solo-x86

@@ -0,0 +1,10 @@
+# -*-makefile-*-
+# Configuration for linux-solo-x86: Linux hardware drivers for fbdev for x86
+
+include $(TOP)/configs/linux-solo
+
+CONFIG_NAME = linux-solo-x86
+
+ASM_FLAGS = -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
+MESA_ASM_SOURCES = $(X86_SOURCES)
+GLAPI_ASM_SOURCES = $(X86_API)

configs/linux-x86-glide

@@ -0,0 +1,28 @@
+# Configuration for Linux with 3Dfx Glide driver and x86 optimizations
+
+include $(TOP)/configs/default
+
+CONFIG_NAME = linux-x86-glide
+
+# Compiler and flags
+CC = gcc
+CXX = g++
+
+CFLAGS = -Wall -O3 -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -DPTHREADS -I/usr/X11R6/include -DFX -I/usr/include/glide -I/usr/local/glide/include
+
+CXXFLAGS = -Wall -O3 -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
+
+GLUT_CFLAGS = -fexceptions
+
+# Work around aliasing bugs - developers should comment this out
+CFLAGS += -fno-strict-aliasing
+CXXFLAGS += -fno-strict-aliasing
+
+MESA_ASM_SOURCES = $(X86_SOURCES)
+GLAPI_ASM_SOURCES = $(X86_API)
+
+# Library/program dependencies
+GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -L/usr/local/glide/lib -lglide3x -lm -lpthread
+GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
+GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11
+APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/local/glide/lib -lglide3x -lm

configure.ac

@@ -19,11 +19,7 @@ AC_CANONICAL_HOST
 
 dnl Versions for external dependencies
 LIBDRM_REQUIRED=2.4.15
-LIBDRM_RADEON_REQUIRED=2.4.17
-DRI2PROTO_REQUIRED=2.1
-GLPROTO_REQUIRED=1.4.11
-LIBDRM_XORG_REQUIRED=2.4.17
-LIBKMS_XORG_REQUIRED=1.0.0
+DRI2PROTO_REQUIRED=1.99.3
 
 dnl Check for progs
 AC_PROG_CPP
@@ -48,28 +44,6 @@ solaris*)
     ;;
 esac
 
-dnl If we're using GCC, make sure that it is at least version 3.3.0.  Older
-dnl versions are explictly not supported.
-if test "x$GCC" = xyes; then
-    AC_MSG_CHECKING([whether gcc version is sufficient])
-    major=0
-    minor=0
-
-    GCC_VERSION=`$CC -dumpversion`
-    if test $? -eq 0; then
-        major=`echo $GCC_VERSION | cut -d. -f1`
-        minor=`echo $GCC_VERSION | cut -d. -f1`
-    fi
-
-    if test $major -lt 3 -o $major -eq 3 -a $minor -lt 3 ; then
-        AC_MSG_RESULT([no])
-        AC_MSG_ERROR([If using GCC, version 3.3.0 or later is required.])
-    else
-        AC_MSG_RESULT([yes])
-    fi
-fi
-
-
 MKDEP_OPTIONS=-fdepend
 dnl Ask gcc where it's keeping its secret headers
 if test "x$GCC" = xyes; then
@@ -116,22 +90,12 @@ linux*|*-gnu*|gnu*)
 solaris*)
     DEFINES="$DEFINES -DPTHREADS -DSVR4"
     ;;
-cygwin*)
-    DEFINES="$DEFINES -DPTHREADS"
-    ;;
 esac
 
 dnl Add flags for gcc and g++
 if test "x$GCC" = xyes; then
     CFLAGS="$CFLAGS -Wall -Wmissing-prototypes -std=c99 -ffast-math"
 
-    # Enable -fvisibility=hidden if using a gcc that supports it
-    save_CFLAGS="$CFLAGS"
-    AC_MSG_CHECKING([whether $CC supports -fvisibility=hidden])
-    CFLAGS="$CFLAGS -fvisibility=hidden"
-    AC_LINK_IFELSE([AC_LANG_PROGRAM()], AC_MSG_RESULT([yes]),
-		   [CFLAGS="$save_CFLAGS" ; AC_MSG_RESULT([no])]);
-
     # Work around aliasing bugs - developers should comment this out
     CFLAGS="$CFLAGS -fno-strict-aliasing"
 fi
@@ -278,28 +242,24 @@ GLU_LIB_NAME='lib$(GLU_LIB).'${LIB_EXTENSION}
 GLUT_LIB_NAME='lib$(GLUT_LIB).'${LIB_EXTENSION}
 GLW_LIB_NAME='lib$(GLW_LIB).'${LIB_EXTENSION}
 OSMESA_LIB_NAME='lib$(OSMESA_LIB).'${LIB_EXTENSION}
-EGL_LIB_NAME='lib$(EGL_LIB).'${LIB_EXTENSION}
 
 GL_LIB_GLOB='lib$(GL_LIB).*'${LIB_EXTENSION}'*'
 GLU_LIB_GLOB='lib$(GLU_LIB).*'${LIB_EXTENSION}'*'
 GLUT_LIB_GLOB='lib$(GLUT_LIB).*'${LIB_EXTENSION}'*'
 GLW_LIB_GLOB='lib$(GLW_LIB).*'${LIB_EXTENSION}'*'
 OSMESA_LIB_GLOB='lib$(OSMESA_LIB).*'${LIB_EXTENSION}'*'
-EGL_LIB_GLOB='lib$(EGL_LIB).*'${LIB_EXTENSION}'*'
 
 AC_SUBST([GL_LIB_NAME])
 AC_SUBST([GLU_LIB_NAME])
 AC_SUBST([GLUT_LIB_NAME])
 AC_SUBST([GLW_LIB_NAME])
 AC_SUBST([OSMESA_LIB_NAME])
-AC_SUBST([EGL_LIB_NAME])
 
 AC_SUBST([GL_LIB_GLOB])
 AC_SUBST([GLU_LIB_GLOB])
 AC_SUBST([GLUT_LIB_GLOB])
 AC_SUBST([GLW_LIB_GLOB])
 AC_SUBST([OSMESA_LIB_GLOB])
-AC_SUBST([EGL_LIB_GLOB])
 
 dnl
 dnl Arch/platform-specific settings
@@ -419,7 +379,7 @@ fi
 
 dnl
 dnl Driver configuration. Options are xlib, dri and osmesa right now.
-dnl More later: fbdev, ...
+dnl More later: directfb, fbdev, ...
 dnl
 default_driver="xlib"
 
@@ -453,16 +413,13 @@ esac
 dnl
 dnl Driver specific build directories
 dnl
-
-dnl this variable will be prepended to SRC_DIRS and is not exported
-CORE_DIRS="glsl mesa"
-
-SRC_DIRS="glew"
+SRC_DIRS="mesa glew"
 GLU_DIRS="sgi"
 WINDOW_SYSTEM=""
 GALLIUM_DIRS="auxiliary drivers state_trackers"
 GALLIUM_WINSYS_DIRS=""
 GALLIUM_WINSYS_DRM_DIRS=""
+GALLIUM_AUXILIARY_DIRS="rbug draw translate cso_cache pipebuffer tgsi sct rtasm util indices vl"
 GALLIUM_DRIVERS_DIRS="softpipe failover trace identity"
 GALLIUM_STATE_TRACKERS_DIRS=""
 
@@ -472,7 +429,7 @@ xlib)
     GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS xlib"
     ;;
 dri)
-    SRC_DIRS="$SRC_DIRS glx"
+    SRC_DIRS="glx/x11 $SRC_DIRS"
     DRIVER_DIRS="dri"
     WINDOW_SYSTEM="dri"
     GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS drm"
@@ -489,7 +446,10 @@ AC_SUBST([GALLIUM_DIRS])
 AC_SUBST([GALLIUM_WINSYS_DIRS])
 AC_SUBST([GALLIUM_WINSYS_DRM_DIRS])
 AC_SUBST([GALLIUM_DRIVERS_DIRS])
+AC_SUBST([GALLIUM_AUXILIARY_DIRS])
 AC_SUBST([GALLIUM_STATE_TRACKERS_DIRS])
+AC_SUBST([RADEON_CFLAGS])
+AC_SUBST([RADEON_LDFLAGS])
 
 dnl
 dnl User supplied program configuration
@@ -547,14 +507,8 @@ else
     x11_pkgconfig=no
 fi
 dnl Use the autoconf macro if no pkg-config files
-if test "$x11_pkgconfig" = yes; then
-    PKG_CHECK_MODULES([X11], [x11])
-else
+if test "$x11_pkgconfig" = no; then
     AC_PATH_XTRA
-    test -z "$X11_CFLAGS" && X11_CFLAGS="$X_CFLAGS"
-    test -z "$X11_LIBS" && X11_LIBS="$X_LIBS -lX11"
-    AC_SUBST([X11_CFLAGS])
-    AC_SUBST([X11_LIBS])
 fi
 
 dnl Try to tell the user that the --x-* options are only used when
@@ -620,10 +574,16 @@ dri)
     # Check for libdrm
     PKG_CHECK_MODULES([LIBDRM], [libdrm >= $LIBDRM_REQUIRED])
     PKG_CHECK_MODULES([DRI2PROTO], [dri2proto >= $DRI2PROTO_REQUIRED])
-    PKG_CHECK_MODULES([GLPROTO], [glproto >= $GLPROTO_REQUIRED])
-    GL_PC_REQ_PRIV="libdrm >= $LIBDRM_REQUIRED dri2proto >= $DRI2PROTO_REQUIRED glproto >= $GLPROTO_REQUIRED"
+    GL_PC_REQ_PRIV="libdrm >= $LIBDRM_REQUIRED dri2proto >= $DRI2PROTO_REQUIRED"
     DRI_PC_REQ_PRIV="libdrm >= $LIBDRM_REQUIRED"
 
+    PKG_CHECK_MODULES([LIBDRM_RADEON], [libdrm_radeon], HAVE_LIBDRM_RADEON=yes, HAVE_LIBDRM_RADEON=no)
+
+    if test "$HAVE_LIBDRM_RADEON" = yes; then
+	RADEON_CFLAGS="-DHAVE_LIBDRM_RADEON=1 $LIBDRM_RADEON_CFLAGS"
+	RADEON_LDFLAGS=$LIBDRM_RADEON_LIBS
+    fi
+
     # find the DRI deps for libGL
     if test "$x11_pkgconfig" = yes; then
         # add xcb modules if necessary
@@ -732,6 +692,10 @@ yes)
     ;;
 esac
 
+dnl Just default to no EGL for now
+USING_EGL=0
+AC_SUBST([USING_EGL])
+
 dnl Set DRI_DIRS, DEFINES and LIB_DEPS
 if test "$mesa_driver" = dri; then
     # Use TLS in GLX?
@@ -739,6 +703,10 @@ if test "$mesa_driver" = dri; then
         DEFINES="$DEFINES -DGLX_USE_TLS -DPTHREADS"
     fi
 
+    if test "x$USING_EGL" = x1; then
+        PROGRAM_DIRS="egl"
+    fi
+
     # Platform specific settings and drivers to build
     case "$host_os" in
     linux*)
@@ -750,9 +718,10 @@ if test "$mesa_driver" = dri; then
 
         case "$host_cpu" in
         x86_64)
-            # sis is missing because they have not be converted to use
-            # the new interface.  i810 are missing because there is no
-            # x86-64 system where they could *ever* be used.
+            # ffb, gamma, and sis are missing because they have not be
+            # converted to use the new interface.  i810 are missing
+            # because there is no x86-64 system where they could *ever*
+            # be used.
             if test "x$DRI_DIRS" = "xyes"; then
                 DRI_DIRS="i915 i965 mach64 mga r128 r200 r300 r600 radeon \
                     savage tdfx unichrome swrast"
@@ -768,7 +737,7 @@ if test "$mesa_driver" = dri; then
         sparc*)
             # Build only the drivers for cards that exist on sparc`
             if test "x$DRI_DIRS" = "xyes"; then
-                DRI_DIRS="mach64 r128 r200 r300 r600 radeon swrast"
+                DRI_DIRS="mach64 r128 r200 r300 r600 radeon ffb swrast"
             fi
             ;;
         esac
@@ -784,6 +753,8 @@ if test "$mesa_driver" = dri; then
             CXXFLAGS="$CXXFLAGS -ansi -pedantic"
         fi
 
+        # ffb and gamma are missing because they have not been converted
+        # to use the new interface.
         if test "x$DRI_DIRS" = "xyes"; then
             DRI_DIRS="i810 i915 i965 mach64 mga r128 r200 r300 r600 radeon tdfx \
                 unichrome savage sis swrast"
@@ -805,7 +776,7 @@ if test "$mesa_driver" = dri; then
     # default drivers
     if test "x$DRI_DIRS" = "xyes"; then
         DRI_DIRS="i810 i915 i965 mach64 mga r128 r200 r300 r600 radeon \
-            savage sis tdfx unichrome swrast"
+            savage sis tdfx unichrome ffb swrast"
     fi
 
     DRI_DIRS=`echo "$DRI_DIRS" | $SED 's/  */ /g'`
@@ -832,29 +803,6 @@ AC_SUBST([DRI_DIRS])
 AC_SUBST([EXPAT_INCLUDES])
 AC_SUBST([DRI_LIB_DEPS])
 
-case $DRI_DIRS in
-*i915*|*i965*)
-    PKG_CHECK_MODULES([INTEL], [libdrm_intel >= 2.4.19])
-    ;;
-esac
-
-case $DRI_DIRS in
-*radeon*|*r200*|*r300*|*r600*)
-    PKG_CHECK_MODULES([LIBDRM_RADEON],
-		      [libdrm_radeon libdrm >= $LIBDRM_RADEON_REQUIRED],
-		      HAVE_LIBDRM_RADEON=yes,
-		      HAVE_LIBDRM_RADEON=no)
-
-    if test "$HAVE_LIBDRM_RADEON" = yes; then
-	RADEON_CFLAGS="-DHAVE_LIBDRM_RADEON=1 $LIBDRM_RADEON_CFLAGS"
-	RADEON_LDFLAGS=$LIBDRM_RADEON_LIBS
-    fi
-    ;;
-esac
-AC_SUBST([RADEON_CFLAGS])
-AC_SUBST([RADEON_LDFLAGS])
-
-
 dnl
 dnl OSMesa configuration
 dnl
@@ -865,7 +813,7 @@ else
 fi
 AC_ARG_ENABLE([gl-osmesa],
     [AS_HELP_STRING([--enable-gl-osmesa],
-        [enable OSMesa with libGL @<:@default=enabled for xlib driver@:>@])],
+        [enable OSMesa on libGL @<:@default=enabled for xlib driver@:>@])],
     [gl_osmesa="$enableval"],
     [gl_osmesa="$default_gl_osmesa"])
 if test "x$gl_osmesa" = xyes; then
@@ -900,8 +848,8 @@ x16|x32)
 esac
 AC_SUBST([OSMESA_LIB])
 
-case "$DRIVER_DIRS" in
-*osmesa*)
+case "$mesa_driver" in
+osmesa)
     # only link libraries with osmesa if shared
     if test "$enable_static" = no; then
         OSMESA_LIB_DEPS="-lm -lpthread $SELINUX_LIBS $DLOPEN_LIBS"
@@ -911,7 +859,19 @@ case "$DRIVER_DIRS" in
     OSMESA_MESA_DEPS=""
     OSMESA_PC_LIB_PRIV="-lm -lpthread $SELINUX_LIBS $DLOPEN_LIBS"
     ;;
+*)
+    # Link OSMesa to libGL otherwise
+    OSMESA_LIB_DEPS=""
+    # only link libraries with osmesa if shared
+    if test "$enable_static" = no; then
+        OSMESA_MESA_DEPS='-l$(GL_LIB)'
+    else
+        OSMESA_MESA_DEPS=""
+    fi
+    OSMESA_PC_REQ="gl"
+    ;;
 esac
+OSMESA_PC_LIB_PRIV="$OSMESA_PC_LIB_PRIV"
 AC_SUBST([OSMESA_LIB_DEPS])
 AC_SUBST([OSMESA_MESA_DEPS])
 AC_SUBST([OSMESA_PC_REQ])
@@ -927,28 +887,17 @@ AC_ARG_ENABLE([egl],
     [enable_egl=yes])
 if test "x$enable_egl" = xyes; then
     SRC_DIRS="$SRC_DIRS egl"
-    EGL_LIB_DEPS="$DLOPEN_LIBS -lpthread"
-    EGL_DRIVERS_DIRS=""
-    if test "$enable_static" != yes; then
-        # build egl_glx when libGL is built
-        if test "$mesa_driver" != osmesa; then
-            EGL_DRIVERS_DIRS="glx"
-        fi
 
-        # build egl_dri2 when xcb-dri2 is available
-        PKG_CHECK_MODULES([EGL_DRI2], [x11-xcb xcb-dri2 xcb-xfixes libdrm],
-			  [have_xcb_dri2=yes],[have_xcb_dri2=no])
-        if test "$have_xcb_dri2" = yes; then
-            EGL_DRIVERS_DIRS="$EGL_DRIVERS_DIRS dri2"
-        fi
-    fi
-
-    if test "$with_demos" = yes; then
-        PROGRAM_DIRS="$PROGRAM_DIRS egl"
+    if test "$x11_pkgconfig" = yes; then
+        PKG_CHECK_MODULES([EGL], [x11])
+        EGL_LIB_DEPS="$EGL_LIBS"
+    else
+        # should check these...
+        EGL_LIB_DEPS="$X_LIBS -lX11"
     fi
+    EGL_LIB_DEPS="$EGL_LIB_DEPS $DLOPEN_LIBS"
 fi
 AC_SUBST([EGL_LIB_DEPS])
-AC_SUBST([EGL_DRIVERS_DIRS])
 
 dnl
 dnl GLU configuration
@@ -1199,7 +1148,7 @@ yes)
             GALLIUM_STATE_TRACKERS_DIRS="$GALLIUM_STATE_TRACKERS_DIRS egl"
         fi
         # Have only tested st/xorg on 1.6.0 servers
-        PKG_CHECK_MODULES(XORG, [xorg-server >= 1.6.0 libdrm >= $LIBDRM_XORG_REQUIRED libkms >= $LIBKMS_XORG_REQUIRED],
+        PKG_CHECK_MODULES(XORG, [xorg-server >= 1.6.0],
             HAVE_XORG="yes"; GALLIUM_STATE_TRACKERS_DIRS="$GALLIUM_STATE_TRACKERS_DIRS xorg",
             HAVE_XORG="no")
         ;;
@@ -1212,69 +1161,19 @@ yes)
         test -d "$srcdir/src/gallium/state_trackers/$tracker" || \
             AC_MSG_ERROR([state tracker '$tracker' doesn't exist])
 
-        case "$tracker" in
-        egl)
-            if test "x$enable_egl" != xyes; then
-                AC_MSG_ERROR([cannot build egl state tracker without EGL library])
-            fi
-            ;;
-        xorg)
-            PKG_CHECK_MODULES([LIBDRM_XORG], [libdrm >= $LIBDRM_XORG_REQUIRED])
-            PKG_CHECK_MODULES([LIBKMS_XORG], [libkms >= $LIBKMS_XORG_REQUIRED])
-            HAVE_XORG="yes"
-            ;;
-        es)
-            # mesa/es is required to build es state tracker
-            CORE_DIRS="$CORE_DIRS mesa/es"
-            ;;
-        esac
+        if test "$tracker" = egl && test "x$enable_egl" != xyes; then
+            AC_MSG_ERROR([cannot build egl state tracker without EGL library])
+        fi
+        if test "$tracker" = xorg; then
+	    PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
+                  HAVE_XEXTPROTO_71="yes"; DEFINES="$DEFINES -DHAVE_XEXTPROTO_71",
+                  HAVE_XEXTPROTO_71="no")
+        fi
     done
     GALLIUM_STATE_TRACKERS_DIRS="$state_trackers"
     ;;
 esac
 
-if test "x$HAVE_XORG" = xyes; then
-    PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
-        HAVE_XEXTPROTO_71="yes"; DEFINES="$DEFINES -DHAVE_XEXTPROTO_71",
-        HAVE_XEXTPROTO_71="no")
-fi
-
-AC_ARG_WITH([egl-displays],
-    [AS_HELP_STRING([--with-egl-displays@<:@=DIRS...@:>@],
-        [comma delimited native displays libEGL supports, e.g.
-        "x11,kms" @<:@default=auto@:>@])],
-    [with_egl_displays="$withval"],
-    [with_egl_displays=yes])
-
-EGL_DISPLAYS=""
-case "$with_egl_displays" in
-yes)
-    if test "x$enable_egl" = xyes && test "x$mesa_driver" != xosmesa; then
-        EGL_DISPLAYS="x11"
-    fi
-    ;;
-*)
-    if test "x$enable_egl" != xyes; then
-        AC_MSG_ERROR([cannot build egl state tracker without EGL library])
-    fi
-    # verify the requested driver directories exist
-    egl_displays=`IFS=', '; echo $with_egl_displays`
-    for dpy in $egl_displays; do
-        test -d "$srcdir/src/gallium/state_trackers/egl/$dpy" || \
-            AC_MSG_ERROR([EGL display '$dpy' does't exist])
-    done
-    EGL_DISPLAYS="$egl_displays"
-    ;;
-esac
-AC_SUBST([EGL_DISPLAYS])
-
-AC_ARG_WITH([egl-driver-dir],
-    [AS_HELP_STRING([--with-egl-driver-dir=DIR],
-                    [directory for EGL drivers [[default=${libdir}/egl]]])],
-    [EGL_DRIVER_INSTALL_DIR="$withval"],
-    [EGL_DRIVER_INSTALL_DIR='${libdir}/egl'])
-AC_SUBST([EGL_DRIVER_INSTALL_DIR])
-
 AC_ARG_WITH([xorg-driver-dir],
     [AS_HELP_STRING([--with-xorg-driver-dir=DIR],
                     [Default xorg driver directory[[default=${libdir}/xorg/modules/drivers]]])],
@@ -1301,15 +1200,13 @@ dnl
 dnl Gallium SVGA configuration
 dnl
 AC_ARG_ENABLE([gallium-svga],
-    [AS_HELP_STRING([--enable-gallium-svga],
-        [build gallium SVGA @<:@default=disabled@:>@])],
+    [AS_HELP_STRING([--disable-gallium-svga],
+        [build gallium SVGA @<:@default=enabled@:>@])],
     [enable_gallium_svga="$enableval"],
-    [enable_gallium_svga=auto])
+    [enable_gallium_svga=yes])
 if test "x$enable_gallium_svga" = xyes; then
     GALLIUM_WINSYS_DRM_DIRS="$GALLIUM_WINSYS_DRM_DIRS vmware"
     GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS svga"
-elif test "x$enable_gallium_svga" = xauto; then
-    GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS svga"
 fi
 
 dnl
@@ -1321,10 +1218,10 @@ AC_ARG_ENABLE([gallium-intel],
     [enable_gallium_intel="$enableval"],
     [enable_gallium_intel=auto])
 if test "x$enable_gallium_intel" = xyes; then
-    GALLIUM_WINSYS_DRM_DIRS="$GALLIUM_WINSYS_DRM_DIRS intel i965"
-    GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS i915 i965"
+    GALLIUM_WINSYS_DRM_DIRS="$GALLIUM_WINSYS_DRM_DIRS intel"
+    GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS i915"
 elif test "x$enable_gallium_intel" = xauto; then
-    GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS i915 i965"
+    GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS i915"
 fi
 
 dnl
@@ -1334,12 +1231,10 @@ AC_ARG_ENABLE([gallium-radeon],
     [AS_HELP_STRING([--enable-gallium-radeon],
         [build gallium radeon @<:@default=disabled@:>@])],
     [enable_gallium_radeon="$enableval"],
-    [enable_gallium_radeon=auto])
+    [enable_gallium_radeon=no])
 if test "x$enable_gallium_radeon" = xyes; then
     GALLIUM_WINSYS_DRM_DIRS="$GALLIUM_WINSYS_DRM_DIRS radeon"
     GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r300"
-elif test "x$enable_gallium_radeon" = xauto; then
-    GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r300"
 fi
 
 dnl
@@ -1352,23 +1247,9 @@ AC_ARG_ENABLE([gallium-nouveau],
     [enable_gallium_nouveau=no])
 if test "x$enable_gallium_nouveau" = xyes; then
     GALLIUM_WINSYS_DRM_DIRS="$GALLIUM_WINSYS_DRM_DIRS nouveau"
-    GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS nouveau nv30 nv40 nv50"
+    GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS nouveau nv04 nv10 nv20 nv30 nv40 nv50"
 fi
 
-dnl
-dnl Gallium swrast configuration
-dnl
-AC_ARG_ENABLE([gallium-swrast],
-    [AS_HELP_STRING([--enable-gallium-swrast],
-        [build gallium swrast @<:@default=disabled@:>@])],
-    [enable_gallium_swrast="$enableval"],
-    [enable_gallium_swrast=auto])
-if test "x$enable_gallium_swrast" = xyes; then
-    GALLIUM_WINSYS_DRM_DIRS="$GALLIUM_WINSYS_DRM_DIRS swrast"
-fi
-
-dnl prepend CORE_DIRS to SRC_DIRS
-SRC_DIRS="$CORE_DIRS $SRC_DIRS"
 
 dnl Restore LDFLAGS and CPPFLAGS
 LDFLAGS="$_SAVE_LDFLAGS"
@@ -1422,6 +1303,7 @@ if echo "$SRC_DIRS" | grep 'gallium' >/dev/null 2>&1; then
     echo "        Gallium dirs:    $GALLIUM_DIRS"
     echo "        Winsys dirs:     $GALLIUM_WINSYS_DIRS"
     echo "        Winsys drm dirs:$GALLIUM_WINSYS_DRM_DIRS"
+    echo "        Auxiliary dirs:  $GALLIUM_AUXILIARY_DIRS"
     echo "        Driver dirs:     $GALLIUM_DRIVERS_DIRS"
     echo "        Trackers dirs:   $GALLIUM_STATE_TRACKERS_DIRS"
 else
@@ -1432,11 +1314,7 @@ dnl Libraries
 echo ""
 echo "        Shared libs:     $enable_shared"
 echo "        Static libs:     $enable_static"
-if test "$enable_egl" = yes; then
-    echo "        EGL:             $EGL_DRIVERS_DIRS"
-else
-    echo "        EGL:             no"
-fi
+echo "        EGL:             $enable_egl"
 echo "        GLU:             $enable_glu"
 echo "        GLw:             $enable_glw (Motif: $enable_motif)"
 echo "        glut:            $enable_glut"

debian/README.source

@@ -1,39 +0,0 @@
-------------------------------------------------------
-Quick Guide To Patching This Package For The Impatient
-------------------------------------------------------
-
-1. Make sure you have quilt installed
-2. Unpack the package as usual with "dpkg-source -x"
-3. Run the "patch" target in debian/rules
-4. Create a new patch with "quilt new" (see quilt(1))
-5. Edit all the files you want to include in the patch with "quilt edit" 
-   (see quilt(1)).
-6. Write the patch with "quilt refresh" (see quilt(1))
-7. Run the "clean" target in debian/rules
-
-Alternatively, instead of using quilt directly, you can drop the patch in to 
-debian/patches and add the name of the patch to debian/patches/series.
-
-
-The X Strike Force team maintains X packages in git repositories on
-git.debian.org in the pkg-xorg subdirectory. Most upstream packages
-are actually maintained in git repositories as well, so they often
-just need to be pulled into git.debian.org in a "upstream-*" branch.
-
-The .orig.tar.gz upstream source file could be generated this
-"upstream-*" branch in the Debian git repository but it is actually
-generated from upstream tarballs directly.
-Upstream ships Mesa as 3 different tarballs (MesaLib, MesaGLUT and
-MesaDemos) which are re-bundled together into a single .orig.tar.gz.
-
-The Debian packaging is added by creating the "debian-*" git branch
-which contains the aforementioned "upstream-*" branch plus the debian/
-repository files.
-When a patch has to be applied to the Debian package, two solutions
-are involved:
-* If the patch is available in one of the upstream branches, it
-  may be git'cherry-picked into the Debian repository. In this
-  case, it appears directly in the .diff.gz.
-* Otherwise, the patch is added to debian/patches/ which is managed
-  with quilt as documented in /usr/share/doc/quilt/README.source.
-  Thus, the patching system requires a build dependency on quilt.

debian/compat

@@ -1 +0,0 @@
-7

debian/control

@@ -1,696 +0,0 @@
-Source: mesa
-Section: graphics
-Priority: optional
-Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusinow@debian.org>, Brice Goglin <bgoglin@debian.org>
-Standards-Version: 3.8.4
-Build-Depends: debhelper (>= 7.2.7), quilt (>= 0.40), pkg-config,
- libdrm-dev (>= 2.4.19) [!hurd-i386], libx11-dev, xutils-dev,
- x11proto-gl-dev (>= 1.4.11), libxxf86vm-dev,
- libexpat1-dev, lesstif2-dev, dpkg-dev (>= 1.15.6), libxfixes-dev,
- libxdamage-dev, libxext-dev, autoconf, automake, x11proto-dri2-dev (>= 2.1),
- linux-libc-dev (>= 2.6.31) [!hurd-i386 !kfreebsd-amd64 !kfreebsd-i386],
- libx11-xcb-dev, libxcb-dri2-0-dev, libxcb-xfixes0-dev, python-libxml2,
-Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/mesa
-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/mesa.git
-Homepage: http://mesa3d.sourceforge.net/
-
-Package: libgl1-mesa-swx11
-Section: libs
-Priority: extra
-Architecture: any
-Depends:
- libosmesa6 (>= 6.5.2-1),
- ${shlibs:Depends},
- ${misc:Depends},
-Conflicts: mesag3-glide, mesag3-glide2, mesag3+ggi, libgl1, nvidia-glx, mesag3, libgl1-mesa-swrast
-Provides: libgl1, mesag3, libgl1-mesa-swrast
-Replaces: libgl1, mesag3, libgl1-mesa-swrast
-Description: A free implementation of the OpenGL API -- runtime
- Mesa is a 3-D graphics library with an API which is very similar to
- that of OpenGL.  To the extent that Mesa utilizes the OpenGL command
- syntax or state machine, it is being used with authorization from
- Silicon Graphics, Inc.  However, the author makes no claim that Mesa
- is in any way a compatible replacement for OpenGL or associated with
- Silicon Graphics, Inc.
- .
- This library provides a pure software rasteriser; it does not provide
- a direct rendering-capable library, or one which uses GLX.  For that,
- please see libgl1-mesa-glx.
- .
- On Linux, this library is also known as libGL or libGL.so.1.
-
-Package: libgl1-mesa-swx11-dbg
-Section: debug
-Priority: extra
-Architecture: any
-Depends:
- libgl1-mesa-swx11 (= ${binary:Version}),
- ${misc:Depends},
-Conflicts: libgl1-mesa-swrast-dbg
-Provides: libgl1-mesa-swrast-dbg
-Replaces: libgl1-mesa-swrast-dbg
-Description: A free implementation of the OpenGL API -- debugging symbols
- Mesa is a 3-D graphics library with an API which is very similar to
- that of OpenGL.  To the extent that Mesa utilizes the OpenGL command
- syntax or state machine, it is being used with authorization from
- Silicon Graphics, Inc.  However, the author makes no claim that Mesa
- is in any way a compatible replacement for OpenGL or associated with
- Silicon Graphics, Inc.
- .
- This library provides a pure software rasteriser; it does not provide
- a direct rendering-capable library, or one which uses GLX.  For that,
- please see libgl1-mesa-glx.
- .
- On Linux, this library is also known as libGL or libGL.so.1.
- .
- This package contains debugging symbols for the software rasterization GL
- library.
-
-Package: libgl1-mesa-swx11-i686
-Section: libs
-Priority: extra
-Architecture: i386 kfreebsd-i386 hurd-i386
-Depends:
- libgl1-mesa-swx11 (= ${binary:Version}),
- ${shlibs:Depends},
- ${misc:Depends},
-Description: Mesa OpenGL runtime [i686 optimized]
- Mesa is a 3-D graphics library with an API which is very similar to
- that of OpenGL.  To the extent that Mesa utilizes the OpenGL command
- syntax or state machine, it is being used with authorization from
- Silicon Graphics, Inc.  However, the author makes no claim that Mesa
- is in any way a compatible replacement for OpenGL or associated with
- Silicon Graphics, Inc.
- .
- This library provides a pure software rasteriser; it does not provide
- a direct rendering-capable library, or one which uses GLX.  For that,
- please see libgl1-mesa-glx.
- .
- On Linux, this library is also known as libGL or libGL.so.1.
- .
- This set of libraries is optimized for i686 machines and will only be used if
- you are running a 2.6 kernel on an i686 class CPU. This includes Pentium Pro,
- Pentium II/II/IV, Celeron CPU's and similar class CPU's (including clones
- such as AMD Athlon/Opteron, VIA C3 Nehemiah, but not VIA C3 Ezla).
-
-Package: libgl1-mesa-swx11-dev
-Section: libdevel
-Priority: extra
-Architecture: any
-Depends:
- libgl1-mesa-swx11 (= ${binary:Version}),
- libx11-dev,
- libxext6,
- mesa-common-dev (= ${binary:Version}),
- ${misc:Depends},
-Provides: libgl-dev, mesag-dev, libgl1-mesa-swrast-dev
-Conflicts: mesa-dev, libgl-dev, mesag3 (<< 3.1-1), nvidia-glx-dev, mesag-dev, libgl1-mesa-swrast-dev
-Replaces: libgl-dev, mesag-dev, libgl1-mesa-swrast-dev
-Description: A free implementation of the OpenGL API -- development files
- This package provides the development environment required for
- compiling programs with Mesa.  For a complete description of Mesa,
- please look at the libgl1-mesa-swx11 package.
- .
- This library provides a pure software rasteriser; it does not provide
- a direct rendering-capable library, or one which uses GLX.  For that,
- please see libgl1-mesa-dev.
-
-Package: libegl1-mesa
-Section: libs
-Architecture: any
-Depends:
- ${shlibs:Depends},
- ${misc:Depends},
-Recommends: libegl1-mesa-drivers-x11
-Description: A free implementation of the EGL API -- runtime
- This package contains the EGL native platform graphics interface library.
- EGL provides a platform-agnostic mechanism for creating rendering surfaces
- for use with other graphics libraries, such as OpenGL|ES and OpenVG.
- .
- This package contains modules to interface with the existing system GLX or 
- DRI2 drivers to provide OpenGL via EGL.  The libegl1-mesa-drivers-x11 package
- provides drivers to provide hardware-accelerated OpenGL|ES and OpenVG support.
-
-Package: libegl1-mesa-dbg
-Section: debug
-Priority: extra
-Architecture: any
-Depends:
- libegl1-mesa (= ${binary:Version}),
- ${misc:Depends},
-Description: A free implementation of the EGL API -- debugging symbols
- This package contains the EGL native platform graphics interface library.
- EGL provides a platform-agnostic mechanism for creating rendering surfaces
- for use with other graphics libraries, such as OpenGL|ES and OpenVG.
- .
- This package contains the debugging symbols for the EGL library.
-
-Package: libegl1-mesa-dev
-Section: libdevel
-Architecture: any
-Depends:
- libegl1-mesa (= ${binary:Version}),
- ${misc:Depends},
-Description: A free implementation of the EGL API -- development files
- This package contains the development environment required for compiling 
- programs against EGL native platform graphics interface library.
- EGL provides a platform-agnostic mechanism for creating rendering surfaces
- for use with other graphics libraries, such as OpenGL|ES and OpenVG.
- .
- This package provides the development environment for compiling programs
- against the EGL library.
-
-Package: libegl1-mesa-drivers-x11
-Section: libs
-Architecture: any
-Depends:
- ${shlibs:Depends},
- ${misc:Depends},
-Description: A free implementation of the EGL API -- X11 drivers
- This package contains the EGL native platform graphics interface library.
- EGL provides a platform-agnostic mechanism for creating rendering surfaces
- for use with other graphics libraries, such as OpenGL|ES and OpenVG.
- .
- This package contains the drivers required for hardware accelerated rendering
- of EGL-based graphics libraries, such as OpenGL|ES and OpenVG, in an X11
- environment.
-
-Package: libegl1-mesa-drivers-x11-dbg
-Section: debug
-Priority: extra
-Architecture: any
-Depends:
- libegl1-mesa-drivers-x11 (= ${binary:Version}),
- ${misc:Depends},
-Description: A free implementation of the EGL API -- X11 driver debugging symbols
- This package contains the EGL native platform graphics interface library.
- EGL provides a platform-agnostic mechanism for creating rendering surfaces
- for use with other graphics libraries, such as OpenGL|ES and OpenVG.
- .
- This package contains the debugging symbols for the drivers required for 
- hardware accelerated rendering of EGL-based graphics libraries, such as
- OpenGL|ES and OpenVG, in an X11 environment.
-
-Package: libegl1-mesa-drivers-kms
-Section: libs
-Architecture: linux-any
-Depends:
- ${shlibs:Depends},
- ${misc:Depends},
-Description: A free implementation of the EGL API -- KMS drivers
- This package contains the EGL native platform graphics interface library.
- EGL provides a platform-agnostic mechanism for creating rendering surfaces
- for use with other graphics libraries, such as OpenGL|ES and OpenVG.
- .
- This package contains the drivers required for hardware accelerated rendering
- of EGL-based graphics libraries, such as OpenGL|ES and OpenVG in a raw
- KMS-framebuffer environment.
-
-Package: libegl1-mesa-drivers-kms-dbg
-Section: debug
-Priority: extra
-Architecture: linux-any
-Depends:
- libegl1-mesa-drivers-kms (= ${binary:Version}),
- ${misc:Depends},
-Description: A free implementation of the EGL API -- KMS driver debugging symbols
- This package contains the EGL native platform graphics interface library.
- EGL provides a platform-agnostic mechanism for creating rendering surfaces
- for use with other graphics libraries, such as OpenGL|ES and OpenVG.
- .
- This package contains the debugging symbols for the drivers required for 
- hardware accelerated rendering of EGL-based graphics libraries, such as 
- OpenGL|ES and OpenVG in a raw KMS-framebuffer environment.
-
-Package: libopenvg1-mesa
-Section: libs
-Architecture: any
-Depends:
- ${shlibs:Depends},
- ${misc:Depends},
-Description: A free implementation of the OpenVG API -- runtime
- This package contains the mesa implementation of the OpenVG 2D acceleration
- library.  OpenVG provides a device independent and vendor-neutral interface 
- for sophisticated 2D graphical applications, while allowing device 
- manufacturers to provide hardware acceleration on devices ranging from wrist 
- watches to full microprocessor-based desktop and server machines. 
-
-Package: libopenvg1-mesa-dbg
-Section: debug
-Priority: extra
-Architecture: any
-Depends:
- libopenvg1-mesa (= ${binary:Version}),
- ${misc:Depends},
-Description: A free implementation of the OpenVG API -- debugging symbols
- This package contains the mesa implementation of the OpenVG 2D acceleration
- library.  OpenVG provides a device independent and vendor-neutral interface 
- for sophisticated 2D graphical applications, while allowing device 
- manufacturers to provide hardware acceleration on devices ranging from wrist 
- watches to full microprocessor-based desktop and server machines. 
- .
- This package contains the debugging symbols for the OpenVG library.
-
-Package: libopenvg1-mesa-dev
-Section: libdevel
-Architecture: any
-Depends:
- libopenvg1-mesa (= ${binary:Version}),
- libegl1-mesa-dev,
- ${misc:Depends},
-Description: A free implementation of the OpenVG API -- development files
- This package contains the mesa implementation of the OpenVG 2D acceleration
- library.  OpenVG provides a device independent and vendor-neutral interface 
- for sophisticated 2D graphical applications, while allowing device 
- manufacturers to provide hardware acceleration on devices ranging from wrist 
- watches to full microprocessor-based desktop and server machines. 
- .
- This package contains the development environment required for compiling 
- programs against the OpenVG 2D acceleration library.
-
-Package: libgles1-mesa
-Section: libs
-Architecture: any
-Depends:
- ${shlibs:Depends},
- ${misc:Depends},
-Description: A free implementation of the OpenGL|ES 1.x API -- runtime
- OpenGL|ES is a cross-platform API for full-function 2D and 3D graphics on 
- embedded systems - including consoles, phones, appliances and vehicles.
- It contains a subset of OpenGL plus a number of extensions for the 
- special needs of embedded systems.
- .
- OpenGL|ES 1.x provides an API for fixed-function hardware.
-
-Package: libgles1-mesa-dbg
-Section: debug
-Priority: extra
-Architecture: any
-Depends:
- libgles1-mesa (= ${binary:Version}),
- ${misc:Depends},
-Description: A free implementation of the OpenGL|ES 1.x API -- debugging symbols
- OpenGL|ES is a cross-platform API for full-function 2D and 3D graphics on 
- embedded systems - including consoles, phones, appliances and vehicles.
- It contains a subset of OpenGL plus a number of extensions for the 
- special needs of embedded systems.
- .
- OpenGL|ES 1.x provides an API for fixed-function hardware.
- .
- This package contains the debugging symbols for the libGLESv1_CM library.
-
-Package: libgles1-mesa-dev
-Section: libdevel
-Architecture: any
-Depends:
- libgles1-mesa (= ${binary:Version}),
- libegl1-mesa-dev,
- ${misc:Depends},
-Description: A free implementation of the OpenGL|ES 1.x API -- development files
- OpenGL|ES is a cross-platform API for full-function 2D and 3D graphics on 
- embedded systems - including consoles, phones, appliances and vehicles.
- It contains a subset of OpenGL plus a number of extensions for the 
- special needs of embedded systems.
- .
- OpenGL|ES 1.x provides an API for fixed-function hardware.
- .
- This package provides a development environment for building programs using
- the OpenGL|ES 1.x APIs.
-
-Package: libgles2-mesa
-Section: libs
-Architecture: any
-Depends:
- ${shlibs:Depends},
- ${misc:Depends},
-Description: A free implementation of the OpenGL|ES 2.x API -- runtime
- OpenGL|ES is a cross-platform API for full-function 2D and 3D graphics on 
- embedded systems - including consoles, phones, appliances and vehicles.
- It contains a subset of OpenGL plus a number of extensions for the 
- special needs of embedded systems.
- .
- OpenGL|ES 2.x provides an API for programmable hardware including vertex
- and fragment shaders.
-
-Package: libgles2-mesa-dbg
-Section: debug
-Priority: extra
-Architecture: any
-Depends:
- libgles2-mesa (= ${binary:Version}),
- ${misc:Depends},
-Description: A free implementation of the OpenGL|ES 2.x API -- debugging symbols
- OpenGL|ES is a cross-platform API for full-function 2D and 3D graphics on 
- embedded systems - including consoles, phones, appliances and vehicles.
- It contains a subset of OpenGL plus a number of extensions for the 
- special needs of embedded systems.
- .
- OpenGL|ES 2.x provides an API for programmable hardware including vertex
- and fragment shaders.
- .
- This package contains the debugging symbols for the libGLESv2 library.
-
-Package: libgles2-mesa-dev
-Section: libdevel
-Architecture: any
-Depends:
- libgles2-mesa (= ${binary:Version}),
- libegl1-mesa-dev,
- ${misc:Depends},
-Description: A free implementation of the OpenGL|ES 2.x API -- development files
- OpenGL|ES is a cross-platform API for full-function 2D and 3D graphics on 
- embedded systems - including consoles, phones, appliances and vehicles.
- It contains a subset of OpenGL plus a number of extensions for the 
- special needs of embedded systems.
- .
- OpenGL|ES 2.x provides an API for programmable hardware including vertex
- and fragment shaders.
- .
- This package provides a development environment for building applications 
- using the OpenGL|ES 2.x APIs.
-
-Package: libgl1-mesa-glx
-Section: libs
-Architecture: any
-Depends:
- ${shlibs:Depends},
- ${misc:Depends}
-Recommends: libgl1-mesa-dri (>= 7.2)
-Conflicts: libgl1, libgl1-mesa-dri (<< 6.4.0)
-Replaces: libgl1, libgl1-mesa-dri (<< 6.4.0)
-Provides: libgl1
-Description: A free implementation of the OpenGL API -- GLX runtime
- This version of Mesa provides GLX and DRI capabilities: it is capable of
- both direct and indirect rendering.  For direct rendering, it can use DRI
- modules from the libgl1-mesa-dri package to accelerate drawing.
- .
- This package does not include the modules themselves: these can be found
- in the libgl1-mesa-dri package.
- .
- For a complete description of Mesa, please look at the
- libgl1-mesa-swx11 package.
-
-Package: libgl1-mesa-glx-dbg
-Section: debug
-Priority: extra
-Architecture: any
-Depends:
- libgl1-mesa-glx (= ${binary:Version}),
- ${misc:Depends},
-Description: Debugging symbols for the Mesa GLX runtime
- This version of Mesa provides GLX and DRI capabilities: it is capable of
- both direct and indirect rendering.  For direct rendering, it can use DRI
- modules from the libgl1-mesa-dri package to accelerate drawing.
- .
- This package does not include the modules themselves: these can be found
- in the libgl1-mesa-dri package.
- .
- For a complete description of Mesa, please look at the
- libgl1-mesa-swx11 package.
- .
- This package contains debugging symbols for the GL library with GLX and DRI
- capabilities.
-
-#Package: libgl1-mesa-glx-i686
-#Section: libs
-#Priority: extra
-#Architecture: i386 kfreebsd-i386 hurd-i386
-#Pre-Depends: libgl1-mesa-glx
-#Description: A free implementation of the OpenGL API -- GLX runtime [i686 optimized]
-# This version of Mesa provides GLX and DRI capabilities: it is capable of
-# both direct and indirect rendering.  For direct rendering, it can use DRI
-# modules from the libgl1-mesa-dri package to accelerate drawing.
-# .
-# This package does not include the modules themselves: these can be found
-# in the libgl1-mesa-dri package.
-# .
-# For a complete description of Mesa, please look at the
-# libgl1-mesa-swx11 package.
-# .
-# This set of libraries is optimized for i686 machines and will only be used if
-# you are running a 2.6 kernel on an i686 class CPU. This includes Pentium Pro,
-# Pentium II/II/IV, Celeron CPU's and similar class CPU's (including clones
-# such as AMD Athlon/Opteron, VIA C3 Nehemiah, but not VIA C3 Ezla).
-
-Package: libgl1-mesa-dri
-Section: libs
-Priority: optional
-Architecture: any
-Depends:
- ${shlibs:Depends},
- ${misc:Depends}
-Suggests: libglide3
-Conflicts: xlibmesa-dri (<< 1:7.0.0)
-Replaces: xlibmesa-dri (<< 1:7.0.0)
-Breaks: xserver-xorg-core (<< 2:1.5), libgl1-mesa-glx (<< 7.2)
-Description: A free implementation of the OpenGL API -- DRI modules
- This version of Mesa provides GLX and DRI capabilities: it is capable of
- both direct and indirect rendering.  For direct rendering, it can use DRI
- modules from the libgl1-mesa-dri package to accelerate drawing.
- .
- This package does not include the OpenGL library itself, only the DRI
- modules for accelerating direct rendering.
- .
- For a complete description of Mesa, please look at the
- libgl1-mesa-swx11 package.
- .
- The tdfx DRI module needs libglide3 to enable direct rendering.
-
-Package: libgl1-mesa-dri-dbg
-Section: debug
-Priority: extra
-Architecture: any
-Depends:
- libgl1-mesa-dri (= ${binary:Version}),
- ${misc:Depends},
-Description: Debugging symbols for the Mesa DRI modules
- This version of Mesa provides GLX and DRI capabilities: it is capable of
- both direct and indirect rendering.  For direct rendering, it can use DRI
- modules from the libgl1-mesa-dri package to accelerate drawing.
- .
- This package does not include the OpenGL library itself, only the DRI
- modules for accelerating direct rendering.
- .
- For a complete description of Mesa, please look at the
- libgl1-mesa-swx11 package.
- .
- This package contains debugging symbols for the DRI modules.
-
-Package: libgl1-mesa-dri-experimental
-Section: libs
-Architecture: linux-any
-Depends:
- ${shlibs:Depends},
- ${misc:Depends},
-Description: A free implementation of the OpenGL API -- Extra DRI modules
- This version of Mesa provides GLX and DRI capabilities: it is capable of
- both direct and indirect rendering.  For direct rendering, it can use DRI
- modules from the libgl1-mesa-dri package to accelerate drawing.
- .
- This package does not include the OpenGL library itself, only the DRI
- modules for accelerating direct and indirect rendering.  The drivers
- in this package may provide more features than the drivers in the
- libgl1-mesa-dri at the cost of less stability.
- .
- For a complete description of Mesa, please look at the
- libgl1-mesa-swx11 package.
-
-Package: libgl1-mesa-dri-experimental-dbg
-Section: debug
-Priority: extra
-Architecture: linux-any
-Depends:
- libgl1-mesa-dri-experimental (= ${binary:Version}),
- ${misc:Depends},
-Description: Debugging symbols for the experimental Mesa DRI modules
- This version of Mesa provides GLX and DRI capabilities: it is capable of
- both direct and indirect rendering.  For direct rendering, it can use DRI
- modules from the libgl1-mesa-dri package to accelerate drawing.
- .
- This package does not include the OpenGL library itself, only the DRI
- modules for accelerating direct rendering.
- .
- For a complete description of Mesa, please look at the
- libgl1-mesa-swx11 package.
- .
- This package contains debugging symbols for the Gallium DRI modules.
-
-#Package: libgl1-mesa-dri-i686
-#Section: libs
-#Priority: extra
-#Architecture: i386 kfreebsd-i386 hurd-i386
-#Pre-Depends: libgl1-mesa-dri
-#Description: A free implementation of the OpenGL API -- DRI modules [i686 optimized]
-# This version of Mesa provides GLX and DRI capabilities: it is capable of
-# both direct and indirect rendering.  For direct rendering, it can use DRI
-# modules from the libgl1-mesa-dri package to accelerate drawing.
-# .
-# This package does not include the OpenGL library itself, only the DRI
-# modules for accelerating direct rendering.
-# .
-# For a complete description of Mesa, please look at the
-# libgl1-mesa-swx11 package.
-# .
-# This set of libraries is optimized for i686 machines and will only be used if
-# you are running a 2.6 kernel on an i686 class CPU. This includes Pentium Pro,
-# Pentium II/II/IV, Celeron CPU's and similar class CPU's (including clones
-# such as AMD Athlon/Opteron, VIA C3 Nehemiah, but not VIA C3 Ezla).
-
-Package: libgl1-mesa-dev
-Section: libdevel
-Architecture: any
-Depends:
- mesa-common-dev (= ${binary:Version}),
- libgl1-mesa-glx (= ${binary:Version}),
- ${misc:Depends},
-Conflicts: libgl-dev, libgl1-mesa-dri-dev
-Replaces: libgl-dev, libgl1-mesa-dri-dev
-Provides: libgl-dev, libgl1-mesa-dri-dev
-Description: A free implementation of the OpenGL API -- GLX development files
- This version of Mesa provides GLX and DRI capabilities: it is capable of
- both direct and indirect rendering.  For direct rendering, it can use DRI
- modules from the libgl1-mesa-dri package to accelerate drawing.
- .
- This package includes headers and static libraries for compiling
- programs with Mesa.
- .
- For a complete description of Mesa, please look at the libgl1-mesa-swx11
- package.
-
-Package: mesa-common-dev
-Section: libdevel
-Architecture: any
-Replaces: xlibmesa-gl-dev (<< 1:7), xlibosmesa-dev, libgl1-mesa-swx11-dev (<< 6.5.2), libgl1-mesa-dev (<< 7.5~rc4-2)
-Depends:
- libx11-dev,
- ${misc:Depends},
-Description: Developer documentation for Mesa
- This package includes the specifications for the Mesa-specific OpenGL
- extensions, the complete set of release notes and the development header
- files common to all Mesa packages.
-
-Package: libosmesa6
-Section: libs
-Architecture: any
-Depends:
- ${shlibs:Depends},
- ${misc:Depends},
-Replaces: libgl1-mesa-swx11 (<< 6.5.2)
-Description: Mesa Off-screen rendering extension
- OSmesa is a Mesa extension that allows programs to render to an
- off-screen buffer using the OpenGL API without having to create a
- rendering context on an X Server.  It uses a pure software renderer.
- .
- This package provides both 16-bit and 32-bit versions of the off-screen
- renderer which do not require external libraries to work.
-
-Package: libosmesa6-dev
-Section: libdevel
-Architecture: any
-Depends:
- libosmesa6 (= ${binary:Version}),
- mesa-common-dev (= ${binary:Version}) | libgl-dev,
- ${misc:Depends},
-Conflicts: xlibosmesa-dev, libosmesa4-dev, libosmesa-dev
-Replaces: xlibosmesa-dev, libosmesa-dev, libgl1-mesa-swx11-dev (<< 6.5.2), mesa-common-dev (<< 6.5.2)
-Provides: xlibosmesa-dev, libosmesa-dev
-Description: Mesa Off-screen rendering extension -- development files
- This package provides the required environment for developing programs
- that use the off-screen rendering extension of Mesa.
- .
- For more information on OSmesa see the libosmesa6 package.
-
-Package: libglu1-mesa
-Section: libs
-Architecture: any
-Depends:
- ${shlibs:Depends},
- ${misc:Depends},
-Provides: libglu1
-Conflicts: mesag3 (<< 5.0.0-1), xlibmesa3, libglu1
-Replaces: libglu1
-Description: The OpenGL utility library (GLU)
- GLU offers simple interfaces for building mipmaps; checking for the
- presence of extensions in the OpenGL (or other libraries which follow
- the same conventions for advertising extensions); drawing
- piecewise-linear curves, NURBS, quadrics and other primitives
- (including, but not limited to, teapots); tesselating surfaces; setting
- up projection matrices and unprojecting screen coordinates to world
- coordinates.
- .
- On Linux, this library is also known as libGLU or libGLU.so.1.
- .
- This package provides the SGI implementation of GLU shipped with the
- Mesa package (ergo the "-mesa" suffix).
-
-Package: libglu1-mesa-dev
-Section: libdevel
-Architecture: any
-Depends:
- libglu1-mesa (= ${binary:Version}),
- libgl1-mesa-dev | libgl-dev,
- ${misc:Depends},
-Provides: libglu-dev, xlibmesa-glu-dev
-Conflicts: mesag-dev (<< 5.0.0-1), mesa-glide2-dev (<< 5.0.0-1), mesag3+ggi-dev (<< 5.0.0-1), xlibmesa-dev
-Replaces: libglu-dev
-Description: The OpenGL utility library -- development files
- Includes headers and static libraries for compiling programs with GLU.
- .
- For a complete description of GLU, please look at the libglu1-mesa
- package.
-
-Package: libglw1-mesa
-Section: libs
-Architecture: any
-Depends:
- ${shlibs:Depends},
- ${misc:Depends},
-Provides: libglw1
-Description: A free implementation of the OpenGL API -- runtime
- Mesa is a 3-D graphics library with an API which is very similar to
- that of OpenGL.  To the extent that Mesa utilizes the OpenGL command
- syntax or state machine, it is being used with authorization from
- Silicon Graphics, Inc.  However, the author makes no claim that Mesa
- is in any way a compatible replacement for OpenGL or associated with
- Silicon Graphics, Inc.
- .
- This package provides a simple widgets library, libGLw, which
- allows Motif-based applications to embed an OpenGL drawing context.
- .
- On Linux, this library is also known as libGLw or libGLw.so.1.
-
-Package: libglw1-mesa-dev
-Section: libdevel
-Architecture: any
-Depends:
- libglw1-mesa (= ${binary:Version}),
- libx11-dev,
- libxt-dev,
- lesstif2-dev,
- mesa-common-dev (= ${binary:Version}),
- ${shlibs:Depends},
- ${misc:Depends},
-Provides: mesag3-widgets, mesag-widgets-dev, libglw-dev
-Conflicts: libglw-dev, libgl1-mesa-swx11-dev (<< 6.5.2-4)
-Replaces: libglw-dev
-Description: A free implementation of the OpenGL API -- development files
- This package provides the development environment required for
- compiling programs with the Mesa widgets library, libGLw, which
- allows Motif-based applications to embed an OpenGL drawing context.
- The headers and static libraries for compiling programs that use this
- library are included.
-
-Package: mesa-utils
-Section: x11
-Priority: optional
-Architecture: any
-Depends:
- ${shlibs:Depends},
- ${misc:Depends},
-Replaces: xbase-clients (<< 6.8.2-38)
-Description: Miscellaneous Mesa GL utilities
- This package provides several basic GL utilities built by Mesa, including
- glxinfo and glxgears.
-
-# vim: tw=0

debian/copyright

@@ -1,196 +0,0 @@
-This package was debianized by James A. Treacy treacy@debian.org on Thu,
-6 Jan 2000 01:11:34 -0500.  It was newly debianized by Marcelo E.
-Magallon <mmagallo@debian.org> on Sat, 25 Dec 2004 14:50:02 -0600. It was
-again debianized by Thierry Reding <thierry@gilfi.de> on Sat, 14 Oct 2006
-02:01:12 +0200.
-
-It was downloaded from http://www.mesa3d.org/download.html
-
-For more information see:
-
-  http://www.mesa3d.org/
-
-The tarball was built by combining MesaLib and MesaDemos tarballs, and
-deleting the progs/objviewer/ directory.
-
-Copyright:
-
-Upstream Author: Brian Paul <brian.paul@tungstengraphics.com>
-
-License:
-
-                    License / Copyright Information
-
-   The Mesa distribution consists of several components. Different
-   copyrights and licenses apply to different components. For
-   example, GLUT is copyrighted by Mark Kilgard, some demo programs
-   are copyrighted by SGI, some of the Mesa device drivers are
-   copyrighted by their authors. See below for a list of Mesa's
-   components and the copyright/license for each.
-
-   The core Mesa library is licensed according to the terms of the
-   XFree86 copyright (an MIT-style license). This allows integration
-   with the XFree86/DRI project. Unless otherwise stated, the Mesa
-   source code and documentation is licensed as follows:
-
- Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
-
- Permission is hereby granted, free of charge, to any person obtaining a
- copy of this software and associated documentation files (the "Software"),
- to deal in the Software without restriction, including without limitation
- the rights to use, copy, modify, merge, publish, distribute, sublicense,
- and/or sell copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included
- in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-                        Attention, Contributors
-
-   When contributing to the Mesa project you must agree to relinquish
-   your work to the holder of the copyright for the particular
-   component you're contributing to. That is, you can't put your own
-   copyright on the code, unless it's a modular piece that can be
-   omitted from Mesa (like a new device driver). If for example, you
-   contribute a bug fix to Mesa's texture mapping code, your code
-   will become a part of the body of work which is copyrighted by
-   Brian Paul and licensed by the above terms.
-
-----------------------------------------------------------------------
-
-Some files, as listed below, are made available under the SGI Free B 
-license.  This license is as follows:
-
-SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)
-
-Copyright (C) [dates of first publication] Silicon Graphics, Inc. All Rights
-Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-The above copyright notice including the dates of first publication and either
-this permission notice or a reference to http://oss.sgi.com/projects/FreeB/
-shall be included in all copies or substantial portions of the Software.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL SILICON GRAPHICS, INC. BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
-IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-IN THE SOFTWARE.
-Except as contained in this notice, the name of Silicon Graphics, Inc. shall
-not be used in advertising or otherwise to promote the sale, use or other
-dealings in this Software without prior written authorization from Silicon
-Graphics, Inc.
-
---------------------------------------------------------------------------
-
-Some other files listed below are made available from Silicon Graphics,
-Inc. under a more liberal, MIT-style license, as follows:
-
-   Permission to use, copy, modify, and distribute this software for
-   any purpose and without fee is hereby granted, provided that the above
-   copyright notice appear in all copies and that both the copyright notice
-   and this permission notice appear in supporting documentation, and that
-   the name of Silicon Graphics, Inc. not be used in advertising
-   or publicity pertaining to distribution of the software without specific,
-   written prior permission.
-
-   THE MATERIAL EMBODIED ON THIS SOFTWARE IS PROVIDED TO YOU "AS-IS"
-   AND WITHOUT WARRANTY OF ANY KIND, EXPRESS, IMPLIED OR OTHERWISE
-   INCLUDING WITHOUT LIMITATION, ANY WARRANTY OF MERCHANTABILITY OR
-   FITNESS FOR A PARTICULAR PURPOSE.  IN NO EVENT SHALL SILICON
-   GRAPHICS, INC.  BE LIABLE TO YOU OR ANYONE ELSE FOR ANY DIRECT,
-   SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY
-   KIND, OR ANY DAMAGES WHATSOEVER, INCLUDING WITHOUT LIMITATION,
-   LOSS OF PROFIT, LOSS OF USE, SAVINGS OR REVENUE, OR THE CLAIMS OF
-   THIRD PARTIES, WHETHER OR NOT SILICON GRAPHICS, INC.  HAS BEEN
-   ADVISED OF THE POSSIBILITY OF SUCH LOSS, HOWEVER CAUSED AND ON
-   ANY THEORY OF LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE
-   POSSESSION, USE OR PERFORMANCE OF THIS SOFTWARE.
-   
-   US Government Users Restricted Rights
-   Use, duplication, or disclosure by the Government is subject to
-   restrictions set forth in FAR 52.227.19(c)(2) or subparagraph
-   (c)(1)(ii) of the Rights in Technical Data and Computer Software
-   clause at DFARS 252.227-7013 and/or in similar or successor
-   clauses in the FAR or the DOD or NASA FAR Supplement.
-   Unpublished-- rights reserved under the copyright laws of the
-   United States.  Contractor/manufacturer is Silicon Graphics,
-   Inc., 2011 N.  Shoreline Blvd., Mountain View, CA 94039-7311.
-
---------------------------------------------------------------------------
-
- Mesa Component Licenses:
-
- Component       Files                 Primary Author      License
- ----------------------------------------------------------------------------
- core Mesa code  src/*.[ch]            Brian Paul          Mesa
-                 include/GL/gl.h
-
- GLX driver      src/X/*               Brian Paul          Mesa
-                 include/GL/glx.h
-                 include/GL/xmesa.h
-
- OS/Mesa driver  src/OSmesa/*          Brian Paul          Mesa
-                 include/GL/osmesa.h
-
- 3Dfx driver     src/FX/*              David Bucciarelli   Mesa
-                 include/GL/fxmesa.h
-
- BeOS R4 driver  mesa/drivers/beos/    Brian Paul          Mesa
-
- MGL driver      include/GL/mglmesa.h  SciTech, Inc        GNU LGPL
-
- Windows driver  mesa/drivers/windows/ Li Wei              GNU LGPL
-                 include/GL/wmesa.h
-
- SVGA driver     mesa/drivers/svga/    Brian Paul          GNU LGPL
-                 include/GL/svgamesa.h
-
- DOS driver      mesa/drivers/dos/     Charlie Wallace     GNU LGPL
-                 include/GL/dosmesa.h
-
- GGI driver      mesa/drivers/ggi/     Uwe Maurer          GNU LGPL
-                 include/GL/ggimesa.h
-
- GLUT            src/glut/*            Mark Kilgard        Mark's copyright
-                 include/GL/*glut*.h
-
- GLU library     src/glu/*             Brian Paul          GNU LGPL
-
- SGI GLU library src/glu/sgi/*         SGI                 SGI Free B
-                 include/GL/glu.h
-
- Ext registry    include/GL/glext.h    SGI                 SGI Free B
-                 include/GL/glxext.h
-
- demo programs   progs/demos/*         various             see source files
-
- X demos         progs/xdemos/*        Brian Paul          see source files
-
- SGI demos       progs/samples/*       SGI                 SGI MIT-style
-
- RedBook demos   progs/redbook/*       SGI                 SGI MIT-style
-
-
-On Debian systems the full text of the GNU LGPL license is found in
-/usr/share/common-licenses/LGPL.
-
-------------------------------------------------------------------------------
-
-The Debian packaging is (C) 2006, Thierry Reding <thierry@gilfi.de> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
-

debian/egl.pc

@@ -1,12 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=/usr/lib
-includedir=/usr/include
-
-Name: egl
-Description: Mesa EGL library
-Requires.private: libdrm >= 2.4.15 dri2proto >= 2.1 glproto >= 1.4.11 x11 xext xxf86vm xdamage xfixes
-Version: 7.8.1
-Libs: -L${libdir} -lEGL
-Libs.private: -lm -lpthread -ldl
-Cflags: -I${includedir} 

debian/glesv1_cm.pc

@@ -1,12 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=/usr/lib
-includedir=/usr/include
-
-Name: glesv1_cm
-Description: Mesa OpenGL ES 1.1 CM library
-Requires.private: 
-Version: 7.8.1
-Libs: -L${libdir} -lGLESv1_CM
-Libs.private: -lm -lpthread -ldl
-Cflags: -I${includedir} 

debian/glesv2.pc

@@ -1,12 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=/usr/lib
-includedir=/usr/include
-
-Name: glesv2
-Description: Mesa OpenGL ES 2.0 library
-Requires.private: 
-Version: 7.8.1
-Libs: -L${libdir} -lGLESv2
-Libs.private: -lm -lpthread -ldl
-Cflags: -I${includedir} 

debian/glxdemo.1

@@ -1,15 +0,0 @@
-.TH glxdemo 1 "2006-11-29"
-.SH NAME
-glxdemo \- a demonstration of the GLX functions
-.SH SYNOPSIS
-.B glxdemo
-.SH DESCRIPTION
-The \fIglxdemo\fP program shows how to use the GLX functions in order to
-create an OpenGL program running on top of an X server. This program is most
-useful when studied in its source code form.
-.SH AUTHOR
-glxdemo was written by Brian Paul <brian.paul@tungstengraphics.com>.
-.PP
-This manual page was written by Thierry Reding <thierry@gilfi.de>, for the
-Debian project (but may be used by others).
-

debian/glxgears.1

@@ -1,29 +0,0 @@
-.TH glxgears 1 "2006-11-29"
-.SH NAME
-glxgears \- ``gears'' demo for GLX
-.SH SYNOPSIS
-.B glxgears
-.RI [ options ]
-.SH DESCRIPTION
-The \fIglxgears\fP program is a port of the ``gears'' demo to GLX. It displays
-a set of rotating gears and prints out the frame rate at regular intervals. It
-has become quite popular as basic benchmarking tool.
-.SH OPTIONS
-.TP 8
-.B \-display \fIdisplay\fP
-Specify which X display to run on.
-.TP 8
-.B \-info
-Display OpenGL renderer information.
-.TP 8
-.B \-stereo
-Use a stereo enabled GLX visual.
-.TP 8
-.B \-fullscreen
-Run in fullscreen mode.
-.SH AUTHOR
-glxgears was written by Brian Paul <brian.paul@tungstengraphics.com>.
-.PP
-This manual page was written by Thierry Reding <thierry@gilfi.de>, for the
-Debian project (but may be used by others).
-

debian/glxheads.1

@@ -1,30 +0,0 @@
-.TH glxheads 1 "2006-11-29"
-.SH NAME
-glxheads \- exercise multiple GLX connections
-.SH SYNOPSIS
-.B glxheads
-[\fIdisplay\fP ...]
-.SH DESCRIPTION
-The \fIglxheads\fP program will try to open GLX connections on multiple X
-displays as specified on the command-line. If a connection can be made it will
-try to create a direct GLX context (and fallback to using indirect contexts if
-that fails) and open a window displaying a spinning green triangle.
-.PP
-If no display names are specified, \fIglxheads\fP will default to opening a
-single local connection on display 0.
-.SH EXAMPLE
-To open a local connection on display 0 and two remote connections to the
-hosts \fImars\fP (display 0) and \fIvenus\fP (display 1), run glxheads with
-the following command-line:
-.PP
-.RS 3n
-.nf
-$ glxheads :0 mars:0 venus:1
-.fi
-.RE
-.SH AUTHOR
-glxheads was written by Brian Paul <brian.paul@tungstengraphics.com>.
-.PP
-This manual page was written by Thierry Reding <thierry@gilfi.de> for the
-Debian project (but may be used by others).
-

debian/glxinfo.1

@@ -1,41 +0,0 @@
-.TH glxinfo 1 "2006-11-29"
-.SH NAME
-glxinfo \- show information about the GLX implementation
-.SH SYNOPSIS
-.B glxinfo
-.RI [ options ]
-.SH DESCRIPTION
-The \fIglxinfo\fP program shows information about the OpenGL and GLX
-implementations running on a given X display.
-.PP
-The information includes details about the server- and client-side GLX
-implementation, the OpenGL and GLU implementations as well as a list
-of available GLX visuals.
-.SH OPTIONS
-.TP 8
-.B \-v
-Print visuals info in verbose form.
-.TP 8
-.B \-t
-Print verbose table.
-.TP 8
-.B \-display \fIdisplay\fP
-Specify the X display to interrogate.
-.TP 8
-.B \-h
-Print usage information.
-.TP 8
-.B \-i
-Force an indirect rendering context.
-.TP 8
-.B \-b
-Find the "best" visual and print its number.
-.TP 8
-.B \-l
-Print interesting OpenGL limits.
-.SH AUTHOR
-glxinfo was written by Brian Paul <brian.paul@tungstengraphics.com>.
-.PP
-This manual page was written by Thierry Reding <thierry@gilfi.de>, for the
-Debian project (but may be used by others).
-

debian/libegl1-mesa-dev.install

@@ -1,4 +0,0 @@
-dri/usr/lib/libEGL.so usr/lib
-dri/usr/include/EGL usr/include
-dri/usr/include/KHR usr/include
-debian/egl.pc usr/lib/pkgconfig

debian/libegl1-mesa-drivers-kms.install

@@ -1 +0,0 @@
-dri/usr/lib/egl/egl_kms_*.so usr/lib/egl

debian/libegl1-mesa-drivers-x11.install

@@ -1 +0,0 @@
-dri/usr/lib/egl/egl_x11_*.so usr/lib/egl

debian/libegl1-mesa.install

@@ -1,3 +0,0 @@
-dri/usr/lib/libEGL.so.1* usr/lib
-dri/usr/lib/egl/egl_dri2.so usr/lib/egl
-dri/usr/lib/egl/egl_glx.so usr/lib/egl

debian/libegl1-mesa.lintian-overrides

@@ -1 +0,0 @@
-package-name-doesnt-match-sonames libEGL1

debian/libegl1-mesa.symbols

@@ -1,79 +0,0 @@
-libEGL.so.1 libegl1-mesa #MINVER#
- _eglAddConfig@Base 7.8.1
- _eglAddNewMode@Base 7.8.1
- _eglAddScreen@Base 7.8.1
- _eglBindContext@Base 7.8.1
- _eglCheckResource@Base 7.8.1
- _eglCleanupDisplay@Base 7.8.1
- _eglCompareConfigs@Base 7.8.1
- _eglConfigFromContextModesRec@Base 7.8.1
- _eglConfigToContextModesRec@Base 7.8.1
- _eglDestroyScreen@Base 7.8.1
- _eglError@Base 7.8.1
- _eglGetAPIContext@Base 7.8.1
- _eglGetCurrentContext@Base 7.8.1
- _eglGetCurrentThread@Base 7.8.1
- _eglGetProbeCache@Base 7.8.1
- _eglInitConfig@Base 7.8.1
- _eglInitContext@Base 7.8.1
- _eglInitDriverFallbacks@Base 7.8.1
- _eglInitImage@Base 7.8.1
- _eglInitScreen@Base 7.8.1
- _eglInitSurface@Base 7.8.1
- _eglLog@Base 7.8.1
- _eglMatchConfig@Base 7.8.1
- _eglParseConfigAttribList@Base 7.8.1
- _eglReleaseDisplayResources@Base 7.8.1
- _eglSetLogLevel@Base 7.8.1
- _eglSetLogProc@Base 7.8.1
- _eglSetProbeCache@Base 7.8.1
- _eglSortConfigs@Base 7.8.1
- _eglValidateConfig@Base 7.8.1
- eglBindAPI@Base 7.8.1
- eglBindTexImage@Base 7.8.1
- eglChooseConfig@Base 7.8.1
- eglChooseModeMESA@Base 7.8.1
- eglCopyBuffers@Base 7.8.1
- eglCopyContextMESA@Base 7.8.1
- eglCreateContext@Base 7.8.1
- eglCreateImageKHR@Base 7.8.1
- eglCreatePbufferFromClientBuffer@Base 7.8.1
- eglCreatePbufferSurface@Base 7.8.1
- eglCreatePixmapSurface@Base 7.8.1
- eglCreateScreenSurfaceMESA@Base 7.8.1
- eglCreateWindowSurface@Base 7.8.1
- eglDestroyContext@Base 7.8.1
- eglDestroyImageKHR@Base 7.8.1
- eglDestroySurface@Base 7.8.1
- eglGetConfigAttrib@Base 7.8.1
- eglGetConfigs@Base 7.8.1
- eglGetCurrentContext@Base 7.8.1
- eglGetCurrentDisplay@Base 7.8.1
- eglGetCurrentSurface@Base 7.8.1
- eglGetDisplay@Base 7.8.1
- eglGetError@Base 7.8.1
- eglGetModeAttribMESA@Base 7.8.1
- eglGetModesMESA@Base 7.8.1
- eglGetProcAddress@Base 7.8.1
- eglGetScreensMESA@Base 7.8.1
- eglInitialize@Base 7.8.1
- eglMakeCurrent@Base 7.8.1
- eglQueryAPI@Base 7.8.1
- eglQueryContext@Base 7.8.1
- eglQueryModeStringMESA@Base 7.8.1
- eglQueryScreenMESA@Base 7.8.1
- eglQueryScreenModeMESA@Base 7.8.1
- eglQueryScreenSurfaceMESA@Base 7.8.1
- eglQueryString@Base 7.8.1
- eglQuerySurface@Base 7.8.1
- eglReleaseTexImage@Base 7.8.1
- eglReleaseThread@Base 7.8.1
- eglScreenPositionMESA@Base 7.8.1
- eglShowScreenSurfaceMESA@Base 7.8.1
- eglSurfaceAttrib@Base 7.8.1
- eglSwapBuffers@Base 7.8.1
- eglSwapInterval@Base 7.8.1
- eglTerminate@Base 7.8.1
- eglWaitClient@Base 7.8.1
- eglWaitGL@Base 7.8.1
- eglWaitNative@Base 7.8.1

debian/libgl1-mesa-dev.install

@@ -1,2 +0,0 @@
-usr/lib/libGL.so
-usr/lib/pkgconfig/gl.pc

debian/libgl1-mesa-dri-experimental.install

@@ -1 +0,0 @@
-build/dri/lib/gallium/nouveau_dri.so usr/lib/dri

debian/libgl1-mesa-dri-i686.install

@@ -1 +0,0 @@
-dri/usr/lib/dri/i686/cmov/*.so

debian/libgl1-mesa-dri.install

@@ -1 +0,0 @@
-build/dri/lib/*_dri.so  usr/lib/dri/

debian/libgl1-mesa-glx-i686.install

@@ -1 +0,0 @@
-dri/usr/lib/i686/cmov/libGL.so.* usr/lib/i686/cmov

debian/libgl1-mesa-glx.install

@@ -1 +0,0 @@
-dri/usr/lib/libGL.so.* usr/lib

debian/libgl1-mesa-glx.lintian-overrides

@@ -1 +0,0 @@
-package-name-doesnt-match-sonames libGL1

debian/libgl1-mesa-glx.shlibs

@@ -1 +0,0 @@
-libGL 1 libgl1-mesa-glx | libgl1

debian/libgl1-mesa-swx11-dev.install

@@ -1,2 +0,0 @@
-usr/lib/libGL.a
-usr/lib/libGL.so

debian/libgl1-mesa-swx11-i686.install

@@ -1 +0,0 @@
-usr/lib/i686/cmov/libGL.so.*

debian/libgl1-mesa-swx11-i686.shlibs

@@ -1 +0,0 @@
-libGL 1 libgl1-mesa-glx | libgl1

debian/libgl1-mesa-swx11.install

@@ -1 +0,0 @@
-usr/lib/libGL.so.*

debian/libgl1-mesa-swx11.lintian-overrides

@@ -1 +0,0 @@
-package-name-doesnt-match-sonames libGL1

debian/libgl1-mesa-swx11.shlibs

@@ -1 +0,0 @@
-libGL 1 libgl1-mesa-glx | libgl1

debian/libgles1-mesa-dev.install

@@ -1,3 +0,0 @@
-dri/usr/lib/libGLESv1_CM.so usr/lib
-dri/usr/include/GLES usr/include
-debian/glesv1_cm.pc usr/lib/pkgconfig

debian/libgles1-mesa.install

@@ -1 +0,0 @@
-dri/usr/lib/libGLESv1_CM.so.1* usr/lib

debian/libgles1-mesa.lintian-overrides

@@ -1 +0,0 @@
-package-name-doesnt-match-sonames libGLESv1-CM1

debian/libgles1-mesa.symbols

@@ -1,265 +0,0 @@
-libGLESv1_CM.so.1 libgles1-mesa #MINVER#
-# _glapi_* are internal GL dispatch symbols.  They should probably be hidden
- (regex)"^_glapi_.*@Base$" 7.8.1
-# These are optimised assembly versions of functions, accessed through a 
-# dispatch table.  They're arch-specific, and should probably be hidden.
- (regex|optional=mesa internal ASM optimized functions)"^_mesa_.*@Base$" 7.8.1
- _glthread_GetID@Base 7.8.1
- glActiveTexture@Base 7.8.1
- glAlphaFunc@Base 7.8.1
- glAlphaFuncx@Base 7.8.1
- glAlphaFuncxOES@Base 7.8.1
- glBindBuffer@Base 7.8.1
- glBindFramebufferOES@Base 7.8.1
- glBindRenderbufferOES@Base 7.8.1
- glBindTexture@Base 7.8.1
- glBlendEquationOES@Base 7.8.1
- glBlendEquationSeparateOES@Base 7.8.1
- glBlendFunc@Base 7.8.1
- glBlendFuncSeparateOES@Base 7.8.1
- glBufferData@Base 7.8.1
- glBufferSubData@Base 7.8.1
- glCheckFramebufferStatusOES@Base 7.8.1
- glClear@Base 7.8.1
- glClearColor@Base 7.8.1
- glClearColorx@Base 7.8.1
- glClearColorxOES@Base 7.8.1
- glClearDepthf@Base 7.8.1
- glClearDepthfOES@Base 7.8.1
- glClearDepthx@Base 7.8.1
- glClearDepthxOES@Base 7.8.1
- glClearStencil@Base 7.8.1
- glClientActiveTexture@Base 7.8.1
- glClipPlanef@Base 7.8.1
- glClipPlanefOES@Base 7.8.1
- glClipPlanex@Base 7.8.1
- glClipPlanexOES@Base 7.8.1
- glColor4f@Base 7.8.1
- glColor4ub@Base 7.8.1
- glColor4x@Base 7.8.1
- glColor4xOES@Base 7.8.1
- glColorMask@Base 7.8.1
- glColorPointer@Base 7.8.1
- glCompressedTexImage2D@Base 7.8.1
- glCompressedTexSubImage2D@Base 7.8.1
- glCopyTexImage2D@Base 7.8.1
- glCopyTexSubImage2D@Base 7.8.1
- glCullFace@Base 7.8.1
- glDeleteBuffers@Base 7.8.1
- glDeleteFramebuffersOES@Base 7.8.1
- glDeleteRenderbuffersOES@Base 7.8.1
- glDeleteTextures@Base 7.8.1
- glDepthFunc@Base 7.8.1
- glDepthMask@Base 7.8.1
- glDepthRangef@Base 7.8.1
- glDepthRangefOES@Base 7.8.1
- glDepthRangex@Base 7.8.1
- glDepthRangexOES@Base 7.8.1
- glDisable@Base 7.8.1
- glDisableClientState@Base 7.8.1
- glDrawArrays@Base 7.8.1
- glDrawElements@Base 7.8.1
- glDrawTexfOES@Base 7.8.1
- glDrawTexfvOES@Base 7.8.1
- glDrawTexiOES@Base 7.8.1
- glDrawTexivOES@Base 7.8.1
- glDrawTexsOES@Base 7.8.1
- glDrawTexsvOES@Base 7.8.1
- glDrawTexxOES@Base 7.8.1
- glDrawTexxvOES@Base 7.8.1
- glEGLImageTargetRenderbufferStorageOES@Base 7.8.1
- glEGLImageTargetTexture2DOES@Base 7.8.1
- glEnable@Base 7.8.1
- glEnableClientState@Base 7.8.1
- glFinish@Base 7.8.1
- glFlush@Base 7.8.1
- glFogf@Base 7.8.1
- glFogfv@Base 7.8.1
- glFogx@Base 7.8.1
- glFogxOES@Base 7.8.1
- glFogxv@Base 7.8.1
- glFogxvOES@Base 7.8.1
- glFramebufferRenderbufferOES@Base 7.8.1
- glFramebufferTexture2DOES@Base 7.8.1
- glFrontFace@Base 7.8.1
- glFrustumf@Base 7.8.1
- glFrustumfOES@Base 7.8.1
- glFrustumx@Base 7.8.1
- glFrustumxOES@Base 7.8.1
- glGenBuffers@Base 7.8.1
- glGenFramebuffersOES@Base 7.8.1
- glGenRenderbuffersOES@Base 7.8.1
- glGenTextures@Base 7.8.1
- glGenerateMipmapOES@Base 7.8.1
- glGetBooleanv@Base 7.8.1
- glGetBufferParameteriv@Base 7.8.1
- glGetBufferPointervOES@Base 7.8.1
- glGetClipPlanef@Base 7.8.1
- glGetClipPlanefOES@Base 7.8.1
- glGetClipPlanex@Base 7.8.1
- glGetClipPlanexOES@Base 7.8.1
- glGetError@Base 7.8.1
- glGetFixedv@Base 7.8.1
- glGetFixedvOES@Base 7.8.1
- glGetFloatv@Base 7.8.1
- glGetFramebufferAttachmentParameterivOES@Base 7.8.1
- glGetIntegerv@Base 7.8.1
- glGetLightfv@Base 7.8.1
- glGetLightxv@Base 7.8.1
- glGetLightxvOES@Base 7.8.1
- glGetMaterialfv@Base 7.8.1
- glGetMaterialxv@Base 7.8.1
- glGetMaterialxvOES@Base 7.8.1
- glGetPointerv@Base 7.8.1
- glGetRenderbufferParameterivOES@Base 7.8.1
- glGetString@Base 7.8.1
- glGetTexEnvfv@Base 7.8.1
- glGetTexEnviv@Base 7.8.1
- glGetTexEnvxv@Base 7.8.1
- glGetTexEnvxvOES@Base 7.8.1
- glGetTexGenfvOES@Base 7.8.1
- glGetTexGenivOES@Base 7.8.1
- glGetTexGenxvOES@Base 7.8.1
- glGetTexParameterfv@Base 7.8.1
- glGetTexParameteriv@Base 7.8.1
- glGetTexParameterxv@Base 7.8.1
- glGetTexParameterxvOES@Base 7.8.1
- glHint@Base 7.8.1
- glIsBuffer@Base 7.8.1
- glIsEnabled@Base 7.8.1
- glIsFramebufferOES@Base 7.8.1
- glIsRenderbufferOES@Base 7.8.1
- glIsTexture@Base 7.8.1
- glLightModelf@Base 7.8.1
- glLightModelfv@Base 7.8.1
- glLightModelx@Base 7.8.1
- glLightModelxOES@Base 7.8.1
- glLightModelxv@Base 7.8.1
- glLightModelxvOES@Base 7.8.1
- glLightf@Base 7.8.1
- glLightfv@Base 7.8.1
- glLightx@Base 7.8.1
- glLightxOES@Base 7.8.1
- glLightxv@Base 7.8.1
- glLightxvOES@Base 7.8.1
- glLineWidth@Base 7.8.1
- glLineWidthx@Base 7.8.1
- glLineWidthxOES@Base 7.8.1
- glLoadIdentity@Base 7.8.1
- glLoadMatrixf@Base 7.8.1
- glLoadMatrixx@Base 7.8.1
- glLoadMatrixxOES@Base 7.8.1
- glLogicOp@Base 7.8.1
- glMapBufferOES@Base 7.8.1
- glMaterialf@Base 7.8.1
- glMaterialfv@Base 7.8.1
- glMaterialx@Base 7.8.1
- glMaterialxOES@Base 7.8.1
- glMaterialxv@Base 7.8.1
- glMaterialxvOES@Base 7.8.1
- glMatrixMode@Base 7.8.1
- glMultMatrixf@Base 7.8.1
- glMultMatrixx@Base 7.8.1
- glMultMatrixxOES@Base 7.8.1
- glMultiDrawArraysEXT@Base 7.8.1
- glMultiDrawElementsEXT@Base 7.8.1
- glMultiTexCoord4f@Base 7.8.1
- glMultiTexCoord4x@Base 7.8.1
- glMultiTexCoord4xOES@Base 7.8.1
- glNormal3f@Base 7.8.1
- glNormal3x@Base 7.8.1
- glNormal3xOES@Base 7.8.1
- glNormalPointer@Base 7.8.1
- glOrthof@Base 7.8.1
- glOrthofOES@Base 7.8.1
- glOrthox@Base 7.8.1
- glOrthoxOES@Base 7.8.1
- glPixelStorei@Base 7.8.1
- glPointParameterf@Base 7.8.1
- glPointParameterfv@Base 7.8.1
- glPointParameterx@Base 7.8.1
- glPointParameterxOES@Base 7.8.1
- glPointParameterxv@Base 7.8.1
- glPointParameterxvOES@Base 7.8.1
- glPointSize@Base 7.8.1
- glPointSizePointerOES@Base 7.8.1
- glPointSizex@Base 7.8.1
- glPointSizexOES@Base 7.8.1
- glPolygonOffset@Base 7.8.1
- glPolygonOffsetx@Base 7.8.1
- glPolygonOffsetxOES@Base 7.8.1
- glPopMatrix@Base 7.8.1
- glPushMatrix@Base 7.8.1
- glQueryMatrixxOES@Base 7.8.1
- glReadPixels@Base 7.8.1
- glRenderbufferStorageOES@Base 7.8.1
- glRotatef@Base 7.8.1
- glRotatex@Base 7.8.1
- glRotatexOES@Base 7.8.1
- glSampleCoverage@Base 7.8.1
- glSampleCoveragex@Base 7.8.1
- glSampleCoveragexOES@Base 7.8.1
- glScalef@Base 7.8.1
- glScalex@Base 7.8.1
- glScalexOES@Base 7.8.1
- glScissor@Base 7.8.1
- glShadeModel@Base 7.8.1
- glStencilFunc@Base 7.8.1
- glStencilMask@Base 7.8.1
- glStencilOp@Base 7.8.1
- glTexCoordPointer@Base 7.8.1
- glTexEnvf@Base 7.8.1
- glTexEnvfv@Base 7.8.1
- glTexEnvi@Base 7.8.1
- glTexEnviv@Base 7.8.1
- glTexEnvx@Base 7.8.1
- glTexEnvxOES@Base 7.8.1
- glTexEnvxv@Base 7.8.1
- glTexEnvxvOES@Base 7.8.1
- glTexGenfOES@Base 7.8.1
- glTexGenfvOES@Base 7.8.1
- glTexGeniOES@Base 7.8.1
- glTexGenivOES@Base 7.8.1
- glTexGenxOES@Base 7.8.1
- glTexGenxvOES@Base 7.8.1
- glTexImage2D@Base 7.8.1
- glTexParameterf@Base 7.8.1
- glTexParameterfv@Base 7.8.1
- glTexParameteri@Base 7.8.1
- glTexParameteriv@Base 7.8.1
- glTexParameterx@Base 7.8.1
- glTexParameterxOES@Base 7.8.1
- glTexParameterxv@Base 7.8.1
- glTexParameterxvOES@Base 7.8.1
- glTexSubImage2D@Base 7.8.1
- glTranslatef@Base 7.8.1
- glTranslatex@Base 7.8.1
- glTranslatexOES@Base 7.8.1
- glUnmapBufferOES@Base 7.8.1
- glVertexPointer@Base 7.8.1
- glViewport@Base 7.8.1
-# These are internal gallium statetracker symbols.  
-# They should probably be hidden
- st_api_OpenGL_ES1@Base 7.8.1
- st_bind_teximage@Base 7.8.1
- st_bind_texture_surface@Base 7.8.1
- st_copy_context_state@Base 7.8.1
- st_create_context@Base 7.8.1
- st_create_framebuffer@Base 7.8.1
- st_destroy_context@Base 7.8.1
- st_finish@Base 7.8.1
- st_flush@Base 7.8.1
- st_framebuffer_private@Base 7.8.1
- st_get_current@Base 7.8.1
- st_get_framebuffer_dimensions@Base 7.8.1
- st_get_framebuffer_surface@Base 7.8.1
- st_get_framebuffer_texture@Base 7.8.1
- st_get_proc_address@Base 7.8.1
- st_make_current@Base 7.8.1
- st_notify_swapbuffers@Base 7.8.1
- st_release_teximage@Base 7.8.1
- st_resize_framebuffer@Base 7.8.1
- st_set_framebuffer_surface@Base 7.8.1
- st_swapbuffers@Base 7.8.1
- st_unbind_texture_surface@Base 7.8.1
- st_unreference_framebuffer@Base 7.8.1

debian/libgles2-mesa-dev.install

@@ -1,3 +0,0 @@
-dri/usr/lib/libGLESv2.so usr/lib
-dri/usr/include/GLES2 usr/include
-debian/glesv2.pc usr/lib/pkgconfig

debian/libgles2-mesa.install

@@ -1 +0,0 @@
-dri/usr/lib/libGLESv2.so.2* usr/lib

debian/libgles2-mesa.lintian-overrides

@@ -1 +0,0 @@
-package-name-doesnt-match-sonames libGLESv2-2

debian/libgles2-mesa.symbols

@@ -1,189 +0,0 @@
-libGLESv2.so.2 libgles2-mesa #MINVER#
-# _glapi_* are internal GL dispatch symbols.  They should probably be hidden.
- (regex)"^_glapi_.*@Base$" 7.8.1
-# These are optimised assembly versions of functions, accessed through a 
-# dispatch table.  They're arch-specific, and should probably be hidden.
- (regex|optional=mesa internal ASM optimized functions)"^_mesa_.*@Base$" 7.8.1
- _glthread_GetID@Base 7.8.1
- glActiveTexture@Base 7.8.1
- glAttachShader@Base 7.8.1
- glBindAttribLocation@Base 7.8.1
- glBindBuffer@Base 7.8.1
- glBindFramebuffer@Base 7.8.1
- glBindRenderbuffer@Base 7.8.1
- glBindTexture@Base 7.8.1
- glBlendColor@Base 7.8.1
- glBlendEquation@Base 7.8.1
- glBlendEquationSeparate@Base 7.8.1
- glBlendFunc@Base 7.8.1
- glBlendFuncSeparate@Base 7.8.1
- glBufferData@Base 7.8.1
- glBufferSubData@Base 7.8.1
- glCheckFramebufferStatus@Base 7.8.1
- glClear@Base 7.8.1
- glClearColor@Base 7.8.1
- glClearDepthf@Base 7.8.1
- glClearStencil@Base 7.8.1
- glColorMask@Base 7.8.1
- glCompileShader@Base 7.8.1
- glCompressedTexImage2D@Base 7.8.1
- glCompressedTexImage3DOES@Base 7.8.1
- glCompressedTexSubImage2D@Base 7.8.1
- glCompressedTexSubImage3DOES@Base 7.8.1
- glCopyTexImage2D@Base 7.8.1
- glCopyTexSubImage2D@Base 7.8.1
- glCopyTexSubImage3DOES@Base 7.8.1
- glCreateProgram@Base 7.8.1
- glCreateShader@Base 7.8.1
- glCullFace@Base 7.8.1
- glDeleteBuffers@Base 7.8.1
- glDeleteFramebuffers@Base 7.8.1
- glDeleteProgram@Base 7.8.1
- glDeleteRenderbuffers@Base 7.8.1
- glDeleteShader@Base 7.8.1
- glDeleteTextures@Base 7.8.1
- glDepthFunc@Base 7.8.1
- glDepthMask@Base 7.8.1
- glDepthRangef@Base 7.8.1
- glDetachShader@Base 7.8.1
- glDisable@Base 7.8.1
- glDisableVertexAttribArray@Base 7.8.1
- glDrawArrays@Base 7.8.1
- glDrawElements@Base 7.8.1
- glEGLImageTargetRenderbufferStorageOES@Base 7.8.1
- glEGLImageTargetTexture2DOES@Base 7.8.1
- glEnable@Base 7.8.1
- glEnableVertexAttribArray@Base 7.8.1
- glFinish@Base 7.8.1
- glFlush@Base 7.8.1
- glFramebufferRenderbuffer@Base 7.8.1
- glFramebufferTexture2D@Base 7.8.1
- glFramebufferTexture3DOES@Base 7.8.1
- glFrontFace@Base 7.8.1
- glGenBuffers@Base 7.8.1
- glGenFramebuffers@Base 7.8.1
- glGenRenderbuffers@Base 7.8.1
- glGenTextures@Base 7.8.1
- glGenerateMipmap@Base 7.8.1
- glGetActiveAttrib@Base 7.8.1
- glGetActiveUniform@Base 7.8.1
- glGetAttachedShaders@Base 7.8.1
- glGetAttribLocation@Base 7.8.1
- glGetBooleanv@Base 7.8.1
- glGetBufferParameteriv@Base 7.8.1
- glGetBufferPointervOES@Base 7.8.1
- glGetError@Base 7.8.1
- glGetFloatv@Base 7.8.1
- glGetFramebufferAttachmentParameteriv@Base 7.8.1
- glGetIntegerv@Base 7.8.1
- glGetProgramBinaryOES@Base 7.8.1
- glGetProgramInfoLog@Base 7.8.1
- glGetProgramiv@Base 7.8.1
- glGetRenderbufferParameteriv@Base 7.8.1
- glGetShaderInfoLog@Base 7.8.1
- glGetShaderPrecisionFormat@Base 7.8.1
- glGetShaderSource@Base 7.8.1
- glGetShaderiv@Base 7.8.1
- glGetString@Base 7.8.1
- glGetTexParameterfv@Base 7.8.1
- glGetTexParameteriv@Base 7.8.1
- glGetUniformLocation@Base 7.8.1
- glGetUniformfv@Base 7.8.1
- glGetUniformiv@Base 7.8.1
- glGetVertexAttribPointerv@Base 7.8.1
- glGetVertexAttribfv@Base 7.8.1
- glGetVertexAttribiv@Base 7.8.1
- glHint@Base 7.8.1
- glIsBuffer@Base 7.8.1
- glIsEnabled@Base 7.8.1
- glIsFramebuffer@Base 7.8.1
- glIsProgram@Base 7.8.1
- glIsRenderbuffer@Base 7.8.1
- glIsShader@Base 7.8.1
- glIsTexture@Base 7.8.1
- glLineWidth@Base 7.8.1
- glLinkProgram@Base 7.8.1
- glMapBufferOES@Base 7.8.1
- glMultiDrawArraysEXT@Base 7.8.1
- glMultiDrawElementsEXT@Base 7.8.1
- glPixelStorei@Base 7.8.1
- glPolygonOffset@Base 7.8.1
- glProgramBinaryOES@Base 7.8.1
- glReadPixels@Base 7.8.1
- glReleaseShaderCompiler@Base 7.8.1
- glRenderbufferStorage@Base 7.8.1
- glSampleCoverage@Base 7.8.1
- glScissor@Base 7.8.1
- glShaderBinary@Base 7.8.1
- glShaderSource@Base 7.8.1
- glStencilFunc@Base 7.8.1
- glStencilFuncSeparate@Base 7.8.1
- glStencilMask@Base 7.8.1
- glStencilMaskSeparate@Base 7.8.1
- glStencilOp@Base 7.8.1
- glStencilOpSeparate@Base 7.8.1
- glTexImage2D@Base 7.8.1
- glTexImage3DOES@Base 7.8.1
- glTexParameterf@Base 7.8.1
- glTexParameterfv@Base 7.8.1
- glTexParameteri@Base 7.8.1
- glTexParameteriv@Base 7.8.1
- glTexSubImage2D@Base 7.8.1
- glTexSubImage3DOES@Base 7.8.1
- glUniform1f@Base 7.8.1
- glUniform1fv@Base 7.8.1
- glUniform1i@Base 7.8.1
- glUniform1iv@Base 7.8.1
- glUniform2f@Base 7.8.1
- glUniform2fv@Base 7.8.1
- glUniform2i@Base 7.8.1
- glUniform2iv@Base 7.8.1
- glUniform3f@Base 7.8.1
- glUniform3fv@Base 7.8.1
- glUniform3i@Base 7.8.1
- glUniform3iv@Base 7.8.1
- glUniform4f@Base 7.8.1
- glUniform4fv@Base 7.8.1
- glUniform4i@Base 7.8.1
- glUniform4iv@Base 7.8.1
- glUniformMatrix2fv@Base 7.8.1
- glUniformMatrix3fv@Base 7.8.1
- glUniformMatrix4fv@Base 7.8.1
- glUnmapBufferOES@Base 7.8.1
- glUseProgram@Base 7.8.1
- glValidateProgram@Base 7.8.1
- glVertexAttrib1f@Base 7.8.1
- glVertexAttrib1fv@Base 7.8.1
- glVertexAttrib2f@Base 7.8.1
- glVertexAttrib2fv@Base 7.8.1
- glVertexAttrib3f@Base 7.8.1
- glVertexAttrib3fv@Base 7.8.1
- glVertexAttrib4f@Base 7.8.1
- glVertexAttrib4fv@Base 7.8.1
- glVertexAttribPointer@Base 7.8.1
- glViewport@Base 7.8.1
-# These are internal gallium statetracker symbols.  
-# They should probably be hidden
- st_api_OpenGL_ES2@Base 7.8.1
- st_bind_teximage@Base 7.8.1
- st_bind_texture_surface@Base 7.8.1
- st_copy_context_state@Base 7.8.1
- st_create_context@Base 7.8.1
- st_create_framebuffer@Base 7.8.1
- st_destroy_context@Base 7.8.1
- st_finish@Base 7.8.1
- st_flush@Base 7.8.1
- st_framebuffer_private@Base 7.8.1
- st_get_current@Base 7.8.1
- st_get_framebuffer_dimensions@Base 7.8.1
- st_get_framebuffer_surface@Base 7.8.1
- st_get_framebuffer_texture@Base 7.8.1
- st_get_proc_address@Base 7.8.1
- st_make_current@Base 7.8.1
- st_notify_swapbuffers@Base 7.8.1
- st_release_teximage@Base 7.8.1
- st_resize_framebuffer@Base 7.8.1
- st_set_framebuffer_surface@Base 7.8.1
- st_swapbuffers@Base 7.8.1
- st_unbind_texture_surface@Base 7.8.1
- st_unreference_framebuffer@Base 7.8.1

debian/libglu1-mesa-dev.install

@@ -1,5 +0,0 @@
-usr/include/GL/glu.h
-usr/include/GL/glu_mangle.h
-usr/lib/libGLU.a
-usr/lib/libGLU.so
-usr/lib/pkgconfig/glu.pc

debian/libglu1-mesa.install

@@ -1 +0,0 @@
-usr/lib/libGLU.so.*

debian/libglu1-mesa.lintian-overrides

@@ -1 +0,0 @@
-package-name-doesnt-match-sonames libGLU1

debian/libglu1-mesa.shlibs

@@ -1 +0,0 @@
-libGLU 1 libglu1-mesa | libglu1

debian/libglw1-mesa-dev.install

@@ -1,4 +0,0 @@
-usr/include/GL/GLw*A.h
-usr/lib/libGLw.a
-usr/lib/libGLw.so
-usr/lib/pkgconfig/glw.pc

debian/libglw1-mesa.install

@@ -1 +0,0 @@
-usr/lib/libGLw.so.*

debian/libglw1-mesa.lintian-overrides

@@ -1 +0,0 @@
-package-name-doesnt-match-sonames libGLw1

debian/libglw1-mesa.shlibs

@@ -1 +0,0 @@
-libGLw 1 libglw1-mesa | libglw1

debian/libopenvg1-mesa-dev.install

@@ -1,3 +0,0 @@
-dri/usr/lib/libOpenVG.so usr/lib
-dri/usr/include/VG usr/include
-debian/vg.pc usr/lib/pkgconfig

debian/libopenvg1-mesa.install

@@ -1 +0,0 @@
-dri/usr/lib/libOpenVG.so.1* usr/lib

debian/libopenvg1-mesa.lintian-overrides

@@ -1 +0,0 @@
-package-name-doesnt-match-sonames libOpenVG1

debian/libopenvg1-mesa.symbols

@@ -1,106 +0,0 @@
-libOpenVG.so.1 libopenvg1-mesa #MINVER#
- st_api_OpenVG@Base 7.8.1
- st_bind_texture_surface@Base 7.8.1
- st_copy_context_state@Base 7.8.1
- st_create_context@Base 7.8.1
- st_create_framebuffer@Base 7.8.1
- st_destroy_context@Base 7.8.1
- st_finish@Base 7.8.1
- st_flush@Base 7.8.1
- st_framebuffer_private@Base 7.8.1
- st_get_current@Base 7.8.1
- st_get_framebuffer_dimensions@Base 7.8.1
- st_get_framebuffer_surface@Base 7.8.1
- st_get_framebuffer_texture@Base 7.8.1
- st_get_proc_address@Base 7.8.1
- st_make_current@Base 7.8.1
- st_notify_swapbuffers@Base 7.8.1
- st_notify_swapbuffers_complete@Base 7.8.1
- st_resize_framebuffer@Base 7.8.1
- st_set_framebuffer_surface@Base 7.8.1
- st_unbind_texture_surface@Base 7.8.1
- st_unreference_framebuffer@Base 7.8.1
- vgAppendPath@Base 7.8.1
- vgAppendPathData@Base 7.8.1
- vgChildImage@Base 7.8.1
- vgClear@Base 7.8.1
- vgClearImage@Base 7.8.1
- vgClearPath@Base 7.8.1
- vgColorMatrix@Base 7.8.1
- vgConvolve@Base 7.8.1
- vgCopyImage@Base 7.8.1
- vgCopyPixels@Base 7.8.1
- vgCreateImage@Base 7.8.1
- vgCreatePaint@Base 7.8.1
- vgCreatePath@Base 7.8.1
- vgDestroyImage@Base 7.8.1
- vgDestroyPaint@Base 7.8.1
- vgDestroyPath@Base 7.8.1
- vgDrawImage@Base 7.8.1
- vgDrawPath@Base 7.8.1
- vgFinish@Base 7.8.1
- vgFlush@Base 7.8.1
- vgGaussianBlur@Base 7.8.1
- vgGetColor@Base 7.8.1
- vgGetError@Base 7.8.1
- vgGetImageSubData@Base 7.8.1
- vgGetMatrix@Base 7.8.1
- vgGetPaint@Base 7.8.1
- vgGetParameterVectorSize@Base 7.8.1
- vgGetParameterf@Base 7.8.1
- vgGetParameterfv@Base 7.8.1
- vgGetParameteri@Base 7.8.1
- vgGetParameteriv@Base 7.8.1
- vgGetParent@Base 7.8.1
- vgGetPathCapabilities@Base 7.8.1
- vgGetPixels@Base 7.8.1
- vgGetString@Base 7.8.1
- vgGetVectorSize@Base 7.8.1
- vgGetf@Base 7.8.1
- vgGetfv@Base 7.8.1
- vgGeti@Base 7.8.1
- vgGetiv@Base 7.8.1
- vgHardwareQuery@Base 7.8.1
- vgImageSubData@Base 7.8.1
- vgInterpolatePath@Base 7.8.1
- vgLoadIdentity@Base 7.8.1
- vgLoadMatrix@Base 7.8.1
- vgLookup@Base 7.8.1
- vgLookupSingle@Base 7.8.1
- vgMask@Base 7.8.1
- vgModifyPathCoords@Base 7.8.1
- vgMultMatrix@Base 7.8.1
- vgPaintPattern@Base 7.8.1
- vgPathBounds@Base 7.8.1
- vgPathLength@Base 7.8.1
- vgPathTransformedBounds@Base 7.8.1
- vgPointAlongPath@Base 7.8.1
- vgReadPixels@Base 7.8.1
- vgRemovePathCapabilities@Base 7.8.1
- vgRotate@Base 7.8.1
- vgScale@Base 7.8.1
- vgSeparableConvolve@Base 7.8.1
- vgSetColor@Base 7.8.1
- vgSetPaint@Base 7.8.1
- vgSetParameterf@Base 7.8.1
- vgSetParameterfv@Base 7.8.1
- vgSetParameteri@Base 7.8.1
- vgSetParameteriv@Base 7.8.1
- vgSetPixels@Base 7.8.1
- vgSetf@Base 7.8.1
- vgSetfv@Base 7.8.1
- vgSeti@Base 7.8.1
- vgSetiv@Base 7.8.1
- vgShear@Base 7.8.1
- vgTransformPath@Base 7.8.1
- vgTranslate@Base 7.8.1
- vgWritePixels@Base 7.8.1
- vguArc@Base 7.8.1
- vguComputeWarpQuadToQuad@Base 7.8.1
- vguComputeWarpQuadToSquare@Base 7.8.1
- vguComputeWarpSquareToQuad@Base 7.8.1
- vguEllipse@Base 7.8.1
- vguLine@Base 7.8.1
- vguPolygon@Base 7.8.1
- vguRect@Base 7.8.1
- vguRoundRect@Base 7.8.1

debian/libosmesa6-dev.install

@@ -1,8 +0,0 @@
-usr/include/GL/osmesa.h
-usr/lib/libOSMesa.a
-usr/lib/libOSMesa.so
-usr/lib/libOSMesa16.a
-usr/lib/libOSMesa16.so
-usr/lib/libOSMesa32.a
-usr/lib/libOSMesa32.so
-usr/lib/pkgconfig/osmesa.pc

debian/libosmesa6.install

@@ -1,3 +0,0 @@
-usr/lib/libOSMesa.so.*
-usr/lib/libOSMesa16.so.*
-usr/lib/libOSMesa32.so.*

debian/libosmesa6.shlibs

@@ -1,3 +0,0 @@
-libOSMesa 6 libosmesa6 (>= 6.5.2-1) | libgl1-mesa-glide3
-libOSMesa16 6 libosmesa6 (>= 6.5.2-1)
-libOSMesa32 6 libosmesa6 (>= 6.5.2-1)

debian/mesa-common-dev.docs

@@ -1,8 +0,0 @@
-docs/bugs.html
-docs/debugging.html
-docs/envvars.html
-docs/faq.html
-docs/osmesa.html
-docs/RELNOTES-*
-docs/relnotes*
-docs/*.spec

debian/mesa-common-dev.install

@@ -1,8 +0,0 @@
-dri/usr/include/GL/gl.h usr/include/GL
-dri/usr/include/GL/glext.h usr/include/GL
-dri/usr/include/GL/gl_mangle.h usr/include/GL
-dri/usr/include/GL/glx.h usr/include/GL
-dri/usr/include/GL/glxext.h usr/include/GL
-dri/usr/include/GL/glx_mangle.h usr/include/GL
-dri/usr/include/GL/internal/dri_interface.h usr/include/GL/internal
-dri/usr/lib/pkgconfig/dri.pc usr/lib/pkgconfig/

debian/mesa-utils.install

@@ -1,4 +0,0 @@
-dri/usr/bin/glxdemo usr/bin
-dri/usr/bin/glxgears usr/bin
-dri/usr/bin/glxheads usr/bin
-dri/usr/bin/glxinfo usr/bin

debian/mesa-utils.manpages

@@ -1,4 +0,0 @@
-debian/glxdemo.1
-debian/glxgears.1
-debian/glxheads.1
-debian/glxinfo.1

debian/patches/02_use-ieee-fp-on-s390-and-m68k.patch

@@ -1,21 +0,0 @@
-Patch that fixes Debian bug #349437.
-
-This patch by David Nusinow.
-
----
- src/mesa/main/compiler.h |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/src/mesa/main/compiler.h
-+++ b/src/mesa/main/compiler.h
-@@ -353,8 +353,9 @@ static INLINE GLuint CPU_TO_LE32(GLuint
-  * USE_IEEE: Determine if we're using IEEE floating point
-  */
- #if defined(__i386__) || defined(__386__) || defined(__sparc__) || \
--    defined(__s390x__) || defined(__powerpc__) || \
-+    defined(__s390__) || defined(__s390x__) || defined(__powerpc__) || \
-     defined(__x86_64__) || \
-+    defined(__m68k__) || \
-     defined(ia64) || defined(__ia64__) || \
-     defined(__hppa__) || defined(hpux) || \
-     defined(__mips) || defined(_MIPS_ARCH) || \

debian/patches/03_optional-progs-and-install.patch

@@ -1,60 +0,0 @@
-Allow the programs that are to be built to be defined in the build
-configuration.
-
-Provide an install target for installing the programs in $(INSTALL_DIR)/bin.
-
-This patch by Thierry Reding.
-Not submitted to Mesa.
---
-Also remove references to GLU library since it is not required
-and we don't actually build it at this point.
-
-
----
- progs/Makefile        |    6 +++++-
- progs/xdemos/Makefile |    7 ++++++-
- 2 files changed, 11 insertions(+), 2 deletions(-)
-
-Index: mesa/progs/xdemos/Makefile
-===================================================================
---- mesa.orig/progs/xdemos/Makefile
-+++ mesa/progs/xdemos/Makefile
-@@ -13,7 +13,7 @@
- 
- LIBS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(APP_LIB_DEPS)
- 
--PROGS = \
-+PROGS ?= \
- 	corender \
- 	glsync \
- 	glthreads \
-@@ -69,6 +69,11 @@
- extra: $(EXTRA_PROGS)
- 
- 
-+install: $(PROGS)
-+	$(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/bin
-+	$(INSTALL) -m 755 $(PROGS) $(DESTDIR)$(INSTALL_DIR)/bin
-+
-+
- clean:
- 	-rm -f $(PROGS) $(EXTRA_PROGS)
- 	-rm -f *.o *~
-Index: mesa/progs/Makefile
-===================================================================
---- mesa.orig/progs/Makefile
-+++ mesa/progs/Makefile
-@@ -21,8 +21,12 @@
- 		fi \
- 	done
- 
--# Dummy install target
- install:
-+	@for dir in $(SUBDIRS) ; do \
-+		if [ -d $$dir ] ; then \
-+			(cd $$dir ; $(MAKE) install) ; \
-+		fi \
-+	done
- 
- clean:
- 	@list='$(SUBDIRS)'; for dir in $$list tests ; do \

debian/patches/04_osmesa_version.diff

@@ -1,17 +0,0 @@
----
- src/mesa/drivers/osmesa/Makefile |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: mesa/src/mesa/drivers/osmesa/Makefile
-===================================================================
---- mesa.orig/src/mesa/drivers/osmesa/Makefile
-+++ mesa/src/mesa/drivers/osmesa/Makefile
-@@ -37,7 +37,7 @@
- # -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) \
-+		-major 6 -minor 5 -patch 3 \
- 		-install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \
- 		-id $(INSTALL_LIB_DIR)/lib$(OSMESA_LIB).$(MESA_MAJOR).dylib \
- 		$(OSMESA_LIB_DEPS) $(OBJECTS) $(CORE_MESA)

debian/patches/05_hurd-ftbfs.diff

@@ -1,59 +0,0 @@
-From: Samuel Thibault <samuel.thibault@ens-lyon.org>
-Subject: Fix build on GNU/Hurd
-
----
- configure.ac |   27 +++++++++++++++------------
- 1 file changed, 15 insertions(+), 12 deletions(-)
-
-Index: mesa/configure.ac
-===================================================================
---- mesa.orig/configure.ac
-+++ mesa/configure.ac
-@@ -584,6 +584,13 @@
-     enable_xcb=no
- fi
- 
-+dnl Direct rendering or just indirect rendering
-+AC_ARG_ENABLE([driglx-direct],
-+    [AS_HELP_STRING([--disable-driglx-direct],
-+        [enable direct rendering in GLX for DRI @<:@default=enabled@:>@])],
-+    [driglx_direct="$enableval"],
-+    [driglx_direct="yes"])
-+
- dnl
- dnl libGL configuration per driver
- dnl
-@@ -617,12 +624,14 @@
-         AC_MSG_ERROR([Can't use static libraries for DRI drivers])
-     fi
- 
--    # Check for libdrm
--    PKG_CHECK_MODULES([LIBDRM], [libdrm >= $LIBDRM_REQUIRED])
--    PKG_CHECK_MODULES([DRI2PROTO], [dri2proto >= $DRI2PROTO_REQUIRED])
--    PKG_CHECK_MODULES([GLPROTO], [glproto >= $GLPROTO_REQUIRED])
--    GL_PC_REQ_PRIV="libdrm >= $LIBDRM_REQUIRED dri2proto >= $DRI2PROTO_REQUIRED glproto >= $GLPROTO_REQUIRED"
--    DRI_PC_REQ_PRIV="libdrm >= $LIBDRM_REQUIRED"
-+    if test x"$driglx_direct" = xyes; then
-+        # Check for libdrm
-+        PKG_CHECK_MODULES([LIBDRM], [libdrm >= $LIBDRM_REQUIRED])
-+        PKG_CHECK_MODULES([DRI2PROTO], [dri2proto >= $DRI2PROTO_REQUIRED])
-+        PKG_CHECK_MODULES([GLPROTO], [glproto >= $GLPROTO_REQUIRED])
-+        GL_PC_REQ_PRIV="libdrm >= $LIBDRM_REQUIRED dri2proto >= $DRI2PROTO_REQUIRED glproto >= $GLPROTO_REQUIRED"
-+        DRI_PC_REQ_PRIV="libdrm >= $LIBDRM_REQUIRED"
-+    fi
- 
-     # find the DRI deps for libGL
-     if test "$x11_pkgconfig" = yes; then
-@@ -696,12 +705,6 @@
-     [DRI_DRIVER_SEARCH_DIR="$withval"],
-     [DRI_DRIVER_SEARCH_DIR='${DRI_DRIVER_INSTALL_DIR}'])
- AC_SUBST([DRI_DRIVER_SEARCH_DIR])
--dnl Direct rendering or just indirect rendering
--AC_ARG_ENABLE([driglx-direct],
--    [AS_HELP_STRING([--disable-driglx-direct],
--        [enable direct rendering in GLX for DRI @<:@default=enabled@:>@])],
--    [driglx_direct="$enableval"],
--    [driglx_direct="yes"])
- dnl Which drivers to build - default is chosen by platform
- AC_ARG_WITH([dri-drivers],
-     [AS_HELP_STRING([--with-dri-drivers@<:@=DIRS...@:>@],

debian/patches/06_kfreebsd-ftbfs.diff

@@ -1,23 +0,0 @@
-From: Aurelien Jarno <aurel32@debian.org>
-    
-mesa fails to build on GNU/kFreeBSD, since some parts are not enabled.
-    
-http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=524690
-
----
- configure.ac |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: mesa/configure.ac
-===================================================================
---- mesa.orig/configure.ac
-+++ mesa/configure.ac
-@@ -776,7 +776,7 @@
-             ;;
-         esac
-         ;;
--    freebsd* | dragonfly*)
-+    freebsd* | dragonfly* | kfreebsd*-gnu*)
-         DEFINES="$DEFINES -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1"
-         DEFINES="$DEFINES -DIN_DRI_DRIVER -DHAVE_ALIAS"
-         DEFINES="$DEFINES -DGLX_INDIRECT_RENDERING"

debian/patches/series

@@ -1,6 +0,0 @@
-02_use-ieee-fp-on-s390-and-m68k.patch
-03_optional-progs-and-install.patch
-04_osmesa_version.diff
-05_hurd-ftbfs.diff
-06_kfreebsd-ftbfs.diff
-07-nouveau-update.diff

debian/rules

@@ -1,315 +0,0 @@
-#!/usr/bin/make -f
-# debian/rules for the Debian mesa package
-# Copyright © 2006 Thierry Reding <thierry@gilfi.de>
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-CFLAGS = -Wall -g
-ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-	NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-	MAKEFLAGS += -j$(NUMJOBS)
-endif
-
-DEB_BUILD_ARCH     ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
-DEB_HOST_ARCH     ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-DEB_HOST_ARCH_OS     ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
-DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
-DEB_BUILD_DIR      ?= $(CURDIR)/build
-ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
-        confflags += --build=$(DEB_HOST_GNU_TYPE)
-else
-        confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
-endif
-
-# choose which configurations to build
-include debian/scripts/choose-configs
-
-# build the following configurations by default
-CONFIGS = $(SWX11_GLU_CONFIGS) \
-	  dri \
-	  osmesa \
-	  osmesa-static \
-	  osmesa16 \
-	  osmesa16-static \
-	  osmesa32 \
-	  osmesa32-static
-
-STAMP_DIR = debian/stamp
-STAMP = $(STAMP_DIR)/$(DEB_BUILD_GNU_TYPE)
-BUILD_STAMPS = $(addprefix $(STAMP)-build-, $(CONFIGS))
-
-QUILT_STAMPFN = $(STAMP_DIR)/patch
-include /usr/share/quilt/quilt.make
-
-confflags-common = \
-	--disable-glu \
-	--disable-glut \
-	--disable-glw \
-	CFLAGS="$(CFLAGS)"
-
-DRI_DRIVERS = swrast
-GALLIUM_DRIVERS = swrast
-EGL_DISPLAYS = x11
-
-# hurd doesn't do direct rendering
-ifeq ($(DEB_HOST_ARCH_OS), hurd)
-	DIRECT_RENDERING = --disable-driglx-direct
-else
-	DIRECT_RENDERING = --enable-driglx-direct
-
-  ifeq ($(DEB_HOST_ARCH_OS), linux)
-# Gallium drivers require libdrm-{nouveau,radeon}, only available on Linux
-	GALLIUM_DRIVERS += nouveau radeon
-# Although the KMS egl drivers will probably build on kfreebsd & hurd
-# only linux actually has KMS drivers implemented at this point.
-	EGL_DISPLAYS += kms
-  endif
-
-  ifeq ($(DEB_HOST_ARCH), lpia)
-	DRI_DRIVERS += i915 i965
-	GALLIUM_DRIVERS += intel
-  else ifneq ($(DEB_HOST_ARCH), s390)
-	DRI_DRIVERS += mach64 mga r128 r200 r300 r600 radeon savage tdfx
-    ifeq ($(DEB_HOST_ARCH_CPU), i386)
-	DRI_DRIVERS += i810 i915 i965 sis unichrome
-	GALLIUM_DRIVERS += intel
-    else ifeq ($(DEB_HOST_ARCH_CPU), amd64)
-	DRI_DRIVERS += i915 i965 sis unichrome
-	GALLIUM_DRIVERS += intel
-    endif
-  endif
-endif
-
-ifeq ($(HAVE_KMS), yes)
-	EGL_DISPLAYS += kms
-endif
-
-confflags-dri = \
-	--with-driver=dri \
-	--with-dri-drivers="$(DRI_DRIVERS)" \
-	--with-demos=xdemos \
-	--with-dri-driverdir=/usr/lib/dri \
-	--with-egl-displays="$(EGL_DISPLAYS)" \
-	--enable-glx-tls \
-	$(addprefix --enable-gallium-,$(GALLIUM_DRIVERS)) \
-	--with-state-trackers=egl,es,glx,dri,vega \
-	$(DIRECT_RENDERING) \
-	$(confflags-common)
-
-confflags-osmesa = \
-	--disable-egl \
-	--disable-gallium \
-	--with-driver=osmesa \
-	--with-demos= \
-	$(confflags-common)
-
-confflags-osmesa-static = \
-	--disable-egl \
-	--disable-gallium \
-	--with-driver=osmesa \
-	--enable-static \
-	--with-demos= \
-	$(confflags-common)
-
-confflags-osmesa16 = \
-	--disable-egl \
-	--disable-gallium \
-	--with-driver=osmesa \
-	--with-osmesa-bits=16 \
-	--with-demos= \
-	$(confflags-common)
-
-confflags-osmesa16-static = \
-	--disable-egl \
-	--disable-gallium \
-	--with-driver=osmesa \
-	--with-osmesa-bits=16 \
-	--enable-static \
-	--with-demos= \
-	$(confflags-common)
-
-confflags-osmesa32 = \
-	--disable-egl \
-	--disable-gallium \
-	--with-driver=osmesa \
-	--with-osmesa-bits=32 \
-	--with-demos= \
-	$(confflags-common)
-
-confflags-osmesa32-static = \
-	--disable-egl \
-	--disable-gallium \
-	--with-driver=osmesa \
-	--with-osmesa-bits=32 \
-	--enable-static \
-	--with-demos= \
-	$(confflags-common)
-
-confflags-swx11+glu = \
-	--disable-egl \
-	--disable-gallium \
-	--with-driver=xlib \
-	--disable-gl-osmesa \
-	--with-demos= \
-	--disable-egl \
-	--disable-glut \
-	--enable-motif \
-	CFLAGS="$(CFLAGS)"
-
-confflags-swx11+glu-static = \
-	--disable-egl \
-	--disable-gallium \
-	--with-driver=xlib \
-	--disable-gl-osmesa \
-	--enable-static \
-	--with-demos= \
-	--disable-egl \
-	--disable-glut \
-	--enable-motif \
-	CFLAGS="$(CFLAGS)"
-
-confflags-swx11+glu-i386-i686 = \
-	--disable-egl \
-	--disable-gallium \
-	--with-driver=xlib \
-	--disable-gl-osmesa \
-	--with-demos= \
-	--disable-glut \
-	--disable-egl \
-	--enable-motif \
-	--libdir=/usr/lib/i686/cmov \
-	CFLAGS="$(CFLAGS) -march=i686"
-
-configure: $(QUILT_STAMPFN) configure.ac
-	autoreconf -vfi
-
-# list the configurations that will built
-configs:
-	@echo Building the following configurations: $(CONFIGS)
-
-$(STAMP_DIR)/stamp:
-	dh_testdir
-	mkdir -p $(STAMP_DIR)
-	>$@
-
-$(QUILT_STAMPFN): $(STAMP_DIR)/stamp
-
-build: build-stamp
-
-build-stamp: $(BUILD_STAMPS)
-ifeq ($(findstring radeon, $(GALLIUM_DRIVERS)), radeon)
-	# Radeon searches for r{200,300,600}_dri only, but the gallium driver
-	# is (at the moment) radeong_dri.  Rename it to r300_dri, as it
-	# fails to support r600.
-	# We don't actually install radeong yet, although it will probably
-	# replace r300 classic soon.
-	mv build/dri/lib/gallium/radeong_dri.so \
-		build/dri/lib/gallium/r300_dri.so
-endif
-ifeq ($(findstring intel, $(GALLIUM_DRIVERS)), intel)
-	# Intel i965 Gallium appears to do nothing more than generate GPU 
-	# lockups.  Kill it with fire.  i915 is apparently useful.
-	rm build/dri/lib/gallium/i965_dri.so
-	rm build/dri/lib/egl_*_i965.so
-endif
-	>$@
-
-$(STAMP)-build-%: configure
-	dh_testdir
-
-	mkdir -p $(DEB_BUILD_DIR)/$*
-	find $(CURDIR)/* -maxdepth 0 -not -path '$(DEB_BUILD_DIR)*' | \
-		xargs cp -rlf -t $(DEB_BUILD_DIR)/$*
-	cd $(DEB_BUILD_DIR)/$* && \
-	../../configure --prefix=/usr --mandir=\$${prefix}/share/man \
-	             --infodir=\$${prefix}/share/info --sysconfdir=/etc \
-	             --localstatedir=/var $(confflags) $(confflags-$*)
-	cd $(DEB_BUILD_DIR)/$* && $(MAKE)
-	>$@
-
-install: build
-	# Add here commands to install the package into debian/tmp
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
-	set -e; for config in $(filter-out dri, $(CONFIGS)); do \
-		$(MAKE) -C $(DEB_BUILD_DIR)/$$config DESTDIR=$(CURDIR)/debian/tmp install; \
-	done
-	$(MAKE) -C $(DEB_BUILD_DIR)/dri DESTDIR=$(CURDIR)/debian/tmp/dri install
-
-clean: unpatch
-	dh_testdir
-	dh_testroot
-	rm -rf .pc
-	
-	rm -f config.cache config.log config.status
-	rm -f */config.cache */config.log */config.status
-	rm -f conftest* */conftest*
-	rm -rf autom4te.cache */autom4te.cache
-	rm -rf build
-	rm -rf configure config.guess config.sub config.h.in
-	rm -rf $$(find -name Makefile.in)
-	rm -rf aclocal.m4 missing depcomp install-sh ltmain.sh
-	rm -rf $(STAMP_DIR)
-	
-	dh_clean
-
-# Build architecture-independent files here.
-binary-indep: install
-
-
-# Build architecture-dependent files here.
-binary-arch: install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs -s
-	dh_installchangelogs -pmesa-common-dev
-	dh_installdocs -s
-	dh_installexamples -s
-
-	# Classic DRI and Gallium DRI are mixed up together here
-	# Remove the whole tree to avoid false-positives in --list-missing, and
-	# install the right files manually.
-	rm -r debian/tmp/dri/usr/lib/dri
-
-	dh_install -s --list-missing
-	dh_installman -s
-	dh_lintian -s
-	dh_link -s
-	dh_strip -plibgl1-mesa-swx11 --dbg-package=libgl1-mesa-swx11-dbg
-	dh_strip -plibgl1-mesa-glx --dbg-package=libgl1-mesa-glx-dbg
-	dh_strip -plibgl1-mesa-dri --dbg-package=libgl1-mesa-dri-dbg
-# Mesa 7.8 doesn't build a gallium swrast DRI driver
-# This is built in git, and will be built in 7.9
-ifneq ($(filter-out swrast, $(GALLIUM_DRIVERS)), )
-	dh_strip -plibgl1-mesa-dri-experimental --dbg-package=libgl1-mesa-dri-experimental-dbg
-endif
-	dh_strip -plibopenvg1-mesa --dbg-package=libopenvg1-mesa-dbg
-	dh_strip -plibegl1-mesa --dbg-package=libegl1-mesa-dbg
-	dh_strip -plibgles1-mesa --dbg-package=libgles1-mesa-dbg
-	dh_strip -plibgles2-mesa --dbg-package=libgles2-mesa-dbg	
-	dh_strip -plibegl1-mesa-drivers-x11 --dbg-package=libegl1-mesa-drivers-x11-dbg
-ifeq ($(findstring kms, $(EGL_DISPLAYS)), kms)
-	dh_strip -plibegl1-mesa-drivers-kms --dbg-package=libegl1-mesa-drivers-kms-dbg
-endif
-	dh_strip -s --remaining-packages
-	dh_compress -s
-	dh_fixperms -s
-	dh_makeshlibs -s
-	dh_installdeb -s
-	dh_shlibdeps -s
-	dh_gencontrol -s
-	dh_md5sums -s
-	dh_builddeb -s
-
-binary: binary-indep binary-arch
-.PHONY: configs build clean binary-indep binary-arch binary install

debian/scripts/choose-configs

@@ -1,46 +0,0 @@
-# Script to choose which configurations are to be built depending on the value
-# of the DEB_BUILD_ARCH variable.
-#
-# Copyright © 2006 Thierry Reding <thierry@gilfi.de>
-
-##############################################################################
-## architecture-specific configurations ######################################
-
-# choose an architecture-specific build of swx11 and GLU if a matching
-# configuration exists
-#ifneq ($(wildcard configs/debian-swx11+glu-$(DEB_BUILD_ARCH)),)
-#	SWX11_GLU_CONFIGS := debian-swx11+glu-$(DEB_BUILD_ARCH)
-#else
-#	SWX11_GLU_CONFIGS := debian-swx11+glu-any
-#endif
-
-# same for static builds
-#ifneq ($(wildcard configs/debian-swx11+glu-static-$(DEB_BUILD_ARCH)),)
-#	SWX11_GLU_CONFIGS += debian-swx11+glu-static-$(DEB_BUILD_ARCH)
-#else
-#	SWX11_GLU_CONFIGS += debian-swx11+glu-static-any
-#endif
-
-SWX11_GLU_CONFIGS := swx11+glu swx11+glu-static
-
-##############################################################################
-## CPU-optimized configurations ##############################################
-
-ifneq (,$(filter $(DEB_HOST_ARCH), i386 kfreebsd-i386 hurd-i386)) 
-	SWX11_GLU_CONFIGS += swx11+glu-i386-i686
-endif
-
-#ifeq ($(DEB_BUILD_ARCH), alpha)
-#	SWX11_GLU_CONFIGS += debian-swx11+glu-alpha-ev5
-#endif
-
-#ifeq ($(DEB_BUILD_ARCH), powerpc)
-#	SWX11_GLU_CONFIGS += debian-swx11+glu-powerpc-603
-#endif
-
-#ifeq ($(DEB_BUILD_ARCH), sparc)
-#	SWX11_GLU_CONFIGS += debian-swx11+glu-sparc-ultrasparc
-#endif
-
-# vim: ft=make
-