Author: beatle
Date: 2006-10-14 13:04:02 -0400 (Sat, 14 Oct 2006)
New Revision: 3799
Added:
branches/experimental/mesa/configs/debian-osmesa
branches/experimental/mesa/configs/linux-osmesa32-static
Modified:
branches/experimental/mesa/configs/debian-common
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/debian/rules
Log:
Base the Debian OSMesa configurations on linux-osmesa* provided upstream.
Add a configuration for building a static version of OSMesa with 32 bits per
color channel.
Modified: branches/experimental/mesa/configs/debian-common
===================================================================
--- branches/experimental/mesa/configs/debian-common 2006-10-14 16:58:18 UTC
(rev 3798)
+++ branches/experimental/mesa/configs/debian-common 2006-10-14 17:04:02 UTC
(rev 3799)
@@ -1,10 +1,6 @@
# Override defaults set by the Mesa configuration.
-include $(TOP)/configs/default
-
CONFIG_NAME = debian-common
-override OPT_FLAGS = -O2 -g
-
# vim: ft=make
Added: branches/experimental/mesa/configs/debian-osmesa
===================================================================
--- branches/experimental/mesa/configs/debian-osmesa
(rev 0)
+++ branches/experimental/mesa/configs/debian-osmesa 2006-10-14 17:04:02 UTC
(rev 3799)
@@ -0,0 +1,10 @@
+# Configuration for building OSMesa on Debian.
+
+include $(TOP)/configs/debian-common
+include $(TOP)/configs/linux-osmesa
+
+CONFIG_NAME = debian-osmesa
+
+# vim: ft=make
+
+
Modified: branches/experimental/mesa/configs/debian-osmesa16
===================================================================
--- branches/experimental/mesa/configs/debian-osmesa16 2006-10-14 16:58:18 UTC
(rev 3798)
+++ branches/experimental/mesa/configs/debian-osmesa16 2006-10-14 17:04:02 UTC
(rev 3799)
@@ -2,20 +2,9 @@
# channel.
include $(TOP)/configs/debian-common
-include $(TOP)/configs/linux-osmesa
+include $(TOP)/configs/linux-osmesa16
CONFIG_NAME = debian-osmesa16
-DEFINES += -DCHAN_BITS=16 -DDEFAULT_SOFTWARE_DEPTH_BITS=31
-
-override OSMESA_LIB = OSMesa16
-override OSMESA_LIB_NAME = lib$(OSMESA_LIB).so
-
-override SRC_DIRS = mesa glu
-override DRIVER_DIRS = osmesa
-override PROGRAM_DIRS =
-
-override APP_LIB_DEPS = -lOSMesa16
-
# vim: ft=make
Modified: branches/experimental/mesa/configs/debian-osmesa16-static
===================================================================
--- branches/experimental/mesa/configs/debian-osmesa16-static 2006-10-14
16:58:18 UTC (rev 3798)
+++ branches/experimental/mesa/configs/debian-osmesa16-static 2006-10-14
17:04:02 UTC (rev 3799)
@@ -1,12 +1,10 @@
# Configuration for building a static version of OSMesa with support for 16
# bits per color channel.
-include $(TOP)/configs/debian-static
-include $(TOP)/configs/debian-osmesa16
+include $(TOP)/configs/debian-common
+include $(TOP)/configs/linux-osmesa16-static
CONFIG_NAME = debian-osmesa16-static
-override OSMESA_LIB_NAME = lib$(OSMESA_LIB).a
-
# vim: ft=make
Modified: branches/experimental/mesa/configs/debian-osmesa32
===================================================================
--- branches/experimental/mesa/configs/debian-osmesa32 2006-10-14 16:58:18 UTC
(rev 3798)
+++ branches/experimental/mesa/configs/debian-osmesa32 2006-10-14 17:04:02 UTC
(rev 3799)
@@ -2,20 +2,9 @@
# channel.
include $(TOP)/configs/debian-common
-include $(TOP)/configs/linux-osmesa
+include $(TOP)/configs/linux-osmesa32
CONFIG_NAME = debian-osmesa32
-DEFINES += -DCHAN_BITS=32 -DDEFAULT_SOFTWARE_DEPTH_BITS=31
-
-override OSMESA_LIB = OSMesa32
-override OSMESA_LIB_NAME = lib$(OSMESA_LIB).so
-
-override SRC_DIRS = mesa glu
-override DRIVER_DIRS = osmesa
-override PROGRAM_DIRS =
-
-override APP_LIB_DEPS = -lOSMesa32
-
# vim: ft=make
Modified: branches/experimental/mesa/configs/debian-osmesa32-static
===================================================================
--- branches/experimental/mesa/configs/debian-osmesa32-static 2006-10-14
16:58:18 UTC (rev 3798)
+++ branches/experimental/mesa/configs/debian-osmesa32-static 2006-10-14
17:04:02 UTC (rev 3799)
@@ -1,12 +1,10 @@
# Configuration for building a static version of OSMesa with support for 32
# bits per color channel.
-include $(TOP)/configs/debian-static
-include $(TOP)/configs/debian-osmesa32
+include $(TOP)/configs/debian-common
+include $(TOP)/configs/linux-osmesa32-static
CONFIG_NAME = debian-osmesa32-static
-override OSMESA_LIB_NAME = lib$(OSMESA_LIB).a
-
# vim: ft=make
Added: branches/experimental/mesa/configs/linux-osmesa32-static
===================================================================
--- branches/experimental/mesa/configs/linux-osmesa32-static
(rev 0)
+++ branches/experimental/mesa/configs/linux-osmesa32-static 2006-10-14
17:04:02 UTC (rev 3799)
@@ -0,0 +1,28 @@
+# 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
Modified: branches/experimental/mesa/debian/rules
===================================================================
--- branches/experimental/mesa/debian/rules 2006-10-14 16:58:18 UTC (rev
3798)
+++ branches/experimental/mesa/debian/rules 2006-10-14 17:04:02 UTC (rev
3799)
@@ -30,6 +30,7 @@
# build the following configurations
CONFIGS = debian \
debian-dri \
+ debian-osmesa \
debian-osmesa16 \
debian-osmesa16-static \
debian-osmesa32 \
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
