Author: beatle
Date: 2006-10-15 09:15:56 -0400 (Sun, 15 Oct 2006)
New Revision: 3819
Added:
branches/experimental/mesa/configs/debian
branches/experimental/mesa/configs/debian-arch
branches/experimental/mesa/configs/debian-dri-arch
branches/experimental/mesa/debian/patches/00_create-libdir.patch
Removed:
branches/experimental/mesa/configs/debian
Modified:
branches/experimental/mesa/configs/debian-any
branches/experimental/mesa/configs/debian-default
branches/experimental/mesa/configs/debian-dri
branches/experimental/mesa/configs/debian-dri-any
branches/experimental/mesa/configs/debian-dri-default
branches/experimental/mesa/configs/debian-i386
branches/experimental/mesa/configs/debian-osmesa
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
branches/experimental/mesa/debian/libgl1-mesa-dri.install
branches/experimental/mesa/debian/libgl1-mesa-glx.install
branches/experimental/mesa/debian/patches/01_fix-makefile.patch
branches/experimental/mesa/debian/patches/series
branches/experimental/mesa/debian/rules
Log:
Add a patch (00_create-libdir) that fixes the upstream build system to make
sure the LIB_DIR is created or bail out.
Update the 01_fix-makefile patch to only install libGL/libOSMesa if they
exist. Don't make installation dependent on which drivers are built.
Build optimized versions of the swx11 libraries in addition to those that
should work on the least-capable supported processor for the given
architecture.
Have most configurations include debian-default instead of debian-common so
that INSTALL_DIR is correctly defined. debian-common can probably be dropped
anyway.
Deleted: branches/experimental/mesa/configs/debian
===================================================================
--- branches/experimental/mesa/configs/debian 2006-10-15 12:54:14 UTC (rev
3818)
+++ branches/experimental/mesa/configs/debian 2006-10-15 13:15:56 UTC (rev
3819)
@@ -1,12 +0,0 @@
-# Select the correct configuration depending on the build architecture.
-
-ifneq ($(wildcard $(TOP)/configs/debian-$(DEB_BUILD_ARCH)),)
- include $(TOP)/configs/debian-$(DEB_BUILD_ARCH)
-else
- include $(TOP)/configs/debian-any
-endif
-
-CONFIG_NAME = debian
-
-# vim: ft=make
-
Added: branches/experimental/mesa/configs/debian
===================================================================
--- branches/experimental/mesa/configs/debian (rev 0)
+++ branches/experimental/mesa/configs/debian 2006-10-15 13:15:56 UTC (rev
3819)
@@ -0,0 +1,9 @@
+# Configuration for building Mesa on the build architecture.
+
+include $(TOP)/configs/debian-default
+include $(TOP)/configs/linux
+
+CONFIG_NAME = debian
+
+# vim: ft=make
+
Modified: branches/experimental/mesa/configs/debian-any
===================================================================
--- branches/experimental/mesa/configs/debian-any 2006-10-15 12:54:14 UTC
(rev 3818)
+++ branches/experimental/mesa/configs/debian-any 2006-10-15 13:15:56 UTC
(rev 3819)
@@ -1,9 +1,6 @@
-# Fallback configuration for building Mesa on architectures for which no
-# architecture-specific configuration is provided.
+# Chicken-out configuration for architectures where optimized builds are not
+# supported.
-include $(TOP)/configs/debian-default
-include $(TOP)/configs/linux
-
CONFIG_NAME = debian-any
# vim: ft=make
Copied: branches/experimental/mesa/configs/debian-arch (from rev 3794,
branches/experimental/mesa/configs/debian)
===================================================================
--- branches/experimental/mesa/configs/debian-arch
(rev 0)
+++ branches/experimental/mesa/configs/debian-arch 2006-10-15 13:15:56 UTC
(rev 3819)
@@ -0,0 +1,13 @@
+# Configuration for building a version of Mesa optimized for the build
+# architecture.
+
+ifneq ($(wildcard $(TOP)/configs/debian-$(DEB_BUILD_ARCH)),)
+ include $(TOP)/configs/debian-$(DEB_BUILD_ARCH)
+else
+ include $(TOP)/configs/debian-any
+endif
+
+CONFIG_NAME = debian-arch
+
+# vim: ft=make
+
Modified: branches/experimental/mesa/configs/debian-default
===================================================================
--- branches/experimental/mesa/configs/debian-default 2006-10-15 12:54:14 UTC
(rev 3818)
+++ branches/experimental/mesa/configs/debian-default 2006-10-15 13:15:56 UTC
(rev 3819)
@@ -11,5 +11,7 @@
override SRC_DIRS = mesa glu
override PROGRAM_DIRS =
+override INSTALL_DIR = $(DESTDIR)/usr
+
# vim: ft=make
Modified: branches/experimental/mesa/configs/debian-dri
===================================================================
--- branches/experimental/mesa/configs/debian-dri 2006-10-15 12:54:14 UTC
(rev 3818)
+++ branches/experimental/mesa/configs/debian-dri 2006-10-15 13:15:56 UTC
(rev 3819)
@@ -1,11 +1,7 @@
-# Select the correct configuration for building the DRI drivers depending on
-# the build architecture.
+# Configuration for building the DRI drivers on the build architecture.
-ifneq ($(wildcard $(TOP)/configs/debian-dri-$(DEB_BUILD_ARCH)),)
- include $(TOP)/configs/debian-dri-$(DEB_BUILD_ARCH)
-else
- include $(TOP)/configs/debian-dri-any
-endif
+include $(TOP)/configs/debian-dri-default
+include $(TOP)/configs/linux-dri
CONFIG_NAME = debian-dri
Modified: branches/experimental/mesa/configs/debian-dri-any
===================================================================
--- branches/experimental/mesa/configs/debian-dri-any 2006-10-15 12:54:14 UTC
(rev 3818)
+++ branches/experimental/mesa/configs/debian-dri-any 2006-10-15 13:15:56 UTC
(rev 3819)
@@ -1,9 +1,6 @@
-# Fallback configuration for building the DRI drivers on architectures for
-# which no architecture-specific configuration is provided.
+# Chicken-out configuration for architectures where optimized builds are not
+# supported.
-include $(TOP)/configs/debian-dri-default
-include $(TOP)/configs/linux-dri
-
CONFIG_NAME = debian-dri-any
# vim: ft=make
Copied: branches/experimental/mesa/configs/debian-dri-arch (from rev 3794,
branches/experimental/mesa/configs/debian-dri)
===================================================================
--- branches/experimental/mesa/configs/debian-dri-arch
(rev 0)
+++ branches/experimental/mesa/configs/debian-dri-arch 2006-10-15 13:15:56 UTC
(rev 3819)
@@ -0,0 +1,13 @@
+# Configuration for building a version of the DRI drivers optimized for the
+# build architecture.
+
+ifneq ($(wildcard $(TOP)/configs/debian-dri-$(DEB_BUILD_ARCH)),)
+ include $(TOP)/configs/debian-dri-$(DEB_BUILD_ARCH)
+else
+ include $(TOP)/configs/debian-dri-any
+endif
+
+CONFIG_NAME = debian-dri-arch
+
+# vim: ft=make
+
Modified: branches/experimental/mesa/configs/debian-dri-default
===================================================================
--- branches/experimental/mesa/configs/debian-dri-default 2006-10-15
12:54:14 UTC (rev 3818)
+++ branches/experimental/mesa/configs/debian-dri-default 2006-10-15
13:15:56 UTC (rev 3819)
@@ -1,14 +1,13 @@
# Override defaults for the DRI drivers build.
-include $(TOP)/configs/debian-common
+include $(TOP)/configs/debian-default
CONFIG_NAME = debian-dri-default
-override LIB_DIR = libglx
+override LIB_DIR = lib/glx
override SRC_DIRS = glx/x11 mesa
-override PROGRAM_DIRS =
-override DRI_DRIVER_INSTALL_DIR = $(INSTALL_DIR)/$(LIB_DIR)/dri
+override DRI_DRIVER_INSTALL_DIR = $(INSTALL_DIR)/lib/dri
override DRI_DRIVER_SEARCH_DIR = /usr/lib/dri
# vim: ft=make
Modified: branches/experimental/mesa/configs/debian-i386
===================================================================
--- branches/experimental/mesa/configs/debian-i386 2006-10-15 12:54:14 UTC
(rev 3818)
+++ branches/experimental/mesa/configs/debian-i386 2006-10-15 13:15:56 UTC
(rev 3819)
@@ -5,5 +5,9 @@
CONFIG_NAME = debian-i386
+OPT_FLAGS += -march=i686
+
+override LIB_DIR = lib/i686/cmov
+
# vim: ft=make
Modified: branches/experimental/mesa/configs/debian-osmesa
===================================================================
--- branches/experimental/mesa/configs/debian-osmesa 2006-10-15 12:54:14 UTC
(rev 3818)
+++ branches/experimental/mesa/configs/debian-osmesa 2006-10-15 13:15:56 UTC
(rev 3819)
@@ -1,12 +1,11 @@
# Configuration for building OSMesa on Debian.
-include $(TOP)/configs/debian-common
+include $(TOP)/configs/debian-default
include $(TOP)/configs/linux-osmesa
CONFIG_NAME = debian-osmesa
override SRC_DIRS = mesa
-override PROGRAM_DIRS =
# vim: ft=make
Modified: branches/experimental/mesa/configs/debian-osmesa16
===================================================================
--- branches/experimental/mesa/configs/debian-osmesa16 2006-10-15 12:54:14 UTC
(rev 3818)
+++ branches/experimental/mesa/configs/debian-osmesa16 2006-10-15 13:15:56 UTC
(rev 3819)
@@ -1,7 +1,7 @@
# Configuration for building OSMesa with support for 16 bits per color
# channel.
-include $(TOP)/configs/debian-common
+include $(TOP)/configs/debian-default
include $(TOP)/configs/linux-osmesa16
CONFIG_NAME = debian-osmesa16
Modified: branches/experimental/mesa/configs/debian-osmesa16-static
===================================================================
--- branches/experimental/mesa/configs/debian-osmesa16-static 2006-10-15
12:54:14 UTC (rev 3818)
+++ branches/experimental/mesa/configs/debian-osmesa16-static 2006-10-15
13:15:56 UTC (rev 3819)
@@ -1,7 +1,7 @@
# Configuration for building a static version of OSMesa with support for 16
# bits per color channel.
-include $(TOP)/configs/debian-common
+include $(TOP)/configs/debian-default
include $(TOP)/configs/linux-osmesa16-static
CONFIG_NAME = debian-osmesa16-static
Modified: branches/experimental/mesa/configs/debian-osmesa32
===================================================================
--- branches/experimental/mesa/configs/debian-osmesa32 2006-10-15 12:54:14 UTC
(rev 3818)
+++ branches/experimental/mesa/configs/debian-osmesa32 2006-10-15 13:15:56 UTC
(rev 3819)
@@ -1,7 +1,7 @@
# Configuration for building OSMesa with support for 32 bits per color
# channel.
-include $(TOP)/configs/debian-common
+include $(TOP)/configs/debian-default
include $(TOP)/configs/linux-osmesa32
CONFIG_NAME = debian-osmesa32
Modified: branches/experimental/mesa/configs/debian-osmesa32-static
===================================================================
--- branches/experimental/mesa/configs/debian-osmesa32-static 2006-10-15
12:54:14 UTC (rev 3818)
+++ branches/experimental/mesa/configs/debian-osmesa32-static 2006-10-15
13:15:56 UTC (rev 3819)
@@ -1,7 +1,7 @@
# Configuration for building a static version of OSMesa with support for 32
# bits per color channel.
-include $(TOP)/configs/debian-common
+include $(TOP)/configs/debian-default
include $(TOP)/configs/linux-osmesa32-static
CONFIG_NAME = debian-osmesa32-static
Modified: branches/experimental/mesa/configs/debian-static
===================================================================
--- branches/experimental/mesa/configs/debian-static 2006-10-15 12:54:14 UTC
(rev 3818)
+++ branches/experimental/mesa/configs/debian-static 2006-10-15 13:15:56 UTC
(rev 3819)
@@ -1,12 +1,9 @@
# Configuration for building static versions of the libraries.
-include $(TOP)/configs/debian-common
+include $(TOP)/configs/debian-default
include $(TOP)/configs/linux-static
CONFIG_NAME = debian-static
-override SRC_DIRS = mesa glu
-override PROGRAM_DIRS =
-
# vim: ft=make
Modified: branches/experimental/mesa/debian/libgl1-mesa-dri.install
===================================================================
--- branches/experimental/mesa/debian/libgl1-mesa-dri.install 2006-10-15
12:54:14 UTC (rev 3818)
+++ branches/experimental/mesa/debian/libgl1-mesa-dri.install 2006-10-15
13:15:56 UTC (rev 3819)
@@ -1 +1 @@
-usr/libglx/dri/*.so usr/lib/dri
+usr/lib/dri/*.so
Modified: branches/experimental/mesa/debian/libgl1-mesa-glx.install
===================================================================
--- branches/experimental/mesa/debian/libgl1-mesa-glx.install 2006-10-15
12:54:14 UTC (rev 3818)
+++ branches/experimental/mesa/debian/libgl1-mesa-glx.install 2006-10-15
13:15:56 UTC (rev 3819)
@@ -1 +1 @@
-usr/libglx/libGL.so.* usr/lib
+usr/lib/glx/libGL.so.* usr/lib
Added: branches/experimental/mesa/debian/patches/00_create-libdir.patch
===================================================================
--- branches/experimental/mesa/debian/patches/00_create-libdir.patch
(rev 0)
+++ branches/experimental/mesa/debian/patches/00_create-libdir.patch
2006-10-15 13:15:56 UTC (rev 3819)
@@ -0,0 +1,11 @@
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -29,7 +29,7 @@
+ done
+
+ $(TOP)/$(LIB_DIR):
+- -mkdir $(TOP)/$(LIB_DIR)
++ mkdir -p $(TOP)/$(LIB_DIR)
+
+
+ clean:
Modified: branches/experimental/mesa/debian/patches/01_fix-makefile.patch
===================================================================
--- branches/experimental/mesa/debian/patches/01_fix-makefile.patch
2006-10-15 12:54:14 UTC (rev 3818)
+++ branches/experimental/mesa/debian/patches/01_fix-makefile.patch
2006-10-15 13:15:56 UTC (rev 3819)
@@ -1,13 +1,14 @@
--- a/src/mesa/Makefile
+++ b/src/mesa/Makefile
-@@ -154,7 +154,11 @@
+@@ -154,7 +154,12 @@
$(INSTALL) -d $(INSTALL_DIR)/include/GL
$(INSTALL) -d $(INSTALL_DIR)/$(LIB_DIR)
$(INSTALL) -m 644 $(TOP)/include/GL/*.h $(INSTALL_DIR)/include/GL
- $(COPY_LIBS) $(TOP)/$(LIB_DIR)/libGL.* $(INSTALL_DIR)/$(LIB_DIR)
-+ @if [ "${DRIVER_DIRS}" != "osmesa" ]; then \
++ @if [ -e $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) ]; then \
+ $(COPY_LIBS) $(TOP)/$(LIB_DIR)/lib$(GL_LIB).*
$(INSTALL_DIR)/$(LIB_DIR); \
-+ else \
++ fi
++ @if [ -e $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME) ]; then \
+ $(COPY_LIBS) $(TOP)/$(LIB_DIR)/lib$(OSMESA_LIB).*
$(INSTALL_DIR)/$(LIB_DIR); \
+ fi
@if [ "${DRIVER_DIRS}" = "dri" ] ; then \
Modified: branches/experimental/mesa/debian/patches/series
===================================================================
--- branches/experimental/mesa/debian/patches/series 2006-10-15 12:54:14 UTC
(rev 3818)
+++ branches/experimental/mesa/debian/patches/series 2006-10-15 13:15:56 UTC
(rev 3819)
@@ -1 +1,2 @@
+00_create-libdir.patch
01_fix-makefile.patch
Modified: branches/experimental/mesa/debian/rules
===================================================================
--- branches/experimental/mesa/debian/rules 2006-10-15 12:54:14 UTC (rev
3818)
+++ branches/experimental/mesa/debian/rules 2006-10-15 13:15:56 UTC (rev
3819)
@@ -32,14 +32,19 @@
# build the following configurations
CONFIGS = debian \
+ debian-arch \
debian-dri \
- debian-osmesa \
debian-osmesa16 \
debian-osmesa16-static \
debian-osmesa32 \
debian-osmesa32-static \
debian-static
+# Don't build architecture-dependent DRI drivers (yet) because it's probably
+# not worth the effort. For benchmarking, include the following configuration
+# in the list above.
+#debian-dri-arch
+
STAMP = $(STAMPDIR)/$(DEB_BUILD_GNU_TYPE)
BUILD_STAMPS = $(addprefix $(STAMP)-build-, $(CONFIGS))
INSTALL_STAMPS = $(addprefix $(STAMP)-install-, $(CONFIGS))
@@ -68,7 +73,7 @@
$(STAMP)-install-%: $(STAMP)-build-%
# Add here commands to install the package into debian/tmp
- cd $(DEB_BUILD_DIR)/$* && $(MAKE) install
INSTALL_DIR=$(CURDIR)/debian/tmp/usr
+ cd $(DEB_BUILD_DIR)/$* && $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
touch $@
clean: unpatch
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
