X Strike Force X.Org X11 SVN commit: r3860 - in branches/experimental/mesa/debian: . patches
Author: beatle
Date: 2006-10-20 03:56:11 -0400 (Fri, 20 Oct 2006)
New Revision: 3860
Modified:
branches/experimental/mesa/debian/libgl1-mesa-swx11-dev.install
branches/experimental/mesa/debian/libgl1-mesa-swx11-i686.install
branches/experimental/mesa/debian/libgl1-mesa-swx11.install
branches/experimental/mesa/debian/libosmesa6-dev.install
branches/experimental/mesa/debian/libosmesa6.install
branches/experimental/mesa/debian/mesa-swx11-source.install
branches/experimental/mesa/debian/patches/01_fix-makefile.patch
branches/experimental/mesa/debian/rules
Log:
No longer install the default build of libOSMesa in the libgl1-mesa-swx11
package, but in the libosmesa6 package.
Modify the 01_fix-makefile patch to not build libOSMesa on stand-alone builds,
so that it is only created when building OSMesa explicitly.
Build libOSMesa with 8 bits per color channel (the default) in dynamic and
static versions separately from the software rasterization libGL with the
software rasterization code linked in statically so that libOSMesa can run in
parallel with any libGL. This should fix the problem Yann Dirson mentioned a
while ago.
Use the install-source.sh script to install the Mesa sources needed for the
mesa-swx11-source package instead of doing it in the debian/rules file itself.
Modified: branches/experimental/mesa/debian/libgl1-mesa-swx11-dev.install
===================================================================
--- branches/experimental/mesa/debian/libgl1-mesa-swx11-dev.install 2006-10-20 07:47:37 UTC (rev 3859)
+++ branches/experimental/mesa/debian/libgl1-mesa-swx11-dev.install 2006-10-20 07:56:11 UTC (rev 3860)
@@ -1,5 +1,3 @@
usr/include/GL/glx*.h
usr/lib/libGL.a
usr/lib/libGL.so
-usr/lib/libOSMesa.a
-usr/lib/libOSMesa.so
Modified: branches/experimental/mesa/debian/libgl1-mesa-swx11-i686.install
===================================================================
--- branches/experimental/mesa/debian/libgl1-mesa-swx11-i686.install 2006-10-20 07:47:37 UTC (rev 3859)
+++ branches/experimental/mesa/debian/libgl1-mesa-swx11-i686.install 2006-10-20 07:56:11 UTC (rev 3860)
@@ -1,2 +1 @@
usr/lib/i686/cmov/libGL.so.*
-usr/lib/i686/cmov/libOSMesa.*
Modified: branches/experimental/mesa/debian/libgl1-mesa-swx11.install
===================================================================
--- branches/experimental/mesa/debian/libgl1-mesa-swx11.install 2006-10-20 07:47:37 UTC (rev 3859)
+++ branches/experimental/mesa/debian/libgl1-mesa-swx11.install 2006-10-20 07:56:11 UTC (rev 3860)
@@ -1,2 +1 @@
usr/lib/libGL.so.*
-usr/lib/libOSMesa.so.*
Modified: branches/experimental/mesa/debian/libosmesa6-dev.install
===================================================================
--- branches/experimental/mesa/debian/libosmesa6-dev.install 2006-10-20 07:47:37 UTC (rev 3859)
+++ branches/experimental/mesa/debian/libosmesa6-dev.install 2006-10-20 07:56:11 UTC (rev 3860)
@@ -1,3 +1,5 @@
+usr/lib/libOSMesa.a
+usr/lib/libOSMesa.so
usr/lib/libOSMesa16.a
usr/lib/libOSMesa16.so
usr/lib/libOSMesa32.a
Modified: branches/experimental/mesa/debian/libosmesa6.install
===================================================================
--- branches/experimental/mesa/debian/libosmesa6.install 2006-10-20 07:47:37 UTC (rev 3859)
+++ branches/experimental/mesa/debian/libosmesa6.install 2006-10-20 07:56:11 UTC (rev 3860)
@@ -1,2 +1,3 @@
+usr/lib/libOSMesa.so.*
usr/lib/libOSMesa16.so.*
usr/lib/libOSMesa32.so.*
Modified: branches/experimental/mesa/debian/mesa-swx11-source.install
===================================================================
--- branches/experimental/mesa/debian/mesa-swx11-source.install 2006-10-20 07:47:37 UTC (rev 3859)
+++ branches/experimental/mesa/debian/mesa-swx11-source.install 2006-10-20 07:56:11 UTC (rev 3860)
@@ -0,0 +1 @@
+usr/share/mesa-source/*
Modified: branches/experimental/mesa/debian/patches/01_fix-makefile.patch
===================================================================
--- branches/experimental/mesa/debian/patches/01_fix-makefile.patch 2006-10-20 07:47:37 UTC (rev 3859)
+++ branches/experimental/mesa/debian/patches/01_fix-makefile.patch 2006-10-20 07:56:11 UTC (rev 3860)
@@ -1,5 +1,20 @@
+Do not build OSMesa for a standalone configuration, since Debian only ships
+OSMesa in a separate package.
+
+Fix Mesa makefile to install the libGL and libOSMesa libraries when they
+exist, not only depending on configuration.
+
--- a/src/mesa/Makefile
+++ b/src/mesa/Makefile
+@@ -107,7 +107,7 @@
+ $(OSMESA_DRIVER_OBJECTS)
+
+
+-stand-alone: depend subdirs $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME)
++stand-alone: depend subdirs $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME)
+
+ osmesa-only: depend subdirs $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME)
+
@@ -154,7 +154,12 @@
$(INSTALL) -d $(INSTALL_DIR)/include/GL
$(INSTALL) -d $(INSTALL_DIR)/$(LIB_DIR)
Modified: branches/experimental/mesa/debian/rules
===================================================================
--- branches/experimental/mesa/debian/rules 2006-10-20 07:47:37 UTC (rev 3859)
+++ branches/experimental/mesa/debian/rules 2006-10-20 07:56:11 UTC (rev 3860)
@@ -34,10 +34,22 @@
SWX11_GLU_CONFIGS := debian-swx11+glu-any
endif
+# build a static version of swx11 and GLU as well
+SWX11_GLU_CONFIGS += debian-swx11+glu-static
+
+# choose an architecture-specific configuration for building the DRI-enabled
+# libGL if one exists
+ifneq ($(wildcard configs/debian-dri-$(DEB_BUILD_ARCH)),)
+ DRI_CONFIGS := debian-dri-$(DEB_BUILD_ARCH)
+else
+ DRI_CONFIGS := debian-dri-any
+endif
+
# additional configurations optimized for CPU's supported by the build
# architecture
ifeq ($(DEB_BUILD_ARCH), i386)
SWX11_GLU_CONFIGS += debian-swx11+glu-i386-i686
+# DRI_CONFIGS += debian-dri-i386-i686
endif
#ifeq ($(DEB_BUILD_ARCH), alpha)
@@ -56,20 +68,11 @@
# available for the build architecture. Use with caution =)
#SWX11_GLU_CONFIGS += $(subst configs/,,$(wildcard configs/debian-swx11+glu-$(DEB_BUILD_ARCH)-*))
-# build a static version of swx11 and GLU as well
-SWX11_GLU_CONFIGS += debian-swx11+glu-static
-
-# choose an architecture-specific configuration for building the DRI-enabled
-# libGL if one exists
-ifneq ($(wildcard configs/debian-dri-$(DEB_BUILD_ARCH)),)
- DRI_CONFIGS := debian-dri-$(DEB_BUILD_ARCH)
-else
- DRI_CONFIGS := debian-dri-any
-endif
-
# build the following configurations by default
CONFIGS = $(SWX11_GLU_CONFIGS) \
$(DRI_CONFIGS) \
+ debian-osmesa \
+ debian-osmesa-static \
debian-osmesa16 \
debian-osmesa16-static \
debian-osmesa32 \
@@ -77,7 +80,8 @@
STAMP = $(STAMP_DIR)/$(DEB_BUILD_GNU_TYPE)
BUILD_STAMPS = $(addprefix $(STAMP)-build-, $(CONFIGS))
-INSTALL_STAMPS = $(addprefix $(STAMP)-install-, $(CONFIGS))
+INSTALL_STAMPS = $(addprefix $(STAMP)-install-, $(CONFIGS)) \
+ $(STAMP_DIR)/install-source
# list the configurations that will built
configs:
@@ -114,6 +118,11 @@
cd $(DEB_BUILD_DIR)/$* && $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
touch $@
+$(STAMP_DIR)/install-source:
+ # install Mesa source for mesa-swx11-source package
+ debian/scripts/install-source.sh
+ touch $@
+
clean: unpatch
dh_testdir
dh_testroot
Reply to: