mesa: Changes to 'debian-unstable'
Makefile | 8
configs/debian-default | 17
configs/debian-dri-amd64 | 9
configs/debian-dri-any | 9
configs/debian-dri-default | 36 -
configs/debian-dri-i386 | 9
configs/debian-dri-i386-i686 | 14
configs/debian-dri-optimized-default | 13
configs/debian-indirect-default | 7
configs/debian-indirect-hurd-i386 | 9
configs/debian-osmesa | 9
configs/debian-osmesa-default | 10
configs/debian-osmesa-static | 9
configs/debian-osmesa16 | 10
configs/debian-osmesa16-static | 10
configs/debian-osmesa32 | 10
configs/debian-osmesa32-static | 10
configs/debian-swx11+glu-alpha-ev5 | 12
configs/debian-swx11+glu-amd64 | 10
configs/debian-swx11+glu-any | 9
configs/debian-swx11+glu-default | 14
configs/debian-swx11+glu-i386 | 10
configs/debian-swx11+glu-i386-i686 | 14
configs/debian-swx11+glu-powerpc-603 | 13
configs/debian-swx11+glu-ppc64 | 11
configs/debian-swx11+glu-sparc | 10
configs/debian-swx11+glu-sparc-ultrasparc | 13
configs/debian-swx11+glu-static-amd64 | 10
configs/debian-swx11+glu-static-any | 10
configs/debian-swx11+glu-static-i386 | 10
configs/debian-swx11+glu-static-ppc64 | 11
configs/default | 2
configs/default-bp | 75 --
configs/linux-dri-bp | 55 -
configs/linux-osmesa-static | 14
configs/linux-osmesa32-static | 28
configs/linux-tcc | 22
debian/changelog | 11
debian/patches/04_cleanup-osmesa-configs.patch | 197 -----
debian/patches/04_debian-configs.patch | 892 +++++++++++++++++++++++++
debian/patches/series | 2
docs/relnotes-7.0.4.html | 2
src/glu/sgi/libutil/quad.c | 4
src/mesa/Makefile | 3
src/mesa/drivers/dri/i965/intel_batchbuffer.h | 2
src/mesa/drivers/glide/fxddspan.c | 3
src/mesa/drivers/glide/fxddtex.c | 4
src/mesa/drivers/glide/fxg.c | 14
src/mesa/drivers/glide/fxsetup.c | 3
src/mesa/drivers/glide/fxtris.c | 17
src/mesa/drivers/glide/fxvbtmp.h | 5
src/mesa/drivers/x11/xm_glide.c | 3
src/mesa/main/version.h | 6
src/mesa/shader/slang/slang_emit.c | 2
src/mesa/sources | 3
src/mesa/swrast/s_context.c | 2
src/mesa/swrast/s_context.h | 1
src/mesa/swrast/s_zoom.c | 33
src/mesa/x86/Makefile | 2
59 files changed, 984 insertions(+), 779 deletions(-)
New commits:
commit 5033e5b36d192fec0bfcb557ec12ac6ed1519f63
Author: Brice Goglin <bgoglin@debian.org>
Date: Tue Jun 17 20:01:01 2008 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 7b51f1d..e91a66d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mesa (7.0.3-3) UNRELEASED; urgency=low
+mesa (7.0.3-3) unstable; urgency=low
* Pull from mesa_7_0_branch (718724de).
+ Fix intel_batchbuffer_space on i965, closes: #455817.
@@ -7,7 +7,7 @@ mesa (7.0.3-3) UNRELEASED; urgency=low
with 04_cleanup-osmesa-configs.patch renamed into 04_debian-configs.patch,
closes: #485161.
- -- Brice Goglin <bgoglin@debian.org> Tue, 17 Jun 2008 20:00:04 +0200
+ -- Brice Goglin <bgoglin@debian.org> Tue, 17 Jun 2008 20:00:51 +0200
mesa (7.0.3-2) unstable; urgency=low
commit 6a6a9c1c5a915297f0b37b810a0ab8801d3b07a1
Author: Brice Goglin <bgoglin@debian.org>
Date: Tue Jun 17 20:00:37 2008 +0200
Pull from mesa_7_0_branch
diff --git a/debian/changelog b/debian/changelog
index c156963..7b51f1d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,13 @@
mesa (7.0.3-3) UNRELEASED; urgency=low
+ * Pull from mesa_7_0_branch (718724de).
+ + Fix intel_batchbuffer_space on i965, closes: #455817.
+ + Fix busy error in i915_wait_irq for real now, closes: #467319.
* Move our configs/ changes from the .diff.gz into our quilt patches,
with 04_cleanup-osmesa-configs.patch renamed into 04_debian-configs.patch,
closes: #485161.
- -- Brice Goglin <bgoglin@debian.org> Tue, 17 Jun 2008 19:31:32 +0200
+ -- Brice Goglin <bgoglin@debian.org> Tue, 17 Jun 2008 20:00:04 +0200
mesa (7.0.3-2) unstable; urgency=low
commit 03970183fc9998bcdee9389830493a0b2dcda8d2
Author: Brice Goglin <bgoglin@debian.org>
Date: Tue Jun 17 19:31:28 2008 +0200
Move our configs/ changes from the .diff.gz into our quilt patches
with 04_cleanup-osmesa-configs.patch renamed into 04_debian-configs.patch
diff --git a/configs/debian-default b/configs/debian-default
deleted file mode 100644
index 8d1b785..0000000
--- a/configs/debian-default
+++ /dev/null
@@ -1,17 +0,0 @@
-# Define Debian-specific defaults.
-
-CONFIG_NAME = debian-default
-
-OPT_FLAGS = -O2 -g
-
-# override settings in configs/linux-x86-64
-LIB_DIR = lib
-EXTRA_LIB_PATH =
-
-SRC_DIRS = mesa
-PROGRAM_DIRS =
-
-INSTALL_DIR = /usr
-
-# vim: ft=make
-
diff --git a/configs/debian-dri-amd64 b/configs/debian-dri-amd64
deleted file mode 100644
index ff4232b..0000000
--- a/configs/debian-dri-amd64
+++ /dev/null
@@ -1,9 +0,0 @@
-# Configuration for building the DRI drivers on i386.
-
-include $(TOP)/configs/linux-dri-x86-64
-include $(TOP)/configs/debian-dri-default
-
-CONFIG_NAME = debian-dri-amd64
-
-# vim: ft=make
-
diff --git a/configs/debian-dri-any b/configs/debian-dri-any
deleted file mode 100644
index c4b65b0..0000000
--- a/configs/debian-dri-any
+++ /dev/null
@@ -1,9 +0,0 @@
-# Configuration for building the DRI drivers on the build architecture.
-
-include $(TOP)/configs/linux-dri
-include $(TOP)/configs/debian-dri-default
-
-CONFIG_NAME = debian-dri-any
-
-# vim: ft=make
-
diff --git a/configs/debian-dri-default b/configs/debian-dri-default
deleted file mode 100644
index f92c7ed..0000000
--- a/configs/debian-dri-default
+++ /dev/null
@@ -1,36 +0,0 @@
-# Configuration defaults for building the DRI drivers and DRI/GLX-enabled
-# libGL.
-
-include $(TOP)/configs/debian-default
-
-CONFIG_NAME = debian-dri-default
-
-SRC_DIRS = glx/x11 mesa progs
-DRIVER_DIRS = dri
-PROGRAM_DIRS = xdemos
-PROGS = glxdemo \
- glxgears \
- glxheads \
- glxinfo
-
-LIB_DIR = lib/glx
-
-DRI_DRIVER_INSTALL_DIR = $(INSTALL_DIR)/lib/dri
-DRI_DRIVER_SEARCH_DIR = /usr/lib/dri
-
-DRI_DIRS = mach64 mga r128 r200 r300 radeon s3v savage tdfx trident
-
-ARCH_X86 = i386 amd64
-
-ifneq ($(findstring $(DEB_BUILD_ARCH), $(ARCH_X86)),)
- DRI_DIRS += i810 i915 i915tex i965 sis unichrome
-endif
-
-ifeq ($(DEB_BUILD_ARCH), sparc)
- DRI_DIRS += ffb
-endif
-
-APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB)
-
-# vim: ft=make
-
diff --git a/configs/debian-dri-i386 b/configs/debian-dri-i386
deleted file mode 100644
index 7a0aaa4..0000000
--- a/configs/debian-dri-i386
+++ /dev/null
@@ -1,9 +0,0 @@
-# Configuration for building the DRI drivers on i386.
-
-include $(TOP)/configs/linux-dri-x86
-include $(TOP)/configs/debian-dri-default
-
-CONFIG_NAME = debian-dri-i386
-
-# vim: ft=make
-
diff --git a/configs/debian-dri-i386-i686 b/configs/debian-dri-i386-i686
deleted file mode 100644
index b15cd77..0000000
--- a/configs/debian-dri-i386-i686
+++ /dev/null
@@ -1,14 +0,0 @@
-# Configuration for building the DRI drivers on i386.
-
-include $(TOP)/configs/linux-dri-x86
-include $(TOP)/configs/debian-dri-optimized-default
-
-CONFIG_NAME = debian-dri-i386-i686
-
-ARCH_FLAGS = -march=i686
-LIB_DIR = lib/glx/i686/cmov
-
-DRI_DRIVER_INSTALL_DIR = $(INSTALL_DIR)/lib/dri/i686/cmov
-
-# vim: ft=make
-
diff --git a/configs/debian-dri-optimized-default b/configs/debian-dri-optimized-default
deleted file mode 100644
index 9c3f68d..0000000
--- a/configs/debian-dri-optimized-default
+++ /dev/null
@@ -1,13 +0,0 @@
-# Configuration defaults for CPU-optimized builds of the DRI drivers and
-# DRI/GLX-enabled libGL.
-
-include $(TOP)/configs/debian-dri-default
-
-CONFIG_NAME = debian-dri-optimized-default
-
-# override so that the utility programs are not rebuilt with CPU-specific
-# optimizations
-SRC_DIRS = glx/x11 mesa
-
-# vim: ft=make
-
diff --git a/configs/debian-indirect-default b/configs/debian-indirect-default
deleted file mode 100644
index a6926c9..0000000
--- a/configs/debian-indirect-default
+++ /dev/null
@@ -1,7 +0,0 @@
-# Configuration defaults for building GLX-enabled libGL.
-
-include $(TOP)/configs/debian-dri-default
-
-CONFIG_NAME = debian-indirect-default
-
-DRI_DIRS =
diff --git a/configs/debian-indirect-hurd-i386 b/configs/debian-indirect-hurd-i386
deleted file mode 100644
index dd4bb07..0000000
--- a/configs/debian-indirect-hurd-i386
+++ /dev/null
@@ -1,9 +0,0 @@
-# Configuration for building the DRI drivers on the build architecture.
-
-include $(TOP)/configs/linux-indirect
-include $(TOP)/configs/debian-indirect-default
-
-CONFIG_NAME = debian-indirect-hurd-i386
-
-# vim: ft=make
-
diff --git a/configs/debian-osmesa b/configs/debian-osmesa
deleted file mode 100644
index 9b7fc7b..0000000
--- a/configs/debian-osmesa
+++ /dev/null
@@ -1,9 +0,0 @@
-# Configuration for building only OSMesa on Debian.
-
-include $(TOP)/configs/linux-osmesa
-include $(TOP)/configs/debian-osmesa-default
-
-CONFIG_NAME = debian-osmesa
-
-# vim: ft=make
-
diff --git a/configs/debian-osmesa-default b/configs/debian-osmesa-default
deleted file mode 100644
index ef5a5ba..0000000
--- a/configs/debian-osmesa-default
+++ /dev/null
@@ -1,10 +0,0 @@
-# Configuration defaults for building OSMesa.
-
-include $(TOP)/configs/debian-default
-
-CONFIG_NAME = debian-osmesa-default
-
-DRIVER_DIRS = osmesa
-
-# vim: ft=make
-
diff --git a/configs/debian-osmesa-static b/configs/debian-osmesa-static
deleted file mode 100644
index 03fe8b5..0000000
--- a/configs/debian-osmesa-static
+++ /dev/null
@@ -1,9 +0,0 @@
-# Configuration for building only OSMesa (static version) on Debian.
-
-include $(TOP)/configs/linux-osmesa-static
-include $(TOP)/configs/debian-osmesa-default
-
-CONFIG_NAME = debian-osmesa-static
-
-# vim: ft=make
-
diff --git a/configs/debian-osmesa16 b/configs/debian-osmesa16
deleted file mode 100644
index 0077930..0000000
--- a/configs/debian-osmesa16
+++ /dev/null
@@ -1,10 +0,0 @@
-# Configuration for building OSMesa with support for 16 bits per color
-# channel.
-
-include $(TOP)/configs/linux-osmesa16
-include $(TOP)/configs/debian-osmesa-default
-
-CONFIG_NAME = debian-osmesa16
-
-# vim: ft=make
-
diff --git a/configs/debian-osmesa16-static b/configs/debian-osmesa16-static
deleted file mode 100644
index 6ff399e..0000000
--- a/configs/debian-osmesa16-static
+++ /dev/null
@@ -1,10 +0,0 @@
-# Configuration for building a static version of OSMesa with support for 16
-# bits per color channel.
-
-include $(TOP)/configs/linux-osmesa16-static
-include $(TOP)/configs/debian-osmesa-default
-
-CONFIG_NAME = debian-osmesa16-static
-
-# vim: ft=make
-
diff --git a/configs/debian-osmesa32 b/configs/debian-osmesa32
deleted file mode 100644
index de3b327..0000000
--- a/configs/debian-osmesa32
+++ /dev/null
@@ -1,10 +0,0 @@
-# Configuration for building OSMesa with support for 32 bits per color
-# channel.
-
-include $(TOP)/configs/linux-osmesa32
-include $(TOP)/configs/debian-osmesa-default
-
-CONFIG_NAME = debian-osmesa32
-
-# vim: ft=make
-
diff --git a/configs/debian-osmesa32-static b/configs/debian-osmesa32-static
deleted file mode 100644
index 7fdfcef..0000000
--- a/configs/debian-osmesa32-static
+++ /dev/null
@@ -1,10 +0,0 @@
-# Configuration for building a static version of OSMesa with support for 32
-# bits per color channel.
-
-include $(TOP)/configs/linux-osmesa32-static
-include $(TOP)/configs/debian-osmesa-default
-
-CONFIG_NAME = debian-osmesa32-static
-
-# vim: ft=make
-
diff --git a/configs/debian-swx11+glu-alpha-ev5 b/configs/debian-swx11+glu-alpha-ev5
deleted file mode 100644
index fd16e49..0000000
--- a/configs/debian-swx11+glu-alpha-ev5
+++ /dev/null
@@ -1,12 +0,0 @@
-# Configuration for building Mesa (swx11 and GLU) on alpha (ev5 optimized).
-
-include $(TOP)/configs/linux-alpha
-include $(TOP)/configs/debian-swx11+glu-default
-
-CONFIG_NAME = debian-swx11+glu-alpha-ev5
-
-SRC_DIRS = mesa
-LIB_DIR = lib/ev5/cmov
-
-# vim: ft=make
-
diff --git a/configs/debian-swx11+glu-amd64 b/configs/debian-swx11+glu-amd64
deleted file mode 100644
index 4bd7e51..0000000
--- a/configs/debian-swx11+glu-amd64
+++ /dev/null
@@ -1,10 +0,0 @@
-# Configuration for building Mesa (swx11 and GLU) with runtime-detected
-# assembler optimizations on amd64.
-
-include $(TOP)/configs/linux-x86-64
-include $(TOP)/configs/debian-swx11+glu-default
-
-CONFIG_NAME = debian-swx11+glu-amd64
-
-# vim: ft=make
-
diff --git a/configs/debian-swx11+glu-any b/configs/debian-swx11+glu-any
deleted file mode 100644
index 884c9f9..0000000
--- a/configs/debian-swx11+glu-any
+++ /dev/null
@@ -1,9 +0,0 @@
-# Configuration for building Mesa (swx11 and GLU) on the build architecture.
-
-include $(TOP)/configs/linux
-include $(TOP)/configs/debian-swx11+glu-default
-
-CONFIG_NAME = debian-swx11+glu-any
-
-# vim: ft=make
-
diff --git a/configs/debian-swx11+glu-default b/configs/debian-swx11+glu-default
deleted file mode 100644
index ccf8276..0000000
--- a/configs/debian-swx11+glu-default
+++ /dev/null
@@ -1,14 +0,0 @@
-# Configuration defaults for building Mesa (swx11 and GLU).
-
-include $(TOP)/configs/debian-default
-
-CONFIG_NAME = debian-swx11+glu-default
-
-SRC_DIRS = mesa glu glw
-DRIVER_DIRS = x11
-
-GLW_SOURCES += GLwMDrawA.c
-GLW_LIB_DEPS += -lXm
-
-# vim: ft=make
-
diff --git a/configs/debian-swx11+glu-i386 b/configs/debian-swx11+glu-i386
deleted file mode 100644
index 0b800c6..0000000
--- a/configs/debian-swx11+glu-i386
+++ /dev/null
@@ -1,10 +0,0 @@
-# Configuration for building Mesa (swx11 and GLU) with runtime-detected
-# assembler optimizations on i386.
-
-include $(TOP)/configs/linux-x86
-include $(TOP)/configs/debian-swx11+glu-default
-
-CONFIG_NAME = debian-swx11+glu-i386
-
-# vim: ft=make
-
diff --git a/configs/debian-swx11+glu-i386-i686 b/configs/debian-swx11+glu-i386-i686
deleted file mode 100644
index c6969b3..0000000
--- a/configs/debian-swx11+glu-i386-i686
+++ /dev/null
@@ -1,14 +0,0 @@
-# Configuration for building Mesa (swx11 and GLU) with runtime-detected
-# assembler optimizations on i386 (i686 optimized).
-
-include $(TOP)/configs/linux-x86
-include $(TOP)/configs/debian-swx11+glu-default
-
-CONFIG_NAME = debian-swx11+glu-i386-i686
-
-ARCH_FLAGS += -march=i686
-SRC_DIRS = mesa
-LIB_DIR = lib/i686/cmov
-
-# vim: ft=make
-
diff --git a/configs/debian-swx11+glu-powerpc-603 b/configs/debian-swx11+glu-powerpc-603
deleted file mode 100644
index 86b3580..0000000
--- a/configs/debian-swx11+glu-powerpc-603
+++ /dev/null
@@ -1,13 +0,0 @@
-# Configuration for building Mesa (swx11 and GLU) with runtime-detected
-# assembler optimizations on powerpc (603 optimized).
-
-include $(TOP)/configs/linux-ppc
-include $(TOP)/configs/debian-swx11+glu-default
-
-CONFIG_NAME = debian-swx11+glu-powerpc-603
-
-SRC_DIRS = mesa
-LIB_DIR = lib/603/cmov
-
-# vim: ft=make
-
diff --git a/configs/debian-swx11+glu-ppc64 b/configs/debian-swx11+glu-ppc64
deleted file mode 100644
index 67c59b6..0000000
--- a/configs/debian-swx11+glu-ppc64
+++ /dev/null
@@ -1,11 +0,0 @@
-# Configuration for building Mesa (swx11 and GLU) with runtime-detected
-# assembler optimizations on ppc64.
-
-include $(TOP)/configs/debian-swx11+glu-any
-
-CONFIG_NAME = debian-swx11+glu-ppc64
-
-LIB_DIR = lib64
-
-# vim: ft=make
-
diff --git a/configs/debian-swx11+glu-sparc b/configs/debian-swx11+glu-sparc
deleted file mode 100644
index 8854b40..0000000
--- a/configs/debian-swx11+glu-sparc
+++ /dev/null
@@ -1,10 +0,0 @@
-# Configuration for building Mesa (swx11 and GLU) with runtime-detected
-# assembler optimizations on sparc.
-
-include $(TOP)/configs/linux-sparc
-include $(TOP)/configs/debian-swx11+glu-default
-
-CONFIG_NAME = debian-swx11+glu-sparc
-
-# vim: ft=make
-
diff --git a/configs/debian-swx11+glu-sparc-ultrasparc b/configs/debian-swx11+glu-sparc-ultrasparc
deleted file mode 100644
index 14e3801..0000000
--- a/configs/debian-swx11+glu-sparc-ultrasparc
+++ /dev/null
@@ -1,13 +0,0 @@
-# Configuration for building Mesa (swx11 and GLU) with runtime-detected
-# assembler optimizations on sparc (ultrasparc-optimized).
-
-include $(TOP)/configs/linux-ultrasparc
-include $(TOP)/configs/debian-swx11+glu-default
-
-CONFIG_NAME = debian-swx11+glu-sparc-ultrasparc
-
-SRC_DIRS = mesa
-LIB_DIR = lib/ultrasparc/cmov
-
-# vim: ft=make
-
diff --git a/configs/debian-swx11+glu-static-amd64 b/configs/debian-swx11+glu-static-amd64
deleted file mode 100644
index 2976fbe..0000000
--- a/configs/debian-swx11+glu-static-amd64
+++ /dev/null
@@ -1,10 +0,0 @@
-# Configuration for building static versions of the libraries (swx11 and GLU)
-# on amd64.
-
-include $(TOP)/configs/linux-x86-64-static
-include $(TOP)/configs/debian-swx11+glu-default
-
-CONFIG_NAME = debian-swx11+glu-static-amd64
-
-# vim: ft=make
-
diff --git a/configs/debian-swx11+glu-static-any b/configs/debian-swx11+glu-static-any
deleted file mode 100644
index 82f794d..0000000
--- a/configs/debian-swx11+glu-static-any
+++ /dev/null
@@ -1,10 +0,0 @@
-# Configuration for building static versions of the libraries (swx11 and GLU)
-# on the build architecture.
-
-include $(TOP)/configs/linux-static
-include $(TOP)/configs/debian-swx11+glu-default
-
-CONFIG_NAME = debian-swx11+glu-static-any
-
-# vim: ft=make
-
diff --git a/configs/debian-swx11+glu-static-i386 b/configs/debian-swx11+glu-static-i386
deleted file mode 100644
index 62859e4..0000000
--- a/configs/debian-swx11+glu-static-i386
+++ /dev/null
@@ -1,10 +0,0 @@
-# Configuration for building static versions of the libraries (swx11 and GLU)
-# on i386.
-
-include $(TOP)/configs/linux-x86-static
-include $(TOP)/configs/debian-swx11+glu-default
-
-CONFIG_NAME = debian-swx11+glu-static-i386
-
-# vim: ft=make
-
diff --git a/configs/debian-swx11+glu-static-ppc64 b/configs/debian-swx11+glu-static-ppc64
deleted file mode 100644
index a9ea4a9..0000000
--- a/configs/debian-swx11+glu-static-ppc64
+++ /dev/null
@@ -1,11 +0,0 @@
-# Configuration for building static versions of the libraries (swx11 and GLU)
-# on ppc64.
-
-include $(TOP)/configs/debian-swx11+glu-static-any
-
-CONFIG_NAME = debian-swx11+glu-static-ppc64
-
-LIB_DIR = lib64
-
-# vim: ft=make
-
diff --git a/configs/default-bp b/configs/default-bp
deleted file mode 100644
index 29facee..0000000
--- a/configs/default-bp
+++ /dev/null
@@ -1,75 +0,0 @@
-# Default/template configuration
-
-# This is included by other config files which may override some
-# of these variables.
-
-CONFIG_NAME = default
-
-# Version info
-MESA_MAJOR=6
-MESA_MINOR=3
-MESA_TINY=0
-
-# external projects
-#DRM_SOURCE_PATH=$(TOP)/../drm
-DRM_SOURCE_PATH=/home/projects/DRI-freedesktop/drm
-
-# Compiler and flags
-CC = cc
-CXX = CC
-CFLAGS = -O
-CXXFLAGS = -O
-GLU_CFLAGS =
-
-# Misc tools and flags
-MKLIB_OPTIONS =
-MKDEP = makedepend
-MKDEP_OPTIONS = -fdepend
-MAKE = make
-
-# Library names (base name)
-GL_LIB = GL
-GLU_LIB = GLU
-GLUT_LIB = glut
-GLW_LIB = GLw
-OSMESA_LIB = OSMesa
-
-
-# Library names (actual file names)
-GL_LIB_NAME = lib$(GL_LIB).so
-GLU_LIB_NAME = lib$(GLU_LIB).so
-GLUT_LIB_NAME = lib$(GLUT_LIB).so
-GLW_LIB_NAME = lib$(GLW_LIB).so
-OSMESA_LIB_NAME = lib$(OSMesa).so
-
-
-# Optional assembly language optimization files for libGL
-ASM_SOURCES =
-
-# GLw widget sources (Append "GLwMDrawA.c" here and add -lXm to GLW_LIB_DEPS in
-# order to build the Motif widget too)
-GLW_SOURCES = GLwDrawA.c
-
-
-# Directories
-LIB_DIR = $(TOP)/lib
-INSTALL_PREFIX = /usr/local
-SRC_DIRS = mesa glu glut/glx glw
-GLU_DIRS = sgi
-DRIVER_DIRS = x11 osmesa
-# Which subdirs under $(TOP)/progs/ to enter:
-PROGRAM_DIRS = demos redbook samples xdemos
-
-
-# Library/program dependencies
-GL_LIB_DEPS = -lX11 -lXext -lm -lpthread
-OSMESA_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB)
-GLU_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lm
-GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXmu -lXt -lXi -lm
-GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lXt -lX11
-APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm
-
-
-# Shading language support (set to 0 or 1)
-SHADING_LANGUAGE = 0
-
diff --git a/configs/linux-dri-bp b/configs/linux-dri-bp
deleted file mode 100644
index e9db29f..0000000
--- a/configs/linux-dri-bp
+++ /dev/null
@@ -1,55 +0,0 @@
-# -*-makefile-*-
-# Configuration for linux-dri: Linux DRI hardware drivers for XFree86 & others
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = linux-dri
-
-# Compiler and flags
-CC = gcc
-CXX = g++
-
-MKDEP = /usr/X11R6/bin/makedepend
-#MKDEP = gcc -M
-#MKDEP_OPTIONS = -MF depend
-
-WARN_FLAGS = -Wall
-OPT_FLAGS = -g
-PIC_FLAGS = -fPIC
-
-# Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support.
-ARCH_FLAGS ?=
-
-DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \
- -D_BSD_SOURCE -D_GNU_SOURCE \
- -DDRI_NEW_INTERFACE_ONLY -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1
-
-X11_INCLUDES = -I/usr/X11R6/include -I/usr/X11R6/include/X11/extensions
-
-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)
-
-
-ASM_SOURCES =
-
-# Library/program dependencies
-EXTRA_LIB_PATH=-L/usr/X11R6/lib
-
-DRI_LIB_DEPS = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl
-GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lm -lpthread -ldl
-GLUT_LIB_DEPS = $(EXTRA_LIB_PATH) -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXmu -lXt -lXi -lm
-GLW_LIB_DEPS = $(EXTRA_LIB_PATH) -L$(LIB_DIR) -l$(GL_LIB) -lXt -lX11
-
-
-# Directories
-SRC_DIRS = glx/x11 mesa glu glut/glx glw
-DRIVER_DIRS = dri
-PROGRAM_DIRS =
-WINDOW_SYSTEM=dri
-
-# ffb and gamma are missing because they have not been converted to use the new
-# interface.
-DRI_DIRS = dri_client i810 i830 i915 mach64 mga r128 r200 radeon s3v \
- savage sis tdfx trident unichrome fb
diff --git a/configs/linux-osmesa-static b/configs/linux-osmesa-static
deleted file mode 100644
index 465f83c..0000000
--- a/configs/linux-osmesa-static
+++ /dev/null
@@ -1,14 +0,0 @@
-# Configuration for building only libOSMesa on Linux, no Xlib driver
-# This doesn't really have any Linux dependencies, so it should be usable
-# on other (gcc-based) systems.
-
-include $(TOP)/configs/linux-osmesa
-
-CONFIG_NAME = linux-osmesa-static
-
-# Compiler and flags
-MKLIB_OPTIONS = -static
-
-# Library names
-OSMESA_LIB_NAME = libOSMesa.a
-
diff --git a/configs/linux-osmesa32-static b/configs/linux-osmesa32-static
deleted file mode 100644
index 6db8bc0..0000000
--- a/configs/linux-osmesa32-static
+++ /dev/null
@@ -1,28 +0,0 @@
-# Configuration for 32 bits/channel OSMesa library on Linux
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = linux-osmesa32-static
-
-# Compiler and flags
-CC = gcc
-CXX = g++
-CFLAGS = -O3 -ansi -pedantic -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include -DCHAN_BITS=32 -DDEFAULT_SOFTWARE_DEPTH_BITS=31
-CXXFLAGS = -O3 -ansi -pedantic -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
-MKLIB_OPTIONS = -static
-
-
-# Library names
-OSMESA_LIB = OSMesa32
-OSMESA_LIB_NAME = libOSMesa32.a
-
-
-# Directories
-SRC_DIRS = mesa glu
-DRIVER_DIRS = osmesa
-PROGRAM_DIRS =
-
-
-# Dependencies
-OSMESA_LIB_DEPS = -lm -lpthread
-APP_LIB_DEPS = -lOSMesa32
diff --git a/configs/linux-tcc b/configs/linux-tcc
deleted file mode 100644
index 4371fe2..0000000
--- a/configs/linux-tcc
+++ /dev/null
@@ -1,22 +0,0 @@
-# Configuration for debugging on Linux
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = linux-tcc
-
-# Compiler and flags
-CC = gcc
-CXX = g++
-
-TCC_DIR=/home/progs/tcc-0.9.20
-
-CFLAGS = -g -ansi -pedantic -Wall -Wmissing-prototypes -Wundef -fPIC -ffast-math -D_POSIX_SOURCE -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM -DPTHREADS -DDEBUG -DMESA_DEBUG -DUSE_TCC -I$(TCC_DIR)
-
-CXXFLAGS = -g -ansi -pedantic -Wall -Wundef -fPIC -ffast-math -D_POSIX_SOURCE -D_SVID_SOURCE -D_BSD_SOURCE -DDEBUG -DMESA_DEBUG
-
-GLUT_CFLAGS = -fexceptions
-
-GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread -L$(TCC_DIR) -ltcc -ldl
-GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
-GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lXt -L/usr/X11R6/lib -lX11
-APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm
diff --git a/debian/changelog b/debian/changelog
index 8870f31..c156963 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mesa (7.0.3-3) UNRELEASED; urgency=low
+
+ * Move our configs/ changes from the .diff.gz into our quilt patches,
+ with 04_cleanup-osmesa-configs.patch renamed into 04_debian-configs.patch,
+ closes: #485161.
+
+ -- Brice Goglin <bgoglin@debian.org> Tue, 17 Jun 2008 19:31:32 +0200
+
mesa (7.0.3-2) unstable; urgency=low
* Pull from mesa_7_0_branch (03447de3).
diff --git a/debian/patches/04_cleanup-osmesa-configs.patch b/debian/patches/04_cleanup-osmesa-configs.patch
deleted file mode 100644
index 68bd477..0000000
--- a/debian/patches/04_cleanup-osmesa-configs.patch
+++ /dev/null
@@ -1,197 +0,0 @@
-Index: mesa/configs/linux-osmesa
-===================================================================
---- mesa.orig/configs/linux-osmesa 2007-11-11 00:24:07.000000000 +0100
-+++ mesa/configs/linux-osmesa 2007-11-11 00:33:20.000000000 +0100
-@@ -9,8 +9,17 @@
- # Compiler and flags
- CC = gcc
- CXX = g++
--CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DPTHREADS
--CXXFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
-+
-+PIC_FLAGS = -fPIC
-+
-+DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \
-+ -D_BSD_SOURCE -D_GNU_SOURCE \
-+ -DPTHREADS -DUSE_XSHM -DHAVE_POSIX_MEMALIGN
-+
-+CFLAGS = -ansi -pedantic $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) \
-+ $(ASM_FLAGS) -ffast-math
-+
-+CXXFLAGS = -ansi -pedantic $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES)
-
- # Work around aliasing bugs - developers should comment this out
- CFLAGS += -fno-strict-aliasing
-@@ -26,3 +35,4 @@
- OSMESA_LIB_DEPS = -lm -lpthread
- GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(OSMESA_LIB)
- APP_LIB_DEPS = -lOSMesa -lGLU
-+
-Index: mesa/configs/linux-osmesa-static
-===================================================================
---- mesa.orig/configs/linux-osmesa-static 2007-11-11 00:24:01.000000000 +0100
-+++ mesa/configs/linux-osmesa-static 2007-11-11 00:33:20.000000000 +0100
-@@ -8,7 +8,8 @@
-
- # Compiler and flags
- MKLIB_OPTIONS = -static
-+PIC_FLAGS =
-
- # Library names
--OSMESA_LIB_NAME = libOSMesa.a
-+OSMESA_LIB_NAME = lib$(OSMESA_LIB).a
-
-Index: mesa/configs/linux-osmesa16
-===================================================================
---- mesa.orig/configs/linux-osmesa16 2007-11-11 00:24:07.000000000 +0100
-+++ mesa/configs/linux-osmesa16 2007-11-11 00:33:41.000000000 +0100
-@@ -1,31 +1,19 @@
- # Configuration for 16 bits/channel OSMesa library on Linux
-
--include $(TOP)/configs/default
-+include $(TOP)/configs/linux-osmesa
-
- CONFIG_NAME = linux-osmesa16
-
--# Compiler and flags
--CC = gcc
--CXX = g++
--CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include -DCHAN_BITS=16 -DDEFAULT_SOFTWARE_DEPTH_BITS=31
--CXXFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
--
- # Work around aliasing bugs - developers should comment this out
- CFLAGS += -fno-strict-aliasing
- CXXFLAGS += -fno-strict-aliasing
--
-+DEFINES += -DCHAN_BITS=16 -DDEFAULT_SOFTWARE_DEPTH_BITS=32
- # Library names
- OSMESA_LIB = OSMesa16
--OSMESA_LIB_NAME = libOSMesa16.so
--
-
- # Directories
--SRC_DIRS = mesa glu
--DRIVER_DIRS = osmesa
- PROGRAM_DIRS =
-
--
- # Dependencies
--OSMESA_LIB_DEPS = -lm -lpthread
--GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(OSMESA_LIB)
--APP_LIB_DEPS = -lOSMesa16
-+APP_LIB_DEPS = -l$(OSMESA_LIB)
-+
-Index: mesa/configs/linux-osmesa16-static
-===================================================================
---- mesa.orig/configs/linux-osmesa16-static 2007-11-11 00:24:07.000000000 +0100
-+++ mesa/configs/linux-osmesa16-static 2007-11-11 00:33:20.000000000 +0100
-@@ -1,14 +1,10 @@
- # Configuration for 16 bits/channel OSMesa library on Linux
-
--include $(TOP)/configs/default
-+include $(TOP)/configs/linux-osmesa16
-
- CONFIG_NAME = linux-osmesa16-static
-
- # Compiler and flags
--CC = gcc
--CXX = g++
--CFLAGS = -O3 -ansi -pedantic -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include -DCHAN_BITS=16 -DDEFAULT_SOFTWARE_DEPTH_BITS=31
--CXXFLAGS = -O3 -ansi -pedantic -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
- MKLIB_OPTIONS = -static
- PIC_FLAGS =
-
-@@ -17,16 +13,5 @@
Reply to: