Author: beatle
Date: 2006-10-14 20:49:41 -0400 (Sat, 14 Oct 2006)
New Revision: 3812
Added:
branches/experimental/mesa/debian/patches/
branches/experimental/mesa/debian/patches/01_fix-makefile.patch
branches/experimental/mesa/debian/patches/series
Modified:
branches/experimental/mesa/configs/debian-dri-default
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/libgl1-mesa-swx11-dev.install
branches/experimental/mesa/debian/libgl1-mesa-swx11.install
branches/experimental/mesa/debian/libglu1-mesa-dev.install
branches/experimental/mesa/debian/libglu1-mesa.install
branches/experimental/mesa/debian/libosmesa6-dev.install
branches/experimental/mesa/debian/libosmesa6.install
branches/experimental/mesa/debian/rules
Log:
Add patch to fix upstream build system to correctly install libOSMesa and
variants. This patch also fixes the build system not to install libGL if only
the OSMesa library is built.
Update *.install files to install more files. Pretty much everything except
debugging and optimized libraries is now built and installed.
Enable building static libraries for inclusion in the -dev packages.
Modified: branches/experimental/mesa/configs/debian-dri-default
===================================================================
--- branches/experimental/mesa/configs/debian-dri-default 2006-10-15
00:42:25 UTC (rev 3811)
+++ branches/experimental/mesa/configs/debian-dri-default 2006-10-15
00:49:41 UTC (rev 3812)
@@ -4,10 +4,11 @@
CONFIG_NAME = debian-dri-default
+override LIB_DIR = libglx
override SRC_DIRS = glx/x11 mesa
override PROGRAM_DIRS =
-override DRI_DRIVER_INSTALL_DIR = $(INSTALL_DIR)/lib/dri
+override DRI_DRIVER_INSTALL_DIR = $(INSTALL_DIR)/$(LIB_DIR)/dri
override DRI_DRIVER_SEARCH_DIR = /usr/lib/dri
# vim: ft=make
Modified: branches/experimental/mesa/configs/debian-osmesa
===================================================================
--- branches/experimental/mesa/configs/debian-osmesa 2006-10-15 00:42:25 UTC
(rev 3811)
+++ branches/experimental/mesa/configs/debian-osmesa 2006-10-15 00:49:41 UTC
(rev 3812)
@@ -5,6 +5,9 @@
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 00:42:25 UTC
(rev 3811)
+++ branches/experimental/mesa/configs/debian-osmesa16 2006-10-15 00:49:41 UTC
(rev 3812)
@@ -6,5 +6,7 @@
CONFIG_NAME = debian-osmesa16
+override SRC_DIRS = mesa
+
# vim: ft=make
Modified: branches/experimental/mesa/configs/debian-osmesa16-static
===================================================================
--- branches/experimental/mesa/configs/debian-osmesa16-static 2006-10-15
00:42:25 UTC (rev 3811)
+++ branches/experimental/mesa/configs/debian-osmesa16-static 2006-10-15
00:49:41 UTC (rev 3812)
@@ -6,5 +6,7 @@
CONFIG_NAME = debian-osmesa16-static
+override SRC_DIRS = mesa
+
# vim: ft=make
Modified: branches/experimental/mesa/configs/debian-osmesa32
===================================================================
--- branches/experimental/mesa/configs/debian-osmesa32 2006-10-15 00:42:25 UTC
(rev 3811)
+++ branches/experimental/mesa/configs/debian-osmesa32 2006-10-15 00:49:41 UTC
(rev 3812)
@@ -6,5 +6,7 @@
CONFIG_NAME = debian-osmesa32
+override SRC_DIRS = mesa
+
# vim: ft=make
Modified: branches/experimental/mesa/configs/debian-osmesa32-static
===================================================================
--- branches/experimental/mesa/configs/debian-osmesa32-static 2006-10-15
00:42:25 UTC (rev 3811)
+++ branches/experimental/mesa/configs/debian-osmesa32-static 2006-10-15
00:49:41 UTC (rev 3812)
@@ -6,5 +6,7 @@
CONFIG_NAME = debian-osmesa32-static
+override SRC_DIRS = mesa
+
# vim: ft=make
Modified: branches/experimental/mesa/configs/debian-static
===================================================================
--- branches/experimental/mesa/configs/debian-static 2006-10-15 00:42:25 UTC
(rev 3811)
+++ branches/experimental/mesa/configs/debian-static 2006-10-15 00:49:41 UTC
(rev 3812)
@@ -1,12 +1,12 @@
-# Override options needed to build static versions of the libraries.
-#
-# This configuration cannot be used standalone.
+# Configuration for building static versions of the libraries.
include $(TOP)/configs/debian-common
+include $(TOP)/configs/linux-static
CONFIG_NAME = debian-static
-override MKLIB_OPTIONS = -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
00:42:25 UTC (rev 3811)
+++ branches/experimental/mesa/debian/libgl1-mesa-dri.install 2006-10-15
00:49:41 UTC (rev 3812)
@@ -1 +1 @@
-usr/lib/dri/*.so
+usr/libglx/dri/*.so usr/lib/dri
Modified: branches/experimental/mesa/debian/libgl1-mesa-glx.install
===================================================================
--- branches/experimental/mesa/debian/libgl1-mesa-glx.install 2006-10-15
00:42:25 UTC (rev 3811)
+++ branches/experimental/mesa/debian/libgl1-mesa-glx.install 2006-10-15
00:49:41 UTC (rev 3812)
@@ -1 +1 @@
-usr/lib/libGL.so.1*
+usr/libglx/libGL.so.* usr/lib
Modified: branches/experimental/mesa/debian/libgl1-mesa-swx11-dev.install
===================================================================
--- branches/experimental/mesa/debian/libgl1-mesa-swx11-dev.install
2006-10-15 00:42:25 UTC (rev 3811)
+++ branches/experimental/mesa/debian/libgl1-mesa-swx11-dev.install
2006-10-15 00:49:41 UTC (rev 3812)
@@ -0,0 +1,3 @@
+usr/include/GL/glx*.h
+usr/lib/libGL.a
+usr/lib/libGL.so
Modified: branches/experimental/mesa/debian/libgl1-mesa-swx11.install
===================================================================
--- branches/experimental/mesa/debian/libgl1-mesa-swx11.install 2006-10-15
00:42:25 UTC (rev 3811)
+++ branches/experimental/mesa/debian/libgl1-mesa-swx11.install 2006-10-15
00:49:41 UTC (rev 3812)
@@ -0,0 +1,2 @@
+usr/lib/libGL.so.*
+usr/lib/libOSMesa.*
Modified: branches/experimental/mesa/debian/libglu1-mesa-dev.install
===================================================================
--- branches/experimental/mesa/debian/libglu1-mesa-dev.install 2006-10-15
00:42:25 UTC (rev 3811)
+++ branches/experimental/mesa/debian/libglu1-mesa-dev.install 2006-10-15
00:49:41 UTC (rev 3812)
@@ -1,3 +1,4 @@
usr/include/GL/glu.h
usr/include/GL/glu_mangle.h
+usr/lib/libGLU.a
usr/lib/libGLU.so
Modified: branches/experimental/mesa/debian/libglu1-mesa.install
===================================================================
--- branches/experimental/mesa/debian/libglu1-mesa.install 2006-10-15
00:42:25 UTC (rev 3811)
+++ branches/experimental/mesa/debian/libglu1-mesa.install 2006-10-15
00:49:41 UTC (rev 3812)
@@ -1 +1 @@
-usr/lib/libGLU.so.1*
+usr/lib/libGLU.so.*
Modified: branches/experimental/mesa/debian/libosmesa6-dev.install
===================================================================
--- branches/experimental/mesa/debian/libosmesa6-dev.install 2006-10-15
00:42:25 UTC (rev 3811)
+++ branches/experimental/mesa/debian/libosmesa6-dev.install 2006-10-15
00:49:41 UTC (rev 3812)
@@ -0,0 +1,4 @@
+usr/lib/libOSMesa16.a
+usr/lib/libOSMesa16.so
+usr/lib/libOSMesa32.a
+usr/lib/libOSMesa32.so
Modified: branches/experimental/mesa/debian/libosmesa6.install
===================================================================
--- branches/experimental/mesa/debian/libosmesa6.install 2006-10-15
00:42:25 UTC (rev 3811)
+++ branches/experimental/mesa/debian/libosmesa6.install 2006-10-15
00:49:41 UTC (rev 3812)
@@ -0,0 +1,2 @@
+usr/lib/libOSMesa16.so.*
+usr/lib/libOSMesa32.so.*
Added: branches/experimental/mesa/debian/patches/01_fix-makefile.patch
===================================================================
--- branches/experimental/mesa/debian/patches/01_fix-makefile.patch
(rev 0)
+++ branches/experimental/mesa/debian/patches/01_fix-makefile.patch
2006-10-15 00:49:41 UTC (rev 3812)
@@ -0,0 +1,15 @@
+--- a/src/mesa/Makefile
++++ b/src/mesa/Makefile
+@@ -154,7 +154,11 @@
+ $(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 \
++ $(COPY_LIBS) $(TOP)/$(LIB_DIR)/lib$(GL_LIB).*
$(INSTALL_DIR)/$(LIB_DIR); \
++ else \
++ $(COPY_LIBS) $(TOP)/$(LIB_DIR)/lib$(OSMESA_LIB).*
$(INSTALL_DIR)/$(LIB_DIR); \
++ fi
+ @if [ "${DRIVER_DIRS}" = "dri" ] ; then \
+ cd drivers/dri ; $(MAKE) install ; \
+ fi
Added: branches/experimental/mesa/debian/patches/series
===================================================================
--- branches/experimental/mesa/debian/patches/series
(rev 0)
+++ branches/experimental/mesa/debian/patches/series 2006-10-15 00:49:41 UTC
(rev 3812)
@@ -0,0 +1 @@
+01_fix-makefile.patch
Modified: branches/experimental/mesa/debian/rules
===================================================================
--- branches/experimental/mesa/debian/rules 2006-10-15 00:42:25 UTC (rev
3811)
+++ branches/experimental/mesa/debian/rules 2006-10-15 00:49:41 UTC (rev
3812)
@@ -9,6 +9,9 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+QUILT_STAMPFN ?= debian/stamp/patch
+include /usr/share/quilt/quilt.make
+
CFLAGS = -Wall -g
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
@@ -34,7 +37,8 @@
debian-osmesa16 \
debian-osmesa16-static \
debian-osmesa32 \
- debian-osmesa32-static
+ debian-osmesa32-static \
+ debian-static
STAMP = $(STAMPDIR)/$(DEB_BUILD_GNU_TYPE)
BUILD_STAMPS = $(addprefix $(STAMP)-build-, $(CONFIGS))
@@ -44,7 +48,7 @@
dh_testdir
mkdir -p debian/stamp
-build: debian/stamp $(BUILD_STAMPS)
+build: debian/stamp patch $(BUILD_STAMPS)
$(STAMP)-build-%:
dh_testdir
mkdir -p $(DEB_BUILD_DIR)/$*
@@ -57,15 +61,17 @@
dh_testdir
dh_testroot
dh_clean -k --exclude ./Makefile.orig --exclude configs/CVS/Root.bak
+ rm -rf $(INSTALL_STAMPS)
dh_installdirs
install: build pre-install $(INSTALL_STAMPS)
-$(STAMP)-install-%:
+$(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
+ touch $@
-clean:
+clean: unpatch
dh_testdir
dh_testroot
rm -rf $(DEB_BUILD_DIR) debian/stamp
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
