On Sat, Aug 26, 2006 at 04:23:07PM +0200, Michel Dänzer wrote: > > This is the upstream part of the patch, which looks good to me. > > Michel, do you think this is reasonable to submit upstream? > > Worth an attempt I think, although it may be desirable to take > configs/linux-indirect into account. Thanks again for your (much appreciated) comments, Michel.
Upstream sent me back to that linux-indirect target, which really sounds like the way to go. Here are an updated patch, which only affects Debian-related files. Quick summary of this patch: - add a diversion so that libdirectfb builds for hurd too (configs/debian-directfb) - add a customized indirect target (configs/debian-indirect) - add a diversion from debian-dri to debian-indirect for hurd (configs/debian-dri) - tag libdirectfb-dev as [!hurd-i386] (debian/control) Of course, that's doesn't impact the build on Linux (I checked on i386). Michael Banck reported that he successfully built freeglut and mesa-utils from experimental with these packages. Sounds like we've got a solution: - following upstream's advice - solving FTBFS troubles, for this release and the next one at least (I mean experimental's CVS snapshot) - allowing us to build (build-)depending packages Would you please consider applying it? Thanks, -- Cyril Brulebois
--- mesa-build.orig/mesa-6.4.2/configs/debian-directfb 1970-01-01 12:44:32.000000000 +0000 +++ mesa-build/mesa-6.4.2/configs/debian-directfb 2006-08-30 21:32:40.000000000 +0000 @@ -5,3 +5,10 @@ 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 --- mesa-build.orig/mesa-6.4.2/configs/debian-dri 1970-01-01 12:44:32.000000000 +0000 +++ mesa-build/mesa-6.4.2/configs/debian-dri 2006-08-30 21:37:24.000000000 +0000 @@ -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` @@ -31,3 +36,5 @@ ifeq ($(DEB_HOST_ARCH),amd64) DRI_DIRS += i915 endif + +endif # DRI or debian-indirect --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ mesa-build/mesa-6.4.2/configs/debian-indirect 2006-08-30 21:34:30.000000000 +0000 @@ -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 --- mesa-build.orig/mesa-6.4.2/debian/control 1970-01-01 12:44:32.000000000 +0000 +++ mesa-build/mesa-6.4.2/debian/control 2006-08-30 21:30:41.000000000 +0000 @@ -4,7 +4,7 @@ Maintainer: Mesa package maintainers <[EMAIL PROTECTED]> Uploaders: Marcelo E. Magallon <[EMAIL PROTECTED]> Standards-Version: 3.7.2 -Build-Depends: lesstif2-dev, grep-dctrl, debhelper (>> 4), build-essential (>= 11), libdrm-dev (>> 2) [!hurd-i386], libdirectfb-dev, xutils, libexpat-dev, libxxf86vm-dev, libx11-dev, libxext-dev, pkg-config, x11proto-gl-dev +Build-Depends: lesstif2-dev, grep-dctrl, debhelper (>> 4), build-essential (>= 11), libdrm-dev (>> 2) [!hurd-i386], libdirectfb-dev [!hurd-i386], xutils, libexpat-dev, libxxf86vm-dev, libx11-dev, libxext-dev, pkg-config, x11proto-gl-dev Package: libgl1-mesa-swx11 Section: libs
signature.asc
Description: Digital signature
