X Strike Force X.Org X11 SVN commit: r3497 - in trunk/lib/mesa: configs debian
Author: dnusinow
Date: 2006-09-25 20:46:14 -0400 (Mon, 25 Sep 2006)
New Revision: 3497
Added:
trunk/lib/mesa/configs/debian-indirect
Modified:
trunk/lib/mesa/configs/debian-directfb
trunk/lib/mesa/configs/debian-dri
trunk/lib/mesa/debian/changelog
trunk/lib/mesa/debian/control
Log:
* Add patch from Cyril Brulebois to allow package to build on HURD, which
lacks DRI and directfb. This includes not using lib-directfb in the
build-depends for hurd-i386. It also creates a new debian config,
debian-indirect, which is used when building for HURD. This config is
invoked in the debian-dri config on hurd-i386. Thanks to Cyril Brulebois
for the patch, Michael Banck, Michel D?\195?\164nzer, and Samuel Thibault for
input on an appropriate fix. (closes: #358065)
Modified: trunk/lib/mesa/configs/debian-directfb
===================================================================
--- trunk/lib/mesa/configs/debian-directfb 2006-09-26 00:32:06 UTC (rev 3496)
+++ trunk/lib/mesa/configs/debian-directfb 2006-09-26 00:46:14 UTC (rev 3497)
@@ -5,3 +5,12 @@
GL_LIB_DEPS = -lm -lpthread
DRIVER_DIRS = directfb
+
+ifeq ($(DEB_HOST_ARCH),hurd-i386)
+gnudefault:
+ @echo "No directfb on hurd, disabling the build by default target
+diversion"
+ @echo "Creating an empty and invalid shared object so that the build
+runs OK"
+ touch mesa/drivers/directfb/libidirectfbgl_mesa.so
+endif
Modified: trunk/lib/mesa/configs/debian-dri
===================================================================
--- trunk/lib/mesa/configs/debian-dri 2006-09-26 00:32:06 UTC (rev 3496)
+++ trunk/lib/mesa/configs/debian-dri 2006-09-26 00:46:14 UTC (rev 3497)
@@ -2,6 +2,11 @@
CONFIG_NAME = debian-dri
+ifeq ($(DEB_HOST_ARCH_OS),hurd)
+# Switch to debian-indirect target
+ include $(TOP)/configs/debian-indirect
+else
+
DEBIAN_COMMON_CPPFLAGS += -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER -DGLX_DIRECT_RENDERING -DHAVE_ALIAS -DDEFAULT_DRIVER_DIR=\"$(DEBIAN_DRIVERS_DIR)\"
LIBDRM_LIB = `pkg-config --libs libdrm`
@@ -32,3 +37,5 @@
ifeq ($(DEB_HOST_ARCH),amd64)
DRI_DIRS += i915
endif
+
+endif # DRI or debian-indirect
Added: trunk/lib/mesa/configs/debian-indirect
===================================================================
--- trunk/lib/mesa/configs/debian-indirect (rev 0)
+++ trunk/lib/mesa/configs/debian-indirect 2006-09-26 00:46:14 UTC (rev 3497)
@@ -0,0 +1,6 @@
+DEBIAN_COMMON_CPPFLAGS += -DPTHREADS -DHAVE_ALIAS
+
+DRI_LIB_DEPS = -lm -lpthread -lexpat -ldl
+GL_LIB_DEPS = `pkg-config --libs x11 xext xxf86vm` -lm -lpthread -ldl
+
+SRC_DIRS = glx/x11 glu glut/glx glw
Modified: trunk/lib/mesa/debian/changelog
===================================================================
--- trunk/lib/mesa/debian/changelog 2006-09-26 00:32:06 UTC (rev 3496)
+++ trunk/lib/mesa/debian/changelog 2006-09-26 00:46:14 UTC (rev 3497)
@@ -13,8 +13,15 @@
* Re-add s390 and m68k to the USE_IEEE test in src/mesa/main/imports.h. This
package seriously needs to store patches somewhere that are easy to find
and re-apply.
+ * Add patch from Cyril Brulebois to allow package to build on HURD, which
+ lacks DRI and directfb. This includes not using lib-directfb in the
+ build-depends for hurd-i386. It also creates a new debian config,
+ debian-indirect, which is used when building for HURD. This config is
+ invoked in the debian-dri config on hurd-i386. Thanks to Cyril Brulebois
+ for the patch, Michael Banck, Michel Dänzer, and Samuel Thibault for
+ input on an appropriate fix. (closes: #358065)
- -- David Nusinow <dnusinow@debian.org> Mon, 25 Sep 2006 20:31:23 -0400
+ -- David Nusinow <dnusinow@debian.org> Mon, 25 Sep 2006 20:43:42 -0400
mesa (6.5.0.cvs.20060524-1.1) unstable; urgency=medium
Modified: trunk/lib/mesa/debian/control
===================================================================
--- trunk/lib/mesa/debian/control 2006-09-26 00:32:06 UTC (rev 3496)
+++ trunk/lib/mesa/debian/control 2006-09-26 00:46:14 UTC (rev 3497)
@@ -4,7 +4,7 @@
Maintainer: Mesa package maintainers <pkg-mesa-devel@lists.alioth.debian.org>
Uploaders: Marcelo E. Magallon <mmagallo@debian.org>
Standards-Version: 3.7.2
-Build-Depends: lesstif2-dev, grep-dctrl, debhelper (>> 4), build-essential (>= 11), libdrm-dev (>= 2.0.2) [!hurd-i386], libdirectfb-dev, xutils, libexpat-dev, libxxf86vm-dev, libx11-dev, libxext-dev, pkg-config, x11proto-gl-dev (>= 1.4.8) , dpkg-dev (>= 1.13.19)
+Build-Depends: lesstif2-dev, grep-dctrl, debhelper (>> 4), build-essential (>= 11), libdrm-dev (>= 2.0.2) [!hurd-i386], libdirectfb-dev [!hurd-i386], xutils, libexpat-dev, libxxf86vm-dev, libx11-dev, libxext-dev, pkg-config, x11proto-gl-dev (>= 1.4.8) , dpkg-dev (>= 1.13.19)
Package: libgl1-mesa-swx11
Section: libs
Reply to: