X Strike Force X.Org X11 SVN commit: r3776 - in branches/experimental/mesa: configs debian
Author: beatle
Date: 2006-10-14 11:11:31 -0400 (Sat, 14 Oct 2006)
New Revision: 3776
Added:
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-static
Modified:
branches/experimental/mesa/configs/debian
branches/experimental/mesa/configs/debian-dri-common
branches/experimental/mesa/debian/libglu1-mesa-dev.install
branches/experimental/mesa/debian/mesa-common-dev.install
branches/experimental/mesa/debian/rules
Log:
Add OSMesa configurations and made fixed several issues here and there.
Modified: branches/experimental/mesa/configs/debian
===================================================================
--- branches/experimental/mesa/configs/debian 2006-10-14 14:27:28 UTC (rev 3775)
+++ branches/experimental/mesa/configs/debian 2006-10-14 15:11:31 UTC (rev 3776)
@@ -3,3 +3,6 @@
CONFIG_NAME = debian
+override SRC_DIRS = mesa glu
+override PROGRAM_DIRS =
+
Modified: branches/experimental/mesa/configs/debian-dri-common
===================================================================
--- branches/experimental/mesa/configs/debian-dri-common 2006-10-14 14:27:28 UTC (rev 3775)
+++ branches/experimental/mesa/configs/debian-dri-common 2006-10-14 15:11:31 UTC (rev 3776)
@@ -2,7 +2,10 @@
CONFIG_NAME = debian-dri-common
-DRI_DRIVER_INSTALL_DIR = $(INSTALL_DIR)/lib/dri
-DRI_DRIVER_SEARCH_DIR = /usr/lib/dri
+override SRC_DIRS = glx/x11 mesa
+override PROGRAM_DIRS =
+override DRI_DRIVER_INSTALL_DIR = $(INSTALL_DIR)/lib/dri
+override DRI_DRIVER_SEARCH_DIR = /usr/lib/dri
+
Added: branches/experimental/mesa/configs/debian-osmesa16
===================================================================
--- branches/experimental/mesa/configs/debian-osmesa16 (rev 0)
+++ branches/experimental/mesa/configs/debian-osmesa16 2006-10-14 15:11:31 UTC (rev 3776)
@@ -0,0 +1,15 @@
+include $(TOP)/configs/debian-common
+
+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
+
Added: branches/experimental/mesa/configs/debian-osmesa16-static
===================================================================
--- branches/experimental/mesa/configs/debian-osmesa16-static (rev 0)
+++ branches/experimental/mesa/configs/debian-osmesa16-static 2006-10-14 15:11:31 UTC (rev 3776)
@@ -0,0 +1,7 @@
+include $(TOP)/configs/debian-static
+include $(TOP)/configs/debian-osmesa16
+
+CONFIG_NAME = debian-osmesa16-static
+
+override OSMESA_LIB_NAME = lib$(OSMESA_LIB).a
+
Added: branches/experimental/mesa/configs/debian-osmesa32
===================================================================
--- branches/experimental/mesa/configs/debian-osmesa32 (rev 0)
+++ branches/experimental/mesa/configs/debian-osmesa32 2006-10-14 15:11:31 UTC (rev 3776)
@@ -0,0 +1,15 @@
+include $(TOP)/configs/debian-common
+
+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
+
Added: branches/experimental/mesa/configs/debian-osmesa32-static
===================================================================
--- branches/experimental/mesa/configs/debian-osmesa32-static (rev 0)
+++ branches/experimental/mesa/configs/debian-osmesa32-static 2006-10-14 15:11:31 UTC (rev 3776)
@@ -0,0 +1,7 @@
+include $(TOP)/configs/debian-static
+include $(TOP)/configs/debian-osmesa32
+
+CONFIG_NAME = debian-osmesa32-static
+
+override OSMESA_LIB_NAME = lib$(OSMESA_LIB).a
+
Added: branches/experimental/mesa/configs/debian-static
===================================================================
--- branches/experimental/mesa/configs/debian-static (rev 0)
+++ branches/experimental/mesa/configs/debian-static 2006-10-14 15:11:31 UTC (rev 3776)
@@ -0,0 +1,6 @@
+include $(TOP)/configs/debian-common
+
+CONFIG_NAME = debian-static
+
+override MKLIB_OPTIONS = -static
+
Modified: branches/experimental/mesa/debian/libglu1-mesa-dev.install
===================================================================
--- branches/experimental/mesa/debian/libglu1-mesa-dev.install 2006-10-14 14:27:28 UTC (rev 3775)
+++ branches/experimental/mesa/debian/libglu1-mesa-dev.install 2006-10-14 15:11:31 UTC (rev 3776)
@@ -1,2 +1,3 @@
usr/include/GL/glu.h
usr/include/GL/glu_mangle.h
+usr/lib/libGLU.so
Modified: branches/experimental/mesa/debian/mesa-common-dev.install
===================================================================
--- branches/experimental/mesa/debian/mesa-common-dev.install 2006-10-14 14:27:28 UTC (rev 3775)
+++ branches/experimental/mesa/debian/mesa-common-dev.install 2006-10-14 15:11:31 UTC (rev 3776)
@@ -0,0 +1,4 @@
+usr/include/GL/gl.h
+usr/include/GL/glext.h
+usr/include/GL/osmesa.h
+usr/include/GL/gl_mangle.h
Modified: branches/experimental/mesa/debian/rules
===================================================================
--- branches/experimental/mesa/debian/rules 2006-10-14 14:27:28 UTC (rev 3775)
+++ branches/experimental/mesa/debian/rules 2006-10-14 15:11:31 UTC (rev 3776)
@@ -26,10 +26,15 @@
STAMPDIR = debian/stamp
+# build the following configurations
CONFIGS = debian \
- debian-dri
+ debian-dri \
+ debian-osmesa16 \
+ debian-osmesa16-static \
+ debian-osmesa32 \
+ debian-osmesa32-static
-STAMP = $(STAMPDIR)/$(DEB_BUILD_GNU_TYPE)-
+STAMP = $(STAMPDIR)/$(DEB_BUILD_GNU_TYPE)
BUILD_STAMPS = $(addprefix $(STAMP)-build-, $(CONFIGS))
INSTALL_STAMPS = $(addprefix $(STAMP)-install-, $(CONFIGS))
@@ -42,14 +47,14 @@
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
+ ln -sf $* $(DEB_BUILD_DIR)/$*/configs/current
cd $(DEB_BUILD_DIR)/$* && $(MAKE)
touch $@
pre-install:
dh_testdir
dh_testroot
- dh_clean -k --exclude ./Makefile.orig
+ dh_clean -k --exclude ./Makefile.orig --exclude configs/CVS/Root.bak
dh_installdirs
install: build pre-install $(INSTALL_STAMPS)
@@ -62,7 +67,7 @@
dh_testdir
dh_testroot
rm -rf $(DEB_BUILD_DIR) debian/stamp
- dh_clean --exclude ./Makefile.orig
+ dh_clean --exclude ./Makefile.orig --exclude configs/CVS/Root.bak
# Build architecture-independent files here.
binary-indep: build install
Reply to: