Bug#358065: mesa: FTBFS on hurd-i386 because of dri/drm

Cyril Brulebois cyril.brulebois at enst-bretagne.fr
Sat Aug 19 23:42:23 UTC 2006 

Hi again,

here is a small but important update of the patch. The additional part
is located in ``additional-GL-mklib.diff'' while the updated patch is
the ``hurd-dri-drm-updated.diff'' file.

There was an extra mklib for the GL library, which made the package
useless. With that updated patch, it was possible to build these
packages:
 - freeglut
 - mesa-utils
 - glitz

BTW, glxgears is running. That seems to be confirming that the package
is usable like that.

If you'd like to have a look at the list of the files for i386 and
hurd-i386 packages, I'm including them. The best way to compare them is
IMHO ``sdiff''.


Cheers,

-- 
Cyril Brulebois
-------------- next part --------------
--- src/mesa/Makefile.old	2006-08-16 10:04:41.000000000 +0000
+++ src/mesa/Makefile	2006-08-16 10:04:11.000000000 +0000
@@ -150,10 +150,12 @@
 
 # Make the GL library
 $(LIB_DIR)/$(GL_LIB_NAME): $(STAND_ALONE_OBJECTS)
+ifndef NO_DRI_NO_DRM
 	@ $(TOP)/bin/mklib -o $(GL_LIB) -linker '$(CC)' \
 		-major $(GL_MAJOR) -minor $(GL_MINOR) -patch $(GL_TINY) \
 		-install $(LIB_DIR) \
 		$(MKLIB_OPTIONS) $(GL_LIB_DEPS) $(STAND_ALONE_OBJECTS)
+endif
 
 # Make the OSMesa library
 $(LIB_DIR)/$(OSMESA_LIB_NAME): $(OSMESA_DRIVER_OBJECTS) $(OSMESA16_OBJECTS)
-------------- next part --------------
diff -urN mesa-6.4.2.old/configs/debian-directfb mesa-6.4.2/configs/debian-directfb
--- mesa-6.4.2.old/configs/debian-directfb	2006-08-12 16:59:25.000000000 +0000
+++ mesa-6.4.2/configs/debian-directfb	2006-08-12 17:00:02.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
diff -urN mesa-6.4.2.old/configs/debian-dri mesa-6.4.2/configs/debian-dri
--- mesa-6.4.2.old/configs/debian-dri	2006-08-12 16:59:25.000000000 +0000
+++ mesa-6.4.2/configs/debian-dri	2006-08-12 17:00:02.000000000 +0000
@@ -2,7 +2,12 @@
 
 CONFIG_NAME = debian-dri
 
-DEBIAN_COMMON_CPPFLAGS += -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER -DGLX_DIRECT_RENDERING -DHAVE_ALIAS -DDEFAULT_DRIVER_DIR=\"$(DEBIAN_DRIVERS_DIR)\"
+DEBIAN_COMMON_CPPFLAGS += -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER -DHAVE_ALIAS -DDEFAULT_DRIVER_DIR=\"$(DEBIAN_DRIVERS_DIR)\"
+
+ifneq ($(DEB_HOST_ARCH),hurd-i386)
+DEBIAN_COMMON_CPPFLAGS += -DGLX_DIRECT_RENDERING
+endif
+
 
 LIBDRM_LIB = `pkg-config --libs libdrm`
 DRI_LIB_DEPS  = -lm -lpthread -lexpat -ldl $(LIBDRM_LIB)
@@ -31,3 +36,10 @@
 ifeq ($(DEB_HOST_ARCH),amd64)
 DRI_DIRS += i915
 endif
+
+ifeq ($(DEB_HOST_ARCH),hurd-i386)
+DEBIAN_DRIVER_DIRS =
+DRIVER_DIRS =
+DRI_DIRS =
+NO_DRI_NO_DRM = Yes_Please
+endif
diff -urN mesa-6.4.2.old/debian/control mesa-6.4.2/debian/control
--- mesa-6.4.2.old/debian/control	2006-08-12 16:59:25.000000000 +0000
+++ mesa-6.4.2/debian/control	2006-08-12 17:00:02.000000000 +0000
@@ -4,7 +4,7 @@
 Maintainer: Mesa package maintainers <pkg-mesa-devel at lists.alioth.debian.org>
 Uploaders: Marcelo E. Magallon <mmagallo at debian.org>
 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
