mesa: Changes to 'debian-experimental'
configs/linux-osmesa-static | 15 +++++++++++++++
configs/linux-osmesa32-static | 13 +++++++++++++
debian/changelog | 3 ++-
debian/control | 11 -----------
debian/mesa-swx11-source.install | 1 -
debian/rules | 9 +--------
6 files changed, 31 insertions(+), 21 deletions(-)
New commits:
commit 24fde3cf34547f489bd03dfc447cd416591a97ba
Author: Timo Aaltonen <tjaalton@pris.hut.fi>
Date: Tue Jul 1 18:56:38 2008 +0300
Drop mesa-swx11-source.
diff --git a/debian/changelog b/debian/changelog
index 494acd6..089eaf0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,9 @@ mesa (7.1~rc1-1) UNRELEASED; urgency=low
* Refresh patches, and drop obsolete 00_create-libdir.patch and
01_fix-makefile.patch.
* Build-depend on x11proto-dri2-dev.
+ * Drop mesa-swx11-source.
- -- Timo Aaltonen <tepsipakki@ubuntu.com> Tue, 01 Jul 2008 16:08:26 +0300
+ -- Timo Aaltonen <tepsipakki@ubuntu.com> Tue, 01 Jul 2008 18:55:51 +0300
mesa (7.0.3-4) unstable; urgency=low
diff --git a/debian/control b/debian/control
index fc8e512..daa88ab 100644
--- a/debian/control
+++ b/debian/control
@@ -335,17 +335,6 @@ Description: A free implementation of the OpenGL API -- development files
The headers and static libraries for compiling programs that use this
library are included.
-Package: mesa-swx11-source
-Section: libdevel
-Architecture: all
-Description: Mesa software rasteriser source -- development files
- This package contains the source to the Mesa software rasteriser, which
- implements all of Mesa's GL support in software. It powers the X11 and
- X server backends (assuming unaccelerated indirect). This package is
- provided mainly for modular X servers which support GL, and need the
- software rasteriser source to build the GLcore module for unaccelerated
- indirect rendering.
-
Package: mesa-utils
Section: x11
Priority: optional
diff --git a/debian/mesa-swx11-source.install b/debian/mesa-swx11-source.install
deleted file mode 100644
index e96b76c..0000000
--- a/debian/mesa-swx11-source.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/mesa-source/*
diff --git a/debian/rules b/debian/rules
index 3d00bb7..d35364e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -45,7 +45,6 @@ CONFIGS = $(SWX11_GLU_CONFIGS) \
STAMP = $(STAMP_DIR)/$(DEB_BUILD_GNU_TYPE)
BUILD_STAMPS = $(addprefix $(STAMP)-build-, $(CONFIGS))
ARCH_INSTALL_STAMPS = $(addprefix $(STAMP)-install-, $(CONFIGS))
-INDEP_INSTALL_STAMPS = $(STAMP_DIR)/install-source
# list the configurations that will built
configs:
@@ -82,12 +81,6 @@ $(STAMP)-install-%: $(STAMP)-build-%
cd $(DEB_BUILD_DIR)/$* && $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
touch $@
-$(STAMP_DIR)/install-source: pre-install
- # install Mesa source for mesa-swx11-source package
- chmod a+x debian/scripts/install-source.sh
- debian/scripts/install-source.sh
- touch $@
-
clean: unpatch
dh_testdir
dh_testroot
@@ -95,7 +88,7 @@ clean: unpatch
rm -rf $(DEB_BUILD_DIR) $(STAMP_DIR)
# Build architecture-independent files here.
-binary-indep: build install $(INDEP_INSTALL_STAMPS)
+binary-indep: build install
dh_testdir
dh_testroot
dh_installchangelogs -i
commit 7ceaa0916a43d518cfc5f6fd1997d0bdcb9d5522
Author: Timo Aaltonen <tjaalton@pris.hut.fi>
Date: Tue Jul 1 18:51:01 2008 +0300
Re-add linux-osmesa-static and linux-osmesa32-static
they were dropped by mistake during the merge.
diff --git a/configs/linux-osmesa-static b/configs/linux-osmesa-static
new file mode 100644
index 0000000..eb3575f
--- /dev/null
+++ b/configs/linux-osmesa-static
@@ -0,0 +1,15 @@
+# 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
+PIC_FLAGS =
+
+# Library names
+OSMESA_LIB_NAME = lib$(OSMESA_LIB).a
+
diff --git a/configs/linux-osmesa32-static b/configs/linux-osmesa32-static
new file mode 100644
index 0000000..ecbb72e
--- /dev/null
+++ b/configs/linux-osmesa32-static
@@ -0,0 +1,13 @@
+# Configuration for 32 bits/channel OSMesa library on Linux
+
+include $(TOP)/configs/linux-osmesa32
+
+CONFIG_NAME = linux-osmesa32-static
+
+# Compiler and flags
+MKLIB_OPTIONS = -static
+PIC_FLAGS =
+
+# Library names
+OSMESA_LIB_NAME = lib$(OSMESA_LIB).a
+
Reply to: