X Strike Force X.Org X11 SVN commit: r3832 - in branches/experimental/mesa: configs debian
Author: beatle
Date: 2006-10-16 09:04:29 -0400 (Mon, 16 Oct 2006)
New Revision: 3832
Added:
branches/experimental/mesa/debian/libgl1-mesa-glx.shlibs
branches/experimental/mesa/debian/libgl1-mesa-swx11.shlibs
branches/experimental/mesa/debian/libglu1-mesa.shlibs
Modified:
branches/experimental/mesa/configs/debian-static
branches/experimental/mesa/debian/libgl1-mesa-swx11-dev.install
branches/experimental/mesa/debian/rules
Log:
Make the debian-static a subclass of debian-swx11+glu-default, because that's
what it actually is. Rename it accordingly and add it to SWX11_GLU_CONFIGS.
Install the libOSMesa.so symlink and the libOSMesa static library in the
libgl1-mesa-swx11-dev package.
Add .shlibs files for the libgl1-mesa-swx11, libgl1-mesa-glx and libglu1-mesa
packages.
Modified: branches/experimental/mesa/configs/debian-static
===================================================================
--- branches/experimental/mesa/configs/debian-static 2006-10-16 12:52:03 UTC (rev 3831)
+++ branches/experimental/mesa/configs/debian-static 2006-10-16 13:04:29 UTC (rev 3832)
@@ -1,11 +1,9 @@
-# Configuration for building static versions of the libraries.
+# Configuration for building static versions of the libraries (swx11 and GLU).
-include $(TOP)/configs/debian-default
+include $(TOP)/configs/debian-swx11+glu-default
include $(TOP)/configs/linux-static
-CONFIG_NAME = debian-static
+CONFIG_NAME = debian-swx11+glu-static
-override SRC_DIRS = mesa glu
-
# vim: ft=make
Added: branches/experimental/mesa/debian/libgl1-mesa-glx.shlibs
===================================================================
--- branches/experimental/mesa/debian/libgl1-mesa-glx.shlibs (rev 0)
+++ branches/experimental/mesa/debian/libgl1-mesa-glx.shlibs 2006-10-16 13:04:29 UTC (rev 3832)
@@ -0,0 +1 @@
+libGL 1 libgl1-mesa-glx | libgl1
Modified: branches/experimental/mesa/debian/libgl1-mesa-swx11-dev.install
===================================================================
--- branches/experimental/mesa/debian/libgl1-mesa-swx11-dev.install 2006-10-16 12:52:03 UTC (rev 3831)
+++ branches/experimental/mesa/debian/libgl1-mesa-swx11-dev.install 2006-10-16 13:04:29 UTC (rev 3832)
@@ -1,3 +1,5 @@
usr/include/GL/glx*.h
usr/lib/libGL.a
usr/lib/libGL.so
+usr/lib/libOSMesa.a
+usr/lib/libOSMesa.so
Added: branches/experimental/mesa/debian/libgl1-mesa-swx11.shlibs
===================================================================
--- branches/experimental/mesa/debian/libgl1-mesa-swx11.shlibs (rev 0)
+++ branches/experimental/mesa/debian/libgl1-mesa-swx11.shlibs 2006-10-16 13:04:29 UTC (rev 3832)
@@ -0,0 +1,2 @@
+libGL 1 libgl1-mesa-glx | libgl1
+libOSMesa 6 libgl1-mesa-swx11 | libgl1-mesa-glide3
Added: branches/experimental/mesa/debian/libglu1-mesa.shlibs
===================================================================
--- branches/experimental/mesa/debian/libglu1-mesa.shlibs (rev 0)
+++ branches/experimental/mesa/debian/libglu1-mesa.shlibs 2006-10-16 13:04:29 UTC (rev 3832)
@@ -0,0 +1 @@
+libGLU 1 libglu1-mesa | libglu1
Modified: branches/experimental/mesa/debian/rules
===================================================================
--- branches/experimental/mesa/debian/rules 2006-10-16 12:52:03 UTC (rev 3831)
+++ branches/experimental/mesa/debian/rules 2006-10-16 13:04:29 UTC (rev 3832)
@@ -56,6 +56,9 @@
# 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)),)
@@ -70,8 +73,7 @@
debian-osmesa16 \
debian-osmesa16-static \
debian-osmesa32 \
- debian-osmesa32-static \
- debian-static
+ debian-osmesa32-static
STAMP = $(STAMP_DIR)/$(DEB_BUILD_GNU_TYPE)
BUILD_STAMPS = $(addprefix $(STAMP)-build-, $(CONFIGS))
Reply to: