[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

mesa: Changes to 'ubuntu'



 Makefile                                                      |   17 
 configs/autoconf.in                                           |   18 
 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                                               |   17 
 configs/default-bp                                            |   75 
 configs/linux-osmesa-static                                   |   15 
 configs/linux-osmesa32-static                                 |   13 
 configure.ac                                                  |   44 
 debian/changelog                                              |   64 
 debian/control                                                |    2 
 debian/copyright                                              |  299 -
 debian/rules                                                  |    2 
 debian/scripts/install-source.sh                              |   46 
 docs/cell.html                                                |   72 
 docs/contents.html                                            |    4 
 docs/download.html                                            |    4 
 docs/install.html                                             |   67 
 docs/news.html                                                |   14 
 docs/relnotes-7.2.html                                        |  104 
 docs/relnotes-7.3.html                                        |   79 
 docs/relnotes.html                                            |    2 
 docs/shading.html                                             |   70 
 include/GL/Makefile.am                                        |   11 
 include/GL/amesa.h                                            |   65 
 include/GL/fxmesa.h                                           |  103 
 include/GL/glext.h                                            |   68 
 include/GL/glxext.h                                           |   32 
 include/GL/internal/dri_interface.h                           |    4 
 include/GL/uglglutshapes.h                                    |   45 
 include/GL/uglmesa.h                                          |  155 
 include/GL/xmesa.h                                            |  424 --
 include/GL/xmesa_x.h                                          |   86 
 include/GL/xmesa_xf86.h                                       |  198 -
 include/GLView.h                                              |  192 -
 progs/demos/arbocclude.c                                      |    5 
 progs/glsl/.gitignore                                         |    1 
 progs/glsl/Makefile                                           |   18 
 progs/glsl/multinoise.c                                       |  281 +
 progs/glsl/noise.c                                            |    1 
 progs/glsl/samplers.c                                         |  357 ++
 progs/glsl/twoside.c                                          |   44 
 progs/glsl/vert-or-frag-only.c                                |  191 +
 progs/util/shaderutil.c                                       |    9 
 src/glu/Makefile                                              |    6 
 src/glu/glu.pc.in                                             |    6 
 src/glu/sgi/glu.exports                                       |   59 
 src/glut/glx/Makefile                                         |    6 
 src/glut/glx/glut.pc.in                                       |    4 
 src/glut/glx/glut_init.c                                      |    4 
 src/glut/glx/glut_ppm.c                                       |   80 
 src/glut/glx/glut_swap.c                                      |    4 
 src/glut/glx/glutint.h                                        |    5 
 src/glut/mini/Makefile                                        |    5 
 src/glut/mini/glut.pc.in                                      |    4 
 src/glw/Makefile                                              |    5 
 src/glw/glw.pc.in                                             |    4 
 src/glx/x11/indirect.c                                        |   10 
 src/mesa/Makefile                                             |   25 
 src/mesa/drivers/allegro/amesa.c                              |    2 
 src/mesa/drivers/allegro/amesa.h                              |   65 
 src/mesa/drivers/dri/Makefile                                 |    3 
 src/mesa/drivers/dri/common/dri_util.c                        |   19 
 src/mesa/drivers/dri/common/vblank.c                          |   18 
 src/mesa/drivers/dri/dri.pc.in                                |    1 
 src/mesa/drivers/dri/i915/i830_vtbl.c                         |   15 
 src/mesa/drivers/dri/i915/i915_context.c                      |    2 
 src/mesa/drivers/dri/i915/i915_fragprog.c                     |   22 
 src/mesa/drivers/dri/i915/i915_state.c                        |    2 
 src/mesa/drivers/dri/i915/i915_texstate.c                     |    7 
 src/mesa/drivers/dri/i915/i915_vtbl.c                         |   13 
 src/mesa/drivers/dri/i965/Makefile                            |    1 
 src/mesa/drivers/dri/i965/brw_context.c                       |    6 
 src/mesa/drivers/dri/i965/brw_context.h                       |    2 
 src/mesa/drivers/dri/i965/brw_draw.c                          |    4 
 src/mesa/drivers/dri/i965/brw_eu.h                            |   89 
 src/mesa/drivers/dri/i965/brw_eu_emit.c                       |    1 
 src/mesa/drivers/dri/i965/brw_state.h                         |    1 
 src/mesa/drivers/dri/i965/brw_state_upload.c                  |    4 
 src/mesa/drivers/dri/i965/brw_vs_emit.c                       |  120 
 src/mesa/drivers/dri/i965/brw_vs_tnl.c                        |   59 
 src/mesa/drivers/dri/i965/brw_wm.c                            |    3 
 src/mesa/drivers/dri/i965/brw_wm_emit.c                       |   81 
 src/mesa/drivers/dri/i965/brw_wm_fp.c                         |   14 
 src/mesa/drivers/dri/i965/brw_wm_glsl.c                       |  455 ++
 src/mesa/drivers/dri/intel/intel_batchbuffer.h                |   22 
 src/mesa/drivers/dri/intel/intel_buffers.c                    |    2 
 src/mesa/drivers/dri/intel/intel_context.c                    |   11 
 src/mesa/drivers/dri/intel/intel_context.h                    |   14 
 src/mesa/drivers/dri/intel/intel_decode.c                     |  146 
 src/mesa/drivers/dri/intel/intel_mipmap_tree.c                |    6 
 src/mesa/drivers/dri/intel/intel_pixel.c                      |  168 
 src/mesa/drivers/dri/intel/intel_pixel.h                      |    9 
 src/mesa/drivers/dri/intel/intel_pixel_bitmap.c               |  268 +
 src/mesa/drivers/dri/intel/intel_pixel_copy.c                 |    7 
 src/mesa/drivers/dri/intel/intel_pixel_draw.c                 |   61 
 src/mesa/drivers/dri/intel/intel_regions.c                    |    9 
 src/mesa/drivers/dri/intel/intel_screen.c                     |   15 
 src/mesa/drivers/dri/intel/intel_screen.h                     |    1 
 src/mesa/drivers/dri/intel/intel_tex.c                        |    1 
 src/mesa/drivers/dri/intel/intel_tex.h                        |   10 
 src/mesa/drivers/dri/intel/intel_tex_copy.c                   |  109 
 src/mesa/drivers/dri/intel/intel_tex_subimage.c               |   15 
 src/mesa/drivers/dri/r300/r300_reg.h                          |    8 
 src/mesa/drivers/dri/r300/r300_render.c                       |    3 
 src/mesa/drivers/dri/swrast/swrast.c                          |    2 
 src/mesa/drivers/osmesa/Makefile                              |    7 
 src/mesa/drivers/x11/fakeglx.c                                |    1 
 src/mesa/drivers/x11/fxmesa.h                                 |  103 
 src/mesa/drivers/x11/xm_api.c                                 |    1 
 src/mesa/drivers/x11/xm_buffer.c                              |    1 
 src/mesa/drivers/x11/xmesa.h                                  |  424 ++
 src/mesa/drivers/x11/xmesaP.h                                 |    4 
 src/mesa/drivers/x11/xmesa_x.h                                |   86 
 src/mesa/drivers/x11/xmesa_xf86.h                             |  198 +
 src/mesa/gl.pc.in                                             |    5 
 src/mesa/glapi/extension_helper.py                            |    3 
 src/mesa/glapi/glX_proto_recv.py                              |    4 
 src/mesa/glapi/glX_proto_send.py                              |   14 
 src/mesa/glapi/glX_proto_size.py                              |    5 
 src/mesa/glapi/gl_API.dtd                                     |    1 
 src/mesa/glapi/gl_API.xml                                     |   15 
 src/mesa/glapi/gl_XML.py                                      |    4 
 src/mesa/glapi/gl_apitemp.py                                  |    3 
 src/mesa/glapi/gl_x86_asm.py                                  |    3 
 src/mesa/main/arrayobj.c                                      |    6 
 src/mesa/main/attrib.c                                        |    5 
 src/mesa/main/bufferobj.c                                     |    2 
 src/mesa/main/config.h                                        |   57 
 src/mesa/main/context.c                                       |   21 
 src/mesa/main/dlopen.c                                        |   99 
 src/mesa/main/dlopen.h                                        |   42 
 src/mesa/main/enable.c                                        |  148 
 src/mesa/main/ffvertex_prog.c                                 |   48 
 src/mesa/main/get.c                                           |    6 
 src/mesa/main/get_gen.py                                      |    2 
 src/mesa/main/image.c                                         |    8 
 src/mesa/main/image.h                                         |    3 
 src/mesa/main/imports.c                                       |   12 
 src/mesa/main/imports.h                                       |    3 
 src/mesa/main/mipmap.c                                        |  473 ++
 src/mesa/main/mtypes.h                                        |   59 
 src/mesa/main/points.c                                        |    2 
 src/mesa/main/rastpos.c                                       |    2 
 src/mesa/main/sources                                         |    2 
 src/mesa/main/state.c                                         |   17 
 src/mesa/main/texcompress_s3tc.c                              |   75 
 src/mesa/main/texenvprogram.c                                 |   23 
 src/mesa/main/texformat.c                                     |    2 
 src/mesa/main/texobj.c                                        |   12 
 src/mesa/main/texrender.c                                     |   52 
 src/mesa/main/texstate.c                                      |   11 
 src/mesa/main/version.h                                       |    2 
 src/mesa/osmesa.pc.in                                         |   12 
 src/mesa/shader/prog_execute.c                                |   24 
 src/mesa/shader/prog_noise.c                                  |  638 +++
 src/mesa/shader/prog_noise.h                                  |   34 
 src/mesa/shader/prog_parameter.c                              |    4 
 src/mesa/shader/prog_print.c                                  |    2 
 src/mesa/shader/prog_statevars.h                              |    8 
 src/mesa/shader/program.c                                     |    2 
 src/mesa/shader/slang/library/slang_120_core_gc.h             | 1389 ++++----
 src/mesa/shader/slang/library/slang_builtin_120_common_gc.h   |  195 -
 src/mesa/shader/slang/library/slang_builtin_120_fragment_gc.h |    2 
 src/mesa/shader/slang/library/slang_common_builtin.gc         |   17 
 src/mesa/shader/slang/library/slang_common_builtin_gc.h       | 1698 ++++-----
 src/mesa/shader/slang/library/slang_core.gc                   |  569 +--
 src/mesa/shader/slang/library/slang_core_gc.h                 | 1708 ++++------
 src/mesa/shader/slang/library/slang_fragment_builtin_gc.h     |  203 -
 src/mesa/shader/slang/library/slang_shader.syn                |  130 
 src/mesa/shader/slang/library/slang_shader_syn.h              |   43 
 src/mesa/shader/slang/library/slang_vertex_builtin_gc.h       |  174 -
 src/mesa/shader/slang/slang_builtin.c                         |  299 +
 src/mesa/shader/slang/slang_builtin.h                         |    3 
 src/mesa/shader/slang/slang_codegen.c                         | 1108 ++++--
 src/mesa/shader/slang/slang_codegen.h                         |   13 
 src/mesa/shader/slang/slang_compile.c                         |  356 +-
 src/mesa/shader/slang/slang_compile.h                         |   14 
 src/mesa/shader/slang/slang_compile_function.c                |  124 
 src/mesa/shader/slang/slang_compile_function.h                |   35 
 src/mesa/shader/slang/slang_compile_operation.c               |    3 
 src/mesa/shader/slang/slang_compile_operation.h               |    6 
 src/mesa/shader/slang/slang_compile_variable.c                |  106 
 src/mesa/shader/slang/slang_compile_variable.h                |   76 
 src/mesa/shader/slang/slang_emit.c                            |   98 
 src/mesa/shader/slang/slang_emit.h                            |    4 
 src/mesa/shader/slang/slang_library_noise.c                   |  501 --
 src/mesa/shader/slang/slang_library_noise.h                   |   42 
 src/mesa/shader/slang/slang_link.c                            |  102 
 src/mesa/shader/slang/slang_log.c                             |   15 
 src/mesa/shader/slang/slang_preprocess.c                      |   97 
 src/mesa/shader/slang/slang_preprocess.h                      |    6 
 src/mesa/shader/slang/slang_print.c                           |    4 
 src/mesa/shader/slang/slang_simplify.c                        |    6 
 src/mesa/shader/slang/slang_storage.h                         |    1 
 src/mesa/shader/slang/slang_typeinfo.c                        |  249 -
 src/mesa/shader/slang/slang_typeinfo.h                        |  125 
 src/mesa/sources                                              |    3 
 src/mesa/swrast/s_aalinetemp.h                                |    2 
 src/mesa/tnl/t_context.c                                      |    2 
 src/mesa/tnl/t_vertex_generic.c                               |    2 
 src/mesa/tnl/t_vertex_sse.c                                   |   12 
 windows/VC7/mesa/mesa/mesa.vcproj                             |   12 
 windows/VC8/mesa/mesa/mesa.vcproj                             |   16 
 232 files changed, 10694 insertions(+), 7465 deletions(-)

New commits:
commit 7f84395852382638422208a227221659feac7f70
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date:   Wed Jan 14 23:05:38 2009 +0200

    update the changelog

diff --git a/debian/changelog b/debian/changelog
index f1c351d..d55f187 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa (7.3~rc1-1ubuntu1) UNRELEASED; urgency=low
+
+  * Merge from Debian experimental.
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com>  Wed, 14 Jan 2009 23:03:58 +0200
+
 mesa (7.3~rc1-1) experimental; urgency=low
 
   * New upstream release candidate.

commit 88083e9bab9fd9b2d6bd5aa3badad1427be0e841
Author: Julien Cristau <jcristau@debian.org>
Date:   Sat Jan 10 22:34:36 2009 +0100

    Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 03c2d8b..ee0b2dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mesa (7.3~rc1-1) UNRELEASED; urgency=low
+mesa (7.3~rc1-1) experimental; urgency=low
 
   * New upstream release candidate.
     + provides DRI2 (closes: #411141).
@@ -18,7 +18,7 @@ mesa (7.3~rc1-1) UNRELEASED; urgency=low
     switched to using autoconf, and mesa-swx11-source is gone.
   * Delete some now unused code from debian/rules.
 
- -- Timo Aaltonen <tjaalton@ubuntu.com>  Tue, 09 Dec 2008 01:38:42 +0200
+ -- Julien Cristau <jcristau@debian.org>  Sat, 10 Jan 2009 22:14:55 +0100
 
 mesa (7.2-1) experimental; urgency=low
 

commit 47e54545ed7fa852b45b2eab9e4bff3c954c0799
Author: Julien Cristau <jcristau@debian.org>
Date:   Sat Jan 10 22:13:17 2009 +0100

    Delete some now unused code from debian/rules.

diff --git a/debian/changelog b/debian/changelog
index e182e87..03c2d8b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ mesa (7.3~rc1-1) UNRELEASED; urgency=low
   * Merge packaging changes from unstable, from 7.0.3-5 to 7.0.3-7.
   * Delete unused configs/debian-*, and install-source.sh script.  We've
     switched to using autoconf, and mesa-swx11-source is gone.
+  * Delete some now unused code from debian/rules.
 
  -- Timo Aaltonen <tjaalton@ubuntu.com>  Tue, 09 Dec 2008 01:38:42 +0200
 
diff --git a/debian/rules b/debian/rules
index b289a48..120319e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,7 +22,6 @@ 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_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
-DEB_HOST_ARCH_CPU  ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
 DEB_BUILD_DIR      ?= $(CURDIR)/obj-$(DEB_BUILD_GNU_TYPE)
 ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
         confflags += --build=$(DEB_HOST_GNU_TYPE)
@@ -30,9 +29,6 @@ else
         confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
 endif
 
-export DEB_BUILD_ARCH
-export DEB_HOST_ARCH_CPU
-
 # choose which configurations to build
 include debian/scripts/choose-configs
 

commit 54885ff0ad9ba39a5e165dd19858d217826fc88f
Author: Julien Cristau <jcristau@debian.org>
Date:   Sat Jan 10 21:55:19 2009 +0100

    Delete unused configs/debian-*, and install-source.sh script.
    
    We've switched to using autoconf, and mesa-swx11-source is gone.

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 b42bfc3..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 ($(filter $(DEB_HOST_ARCH_CPU), $(ARCH_X86)),)
-	DRI_DIRS += i810 i915 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-osmesa-static b/configs/linux-osmesa-static
deleted file mode 100644
index eb3575f..0000000
--- a/configs/linux-osmesa-static
+++ /dev/null
@@ -1,15 +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
-PIC_FLAGS =
-
-# Library names
-OSMESA_LIB_NAME = lib$(OSMESA_LIB).a
-
diff --git a/configs/linux-osmesa32-static b/configs/linux-osmesa32-static
deleted file mode 100644
index ecbb72e..0000000
--- a/configs/linux-osmesa32-static
+++ /dev/null
@@ -1,13 +0,0 @@
-# Configuration for 32 bits/channel OSMesa library on Linux
-
-include $(TOP)/configs/linux-osmesa32
-
-CONFIG_NAME = linux-osmesa32-static
-
-# Compiler and flags
-MKLIB_OPTIONS = -static
-PIC_FLAGS =
-
-# Library names
-OSMESA_LIB_NAME = lib$(OSMESA_LIB).a
-
diff --git a/debian/changelog b/debian/changelog
index 192cfb3..e182e87 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ mesa (7.3~rc1-1) UNRELEASED; urgency=low
   [ Julien Cristau ]
   * Require libdrm-dev 2.4.3.
   * Merge packaging changes from unstable, from 7.0.3-5 to 7.0.3-7.
+  * Delete unused configs/debian-*, and install-source.sh script.  We've
+    switched to using autoconf, and mesa-swx11-source is gone.
 
  -- Timo Aaltonen <tjaalton@ubuntu.com>  Tue, 09 Dec 2008 01:38:42 +0200
 
diff --git a/debian/scripts/install-source.sh b/debian/scripts/install-source.sh
deleted file mode 100755
index 5b1dcfb..0000000
--- a/debian/scripts/install-source.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/sh


Reply to: