X Strike Force X.Org X11 SVN commit: r3857 - branches/experimental/mesa/configs
Author: beatle
Date: 2006-10-20 03:43:50 -0400 (Fri, 20 Oct 2006)
New Revision: 3857
Added:
branches/experimental/mesa/configs/debian-osmesa-default
branches/experimental/mesa/configs/debian-osmesa-static
branches/experimental/mesa/configs/linux-osmesa-static
Modified:
branches/experimental/mesa/configs/debian-default
branches/experimental/mesa/configs/debian-dri-amd64
branches/experimental/mesa/configs/debian-dri-any
branches/experimental/mesa/configs/debian-dri-default
branches/experimental/mesa/configs/debian-dri-i386
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-swx11+glu-alpha-ev5
branches/experimental/mesa/configs/debian-swx11+glu-amd64
branches/experimental/mesa/configs/debian-swx11+glu-any
branches/experimental/mesa/configs/debian-swx11+glu-default
branches/experimental/mesa/configs/debian-swx11+glu-i386
branches/experimental/mesa/configs/debian-swx11+glu-i386-i686
branches/experimental/mesa/configs/debian-swx11+glu-powerpc-603
branches/experimental/mesa/configs/debian-swx11+glu-ppc64
branches/experimental/mesa/configs/debian-swx11+glu-sparc
branches/experimental/mesa/configs/debian-swx11+glu-sparc-ultrasparc
branches/experimental/mesa/configs/debian-swx11+glu-static
Log:
Add configurations to build static versions of the default OSMesa library.
In all Debian-specific configurations, include the Debian defaults
configuration after the Mesa configurations and drop the 'override' for all
variables because it is no longer needed.
Modified: branches/experimental/mesa/configs/debian-default
===================================================================
--- branches/experimental/mesa/configs/debian-default 2006-10-20 03:22:10 UTC (rev 3856)
+++ branches/experimental/mesa/configs/debian-default 2006-10-20 07:43:50 UTC (rev 3857)
@@ -2,10 +2,10 @@
CONFIG_NAME = debian-default
-override SRC_DIRS = mesa
-override PROGRAM_DIRS =
+SRC_DIRS = mesa
+PROGRAM_DIRS =
-override INSTALL_DIR = $(DESTDIR)/usr
+INSTALL_DIR = $(DESTDIR)/usr
# vim: ft=make
Modified: branches/experimental/mesa/configs/debian-dri-amd64
===================================================================
--- branches/experimental/mesa/configs/debian-dri-amd64 2006-10-20 03:22:10 UTC (rev 3856)
+++ branches/experimental/mesa/configs/debian-dri-amd64 2006-10-20 07:43:50 UTC (rev 3857)
@@ -1,7 +1,7 @@
# Configuration for building the DRI drivers on i386.
+include $(TOP)/configs/linux-dri-x86-64
include $(TOP)/configs/debian-dri-default
-include $(TOP)/configs/linux-dri-x86-64
CONFIG_NAME = debian-dri-amd64
Modified: branches/experimental/mesa/configs/debian-dri-any
===================================================================
--- branches/experimental/mesa/configs/debian-dri-any 2006-10-20 03:22:10 UTC (rev 3856)
+++ branches/experimental/mesa/configs/debian-dri-any 2006-10-20 07:43:50 UTC (rev 3857)
@@ -1,7 +1,7 @@
# Configuration for building the DRI drivers on the build architecture.
+include $(TOP)/configs/linux-dri
include $(TOP)/configs/debian-dri-default
-include $(TOP)/configs/linux-dri
CONFIG_NAME = debian-dri-any
Modified: branches/experimental/mesa/configs/debian-dri-default
===================================================================
--- branches/experimental/mesa/configs/debian-dri-default 2006-10-20 03:22:10 UTC (rev 3856)
+++ branches/experimental/mesa/configs/debian-dri-default 2006-10-20 07:43:50 UTC (rev 3857)
@@ -1,25 +1,30 @@
-# Override defaults for the DRI drivers build.
+# Configuration defaults for building the DRI drivers and DRI/GLX-enabled
+# libGL.
include $(TOP)/configs/debian-default
CONFIG_NAME = debian-dri-default
-override LIB_DIR = lib/glx
-override SRC_DIRS = glx/x11 mesa
+OPT_FLAGS = -O3 -g
-override DRI_DRIVER_INSTALL_DIR = $(INSTALL_DIR)/lib/dri
-override DRI_DRIVER_SEARCH_DIR = /usr/lib/dri
+SRC_DIRS = glx/x11 mesa
+DRIVER_DIRS = dri
-override DRI_DIRS = mach64 mga r128 r200 r300 radeon s3v savage tdfx trident
+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)),)
- override DRI_DIRS += i810 i915 i965 sis unichrome
+ DRI_DIRS += i810 i915 i965 sis unichrome
endif
ifeq ($(DEB_BUILD_ARCH), sparc)
- override DRI_DIRS += ffb
+ DRI_DIRS += ffb
endif
# vim: ft=make
Modified: branches/experimental/mesa/configs/debian-dri-i386
===================================================================
--- branches/experimental/mesa/configs/debian-dri-i386 2006-10-20 03:22:10 UTC (rev 3856)
+++ branches/experimental/mesa/configs/debian-dri-i386 2006-10-20 07:43:50 UTC (rev 3857)
@@ -1,7 +1,7 @@
# Configuration for building the DRI drivers on i386.
+include $(TOP)/configs/linux-dri-x86
include $(TOP)/configs/debian-dri-default
-include $(TOP)/configs/linux-dri-x86
CONFIG_NAME = debian-dri-i386
Modified: branches/experimental/mesa/configs/debian-osmesa
===================================================================
--- branches/experimental/mesa/configs/debian-osmesa 2006-10-20 03:22:10 UTC (rev 3856)
+++ branches/experimental/mesa/configs/debian-osmesa 2006-10-20 07:43:50 UTC (rev 3857)
@@ -1,10 +1,9 @@
-# Configuration for building OSMesa on Debian.
+# Configuration for building only OSMesa on Debian.
-include $(TOP)/configs/debian-default
include $(TOP)/configs/linux-osmesa
+include $(TOP)/configs/debian-osmesa-default
CONFIG_NAME = debian-osmesa
# vim: ft=make
-
Added: branches/experimental/mesa/configs/debian-osmesa-default
===================================================================
--- branches/experimental/mesa/configs/debian-osmesa-default (rev 0)
+++ branches/experimental/mesa/configs/debian-osmesa-default 2006-10-20 07:43:50 UTC (rev 3857)
@@ -0,0 +1,10 @@
+# Configuration defaults for building OSMesa.
+
+include $(TOP)/configs/debian-default
+
+CONFIG_NAME = debian-osmesa-default
+
+DRIVER_DIRS = osmesa
+
+# vim: ft=make
+
Added: branches/experimental/mesa/configs/debian-osmesa-static
===================================================================
--- branches/experimental/mesa/configs/debian-osmesa-static (rev 0)
+++ branches/experimental/mesa/configs/debian-osmesa-static 2006-10-20 07:43:50 UTC (rev 3857)
@@ -0,0 +1,9 @@
+# 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
+
Modified: branches/experimental/mesa/configs/debian-osmesa16
===================================================================
--- branches/experimental/mesa/configs/debian-osmesa16 2006-10-20 03:22:10 UTC (rev 3856)
+++ branches/experimental/mesa/configs/debian-osmesa16 2006-10-20 07:43:50 UTC (rev 3857)
@@ -1,8 +1,8 @@
# Configuration for building OSMesa with support for 16 bits per color
# channel.
-include $(TOP)/configs/debian-default
include $(TOP)/configs/linux-osmesa16
+include $(TOP)/configs/debian-osmesa-default
CONFIG_NAME = debian-osmesa16
Modified: branches/experimental/mesa/configs/debian-osmesa16-static
===================================================================
--- branches/experimental/mesa/configs/debian-osmesa16-static 2006-10-20 03:22:10 UTC (rev 3856)
+++ branches/experimental/mesa/configs/debian-osmesa16-static 2006-10-20 07:43:50 UTC (rev 3857)
@@ -1,8 +1,8 @@
# Configuration for building a static version of OSMesa with support for 16
# bits per color channel.
-include $(TOP)/configs/debian-default
include $(TOP)/configs/linux-osmesa16-static
+include $(TOP)/configs/debian-osmesa-default
CONFIG_NAME = debian-osmesa16-static
Modified: branches/experimental/mesa/configs/debian-osmesa32
===================================================================
--- branches/experimental/mesa/configs/debian-osmesa32 2006-10-20 03:22:10 UTC (rev 3856)
+++ branches/experimental/mesa/configs/debian-osmesa32 2006-10-20 07:43:50 UTC (rev 3857)
@@ -1,8 +1,8 @@
# Configuration for building OSMesa with support for 32 bits per color
# channel.
-include $(TOP)/configs/debian-default
include $(TOP)/configs/linux-osmesa32
+include $(TOP)/configs/debian-osmesa-default
CONFIG_NAME = debian-osmesa32
Modified: branches/experimental/mesa/configs/debian-osmesa32-static
===================================================================
--- branches/experimental/mesa/configs/debian-osmesa32-static 2006-10-20 03:22:10 UTC (rev 3856)
+++ branches/experimental/mesa/configs/debian-osmesa32-static 2006-10-20 07:43:50 UTC (rev 3857)
@@ -1,8 +1,8 @@
# Configuration for building a static version of OSMesa with support for 32
# bits per color channel.
-include $(TOP)/configs/debian-default
include $(TOP)/configs/linux-osmesa32-static
+include $(TOP)/configs/debian-osmesa-default
CONFIG_NAME = debian-osmesa32-static
Modified: branches/experimental/mesa/configs/debian-swx11+glu-alpha-ev5
===================================================================
--- branches/experimental/mesa/configs/debian-swx11+glu-alpha-ev5 2006-10-20 03:22:10 UTC (rev 3856)
+++ branches/experimental/mesa/configs/debian-swx11+glu-alpha-ev5 2006-10-20 07:43:50 UTC (rev 3857)
@@ -1,12 +1,12 @@
# Configuration for building Mesa (swx11 and GLU) on alpha (ev5 optimized).
+include $(TOP)/configs/linux-alpha
include $(TOP)/configs/debian-swx11+glu-default
-include $(TOP)/configs/linux-alpha
CONFIG_NAME = debian-swx11+glu-alpha-ev5
-override SRC_DIRS = mesa
-override LIB_DIR = lib/ev5/cmov
+SRC_DIRS = mesa
+LIB_DIR = lib/ev5/cmov
# vim: ft=make
Modified: branches/experimental/mesa/configs/debian-swx11+glu-amd64
===================================================================
--- branches/experimental/mesa/configs/debian-swx11+glu-amd64 2006-10-20 03:22:10 UTC (rev 3856)
+++ branches/experimental/mesa/configs/debian-swx11+glu-amd64 2006-10-20 07:43:50 UTC (rev 3857)
@@ -1,8 +1,8 @@
# 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
-include $(TOP)/configs/linux-x86-64
CONFIG_NAME = debian-swx11+glu-amd64
Modified: branches/experimental/mesa/configs/debian-swx11+glu-any
===================================================================
--- branches/experimental/mesa/configs/debian-swx11+glu-any 2006-10-20 03:22:10 UTC (rev 3856)
+++ branches/experimental/mesa/configs/debian-swx11+glu-any 2006-10-20 07:43:50 UTC (rev 3857)
@@ -1,7 +1,7 @@
# Configuration for building Mesa (swx11 and GLU) on the build architecture.
+include $(TOP)/configs/linux
include $(TOP)/configs/debian-swx11+glu-default
-include $(TOP)/configs/linux
CONFIG_NAME = debian-swx11+glu-any
Modified: branches/experimental/mesa/configs/debian-swx11+glu-default
===================================================================
--- branches/experimental/mesa/configs/debian-swx11+glu-default 2006-10-20 03:22:10 UTC (rev 3856)
+++ branches/experimental/mesa/configs/debian-swx11+glu-default 2006-10-20 07:43:50 UTC (rev 3857)
@@ -4,7 +4,8 @@
CONFIG_NAME = debian-swx11+glu-default
-override SRC_DIRS = mesa glu
+SRC_DIRS = mesa glu
+DRIVER_DIRS = x11
# vim: ft=make
Modified: branches/experimental/mesa/configs/debian-swx11+glu-i386
===================================================================
--- branches/experimental/mesa/configs/debian-swx11+glu-i386 2006-10-20 03:22:10 UTC (rev 3856)
+++ branches/experimental/mesa/configs/debian-swx11+glu-i386 2006-10-20 07:43:50 UTC (rev 3857)
@@ -1,8 +1,8 @@
# 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
-include $(TOP)/configs/linux-x86
CONFIG_NAME = debian-swx11+glu-i386
Modified: branches/experimental/mesa/configs/debian-swx11+glu-i386-i686
===================================================================
--- branches/experimental/mesa/configs/debian-swx11+glu-i386-i686 2006-10-20 03:22:10 UTC (rev 3856)
+++ branches/experimental/mesa/configs/debian-swx11+glu-i386-i686 2006-10-20 07:43:50 UTC (rev 3857)
@@ -1,14 +1,14 @@
# 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
-include $(TOP)/configs/linux-x86
CONFIG_NAME = debian-swx11+glu-i386-i686
-override ARCH_FLAGS += -march=i686
-override SRC_DIRS = mesa
-override LIB_DIR = lib/i686/cmov
+ARCH_FLAGS += -march=i686
+SRC_DIRS = mesa
+LIB_DIR = lib/i686/cmov
# vim: ft=make
Modified: branches/experimental/mesa/configs/debian-swx11+glu-powerpc-603
===================================================================
--- branches/experimental/mesa/configs/debian-swx11+glu-powerpc-603 2006-10-20 03:22:10 UTC (rev 3856)
+++ branches/experimental/mesa/configs/debian-swx11+glu-powerpc-603 2006-10-20 07:43:50 UTC (rev 3857)
@@ -1,13 +1,13 @@
# 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
-include $(TOP)/configs/linux-ppc
CONFIG_NAME = debian-swx11+glu-powerpc-603
-override SRC_DIRS = mesa
-override LIB_DIR = lib/603/cmov
+SRC_DIRS = mesa
+LIB_DIR = lib/603/cmov
# vim: ft=make
Modified: branches/experimental/mesa/configs/debian-swx11+glu-ppc64
===================================================================
--- branches/experimental/mesa/configs/debian-swx11+glu-ppc64 2006-10-20 03:22:10 UTC (rev 3856)
+++ branches/experimental/mesa/configs/debian-swx11+glu-ppc64 2006-10-20 07:43:50 UTC (rev 3857)
@@ -1,11 +1,11 @@
# Configuration for building Mesa (swx11 and GLU) with runtime-detected
# assembler optimizations on ppc64.
-include $(TOP)/configs/debian-ppc
+include $(TOP)/configs/debian-swx11+glu-any
CONFIG_NAME = debian-swx11+glu-ppc64
-override LIB_DIR = lib64
+LIB_DIR = lib64
# vim: ft=make
Modified: branches/experimental/mesa/configs/debian-swx11+glu-sparc
===================================================================
--- branches/experimental/mesa/configs/debian-swx11+glu-sparc 2006-10-20 03:22:10 UTC (rev 3856)
+++ branches/experimental/mesa/configs/debian-swx11+glu-sparc 2006-10-20 07:43:50 UTC (rev 3857)
@@ -1,8 +1,8 @@
# 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
-include $(TOP)/configs/linux-sparc
CONFIG_NAME = debian-swx11+glu-sparc
Modified: branches/experimental/mesa/configs/debian-swx11+glu-sparc-ultrasparc
===================================================================
--- branches/experimental/mesa/configs/debian-swx11+glu-sparc-ultrasparc 2006-10-20 03:22:10 UTC (rev 3856)
+++ branches/experimental/mesa/configs/debian-swx11+glu-sparc-ultrasparc 2006-10-20 07:43:50 UTC (rev 3857)
@@ -1,13 +1,13 @@
# 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
-include $(TOP)/configs/linux-ultrasparc
CONFIG_NAME = debian-swx11+glu-sparc-ultrasparc
-override SRC_DIRS = mesa
-override LIB_DIR = lib/ultrasparc/cmov
+SRC_DIRS = mesa
+LIB_DIR = lib/ultrasparc/cmov
# vim: ft=make
Modified: branches/experimental/mesa/configs/debian-swx11+glu-static
===================================================================
--- branches/experimental/mesa/configs/debian-swx11+glu-static 2006-10-20 03:22:10 UTC (rev 3856)
+++ branches/experimental/mesa/configs/debian-swx11+glu-static 2006-10-20 07:43:50 UTC (rev 3857)
@@ -1,7 +1,7 @@
# Configuration for building static versions of the libraries (swx11 and GLU).
+include $(TOP)/configs/linux-static
include $(TOP)/configs/debian-swx11+glu-default
-include $(TOP)/configs/linux-static
CONFIG_NAME = debian-swx11+glu-static
Added: branches/experimental/mesa/configs/linux-osmesa-static
===================================================================
--- branches/experimental/mesa/configs/linux-osmesa-static (rev 0)
+++ branches/experimental/mesa/configs/linux-osmesa-static 2006-10-20 07:43:50 UTC (rev 3857)
@@ -0,0 +1,14 @@
+# 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
+
Reply to: