Initial version of a new build system for Mesa.

29 files changed, 396 insertions, 0 deletions

diff --git a/configs/debian b/configs/debian
new file mode 100644
index 00000000000..5b3b349a416
--- /dev/null
+++ b/configs/debian
@@ -0,0 +1,5 @@
+include $(TOP)/configs/debian-common
+include $(TOP)/configs/linux
+
+CONFIG_NAME = debian
+
diff --git a/configs/debian-alpha b/configs/debian-alpha
new file mode 100644
index 00000000000..7f482a08469
--- /dev/null
+++ b/configs/debian-alpha
@@ -0,0 +1,5 @@
+include $(TOP)/configs/debian-common
+include $(TOP)/configs/linux-alpha
+
+CONFIG_NAME = debian-alpha
+
diff --git a/configs/debian-amd64 b/configs/debian-amd64
new file mode 100644
index 00000000000..f2e34167177
--- /dev/null
+++ b/configs/debian-amd64
@@ -0,0 +1,5 @@
+include $(TOP)/configs/debian-common
+include $(TOP)/configs/linux-x86-64
+
+CONFIG_NAME = debian-amd64
+
diff --git a/configs/debian-common b/configs/debian-common
new file mode 100644
index 00000000000..b059b328b7a
--- /dev/null
+++ b/configs/debian-common
@@ -0,0 +1,6 @@
+include $(TOP)/configs/default
+
+CONFIG_NAME = debian-common
+
+override OPT_FLAGS = -O2 -g
+
diff --git a/configs/debian-dri b/configs/debian-dri
new file mode 100644
index 00000000000..db8c74e68bb
--- /dev/null
+++ b/configs/debian-dri
@@ -0,0 +1,5 @@
+include $(TOP)/configs/debian-dri-common
+include $(TOP)/configs/linux-dri
+
+CONFIG_NAME = debian-dri
+
diff --git a/configs/debian-dri-common b/configs/debian-dri-common
new file mode 100644
index 00000000000..4069e2c4070
--- /dev/null
+++ b/configs/debian-dri-common
@@ -0,0 +1,8 @@
+include $(TOP)/configs/debian-common
+
+CONFIG_NAME = debian-dri-common
+
+DRI_DRIVER_INSTALL_DIR = $(INSTALL_DIR)/lib/dri
+DRI_DRIVER_SEARCH_DIR = /usr/lib/dri
+
+
diff --git a/configs/debian-dri-i386 b/configs/debian-dri-i386
new file mode 100644
index 00000000000..8156804ed55
--- /dev/null
+++ b/configs/debian-dri-i386
@@ -0,0 +1,5 @@
+include $(TOP)/configs/debian-dri-common
+include $(TOP)/configs/linux-dri-x86
+
+CONFIG_NAME = debian-dri-i386
+
diff --git a/configs/debian-i386 b/configs/debian-i386
new file mode 100644
index 00000000000..1cec231b183
--- /dev/null
+++ b/configs/debian-i386
@@ -0,0 +1,5 @@
+include $(TOP)/configs/debian-common
+include $(TOP)/configs/linux-x86
+
+CONFIG_NAME = debian-i386
+
diff --git a/configs/debian-powerpc b/configs/debian-powerpc
new file mode 100644
index 00000000000..0771dd6dd40
--- /dev/null
+++ b/configs/debian-powerpc
@@ -0,0 +1,5 @@
+include $(TOP)/configs/debian-common
+include $(TOP)/configs/linux-ppc
+
+CONFIG_NAME = debian-powerpc
+
diff --git a/configs/debian-ppc64 b/configs/debian-ppc64
new file mode 100644
index 00000000000..e4c63c8ba86
--- /dev/null
+++ b/configs/debian-ppc64
@@ -0,0 +1,4 @@
+include $(TOP)/configs/debian-ppc
+
+CONFIG_NAME = debian-ppc64
+
diff --git a/configs/debian-sparc b/configs/debian-sparc
new file mode 100644
index 00000000000..6c97c87ba14
--- /dev/null
+++ b/configs/debian-sparc
@@ -0,0 +1,5 @@
+include $(TOP)/configs/debian-common
+include $(TOP)/configs/linux-sparc
+
+CONFIG_NAME = debian-sparc
+
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 00000000000..c6bfbcafd9e
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,6 @@
+mesa (6.5.1-1) unstable; urgency=low
+
+  * 
+
+ -- Thierry Reding <[email protected]>  Sat, 14 Oct 2006 02:09:50 +0200
+
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 00000000000..7ed6ff82de6
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+5
diff --git a/debian/control b/debian/control
new file mode 100644
index 00000000000..ed1565ebaac
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,196 @@
+Source: mesa
+Section: graphics
+Priority: optional
+Maintainer: Debian X Strike Force <[email protected]>
+Uploaders: Thierry Reding <[email protected]>
+Standards-Version: 3.7.2
+Build-Depends: debhelper (>= 5)
+
+Package: libgl1-mesa-swx11
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Conflicts: mesag3-glide, mesag3-glide2, mesag3+ggi, libgl1, nvidia-glx, mesag3, libgl1-mesa-swrast
+Provides: libgl1, mesag3, libgl1-mesa-swrast
+Replaces: libgl1, mesag3, libgl1-mesa-swrast
+Description: A free implementation of the OpenGL API -- runtime
+ Mesa is a 3-D graphics library with an API which is very similar to
+ that of OpenGL.  To the extent that Mesa utilizes the OpenGL command
+ syntax or state machine, it is being used with authorization from
+ Silicon Graphics, Inc.  However, the author makes no claim that Mesa
+ is in any way a compatible replacement for OpenGL or associated with
+ Silicon Graphics, Inc.
+ .
+ This library provides a pure software rasteriser; it does not provide
+ a direct rendering-capable library, or one which uses GLX.  For that,
+ please see libgl1-mesa-glx.
+ .
+ On Linux, this library is also known as libGL or libGL.so.1.
+
+Package: libgl1-mesa-swx11-dev
+Section: libdevel
+Architecture: any
+Depends: libgl1-mesa-swx11 (= ${binary:Version}), libc6-dev, libx11-dev | xlibs-dev (>> 4.1.0), libxext6 | xlibs (>> 4.1.0), mesa-common-dev (= ${source:Version}), lesstif2-dev
+Provides: libgl-dev, mesag3-widgets, mesag-widgets-dev, libglw-dev, mesag-dev, libgl1-mesa-swrast-dev
+Conflicts: mesa-dev, libgl-dev, mesag3 (<< 3.1-1), nvidia-glx-dev, mesag-dev, libgl1-mesa-swrast-dev
+Replaces: libgl-dev, mesag-dev, libgl1-mesa-swrast-dev
+Description: A free implementation of the OpenGL API -- development support files
+ This package provides the development environment required for
+ compiling programs with Mesa.  For a complete description of Mesa,
+ please look at the libgl1-mesa-swx11 package.
+ .
+ This package also provides a simple widgets library, libGLw, which
+ allows Motif-based applications to embed an OpenGL drawing context.
+ The headers and static libraries for compiling programs that use this
+ library are included.
+ .
+ This library provides a pure software rasteriser; it does not provide
+ a direct rendering-capable library, or one which uses GLX.  For that,
+ please see libgl1-mesa-dev.
+
+Package: libgl1-mesa-swx11-dbg
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Conflicts: libgl1-mesa-swrast-dbg
+Replaces: libgl1-mesa-swrast-dbg
+Provides: libgl1-mesa-swrast-dbg
+Description: A free implementation of the OpenGL API -- debugging package
+ This package provides a debug-enabled version of the Mesa libraries.
+ .
+ For a complete description of Mesa, please look at the libgl1-mesa-swx11
+ package.
+
+Package: libgl1-mesa-glx
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Conflicts: libgl1, libgl1-mesa-dri (<< 6.4.0)
+Replaces: libgl1, libgl1-mesa-dri (<< 6.4.0)
+Provides: libgl1
+Description: A free implementation of the OpenGL API -- GLX runtime
+ This version of Mesa provides GLX and DRI capabilities: it is capable of
+ both direct and indirect rendering.  For direct rendering, it can use DRI
+ modules from the libgl1-mesa-dri package to accelerate drawing.
+ .
+ This package does not include the modules themselves: these can be found
+ in the libgl1-mesa-dri package.
+ .
+ For a complete description of Mesa, please look at the
+ libgl1-mesa-swx11 package.
+
+Package: libgl1-mesa-dri
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, libgl1-mesa-glx (= ${binary:Version})
+Conflicts: xlibmesa-dri (<< 1:7.0.0)
+Replaces: xlibmesa-dri (<< 1:7.0.0)
+Description: A free implementation of the OpenGL API -- DRI modules
+ This version of Mesa provides GLX and DRI capabilities: it is capable of
+ both direct and indirect rendering.  For direct rendering, it can use DRI
+ modules from the libgl1-mesa-dri package to accelerate drawing.
+ .
+ This package does not include the OpenGL library itself, only the DRI
+ modules for accelerating direct rendering.
+ .
+ For a complete description of Mesa, please look at the
+ libgl1-mesa-swx11 package.
+
+Package: libgl1-mesa-dev
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, libc6-dev, mesa-common-dev (= ${source:Version}), libgl1-mesa-glx (=${binary:Version}), libgl1-mesa-dri (= ${binary:Version})
+Conflicts: libgl-dev, libgl1-mesa-dri-dev
+Replaces: libgl-dev, libgl1-mesa-dri-dev
+Provides: libgl-dev, libgl1-mesa-dri-dev
+Description: A free implementation of the OpenGL API -- GLX development support files
+ This version of Mesa provides GLX and DRI capabilities: it is capable of
+ both direct and indirect rendering.  For direct rendering, it can use DRI
+ modules from the libgl1-mesa-dri package to accelerate drawing.
+ .
+ This package includes headers and static libraries for compiling
+ programs with Mesa.
+ .
+ For a complete description of Mesa, please look at the libgl1-mesa-swx11
+ package.
+
+Package: mesa-common-dev
+Section: devel
+Architecture: all
+Replaces: xlibmesa-gl-dev (<< 1:7), xlibosmesa-dev
+Description: Developer documentation for Mesa
+ This package includes the specifications for the Mesa-specific OpenGL
+ extensions, the complete set of release release notes and the
+ development header files common to all Mesa packages.
+
+Package: libosmesa6
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: Mesa Off-screen rendering extension
+ OSmesa is a Mesa extension that allows programs to render to an
+ off-screen buffer using the OpenGL API without having to create a
+ rendering context on an X Server.  It uses a pure software renderer.
+ .
+ This package provides both 16-bit and 32-bit versions of the off-screen
+ renderer which do not require external libraries to work.
+
+Package: libosmesa6-dev
+Section: devel
+Architecture: any
+Depends: libosmesa6 (= ${binary:Version}), libgl1-mesa-swx11-dev (= ${binary:Version})
+Conflicts: xlibosmesa-dev, libosmesa4-dev, libosmesa-dev
+Replaces: xlibosmesa-dev, libosmesa-dev
+Provides: xlibosmesa-dev, libosmesa-dev
+Description: Mesa Off-screen rendering extension -- development support files
+ This package provides the required environment for developing programs
+ that use the off-screen rendering extension of Mesa.
+ .
+ For more information on OSmesa see the libosmesa6 package.
+
+Package: libglu1-mesa
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, libgl1-mesa-glx | libgl1
+Provides: libglu1
+Conflicts: mesag3 (<< 5.0.0-1), xlibmesa3, libglu1
+Replaces: libglu1
+Description: The OpenGL utility library (GLU)
+ GLU offers simple interfaces for building mipmaps; checking for the
+ presence of extensions in the OpenGL (or other libraries which follow
+ the same conventions for advertising extensions); drawing
+ piecewise-linear curves, NURBS, quadrics and other primitives
+ (including, but not limited to, teapots); tesselating surfaces; setting
+ up projection matrices and unprojecting screen coordinates to world
+ coordinates.
+ .
+ On Linux, this library is also known as libGLU or libGLU.so.1.
+ .
+ This package provides the SGI implementation of GLU shipped with the
+ Mesa package (ergo the "-mesa" suffix).
+
+Package: libglu1-mesa-dev
+Section: libdevel
+Architecture: any
+Depends: ${shlibs:Depends}, libglu1-mesa (= ${binary:Version}), libgl1-mesa-dev | libgl-dev
+Provides: libglu-dev, xlibmesa-glu-dev
+Conflicts: mesag-dev (<< 5.0.0-1), mesa-glide2-dev (<< 5.0.0-1), mesag3+ggi-dev (<< 5.0.0-1), xlibmesa-dev
+Replaces: libglu-dev
+Description: The OpenGL utility library -- development support files
+ Includes headers and static libraries for compiling programs with GLU.
+ .
+ For a complete description of GLU, please look at the libglu1-mesa
+ package.
+
+Package: mesa-swx11-source
+Section: libdevel
+Architecture: all
+Description: Mesa software rasteriser source -- development support files
+ This package contains the source to the Mesa software rasteriser, which
+ implements all of Mesa's GL support in software.  It powers the X11 and
+ X server backends (assuming unaccelerated indirect).  This package is
+ provided mainly for modular X servers which support GL, and need the
+ software rasteriser source to build the GLcore module for unaccelerated
+ indirect rendering.
+
+# vim: tw=0
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 00000000000..1a07b1d9247
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,33 @@
+This package was debianized by Thierry Reding <[email protected]> on
+Sat, 14 Oct 2006 02:01:12 +0200.
+
+It was downloaded from http://mesa3d.org/download.html.
+
+Upstream Author: Brian Paul <[email protected]>
+
+License:
+
+  Copyright (C) 1999-2005  Brian Paul   All Rights Reserved.
+
+  Permission is hereby granted, free of charge, to any person obtaining a
+  copy of this software and associated documentation files (the "Software"),
+  to deal in the Software without restriction, including without limitation
+  the rights to use, copy, modify, merge, publish, distribute, sublicense,
+  and/or sell copies of the Software, and to permit persons to whom the
+  Software is furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included
+  in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+  OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+  BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+  AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+------------------------------------------------------------------------------
+
+The Debian packaging is (C) 2006, Thierry Reding <[email protected]> and
+is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+
diff --git a/debian/libgl1-mesa-dev.install b/debian/libgl1-mesa-dev.install
new file mode 100644
index 00000000000..c892278267c
--- /dev/null
+++ b/debian/libgl1-mesa-dev.install
@@ -0,0 +1,2 @@
+usr/include/GL/glx*.h
+usr/lib/libGL.so
diff --git a/debian/libgl1-mesa-dri.install b/debian/libgl1-mesa-dri.install
new file mode 100644
index 00000000000..55500c81209
--- /dev/null
+++ b/debian/libgl1-mesa-dri.install
@@ -0,0 +1 @@
+usr/lib/dri/*.so
diff --git a/debian/libgl1-mesa-glx.install b/debian/libgl1-mesa-glx.install
new file mode 100644
index 00000000000..3fc3ba6696e
--- /dev/null
+++ b/debian/libgl1-mesa-glx.install
@@ -0,0 +1 @@
+usr/lib/libGL.so.1*
diff --git a/debian/libgl1-mesa-swx11-dbg.install b/debian/libgl1-mesa-swx11-dbg.install
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/debian/libgl1-mesa-swx11-dbg.install
diff --git a/debian/libgl1-mesa-swx11-dev.install b/debian/libgl1-mesa-swx11-dev.install
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/debian/libgl1-mesa-swx11-dev.install
diff --git a/debian/libgl1-mesa-swx11.install b/debian/libgl1-mesa-swx11.install
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/debian/libgl1-mesa-swx11.install
diff --git a/debian/libglu1-mesa-dev.install b/debian/libglu1-mesa-dev.install
new file mode 100644
index 00000000000..f8973bf1d69
--- /dev/null
+++ b/debian/libglu1-mesa-dev.install
@@ -0,0 +1,2 @@
+usr/include/GL/glu.h
+usr/include/GL/glu_mangle.h
diff --git a/debian/libglu1-mesa.install b/debian/libglu1-mesa.install
new file mode 100644
index 00000000000..d252083d81e
--- /dev/null
+++ b/debian/libglu1-mesa.install
@@ -0,0 +1 @@
+usr/lib/libGLU.so.1*
diff --git a/debian/libosmesa6-dev.install b/debian/libosmesa6-dev.install
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/debian/libosmesa6-dev.install
diff --git a/debian/libosmesa6.install b/debian/libosmesa6.install
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/debian/libosmesa6.install
diff --git a/debian/mesa-common-dev.install b/debian/mesa-common-dev.install
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/debian/mesa-common-dev.install
diff --git a/debian/mesa-swx11-source.install b/debian/mesa-swx11-source.install
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/debian/mesa-swx11-source.install
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 00000000000..90e176e0b83
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,93 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+CFLAGS = -Wall -g
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -O0
+else
+	CFLAGS += -O2
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+	INSTALL_PROGRAM += -s
+endif
+
+DEB_HOST_ARCH      ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_BUILD_DIR      ?= $(CURDIR)/obj-$(DEB_BUILD_GNU_TYPE)
+
+STAMPDIR = debian/stamp
+
+CONFIGS = debian \
+          debian-dri
+
+STAMP = $(STAMPDIR)/$(DEB_BUILD_GNU_TYPE)-
+BUILD_STAMPS = $(addprefix $(STAMP)-build-, $(CONFIGS))
+INSTALL_STAMPS = $(addprefix $(STAMP)-install-, $(CONFIGS))
+
+debian/stamp:
+	dh_testdir
+	mkdir -p debian/stamp
+
+build: debian/stamp $(BUILD_STAMPS)
+$(STAMP)-build-%:
+	dh_testdir
+	mkdir -p $(DEB_BUILD_DIR)/$*
+	find $(CURDIR)/* -maxdepth 0 -not -path '$(DEB_BUILD_DIR)*' | xargs cp -rl -t $(DEB_BUILD_DIR)/$*
+	ln -s $* $(DEB_BUILD_DIR)/$*/configs/current
+	cd $(DEB_BUILD_DIR)/$* && $(MAKE)
+	touch $@
+
+pre-install:
+	dh_testdir
+	dh_testroot
+	dh_clean -k --exclude ./Makefile.orig
+	dh_installdirs
+
+install: build pre-install $(INSTALL_STAMPS)
+
+$(STAMP)-install-%:
+	# Add here commands to install the package into debian/tmp
+	cd $(DEB_BUILD_DIR)/$* && $(MAKE) install INSTALL_DIR=$(CURDIR)/debian/tmp/usr
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -rf $(DEB_BUILD_DIR) debian/stamp
+	dh_clean --exclude ./Makefile.orig
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs
+	dh_installdocs
+	dh_installexamples
+	dh_install --sourcedir=debian/tmp --list-missing
+	dh_installman
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+	dh_makeshlibs
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure
+
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 00000000000..75441ad9de1
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://sf.net/mesa3d/MesaLib-(.*)\.tar\.gz