Bug#368972: libgl1-mesa-directfb-dev should not provide libgl-dev: ITNMU

[Steve Langasek]

So first of all, it seems that no changes at all will be needed to mesa to
fix 368972, because the mesa in experimental has dropped the directfb
packages completely.  Nothing in the archive depends on them, so unless I
hear otherwise, I'll assume that this change is ok for testing/unstable as
well as for experimental, and honor this decision in my NMU.

On Fri, Sep 15, 2006 at 03:02:44PM +0200, Michael Banck wrote:
> On Fri, Sep 15, 2006 at 03:11:28AM -0700, Steve Langasek wrote:
> > I will also be fixing this bug and bug #386185 in the process.

> Please also apply the last patch in #358065 (FTBFS on hurd-i386 because
> of dri/drm), unless Michel or Marcelo veto this.   I have attached the
> patch again for review.

> --- 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 <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

I don't think I'm comfortable applying this patch in an NMU, because I don't
understand the upstream rules well enough to be sure it's correct.  I
particularly don't understand why there needs to be a new debian-indirect
config in order to support Hurd.

A Hurd porter would of course be able to do their own subsequent NMU if
they're confident in this patch.

On Fri, Sep 15, 2006 at 02:42:58PM -0400, Aaron M. Ucko wrote:

> Any chance of addressing #369895 while you're at it?  The fix is a
> one-liner, and upstream applied it three months ago:

> http://webcvs.freedesktop.org/mesa/Mesa/src/mesa/tnl/t_vb_render.c?r1=1.49&r2=1.50&view=patch

Heh, thanks, I was wondering about that irritating output on my console.
Yes, included.

Cheers,
-- 
Steve Langasek                   Give me a lever long enough and a Free OS
Debian Developer                   to set it on, and I can move the world.
vorlon at debian.org                                   http://www.debian.org/