diff -urN mesa-6.4.2.old/src/glx/x11/Makefile mesa-6.4.2/src/glx/x11/Makefile
--- mesa-6.4.2.old/src/glx/x11/Makefile	2006-08-12 16:59:25.000000000 +0000
+++ mesa-6.4.2/src/glx/x11/Makefile	2006-08-12 17:00:02.000000000 +0000
@@ -33,7 +33,11 @@
 	  glx_query.c \
 	  glx_texture_compression.c \
 	  dri_glx.c \
-	  XF86dri.c \
+
+ifndef NO_DRI_NO_DRM
+C_SOURCES += \
+	XF86dri.c
+endif
 
 X86_SOURCES = $(TOP)/src/mesa/x86/glapi_x86.S
 X86-64_SOURCES = $(TOP)/src/mesa/x86-64/glapi_x86-64.S
diff -urN mesa-6.4.2.old/src/Mesa/Makefile mesa-6.4.2/src/Mesa/Makefile
--- mesa-6.4.2.old/src/mesa/Makefile	2006-08-16 10:04:41.000000000 +0000
+++ mesa-6.4.2/src/mesa/Makefile	2006-08-16 10:04:11.000000000 +0000
@@ -150,10 +150,12 @@
 
 # Make the GL library
 $(LIB_DIR)/$(GL_LIB_NAME): $(STAND_ALONE_OBJECTS)
+ifndef NO_DRI_NO_DRM
 	@ $(TOP)/bin/mklib -o $(GL_LIB) -linker '$(CC)' \
 		-major $(GL_MAJOR) -minor $(GL_MINOR) -patch $(GL_TINY) \
 		-install $(LIB_DIR) \
 		$(MKLIB_OPTIONS) $(GL_LIB_DEPS) $(STAND_ALONE_OBJECTS)
+endif
 
 # Make the OSMesa library
 $(LIB_DIR)/$(OSMESA_LIB_NAME): $(OSMESA_DRIVER_OBJECTS) $(OSMESA16_OBJECTS)
-------------- next part --------------
libgl1-mesa-dev
./
./usr/
./usr/lib/
./usr/include/
./usr/include/GL/
./usr/include/GL/glx.h
./usr/include/GL/glxext.h
./usr/include/GL/glx_mangle.h
./usr/share/
./usr/share/doc/
./usr/share/doc/libgl1-mesa-dev/
./usr/share/doc/libgl1-mesa-dev/changelog.gz
./usr/share/doc/libgl1-mesa-dev/copyright
./usr/share/doc/libgl1-mesa-dev/changelog.Debian.gz
./usr/lib/libGL.so -> libGL.so.1

libgl1-mesa-directfb-dev
./
./usr/
./usr/lib/
./usr/share/
./usr/share/doc/
./usr/share/doc/libgl1-mesa-directfb-dev/
./usr/share/doc/libgl1-mesa-directfb-dev/changelog.gz
./usr/share/doc/libgl1-mesa-directfb-dev/copyright
./usr/share/doc/libgl1-mesa-directfb-dev/changelog.Debian.gz
./usr/lib/libGL.so -> libGL.so.6

libgl1-mesa-directfb
./
./usr/
./usr/lib/
./usr/share/
./usr/share/doc/
./usr/share/doc/libgl1-mesa-directfb-dev/
./usr/share/doc/libgl1-mesa-directfb-dev/changelog.gz
./usr/share/doc/libgl1-mesa-directfb-dev/copyright
./usr/share/doc/libgl1-mesa-directfb-dev/changelog.Debian.gz
./usr/lib/libGL.so -> libGL.so.6

libgl1-mesa-dri
./
./usr/
./usr/lib/
./usr/lib/dri/
./usr/lib/dri/ffb_dri.so
./usr/lib/dri/i810_dri.so
./usr/lib/dri/i830_dri.so
./usr/lib/dri/i915_dri.so
./usr/lib/dri/mach64_dri.so
./usr/lib/dri/mga_dri.so
./usr/lib/dri/r128_dri.so
./usr/lib/dri/r200_dri.so
./usr/lib/dri/r300_dri.so
./usr/lib/dri/radeon_dri.so
./usr/lib/dri/s3v_dri.so
./usr/lib/dri/savage_dri.so
./usr/lib/dri/sis_dri.so
./usr/lib/dri/tdfx_dri.so
./usr/lib/dri/trident_dri.so
./usr/lib/dri/unichrome_dri.so
./usr/share/
./usr/share/doc/
./usr/share/doc/libgl1-mesa-dri/
./usr/share/doc/libgl1-mesa-dri/changelog.gz
./usr/share/doc/libgl1-mesa-dri/copyright
./usr/share/doc/libgl1-mesa-dri/changelog.Debian.gz

libgl1-mesa-glx
./
./usr/
./usr/lib/
./usr/lib/libGL.so.1.2
./usr/share/
./usr/share/doc/
./usr/share/doc/libgl1-mesa-glx/
./usr/share/doc/libgl1-mesa-glx/changelog.gz
./usr/share/doc/libgl1-mesa-glx/copyright
./usr/share/doc/libgl1-mesa-glx/changelog.Debian.gz
./usr/lib/libGL.so.1 -> libGL.so.1.2

libgl1-mesa-swx11-dbg
./
./usr/
./usr/lib/
./usr/lib/debug/
./usr/lib/debug/libGL.so.1.5.060402
./usr/lib/debug/libOSMesa.so.6.4.060402
./usr/share/
./usr/share/doc/
./usr/share/doc/libgl1-mesa-swx11-dbg/
./usr/share/doc/libgl1-mesa-swx11-dbg/changelog.gz
./usr/share/doc/libgl1-mesa-swx11-dbg/copyright
./usr/share/doc/libgl1-mesa-swx11-dbg/changelog.Debian.gz
./usr/lib/debug/libGL.so.1 -> libGL.so.1.5.060402
./usr/lib/debug/libOSMesa.so.6 -> libOSMesa.so.6.4.060402
./usr/lib/debug/libGL.so -> libGL.so.1
./usr/lib/debug/libOSMesa.so -> libOSMesa.so.6

libgl1-mesa-swx11-dev
./
./usr/
./usr/lib/
./usr/lib/libGL.a
./usr/lib/libOSMesa.a
./usr/lib/libGLw.a
./usr/include/
./usr/include/GL/
./usr/include/GL/glx.h
./usr/include/GL/glxext.h
./usr/include/GL/glx_mangle.h
./usr/include/GL/GLwDrawA.h
./usr/include/GL/GLwMDrawA.h
./usr/share/
./usr/share/doc/
./usr/share/doc/libgl1-mesa-swx11-dev/
./usr/share/doc/libgl1-mesa-swx11-dev/changelog.gz
./usr/share/doc/libgl1-mesa-swx11-dev/copyright
./usr/share/doc/libgl1-mesa-swx11-dev/changelog.Debian.gz
./usr/lib/libGL.so -> libGL.so.1
./usr/lib/libOSMesa.so -> libOSMesa.so.6

libgl1-mesa-swx11
./
./usr/
./usr/lib/
./usr/lib/debug/
./usr/lib/debug/libGL.so.1.5.060402
./usr/lib/debug/libOSMesa.so.6.4.060402
./usr/share/
./usr/share/doc/
./usr/share/doc/libgl1-mesa-swx11-dbg/
./usr/share/doc/libgl1-mesa-swx11-dbg/changelog.gz
./usr/share/doc/libgl1-mesa-swx11-dbg/copyright
./usr/share/doc/libgl1-mesa-swx11-dbg/changelog.Debian.gz
./usr/lib/debug/libGL.so.1 -> libGL.so.1.5.060402
./usr/lib/debug/libOSMesa.so.6 -> libOSMesa.so.6.4.060402
./usr/lib/debug/libGL.so -> libGL.so.1
./usr/lib/debug/libOSMesa.so -> libOSMesa.so.6

libglu1-mesa-dev
./
./usr/
./usr/lib/
./usr/lib/libGLU.a
./usr/include/
./usr/include/GL/
./usr/include/GL/glu.h
./usr/include/GL/glu_mangle.h
./usr/share/
./usr/share/doc/
./usr/share/doc/libglu1-mesa-dev/
./usr/share/doc/libglu1-mesa-dev/changelog.gz
./usr/share/doc/libglu1-mesa-dev/copyright
./usr/share/doc/libglu1-mesa-dev/changelog.Debian.gz
./usr/lib/libGLU.so -> libGLU.so.1

libglu1-mesa
./
./usr/
./usr/lib/
./usr/lib/libGLU.a
./usr/include/
./usr/include/GL/
./usr/include/GL/glu.h
./usr/include/GL/glu_mangle.h
./usr/share/
./usr/share/doc/
./usr/share/doc/libglu1-mesa-dev/
./usr/share/doc/libglu1-mesa-dev/changelog.gz
./usr/share/doc/libglu1-mesa-dev/copyright
./usr/share/doc/libglu1-mesa-dev/changelog.Debian.gz
./usr/lib/libGLU.so -> libGLU.so.1

libosmesa6-dev
./
./usr/
./usr/lib/
./usr/lib/libOSMesa16.a
./usr/lib/libOSMesa32.a
./usr/share/
./usr/share/doc/
./usr/share/doc/libosmesa6-dev/
./usr/share/doc/libosmesa6-dev/changelog.gz
./usr/share/doc/libosmesa6-dev/copyright
./usr/share/doc/libosmesa6-dev/changelog.Debian.gz
./usr/lib/libOSMesa16.so -> libOSMesa16.so.6
./usr/lib/libOSMesa32.so -> libOSMesa32.so.6

libosmesa6
./
./usr/
./usr/lib/
./usr/lib/libOSMesa16.a
./usr/lib/libOSMesa32.a
./usr/share/
./usr/share/doc/
./usr/share/doc/libosmesa6-dev/
./usr/share/doc/libosmesa6-dev/changelog.gz
./usr/share/doc/libosmesa6-dev/copyright
./usr/share/doc/libosmesa6-dev/changelog.Debian.gz
./usr/lib/libOSMesa16.so -> libOSMesa16.so.6
./usr/lib/libOSMesa32.so -> libOSMesa32.so.6

-------------- next part --------------
libgl1-mesa-dev
./
./usr/
./usr/lib/
./usr/include/
./usr/include/GL/
./usr/include/GL/glx.h
./usr/include/GL/glxext.h
./usr/include/GL/glx_mangle.h
./usr/share/
./usr/share/doc/
./usr/share/doc/libgl1-mesa-dev/
./usr/share/doc/libgl1-mesa-dev/changelog.gz
./usr/share/doc/libgl1-mesa-dev/copyright
./usr/share/doc/libgl1-mesa-dev/changelog.Debian.gz
./usr/lib/libGL.so -> libGL.so.1
./usr/lib/libOSMesa.so -> libOSMesa.so.6

libgl1-mesa-directfb-dev
./
./usr/
./usr/lib/
./usr/share/
./usr/share/doc/
./usr/share/doc/libgl1-mesa-directfb-dev/
./usr/share/doc/libgl1-mesa-directfb-dev/changelog.gz
./usr/share/doc/libgl1-mesa-directfb-dev/copyright
./usr/share/doc/libgl1-mesa-directfb-dev/changelog.Debian.gz

libgl1-mesa-directfb
./
./usr/
./usr/lib/
./usr/share/
./usr/share/doc/
./usr/share/doc/libgl1-mesa-directfb-dev/
./usr/share/doc/libgl1-mesa-directfb-dev/changelog.gz
./usr/share/doc/libgl1-mesa-directfb-dev/copyright
./usr/share/doc/libgl1-mesa-directfb-dev/changelog.Debian.gz

libgl1-mesa-dri
./
./usr/
./usr/lib/
./usr/lib/dri/
./usr/share/
./usr/share/doc/
./usr/share/doc/libgl1-mesa-dri/
./usr/share/doc/libgl1-mesa-dri/changelog.gz
./usr/share/doc/libgl1-mesa-dri/copyright
./usr/share/doc/libgl1-mesa-dri/changelog.Debian.gz

libgl1-mesa-glx
./
./usr/
./usr/lib/
./usr/lib/libGL.so.1.2
./usr/lib/libOSMesa.so.6.4.060402
./usr/share/
./usr/share/doc/
./usr/share/doc/libgl1-mesa-glx/
./usr/share/doc/libgl1-mesa-glx/changelog.gz
./usr/share/doc/libgl1-mesa-glx/copyright
./usr/share/doc/libgl1-mesa-glx/changelog.Debian.gz
./usr/lib/libGL.so.1 -> libGL.so.1.2
./usr/lib/libOSMesa.so.6 -> libOSMesa.so.6.4.060402

libgl1-mesa-swx11-dbg
./
./usr/
./usr/lib/
./usr/lib/debug/
./usr/lib/debug/libGL.so.1.5.060402
./usr/lib/debug/libOSMesa.so.6.4.060402
./usr/share/
./usr/share/doc/
./usr/share/doc/libgl1-mesa-swx11-dbg/
./usr/share/doc/libgl1-mesa-swx11-dbg/changelog.gz
./usr/share/doc/libgl1-mesa-swx11-dbg/copyright
./usr/share/doc/libgl1-mesa-swx11-dbg/changelog.Debian.gz
./usr/lib/debug/libGL.so.1 -> libGL.so.1.5.060402
./usr/lib/debug/libOSMesa.so.6 -> libOSMesa.so.6.4.060402
./usr/lib/debug/libGL.so -> libGL.so.1
./usr/lib/debug/libOSMesa.so -> libOSMesa.so.6

libgl1-mesa-swx11-dev
./
./usr/
./usr/lib/
./usr/lib/libGL.a
./usr/lib/libOSMesa.a
./usr/lib/libGLw.a
./usr/include/
./usr/include/GL/
./usr/include/GL/glx.h
./usr/include/GL/glxext.h
./usr/include/GL/glx_mangle.h
./usr/include/GL/GLwDrawA.h
./usr/include/GL/GLwMDrawA.h
./usr/share/
./usr/share/doc/
./usr/share/doc/libgl1-mesa-swx11-dev/
./usr/share/doc/libgl1-mesa-swx11-dev/changelog.gz
./usr/share/doc/libgl1-mesa-swx11-dev/copyright
./usr/share/doc/libgl1-mesa-swx11-dev/changelog.Debian.gz
./usr/lib/libGL.so -> libGL.so.1
./usr/lib/libOSMesa.so -> libOSMesa.so.6

libgl1-mesa-swx11
./
./usr/
./usr/lib/
./usr/lib/debug/
./usr/lib/debug/libGL.so.1.5.060402
./usr/lib/debug/libOSMesa.so.6.4.060402
./usr/share/
./usr/share/doc/
./usr/share/doc/libgl1-mesa-swx11-dbg/
./usr/share/doc/libgl1-mesa-swx11-dbg/changelog.gz
./usr/share/doc/libgl1-mesa-swx11-dbg/copyright
./usr/share/doc/libgl1-mesa-swx11-dbg/changelog.Debian.gz
./usr/lib/debug/libGL.so.1 -> libGL.so.1.5.060402
./usr/lib/debug/libOSMesa.so.6 -> libOSMesa.so.6.4.060402
./usr/lib/debug/libGL.so -> libGL.so.1
./usr/lib/debug/libOSMesa.so -> libOSMesa.so.6

libglu1-mesa-dev
./
./usr/
./usr/lib/
./usr/lib/libGLU.a
./usr/include/
./usr/include/GL/
./usr/include/GL/glu.h
./usr/include/GL/glu_mangle.h
./usr/share/
./usr/share/doc/
./usr/share/doc/libglu1-mesa-dev/
./usr/share/doc/libglu1-mesa-dev/changelog.gz
./usr/share/doc/libglu1-mesa-dev/copyright
./usr/share/doc/libglu1-mesa-dev/changelog.Debian.gz
./usr/lib/libGLU.so -> libGLU.so.1

libglu1-mesa
./
./usr/
./usr/lib/
./usr/lib/libGLU.a
./usr/include/
./usr/include/GL/
./usr/include/GL/glu.h
./usr/include/GL/glu_mangle.h
./usr/share/
./usr/share/doc/
./usr/share/doc/libglu1-mesa-dev/
./usr/share/doc/libglu1-mesa-dev/changelog.gz
./usr/share/doc/libglu1-mesa-dev/copyright
./usr/share/doc/libglu1-mesa-dev/changelog.Debian.gz
./usr/lib/libGLU.so -> libGLU.so.1

libosmesa6-dev
./
./usr/
./usr/lib/
./usr/lib/libOSMesa16.a
./usr/lib/libOSMesa32.a
./usr/share/
./usr/share/doc/
./usr/share/doc/libosmesa6-dev/
./usr/share/doc/libosmesa6-dev/changelog.gz
./usr/share/doc/libosmesa6-dev/copyright
./usr/share/doc/libosmesa6-dev/changelog.Debian.gz
./usr/lib/libOSMesa16.so -> libOSMesa16.so.6
./usr/lib/libOSMesa32.so -> libOSMesa32.so.6

libosmesa6
./
./usr/
./usr/lib/
./usr/lib/libOSMesa16.a
./usr/lib/libOSMesa32.a
./usr/share/
./usr/share/doc/
./usr/share/doc/libosmesa6-dev/
./usr/share/doc/libosmesa6-dev/changelog.gz
./usr/share/doc/libosmesa6-dev/copyright
./usr/share/doc/libosmesa6-dev/changelog.Debian.gz
./usr/lib/libOSMesa16.so -> libOSMesa16.so.6
./usr/lib/libOSMesa32.so -> libOSMesa32.so.6

More information about the Pkg-mesa-devel mailing list