Rebased ref, commits from common ancestor:
commit 15bf49a44e62677cf2b3eb76126d6ef88d206321
Author: Cyril Brulebois <k...@debian.org>
Date: Sat Feb 5 11:16:36 2011 +0100
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index 1328431..a27cd0c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mesa (7.10-2) UNRELEASED; urgency=low
+mesa (7.10-2) unstable; urgency=low
* Fix FTBFS on i386: Add some files to debian/not-installed, on a
per-architecture fashion (those are under /usr/lib/i686/cmov/).
@@ -7,7 +7,7 @@ mesa (7.10-2) UNRELEASED; urgency=low
shouldn't be exported, but let's make it possible to build xorg-server
1.9 in sid.
- -- Cyril Brulebois <k...@debian.org> Tue, 25 Jan 2011 22:53:45 +0000
+ -- Cyril Brulebois <k...@debian.org> Sat, 05 Feb 2011 11:16:26 +0100
mesa (7.10-1) experimental; urgency=low
commit 7b1cc849b79a51e7a4428186eb5d573d3e1d0836
Author: Cyril Brulebois <k...@debian.org>
Date: Sat Feb 5 11:16:20 2011 +0100
Work around FTBFS on sparc due to new symbols.
Pass -c1 to dpkg-gensymbols instead of -c4 (on sparc only). Those
symbols probably shouldn't be exported, but let's make it possible
to build xorg-server 1.9 in sid.
diff --git a/debian/changelog b/debian/changelog
index 2cd6479..1328431 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,10 @@ mesa (7.10-2) UNRELEASED; urgency=low
* Fix FTBFS on i386: Add some files to debian/not-installed, on a
per-architecture fashion (those are under /usr/lib/i686/cmov/).
+ * Work around FTBFS on sparc due to new symbols: pass -c1 to
+ dpkg-gensymbols instead of -c4 (on sparc only). Those symbols probably
+ shouldn't be exported, but let's make it possible to build xorg-server
+ 1.9 in sid.
-- Cyril Brulebois <k...@debian.org> Tue, 25 Jan 2011 22:53:45 +0000
diff --git a/debian/rules b/debian/rules
index 6c31509..38b567b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -299,7 +299,12 @@ binary-arch: install
-pmesa-common-dev
dh_compress -s
dh_fixperms -s
+ifneq ($(DEB_HOST_ARCH), sparc)
dh_makeshlibs -s -- -c4
+else
+ # Temporarily work around FTBFS on sparc, ignore new symbols:
+ dh_makeshlibs -s -- -c1
+endif
dh_installdeb -s
dh_shlibdeps -s
dh_gencontrol -s
commit 06510fbcb846b6a49a2992085ad878b60bf40fab
Author: Cyril Brulebois <k...@debian.org>
Date: Tue Jan 25 23:44:05 2011 +0000
Use wildcards to avoid specifying the versions, and sort.
diff --git a/debian/not-installed b/debian/not-installed
index 48f257b..b052f8a 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -29,12 +29,12 @@ NOT_INSTALLED := \
# Architecture-specific additional files:
NOT_INSTALLED_i386 = \
usr/lib/i686/cmov/libGL.so \
- usr/lib/i686/cmov/libGLw.so.1 \
- usr/lib/i686/cmov/libGLw.so \
usr/lib/i686/cmov/libGLU.so \
- usr/lib/i686/cmov/libGLU.so.1.3.071000 \
- usr/lib/i686/cmov/libGLw.so.1.0.0 \
usr/lib/i686/cmov/libGLU.so.1 \
+ usr/lib/i686/cmov/libGLU.so.1.* \
+ usr/lib/i686/cmov/libGLw.so \
+ usr/lib/i686/cmov/libGLw.so.1 \
+ usr/lib/i686/cmov/libGLw.so.1.* \
usr/lib/i686/cmov/pkgconfig/glw.pc \
usr/lib/i686/cmov/pkgconfig/glu.pc \
usr/lib/i686/cmov/pkgconfig/gl.pc \
commit b4f6780128ff60fb4b25dbef0626530978683b1f
Author: Cyril Brulebois <k...@debian.org>
Date: Tue Jan 25 22:58:14 2011 +0000
Fix FTBFS on i386: Add some files to debian/not-installed.
Do that on a per-architecture fashion (those are under
/usr/lib/i686/cmov/).
diff --git a/debian/changelog b/debian/changelog
index bd8e383..2cd6479 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mesa (7.10-2) UNRELEASED; urgency=low
+
+ * Fix FTBFS on i386: Add some files to debian/not-installed, on a
+ per-architecture fashion (those are under /usr/lib/i686/cmov/).
+
+ -- Cyril Brulebois <k...@debian.org> Tue, 25 Jan 2011 22:53:45 +0000
+
mesa (7.10-1) experimental; urgency=low
* New upstream release.
diff --git a/debian/not-installed b/debian/not-installed
index 47ff8af..48f257b 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -1,5 +1,7 @@
# Keep track of files we don't install:
-NOT_INSTALLED = \
+
+# Common list:
+NOT_INSTALLED := \
dri/usr/include/GL/glfbdev.h \
dri/usr/include/GL/glu.h \
dri/usr/include/GL/glu_mangle.h \
@@ -23,3 +25,20 @@ NOT_INSTALLED = \
usr/include/GL/vms_x_fix.h \
usr/include/GL/wglext.h \
usr/include/GL/wmesa.h
+
+# Architecture-specific additional files:
+NOT_INSTALLED_i386 = \
+ usr/lib/i686/cmov/libGL.so \
+ usr/lib/i686/cmov/libGLw.so.1 \
+ usr/lib/i686/cmov/libGLw.so \
+ usr/lib/i686/cmov/libGLU.so \
+ usr/lib/i686/cmov/libGLU.so.1.3.071000 \
+ usr/lib/i686/cmov/libGLw.so.1.0.0 \
+ usr/lib/i686/cmov/libGLU.so.1 \
+ usr/lib/i686/cmov/pkgconfig/glw.pc \
+ usr/lib/i686/cmov/pkgconfig/glu.pc \
+ usr/lib/i686/cmov/pkgconfig/gl.pc \
+
+# Detect the current architecture and add the files if any:
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+NOT_INSTALLED += $(NOT_INSTALLED_$(DEB_HOST_ARCH))
commit 667c9b2334a798b6d07b252e92195861357c2ff5
Author: Cyril Brulebois <k...@debian.org>
Date: Tue Jan 25 00:21:38 2011 +0100
Upload to experimental.
diff --git a/debian/changelog b/debian/changelog
index 5915b75..bd8e383 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mesa (7.10-1) UNRELEASED; urgency=low
+mesa (7.10-1) experimental; urgency=low
* New upstream release.
* Add patch: 10-fix-talloc-linking.diff
@@ -23,7 +23,7 @@ mesa (7.10-1) UNRELEASED; urgency=low
aren't in the release tarballs, and make dpkg-source error out.
* Keep my eyes wide shut and add myself to Uploaders.
- -- Cyril Brulebois <k...@debian.org> Sat, 22 Jan 2011 03:14:03 +0000
+ -- Cyril Brulebois <k...@debian.org> Tue, 25 Jan 2011 00:20:57 +0100
mesa (7.9+repack-2) experimental; urgency=low
commit f307107e39b5cc84606fe97889677e6f1fbaf5a8
Author: Cyril Brulebois <k...@debian.org>
Date: Tue Jan 25 00:20:54 2011 +0100
Keep my eyes wide shut and add myself to Uploaders.
diff --git a/debian/changelog b/debian/changelog
index 4aa4c12..5915b75 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,7 @@ mesa (7.10-1) UNRELEASED; urgency=low
That's boring, but avoid getting non-stripped packages.
* Add debian/git-cleanup.sh script to ease removing files in git which
aren't in the release tarballs, and make dpkg-source error out.
+ * Keep my eyes wide shut and add myself to Uploaders.
-- Cyril Brulebois <k...@debian.org> Sat, 22 Jan 2011 03:14:03 +0000
diff --git a/debian/control b/debian/control
index ab88cc1..38bfcf7 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: mesa
Section: graphics
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusi...@debian.org>, Brice Goglin
<bgog...@debian.org>
+Uploaders: David Nusinow <dnusi...@debian.org>, Brice Goglin
<bgog...@debian.org>, Cyril Brulebois <k...@debian.org>
Standards-Version: 3.8.4
Build-Depends: debhelper (>= 7.2.7), quilt (>= 0.40), pkg-config,
libdrm-dev (>= 2.4.23) [!hurd-i386], libx11-dev, xutils-dev,
commit 713a532c13e2a7b1f827587f499be2ff9b0ed2fd
Author: Cyril Brulebois <k...@debian.org>
Date: Tue Jan 25 00:16:52 2011 +0100
Revert "Update this list with new files."
This reverts commit d7b2caedf37335ec4d6c222559bab12e5e51cb74.
Those files are only in git, not in the released tarballs, so they don't
show up in the list of files which aren't installed, since we cleaned up
git to match the tarball's contents.
Conflicts:
debian/changelog
diff --git a/debian/changelog b/debian/changelog
index aa2d716..4aa4c12 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,6 @@ mesa (7.10-1) UNRELEASED; urgency=low
* Use debian/not-installed to keep track of files which aren't getting
installed for now. Delete them before running dh_install. Use the list
of files appearing in the build logs for 7.9+repack-2.
- * Update this list with new files, until we decide what to do with
- those: {,dri/}usr/include/GL/glut{,f90}.h
* Switch from --list-missing to --fail-missing accordingly.
* Pass -c4 to dpkg-gensymbols through dh_makeshlibs to make sure
symbol-related changes are noticed and dealt with.
diff --git a/debian/not-installed b/debian/not-installed
index 8ae7004..47ff8af 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -3,8 +3,6 @@ NOT_INSTALLED = \
dri/usr/include/GL/glfbdev.h \
dri/usr/include/GL/glu.h \
dri/usr/include/GL/glu_mangle.h \
- dri/usr/include/GL/glutf90.h \
- dri/usr/include/GL/glut.h \
dri/usr/include/GL/mesa_wgl.h \
dri/usr/include/GL/osmesa.h \
dri/usr/include/GL/vms_x_fix.h \
@@ -16,8 +14,6 @@ NOT_INSTALLED = \
usr/include/GL/glfbdev.h \
usr/include/GL/gl.h \
usr/include/GL/gl_mangle.h \
- usr/include/GL/glutf90.h \
- usr/include/GL/glut.h \
usr/include/GL/GLwDrawAP.h \
usr/include/GL/GLwMDrawAP.h \
usr/include/GL/glxext.h \
commit 90537fdb52f48e3194905f44e288ce62d79f4025
Author: Cyril Brulebois <k...@debian.org>
Date: Mon Jan 24 23:56:58 2011 +0100
Commit git clean-up.
diff --git a/.emacs-dirvars b/.emacs-dirvars
deleted file mode 100644
index 33945f9..0000000
--- a/.emacs-dirvars
+++ /dev/null
@@ -1,10 +0,0 @@
-;; -*- emacs-lisp -*-
-;;
-;; This file is processed by the dirvars emacs package. Each variable
-;; setting below is performed when this dirvars file is loaded.
-;;
-indent-tabs-mode: nil
-tab-width: 8
-c-basic-offset: 3
-kde-emacs-after-parent-string: ""
-evaluate: (c-set-offset 'inline-open '0)
diff --git a/.gitattributes b/.gitattributes
deleted file mode 100644
index 23c6280..0000000
--- a/.gitattributes
+++ /dev/null
@@ -1,4 +0,0 @@
-*.dsp -crlf
-*.dsw -crlf
-*.sln -crlf
-*.vcproj -crlf
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index e48dd3b..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,28 +0,0 @@
-*.a
-*.dll
-*.exe
-*.ilk
-*.o
-*.obj
-*.os
-*.pc
-*.pdb
-*.pyc
-*.pyo
-*.so
-*.sw[a-z]
-*~
-depend
-depend.bak
-lib
-lib64
-configure
-autom4te.cache
-aclocal.m4
-config.log
-config.status
-cscope*
-.scon*
-config.py
-build
-.dir-locals.el
diff --git a/SConstruct b/SConstruct
deleted file mode 100644
index 8880d85..0000000
--- a/SConstruct
+++ /dev/null
@@ -1,132 +0,0 @@
-#######################################################################
-# Top-level SConstruct
-#
-# For example, invoke scons as
-#
-# scons build=debug llvm=yes machine=x86
-#
-# to set configuration variables. Or you can write those options to a file
-# named config.py:
-#
-# # config.py
-# build='debug'
-# llvm=True
-# machine='x86'
-#
-# Invoke
-#
-# scons -h
-#
-# to get the full list of options. See scons manpage for more info.
-#
-
-import os
-import os.path
-import sys
-import SCons.Util
-
-import common
-
-#######################################################################
-# Configuration options
-
-opts = Variables('config.py')
-common.AddOptions(opts)
-
-env = Environment(
- options = opts,
- tools = ['gallium'],
- toolpath = ['#scons'],
- ENV = os.environ,
-)
-
-# Backwards compatability with old target configuration variable
-try:
- targets = ARGUMENTS['targets']
-except KeyError:
- pass
-else:
- targets = targets.split(',')
- print 'scons: warning: targets option is deprecated; pass the targets on
their own such as'
- print
- print ' scons %s' % ' '.join(targets)
- print
- COMMAND_LINE_TARGETS.append(targets)
-
-
-Help(opts.GenerateHelpText(env))
-
-
-#######################################################################
-# Environment setup
-
-# Includes
-env.Prepend(CPPPATH = [
- '#/include',
-])
-env.Append(CPPPATH = [
- '#/src/gallium/include',
- '#/src/gallium/auxiliary',
- '#/src/gallium/drivers',
- '#/src/gallium/winsys',
-])
-
-if env['msvc']:
- env.Append(CPPPATH = ['#include/c99'])
-
-# Embedded
-if env['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 env['platform'] in ('posix', 'linux', 'freebsd', 'darwin'):
- env.Append(CPPDEFINES = [
- '_POSIX_SOURCE',
- ('_POSIX_C_SOURCE', '199309L'),
- '_SVID_SOURCE',
- '_BSD_SOURCE',
- '_GNU_SOURCE',
- 'PTHREADS',
- 'HAVE_POSIX_MEMALIGN',
- ])
- if env['gcc']:
- env.Append(CFLAGS = ['-fvisibility=hidden'])
- if env['platform'] == 'darwin':
- env.Append(CPPDEFINES = ['_DARWIN_C_SOURCE'])
- env.Append(LIBS = [
- 'm',
- 'pthread',
- 'dl',
- ])
-
-# for debugging
-#print env.Dump()
-
-Export('env')
-
-
-#######################################################################
-# Invoke SConscripts
-
-# TODO: Build several variants at the same time?
-# http://www.scons.org/wiki/SimultaneousVariantBuilds
-
-SConscript(
- 'src/SConscript',
- variant_dir = env['build_dir'],
- duplicate = 0 # http://www.scons.org/doc/0.97/HTML/scons-user/x2261.html
-)
-
diff --git a/autogen.sh b/autogen.sh
deleted file mode 100755
index c76bf8b..0000000
--- a/autogen.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#! /bin/sh
-
-srcdir=`dirname "$0"`
-test -z "$srcdir" && srcdir=.
-
-SRCDIR=`(cd "$srcdir" && pwd)`
-ORIGDIR=`pwd`
-
-if test "x$SRCDIR" != "x$ORIGDIR"; then
- echo "Mesa cannot be built when srcdir != builddir" 1>&2
- exit 1
-fi
-
-MAKEFLAGS=""
-
-autoreconf -v --install || exit 1
-
-"$srcdir"/configure "$@"
diff --git a/bin/confdiff.sh b/bin/confdiff.sh
deleted file mode 100755
index 568fcd6..0000000
--- a/bin/confdiff.sh
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/bash -e
-
-usage()
-{
- echo "Usage: $0 <target1> <target2>"
- echo "Highlight differences between Mesa configs"
- echo "Example:"
- echo " $0 linux linux-x86"
-}
-
-die()
-{
- echo "$@" >&2
- return 1
-}
-
-case "$1" in
--h|--help) usage; exit 0;;
-esac
-
-[ $# -lt 2 ] && die 2 targets needed. See $0 --help
-target1=$1
-target2=$2
-
-topdir=$(cd "`dirname $0`"/..; pwd)
-cd "$topdir"
-
-[ -f "./configs/$target1" ] || die Missing configs/$target1
-[ -f "./configs/$target2" ] || die Missing configs/$target2
-
-trap 'rm -f "$t1" "$t2"' 0
-
-t1=$(mktemp)
-t2=$(mktemp)
-
-make -f- -n -p <<EOF | sed '/^# Not a target/,/^$/d' > $t1
-TOP = .
-include \$(TOP)/configs/$target1
-default:
-EOF
-
-make -f- -n -p <<EOF | sed '/^# Not a target/,/^$/d' > $t2
-TOP = .
-include \$(TOP)/configs/$target2
-default:
-EOF
-
-diff -pu -I'^#' $t1 $t2
diff --git a/bin/installmesa b/bin/installmesa
deleted file mode 100755
index 1e24c05..0000000
--- a/bin/installmesa
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/bin/sh
-
-#
-# Simple shell script for installing Mesa's header and library files.
-# If the copy commands below don't work on a particular system (i.e. the
-# -f or -d flags), we may need to branch on `uname` to do the right thing.
-#
-
-
-TOP=.
-
-INCLUDE_DIR="/usr/local/include"
-LIB_DIR="/usr/local/lib"
-
-if [ "x$#" = "x0" ] ; then
-echo
-echo "***** Mesa installation - You may need root privileges to do this *****"
-echo
-echo "Default directory for header files is:" ${INCLUDE_DIR}
-echo "Enter new directory or press <Enter> to accept this default."
-
-read INPUT
-if [ "x${INPUT}" != "x" ] ; then
- INCLUDE_DIR=${INPUT}
-fi
-
-echo
-echo "Default directory for library files is:" ${LIB_DIR}
-echo "Enter new directory or press <Enter> to accept this default."
-
-read INPUT
-if [ "x${INPUT}" != "x" ] ; then
- LIB_DIR=${INPUT}
-fi
-
-echo
-echo "About to install Mesa header files (GL/*.h) in: " ${INCLUDE_DIR}/GL
-echo "and Mesa library files (libGL.*, etc) in: " ${LIB_DIR}
-echo "Press <Enter> to continue, or <ctrl>-C to abort."
-
-read INPUT
-
-else
-INCLUDE_DIR=$1/include
-LIB_DIR=$1/lib
-fi
-
-# flags:
-# -f = force
-# -d = preserve symlinks (does not work on BSD)
-
-if [ `uname` = "FreeBSD" ] ; then
- CP_FLAGS="-f"
-elif [ `uname` = "Darwin" ] ; then
- CP_FLAGS="-f"
-elif [ `uname` = "AIX" ] ; then
- CP_FLAGS="-fh"
-else
- CP_FLAGS="-fd"
-fi
-
-
-set -v
-
-mkdir -p ${INCLUDE_DIR}
-mkdir -p ${INCLUDE_DIR}/GL
-# NOT YET: mkdir -p ${INCLUDE_DIR}/GLES
-mkdir -p ${LIB_DIR}
-cp -f ${TOP}/include/GL/*.h ${INCLUDE_DIR}/GL
-cp -f ${TOP}/src/glw/*.h ${INCLUDE_DIR}/GL
-# NOT YET: cp -f ${TOP}/include/GLES/*.h ${INCLUDE_DIR}/GLES
-cp ${CP_FLAGS} ${TOP}/lib*/lib* ${LIB_DIR}
-
-echo "Done."
diff --git a/common.py b/common.py
deleted file mode 100644
index 78e2d0f..0000000
--- a/common.py
+++ /dev/null
@@ -1,94 +0,0 @@
-#######################################################################
-# Common SCons code
-
-import os
-import os.path
-import re
-import subprocess
-import sys
-import platform as _platform
-
-import SCons.Script.SConscript
-
-
-#######################################################################
-# Defaults
-
-_platform_map = {
- 'linux2': 'linux',
- 'win32': 'windows',
-}
-
-default_platform = sys.platform
-default_platform = _platform_map.get(default_platform, default_platform)
-
-# Search sys.argv[] for a "platform=foo" argument since we don't have
-# an 'env' variable at this point.
-if 'platform' in SCons.Script.ARGUMENTS:
- selected_platform = SCons.Script.ARGUMENTS['platform']
-else:
- selected_platform = default_platform
-
-cross_compiling = selected_platform != default_platform
-
-_machine_map = {
- 'x86': 'x86',
- 'i386': 'x86',
- 'i486': 'x86',
- 'i586': 'x86',
- 'i686': 'x86',
- 'ppc' : 'ppc',
- 'x86_64': 'x86_64',
-}
-
-
-# find default_machine value
-if 'PROCESSOR_ARCHITECTURE' in os.environ:
- default_machine = os.environ['PROCESSOR_ARCHITECTURE']
-else:
- default_machine = _platform.machine()
-default_machine = _machine_map.get(default_machine, 'generic')
-default_toolchain = 'default'
-
-if selected_platform == 'windows' and cross_compiling:
- default_machine = 'x86'
- default_toolchain = 'crossmingw'
-
-
-# find default_llvm value
-if 'LLVM' in os.environ:
- default_llvm = 'yes'
-else:
- default_llvm = 'no'
- try:
- if selected_platform != 'windows' and \
- subprocess.call(['llvm-config', '--version'],
stdout=subprocess.PIPE) == 0:
- default_llvm = 'yes'
- except:
- pass
-
-
-#######################################################################
-# Common options
-
-def AddOptions(opts):
- try:
- from SCons.Variables.BoolVariable import BoolVariable as
BoolOption
- except ImportError:
- from SCons.Options.BoolOption import BoolOption
- try:
- from SCons.Variables.EnumVariable import EnumVariable as
EnumOption
- except ImportError:
- from SCons.Options.EnumOption import EnumOption
- opts.Add(EnumOption('build', 'build type', 'debug',
- allowed_values=('debug', 'checked', 'profile',
'release')))
- opts.Add(BoolOption('quiet', 'quiet command lines', 'yes'))
- 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', 'cygwin', 'sunos5', 'freebsd8')))
- opts.Add('toolchain', 'compiler toolchain', default_toolchain)
- opts.Add(BoolOption('llvm', 'use LLVM', default_llvm))
- opts.Add(BoolOption('debug', 'DEPRECATED: debug build', 'yes'))
- opts.Add(BoolOption('profile', 'DEPRECATED: profile build', 'no'))
- opts.Add(EnumOption('MSVS_VERSION', 'MS Visual C++ version', None,
allowed_values=('7.1', '8.0', '9.0')))
diff --git a/configs/.gitignore b/configs/.gitignore
deleted file mode 100644
index 97ac5b7..0000000
--- a/configs/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-current
-autoconf
diff --git a/docs/GL3.txt b/docs/GL3.txt
deleted file mode 100644
index fb22739..0000000
--- a/docs/GL3.txt
+++ /dev/null
@@ -1,114 +0,0 @@
-
-Status of OpenGL 3.x features in Mesa
-
-
-Note: when an item is marked as "DONE" it means all the core Mesa
-infrastructure is complete but it may be the case that few (if any) drivers
-implement the features.
-
-
-Feature Status
------------------------------------------------------ ------------------------
-
-GL 3.0:
-
-GLSL changes (GL_EXT_gpu_shader4, etc) not started
-Conditional rendering (GL_NV_conditional_render) DONE (swrast & softpipe)
-Map buffer subranges (GL_ARB_map_buffer_range) DONE
-Float textures, renderbuffers some infrastructure done
- (incl. GL_EXT_packed_float, GL_EXT_shared_exponent)
-Framebuffer objects (GL_EXT_framebuffer_object) DONE
-Half-float some infrastructure done
-Multisample blit DONE
-Non-normalized Integer texture/framebuffer formats ~50% done
-1D/2D Texture arrays core Mesa, swrast done
-Packed depth/stencil formats DONE
-Per-buffer blend and masks (GL_EXT_draw_buffers2) DONE
-GL_EXT_texture_compression_rgtc not started
-Red and red/green texture formats DONE (swrast, i965,
gallium)
-Transform feedback (GL_EXT_transform_feedback) ~50% done
- glBindFragDataLocation, glGetFragDataLocation,
- glBindBufferRange, glBindBufferBase commands
-Vertex array objects (GL_APPLE_vertex_array_object) DONE
-sRGB framebuffer format (GL_EXT_framebuffer_sRGB) not started
-glClearBuffer commands DONE
-glGetStringi command DONE
-glTexParameterI, glGetTexParameterI commands DONE
-glVertexAttribI commands DONE (but converts int
- values to floats)
-
-
-GL 3.1:
-
-GLSL 1.30 and 1.40 not started
-Instanced drawing (GL_ARB_draw_instanced) ~50% done
-Buffer copying (GL_ARB_copy_buffer) DONE
-Primitive restart (GL_NV_primitive_restart) DONE (gallium)
-16 vertex texture image units not started
-Texture buffer objs (GL_ARB_texture_buffer_object) not started
-Rectangular textures (GL_ARB_texture_rectangle) DONE
-Uniform buffer objs (GL_ARB_uniform_buffer_object) not started
-Signed normalized texture formats ~50% done
-
-
-GL 3.2:
-
-Core/compatibility profiles not started
-GLSL 1.50 not started
-Geometry shaders (GL_ARB_geometry_shader4) partially done (Zack)
-BGRA vertex order (GL_ARB_vertex_array_bgra) DONE
-Base vertex offset(GL_ARB_draw_elements_base_vertex) DONE
-Frag shader coord (GL_ARB_fragment_coord_conventions) DONE (swrast, gallium)
-Provoking vertex (GL_ARB_provoking_vertex) DONE
-Seamless cubemaps (GL_ARB_seamless_cube_map) DONE, mostly?
-Multisample textures (GL_ARB_texture_multisample) not started
-Frag depth clamp (GL_ARB_depth_clamp) DONE
-Fence objects (GL_ARB_sync) DONE
-
-
-GL 3.3:
-
-GLSL 3.30 not started
-GL_ARB_blend_func_extended not started
-GL_ARB_explicit_attrib_location DONE (swrast, i915, i965)
-GL_ARB_occlusion_query2 not started
-GL_ARB_sampler_objects not started
-GL_ARB_texture_rgb10_a2ui not started
-GL_ARB_texture_swizzle DONE (same as EXT
version)
-GL_ARB_timer_query DONE (only Xlib sw
driver)
-GL_ARB_instanced_arrays not started
-GL_ARB_vertex_type_2_10_10_10_rev not started
-
-
-GL 4.0:
-
-GLSL 4.0 not started
-GL_ARB_texture_query_lod not started
-GL_ARB_draw_buffers_blend not started
-GL_ARB_draw_indirect not started
-GL_ARB_gpu_shader_fp64 not started
-GL_ARB_sample_shading not started
-GL_ARB_shader_subroutine not started
-GL_ARB_tessellation_shader not started
-GL_ARB_texture_buffer_object_rgb32 not started
-GL_ARB_texture_cube_map_array not started
-GL_ARB_texture_gather not started
-GL_ARB_transform_feedback2 not started
-GL_ARB_transform_feedback3 not started
-
-
-GL 4.1:
-
-GLSL 4.1 not started
-GL_ARB_ES2_compatibility not started
-GL_ARB_get_program_binary not started
-GL_ARB_separate_shader_objects some infrastructure done
-GL_ARB_shader_precision not started
-GL_ARB_vertex_attrib_64bit not started
-GL_ARB_viewport_array not started
-
-
-
-
-More info about these features and the work involved can be found at
-http://dri.freedesktop.org/wiki/MissingFunctionality
diff --git a/docs/OLD/MESA_packed_depth_stencil.spec
b/docs/OLD/MESA_packed_depth_stencil.spec
deleted file mode 100644
index 112b730..0000000
--- a/docs/OLD/MESA_packed_depth_stencil.spec
+++ /dev/null
@@ -1,230 +0,0 @@
-Name
-
- MESA_packed_depth_stencil
-
-Name Strings
-
- GL_MESA_packed_depth_stencil
-
-Contact
-
- Keith Whitwell, VA Linux Systems Inc. (keithw 'at' valinux.com)
- Brian Paul, VA Linux Systems Inc. (brianp 'at' valinux.com)
-
-Status
-
- Obsolete.
-
-Version
-
-
-Number
-
- ???
-
-Dependencies
-
- EXT_abgr affects the definition of this extension
- SGIS_texture4D affects the definition of this extension
- EXT_cmyka affects the definition of this extension
- ARB_packed_pixels affects the definition of this extension
-
-Overview
-
- Provides a mechanism for DrawPixels and ReadPixels to efficiently
- transfer depth and stencil image data. Specifically, we defined new
- packed pixel formats and types which pack both stencil and depth
- into one value.
-
-Issues:
-
- 1. Is this the right way to distinguish between 24/8 and 8/24
- pixel formats? Should we instead provide both:
-
- GL_DEPTH_STENCIL_MESA
- GL_STENCIL_DEPTH_MESA
-
- And perhaps just use GL_UNSIGNED_INT, GL_UNSIGNED_SHORT ?
-
- 2. If not, is it correct to use _REV to indicate that stencil
- preceeds depth in the 1_15 and 8_24 formats?
-
- 3. Do we really want the GL_UNSIGNED_SHORT formats?
-
-
-New Procedures and Functions
-
- None.
-
-New Tokens
-
- Accepted by the <format> parameter of ReadPixels and DrawPixels:
-
- GL_DEPTH_STENCIL_MESA 0x8750
-
- Accepted by the <type> parameter of ReadPixels and DrawPixels:
-
- GL_UNSIGNED_INT_24_8_MESA 0x8751
- GL_UNSIGNED_INT_8_24_REV_MESA 0x8752
- GL_UNSIGNED_SHORT_15_1_MESA 0x8753
- GL_UNSIGNED_SHORT_1_15_REV_MESA 0x8754
-
-Additions to Chapter 2 of the 1.1 Specification (OpenGL Operation)
-
- None
-
-Additions to Chapter 3 of the 1.1 Specification (Rasterization)
-
- One entry is added to table 3.5 (DrawPixels and ReadPixels formats).
- The new table is:
-
- Target
- Format Name Buffer Element Meaning and Order
- ----------- ------ -------------------------
- COLOR_INDEX Color Color index
- STENCIL_INDEX Stencil Stencil index
- DEPTH_COMPONENT Depth Depth component
- RED Color R component
- GREEN Color G component
- BLUE Color B component
- ALPHA Color A component
- RGB Color R, G, B components
- RGBA Color R, G, B, A components
- BGRA Color B, G, R, A components
- ABGR_EXT Color A, B, G, R components
- CMYK_EXT Color Cyan, Magenta, Yellow, Black components
- CMYKA_EXT Color Cyan, Magenta, Yellow, Black, A components
- LUMINANCE Color Luminance component
- LUMINANCE_ALPHA Color Luminance, A components
- DEPTH_STENCIL Depth, Depth component, stencil index.
- Stencil
-
- Table 3.5: DrawPixels and ReadPixels formats. The third column
- gives a description of and the number and order of elements in a
- group.
-
- Add to the description of packed pixel formats:
-
- <type> Parameter Data of Matching
- Token Name Type Elements Pixel Formats
- ---------------- ---- -------- -------------
-
- UNSIGNED_BYTE_3_3_2 ubyte 3 RGB
- UNSIGNED_BYTE_2_3_3_REV ubyte 3 RGB
- UNSIGNED_SHORT_5_6_5 ushort 3 RGB
- UNSIGNED_SHORT_5_6_5_REV ushort 3 RGB
- UNSIGNED_SHORT_4_4_4_4 ushort 4
RGBA,BGRA,ABGR_EXT,CMYK_EXT
- UNSIGNED_SHORT_4_4_4_4_REV ushort 4 RGBA,BGRA
- UNSIGNED_SHORT_5_5_5_1 ushort 4
RGBA,BGRA,ABGR_EXT,CMYK_EXT
- UNSIGNED_SHORT_1_5_5_5_REV ushort 4 RGBA,BGRA
- UNSIGNED_INT_8_8_8_8 uint 4
RGBA,BGRA,ABGR_EXT,CMYK_EXT
- UNSIGNED_INT_8_8_8_8_REV uint 4 RGBA,BGRA
- UNSIGNED_INT_10_10_10_2 uint 4
RGBA,BGRA,ABGR_EXT,CMYK_EXT
- UNSIGNED_INT_2_10_10_10_REV uint 4 RGBA,BGRA
- UNSIGNED_SHORT_15_1_MESA ushort 2 DEPTH_STENCIL_MESA
- UNSIGNED_SHORT_1_15_REV_MESA ushort 2 DEPTH_STENCIL_MESA
- UNSIGNED_SHORT_24_8_MESA ushort 2 DEPTH_STENCIL_MESA
- UNSIGNED_SHORT_8_24_REV_MESA ushort 2 DEPTH_STENCIL_MESA
-
- UNSIGNED_INT_8_24:
-
- 31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10
9 8 7 6 5 4 3 2 1 0
-
+-----------------------+-----------------------------------------------------------------------+
- | |
|
-
+-----------------------+-----------------------------------------------------------------------+
-
- first second
- element element
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1plizs-00087b...@alioth.debian.org
