X Strike Force X.Org X11 SVN commit: r3824 - in branches/experimental/mesa: configs debian
Author: beatle
Date: 2006-10-16 04:58:05 -0400 (Mon, 16 Oct 2006)
New Revision: 3824
Added:
branches/experimental/mesa/configs/debian-alpha-ev5
branches/experimental/mesa/configs/debian-i386-i686
branches/experimental/mesa/configs/debian-powerpc-603
branches/experimental/mesa/configs/debian-sparc-ultrasparc
branches/experimental/mesa/configs/debian-swx11+glu
branches/experimental/mesa/debian/libgl1-mesa-swx11-i686.install
Removed:
branches/experimental/mesa/configs/debian
branches/experimental/mesa/configs/debian-alpha
branches/experimental/mesa/configs/debian-common
branches/experimental/mesa/configs/debian-i386
branches/experimental/mesa/configs/debian-powerpc
branches/experimental/mesa/configs/debian-sparc
branches/experimental/mesa/debian/libgl1-mesa-swx11-dbg.install
Modified:
branches/experimental/mesa/configs/debian-amd64
branches/experimental/mesa/configs/debian-default
branches/experimental/mesa/configs/debian-osmesa
branches/experimental/mesa/configs/debian-osmesa16
branches/experimental/mesa/configs/debian-osmesa16-static
branches/experimental/mesa/configs/debian-osmesa32
branches/experimental/mesa/configs/debian-osmesa32-static
branches/experimental/mesa/configs/debian-ppc64
branches/experimental/mesa/debian/changelog
branches/experimental/mesa/debian/control
branches/experimental/mesa/debian/rules
Log:
Drop the libgl1-mesa-swx11-dbg package until there's a decision as to whether
it is really needed.
Allow more than one type of optimization libraries to be built for any given
architecture. Currently optimization configurations are provided for i386
[i686], alpha [ev5], amd64, powerpc [603], ppc64 and sparc [ultrasparc].
However, only i686 and amd64 are enabled for now for safety.
Add the libgl1-mesa-swx11-i686 for i686 optimized libraries.
Drop the debian-common configuration because it is no longer used.
Don't build libGLU in all configurations, only when needed.
Deleted: branches/experimental/mesa/configs/debian
===================================================================
--- branches/experimental/mesa/configs/debian 2006-10-15 18:02:33 UTC (rev 3823)
+++ branches/experimental/mesa/configs/debian 2006-10-16 08:58:05 UTC (rev 3824)
@@ -1,9 +0,0 @@
-# Configuration for building Mesa on the build architecture.
-
-include $(TOP)/configs/debian-default
-include $(TOP)/configs/linux
-
-CONFIG_NAME = debian
-
-# vim: ft=make
-
Deleted: branches/experimental/mesa/configs/debian-alpha
===================================================================
--- branches/experimental/mesa/configs/debian-alpha 2006-10-15 18:02:33 UTC (rev 3823)
+++ branches/experimental/mesa/configs/debian-alpha 2006-10-16 08:58:05 UTC (rev 3824)
@@ -1,9 +0,0 @@
-# Configuration for building Mesa on alpha.
-
-include $(TOP)/configs/debian-default
-include $(TOP)/configs/linux-alpha
-
-CONFIG_NAME = debian-alpha
-
-# vim: ft=make
-
Copied: branches/experimental/mesa/configs/debian-alpha-ev5 (from rev 3823, branches/experimental/mesa/configs/debian-alpha)
===================================================================
--- branches/experimental/mesa/configs/debian-alpha-ev5 (rev 0)
+++ branches/experimental/mesa/configs/debian-alpha-ev5 2006-10-16 08:58:05 UTC (rev 3824)
@@ -0,0 +1,11 @@
+# Configuration for building Mesa on alpha.
+
+include $(TOP)/configs/debian-default
+include $(TOP)/configs/linux-alpha
+
+CONFIG_NAME = debian-alpha
+
+override LIB_DIR = lib/ev5/cmov
+
+# vim: ft=make
+
Modified: branches/experimental/mesa/configs/debian-amd64
===================================================================
--- branches/experimental/mesa/configs/debian-amd64 2006-10-15 18:02:33 UTC (rev 3823)
+++ branches/experimental/mesa/configs/debian-amd64 2006-10-16 08:58:05 UTC (rev 3824)
@@ -5,5 +5,7 @@
CONFIG_NAME = debian-amd64
+override LIB_DIR = lib64
+
# vim: ft=make
Deleted: branches/experimental/mesa/configs/debian-common
===================================================================
--- branches/experimental/mesa/configs/debian-common 2006-10-15 18:02:33 UTC (rev 3823)
+++ branches/experimental/mesa/configs/debian-common 2006-10-16 08:58:05 UTC (rev 3824)
@@ -1,6 +0,0 @@
-# Override defaults set by the Mesa configuration.
-
-CONFIG_NAME = debian-common
-
-# vim: ft=make
-
Modified: branches/experimental/mesa/configs/debian-default
===================================================================
--- branches/experimental/mesa/configs/debian-default 2006-10-15 18:02:33 UTC (rev 3823)
+++ branches/experimental/mesa/configs/debian-default 2006-10-16 08:58:05 UTC (rev 3824)
@@ -1,14 +1,8 @@
-# Debian-specific defaults for the default Mesa configuration.
-#
-# Yes, this is somewhat confusing: this is different from debian-common in
-# that debian-common only sets general compilation flags while this file
-# overrides the directories that are actually built by default.
+# Define Debian-specific defaults.
-include $(TOP)/configs/debian-common
-
CONFIG_NAME = debian-default
-override SRC_DIRS = mesa glu
+override SRC_DIRS = mesa
override PROGRAM_DIRS =
override INSTALL_DIR = $(DESTDIR)/usr
Deleted: branches/experimental/mesa/configs/debian-i386
===================================================================
--- branches/experimental/mesa/configs/debian-i386 2006-10-15 18:02:33 UTC (rev 3823)
+++ branches/experimental/mesa/configs/debian-i386 2006-10-16 08:58:05 UTC (rev 3824)
@@ -1,13 +0,0 @@
-# Configuration for building Mesa on i386.
-
-include $(TOP)/configs/debian-default
-include $(TOP)/configs/linux-x86
-
-CONFIG_NAME = debian-i386
-
-OPT_FLAGS += -march=i686
-
-override LIB_DIR = lib/i686/cmov
-
-# vim: ft=make
-
Copied: branches/experimental/mesa/configs/debian-i386-i686 (from rev 3823, branches/experimental/mesa/configs/debian-i386)
===================================================================
--- branches/experimental/mesa/configs/debian-i386-i686 (rev 0)
+++ branches/experimental/mesa/configs/debian-i386-i686 2006-10-16 08:58:05 UTC (rev 3824)
@@ -0,0 +1,12 @@
+# Configuration for building Mesa on i386.
+
+include $(TOP)/configs/debian-default
+include $(TOP)/configs/linux-x86
+
+CONFIG_NAME = debian-i386
+
+override ARCH_FLAGS += -mcpu=i686
+override LIB_DIR = lib/i686/cmov
+
+# vim: ft=make
+
Modified: branches/experimental/mesa/configs/debian-osmesa
===================================================================
--- branches/experimental/mesa/configs/debian-osmesa 2006-10-15 18:02:33 UTC (rev 3823)
+++ branches/experimental/mesa/configs/debian-osmesa 2006-10-16 08:58:05 UTC (rev 3824)
@@ -5,8 +5,6 @@
CONFIG_NAME = debian-osmesa
-override SRC_DIRS = mesa
-
# vim: ft=make
Modified: branches/experimental/mesa/configs/debian-osmesa16
===================================================================
--- branches/experimental/mesa/configs/debian-osmesa16 2006-10-15 18:02:33 UTC (rev 3823)
+++ branches/experimental/mesa/configs/debian-osmesa16 2006-10-16 08:58:05 UTC (rev 3824)
@@ -6,7 +6,5 @@
CONFIG_NAME = debian-osmesa16
-override SRC_DIRS = mesa
-
# vim: ft=make
Modified: branches/experimental/mesa/configs/debian-osmesa16-static
===================================================================
--- branches/experimental/mesa/configs/debian-osmesa16-static 2006-10-15 18:02:33 UTC (rev 3823)
+++ branches/experimental/mesa/configs/debian-osmesa16-static 2006-10-16 08:58:05 UTC (rev 3824)
@@ -6,7 +6,5 @@
CONFIG_NAME = debian-osmesa16-static
-override SRC_DIRS = mesa
-
# vim: ft=make
Modified: branches/experimental/mesa/configs/debian-osmesa32
===================================================================
--- branches/experimental/mesa/configs/debian-osmesa32 2006-10-15 18:02:33 UTC (rev 3823)
+++ branches/experimental/mesa/configs/debian-osmesa32 2006-10-16 08:58:05 UTC (rev 3824)
@@ -6,7 +6,5 @@
CONFIG_NAME = debian-osmesa32
-override SRC_DIRS = mesa
-
# vim: ft=make
Modified: branches/experimental/mesa/configs/debian-osmesa32-static
===================================================================
--- branches/experimental/mesa/configs/debian-osmesa32-static 2006-10-15 18:02:33 UTC (rev 3823)
+++ branches/experimental/mesa/configs/debian-osmesa32-static 2006-10-16 08:58:05 UTC (rev 3824)
@@ -6,7 +6,5 @@
CONFIG_NAME = debian-osmesa32-static
-override SRC_DIRS = mesa
-
# vim: ft=make
Deleted: branches/experimental/mesa/configs/debian-powerpc
===================================================================
--- branches/experimental/mesa/configs/debian-powerpc 2006-10-15 18:02:33 UTC (rev 3823)
+++ branches/experimental/mesa/configs/debian-powerpc 2006-10-16 08:58:05 UTC (rev 3824)
@@ -1,9 +0,0 @@
-# Configuration for building Mesa on powerpc.
-
-include $(TOP)/configs/debian-default
-include $(TOP)/configs/linux-ppc
-
-CONFIG_NAME = debian-powerpc
-
-# vim: ft=make
-
Copied: branches/experimental/mesa/configs/debian-powerpc-603 (from rev 3823, branches/experimental/mesa/configs/debian-powerpc)
===================================================================
--- branches/experimental/mesa/configs/debian-powerpc-603 (rev 0)
+++ branches/experimental/mesa/configs/debian-powerpc-603 2006-10-16 08:58:05 UTC (rev 3824)
@@ -0,0 +1,11 @@
+# Configuration for building Mesa on powerpc.
+
+include $(TOP)/configs/debian-default
+include $(TOP)/configs/linux-ppc
+
+CONFIG_NAME = debian-powerpc
+
+override LIB_DIR = lib/603/cmov
+
+# vim: ft=make
+
Modified: branches/experimental/mesa/configs/debian-ppc64
===================================================================
--- branches/experimental/mesa/configs/debian-ppc64 2006-10-15 18:02:33 UTC (rev 3823)
+++ branches/experimental/mesa/configs/debian-ppc64 2006-10-16 08:58:05 UTC (rev 3824)
@@ -4,5 +4,7 @@
CONFIG_NAME = debian-ppc64
+override LIB_DIR = lib64
+
# vim: ft=make
Deleted: branches/experimental/mesa/configs/debian-sparc
===================================================================
--- branches/experimental/mesa/configs/debian-sparc 2006-10-15 18:02:33 UTC (rev 3823)
+++ branches/experimental/mesa/configs/debian-sparc 2006-10-16 08:58:05 UTC (rev 3824)
@@ -1,9 +0,0 @@
-# Configuration for building Mesa on sparc.
-
-include $(TOP)/configs/debian-default
-include $(TOP)/configs/linux-sparc
-
-CONFIG_NAME = debian-sparc
-
-# vim: ft=make
-
Copied: branches/experimental/mesa/configs/debian-sparc-ultrasparc (from rev 3823, branches/experimental/mesa/configs/debian-sparc)
===================================================================
--- branches/experimental/mesa/configs/debian-sparc-ultrasparc (rev 0)
+++ branches/experimental/mesa/configs/debian-sparc-ultrasparc 2006-10-16 08:58:05 UTC (rev 3824)
@@ -0,0 +1,11 @@
+# Configuration for building Mesa on sparc.
+
+include $(TOP)/configs/debian-default
+include $(TOP)/configs/linux-sparc
+
+CONFIG_NAME = debian-sparc
+
+override LIB_DIR = lib/ultrasparc/cmov
+
+# vim: ft=make
+
Copied: branches/experimental/mesa/configs/debian-swx11+glu (from rev 3823, branches/experimental/mesa/configs/debian)
===================================================================
--- branches/experimental/mesa/configs/debian-swx11+glu (rev 0)
+++ branches/experimental/mesa/configs/debian-swx11+glu 2006-10-16 08:58:05 UTC (rev 3824)
@@ -0,0 +1,11 @@
+# Configuration for building Mesa (swx11 and GLU) on the build architecture.
+
+include $(TOP)/configs/debian-default
+include $(TOP)/configs/linux
+
+CONFIG_NAME = debian
+
+override SRC_DIRS = mesa glu
+
+# vim: ft=make
+
Modified: branches/experimental/mesa/debian/changelog
===================================================================
--- branches/experimental/mesa/debian/changelog 2006-10-15 18:02:33 UTC (rev 3823)
+++ branches/experimental/mesa/debian/changelog 2006-10-16 08:58:05 UTC (rev 3824)
@@ -1,6 +1,7 @@
mesa (6.5.1-1) unstable; urgency=low
- *
+ * Provide i686 optimized versions in libgl1-mesa-swx11-i686.
+ * No longer provide the libgl1-mesa-swx11-dbg package.
- -- Thierry Reding <thierry@gilfi.de> Sat, 14 Oct 2006 02:09:50 +0200
+ -- Thierry Reding <thierry@gilfi.de> Sun, 15 Oct 2006 19:21:13 +0200
Modified: branches/experimental/mesa/debian/control
===================================================================
--- branches/experimental/mesa/debian/control 2006-10-15 18:02:33 UTC (rev 3823)
+++ branches/experimental/mesa/debian/control 2006-10-16 08:58:05 UTC (rev 3824)
@@ -27,6 +27,30 @@
.
On Linux, this library is also known as libGL or libGL.so.1.
+Package: libgl1-mesa-swx11-i686
+Section: libs
+Priority: extra
+Architecture: i386
+Pre-Depends: libgl1-mesa-swx11
+Description: A free implementation of the OpenGL API -- i686 optimized 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.
+ .
+ This set of libraries is optimized for i686 machines and will only be used if
+ you are running a 2.6 kernel on an i686 class CPU. This includes Pentium Pro,
+ Pentium II/II/IV, Celeron CPU's and similar class CPU's (including clones
+ such as AMD Athlon/Opteron, VIA C3 Nehemiah, but not VIA C3 Ezla).
+
Package: libgl1-mesa-swx11-dev
Section: libdevel
Architecture: any
@@ -48,19 +72,6 @@
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
Deleted: branches/experimental/mesa/debian/libgl1-mesa-swx11-dbg.install
===================================================================
Added: branches/experimental/mesa/debian/libgl1-mesa-swx11-i686.install
===================================================================
--- branches/experimental/mesa/debian/libgl1-mesa-swx11-i686.install (rev 0)
+++ branches/experimental/mesa/debian/libgl1-mesa-swx11-i686.install 2006-10-16 08:58:05 UTC (rev 3824)
@@ -0,0 +1,2 @@
+usr/lib/i686/cmov/libGL.so.*
+usr/lib/i686/cmov/libOSMesa.*
Modified: branches/experimental/mesa/debian/rules
===================================================================
--- branches/experimental/mesa/debian/rules 2006-10-15 18:02:33 UTC (rev 3823)
+++ branches/experimental/mesa/debian/rules 2006-10-16 08:58:05 UTC (rev 3824)
@@ -1,10 +1,6 @@
#!/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.
+# debian/rules for the Debian mesa package
+# Copyright © 2006 Thierry Reding <thierry@gilfi.de>
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
@@ -31,8 +27,7 @@
export DEB_BUILD_ARCH
# build the following configurations
-CONFIGS = debian \
- debian-arch \
+CONFIGS = debian-swx11+glu \
debian-dri-arch \
debian-osmesa16 \
debian-osmesa16-static \
@@ -40,6 +35,36 @@
debian-osmesa32-static \
debian-static
+# additional configurations optimized for CPU's supported by the build
+# architecture
+ifeq ($(DEB_BUILD_ARCH), i386)
+ CONFIGS += debian-i386-i686
+endif
+
+#ifeq ($(DEB_BUILD_ARCH), alpha)
+# CONFIGS += debian-alpha-ev5
+#endif
+
+ifeq ($(DEB_BUILD_ARCH), amd64)
+ CONFIGS += debian-amd64
+endif
+
+#ifeq ($(DEB_BUILD_ARCH), powerpc)
+# CONFIGS += debian-powerpc-603
+#endif
+
+#ifeq ($(DEB_BUILD_ARCH), ppc64)
+# CONFIGS += debian-ppc64
+#endif
+
+#ifeq ($(DEB_BUILD_ARCH), sparc)
+# CONFIGS += debian-sparc-ultrasparc
+#endif
+
+# Use the following to automatically build all optimized configurations
+# available for the build architecture. Use with caution =)
+#CONFIGS += $(subst configs/,,$(wildcard configs/debian-$(DEB_BUILD_ARCH)*))
+
STAMP = $(STAMP_DIR)/$(DEB_BUILD_GNU_TYPE)
BUILD_STAMPS = $(addprefix $(STAMP)-build-, $(CONFIGS))
INSTALL_STAMPS = $(addprefix $(STAMP)-install-, $(CONFIGS))
@@ -50,7 +75,9 @@
$(QUILT_STAMPFN): $(STAMP_DIR)
+
build: $(BUILD_STAMPS)
+
$(STAMP)-build-%: patch
dh_testdir
mkdir -p $(DEB_BUILD_DIR)/$*
@@ -65,9 +92,8 @@
dh_testroot
dh_clean -k --exclude ./Makefile.orig --exclude configs/CVS/Root.bak
rm -rf $(INSTALL_STAMPS)
- dh_installdirs
-install: build pre-install $(INSTALL_STAMPS)
+install: pre-install $(INSTALL_STAMPS)
$(STAMP)-install-%: $(STAMP)-build-%
# Add here commands to install the package into debian/tmp
@@ -77,8 +103,8 @@
clean: unpatch
dh_testdir
dh_testroot
+ dh_clean --exclude ./Makefile.orig --exclude configs/CVS/Root.bak
rm -rf $(DEB_BUILD_DIR) $(STAMP_DIR)
- dh_clean --exclude ./Makefile.orig --exclude configs/CVS/Root.bak
# Build architecture-independent files here.
binary-indep: build install
Reply to: