Hi,
Julien Cristau, le Mon 28 May 2007 23:08:36 +0200, a écrit :
> I don't really understand why the software libGL is built in a target
> named "*-dri-*", instead of "*-indirect-*", that seems wrong... I think
> I've told that to Samuel, but in any case I'll discuss it with him
> again.
That was to avoid modifying scripts/choose-configs, here is a better
patch.
Samuel
--- mesa-6.5.3-orig/debian/rules 2007-05-30 23:31:20.000916420 +0000
+++ mesa-6.5.3/debian/rules 2007-05-30 23:38:09.000754926 +0000
@@ -112,6 +112,7 @@
dh_builddeb -i
# Build architecture-dependent files here.
+binary-arch: DH_OPTIONS += -s
binary-arch: build install
dh_testdir
dh_testroot
--- mesa-6.5.3-orig/debian/scripts/choose-configs 2007-05-30
23:31:20.000354544 +0000
+++ mesa-6.5.3/debian/scripts/choose-configs 2007-05-30 23:39:46.000866560
+0000
@@ -22,10 +22,14 @@
endif
# and for the GLX/DRI-enabled libGL
-ifneq ($(wildcard configs/debian-dri-$(DEB_BUILD_ARCH)),)
- DRI_CONFIGS := debian-dri-$(DEB_BUILD_ARCH)
+ifneq ($(wildcard configs/debian-indirect-$(DEB_BUILD_ARCH)),)
+ DRI_CONFIGS := debian-indirect-$(DEB_BUILD_ARCH)
else
+ ifneq ($(wildcard configs/debian-dri-$(DEB_BUILD_ARCH)),)
+ DRI_CONFIGS := debian-dri-$(DEB_BUILD_ARCH)
+ else
DRI_CONFIGS := debian-dri-any
+ endif
endif
##############################################################################
--- mesa-6.5.3-orig/configs/debian-indirect-hurd-i386 1970-01-01
00:00:00.000000000 +0000
+++ mesa-6.5.3/configs/debian-indirect-hurd-i386 2007-05-30
23:40:35.000147363 +0000
@@ -0,0 +1,9 @@
+# Configuration for building the DRI drivers on the build architecture.
+
+include $(TOP)/configs/linux-indirect
+include $(TOP)/configs/debian-indirect-default
+
+CONFIG_NAME = debian-indirect-hurd-i386
+
+# vim: ft=make
+
--- mesa-6.5.3-orig/configs/debian-indirect-default 1970-01-01
00:00:00.000000000 +0000
+++ mesa-6.5.3/configs/debian-indirect-default 2007-05-30 23:43:02.000389834
+0000
@@ -0,0 +1,9 @@
+# Configuration defaults for building GLX-enabled libGL.
+
+include $(TOP)/configs/debian-dri-default
+
+CONFIG_NAME = debian-indirect-default
+
+SRC_DIRS = glx/x11 progs
+DRIVER_DIRS =
+DRI_DIRS =
--- mesa-6.5.3-orig/debian/control 2007-05-30 23:45:29.000672311 +0000
+++ mesa-6.5.3/debian/control 2007-05-30 23:44:16.000620397 +0000
@@ -94,7 +94,7 @@
Package: libgl1-mesa-glx
Section: libs
-Architecture: any
+Architecture: alpha amd64 arm armeb armel hppa i386 ia64 kfreebsd-i386
kfreebsd-amd64 m68k mips mipsel powerpc s390 sparc
Depends: ${shlibs:Depends}
Conflicts: libgl1, libgl1-mesa-dri (<< 6.4.0)
Replaces: libgl1, libgl1-mesa-dri (<< 6.4.0)
@@ -113,7 +113,7 @@
Package: libgl1-mesa-glx-dbg
Section: libdevel
Priority: extra
-Architecture: any
+Architecture: alpha amd64 arm armeb armel hppa i386 ia64 kfreebsd-i386
kfreebsd-amd64 m68k mips mipsel powerpc s390 sparc
Depends: libgl1-mesa-glx (= ${binary:Version})
Description: A free implementation of the OpenGL API -- GLX runtime --
debugging symbols
This version of Mesa provides GLX and DRI capabilities: it is capable of
@@ -153,7 +153,7 @@
Package: libgl1-mesa-dri
Section: libs
Priority: optional
-Architecture: any
+Architecture: alpha amd64 arm armeb armel hppa i386 ia64 kfreebsd-i386
kfreebsd-amd64 m68k mips mipsel powerpc s390 sparc
Depends: ${shlibs:Depends}, libgl1-mesa-glx (= ${binary:Version})
Suggests: libglide3
Conflicts: xlibmesa-dri (<< 1:7.0.0)
@@ -174,7 +174,7 @@
Package: libgl1-mesa-dri-dbg
Section: libdevel
Priority: extra
-Architecture: any
+Architecture: alpha amd64 arm armeb armel hppa i386 ia64 kfreebsd-i386
kfreebsd-amd64 m68k mips mipsel powerpc s390 sparc
Depends: libgl1-mesa-dri (= ${binary:Version})
Description: A free implementation of the OpenGL API -- DRI modules --
debugging symbols
This version of Mesa provides GLX and DRI capabilities: it is capable of
