Hi Darren, Alle mercoledì 17 giugno 2009, Marc Dequènes (Duck) ha scritto: > Quoting Darren Salt <li...@youmustbejoking.demon.co.uk>: > > Could you test the attached patch? It should disable DVB support on > > hurd-* & Windows only; it seems fine on Linux. > > Sorry for the delay, i was a bit overloaded these days. > > Your patch works like a charm, thanks a lot :-).
The upload of xine-lib 1.1.16.3-2 improved a bit the situation on GNU/Hurd. Now the problem left (on the upstream code) is the xine-lib_hurd_dvb.patch, which looks like it isn't merged yet? Can you please merge it (I confirm Marc's testing, it works). Although, it needs some tweaking to the Debian part, ie the generation of the .install file is missing. Attached is a patch that fixes this issue. Thanks, -- Pino Toscano
--- xine-lib-1.1.16.3.orig/debian/rules +++ xine-lib-1.1.16.3/debian/rules @@ -90,6 +90,7 @@ generate-arch-files-stamp \ debian/libxine1-bin.install.i386 \ debian/libxine1*.install.kfreebsd* \ + debian/libxine1*.install.hurd* \ config.h config.log \ a.out # XXX fix the configure script to not create this @@ -174,12 +175,16 @@ generate-arch-files-stamp: \ debian/libxine1-bin.install.i386 \ debian/libxine1-bin.install.kfreebsd-i386 \ + debian/libxine1-bin.install.hurd-i386 \ debian/libxine1-x.install.kfreebsd-i386 \ debian/libxine1-x.install.kfreebsd-amd64 \ + debian/libxine1-x.install.hurd-i386 \ debian/libxine1-misc-plugins.install.kfreebsd-i386 \ debian/libxine1-misc-plugins.install.kfreebsd-amd64 \ + debian/libxine1-misc-plugins.install.hurd-i386 \ debian/libxine1-console.install.kfreebsd-i386 \ - debian/libxine1-console.install.kfreebsd-amd64 + debian/libxine1-console.install.kfreebsd-amd64 \ + debian/libxine1-console.install.hurd-i386 touch $@ # i386 specific plugins are also available for kfreebsd-i386 @@ -191,6 +196,9 @@ debian/libxine1-bin.install.kfreebsd-i386: debian/libxine1-bin.install.i386 ln -f $^ $@ +debian/libxine1-bin.install.hurd-i386: debian/libxine1-bin.install.i386 + ln -f $^ $@ + # create install files for Debian GNU/kFreeBSD i386/amd64 by dropping # everything which is not available on those architectures. debian/libxine1-x.install.kfreebsd-i386: debian/libxine1-x.install @@ -202,6 +210,17 @@ debian/libxine1-console.install.kfreebsd-i386: debian/libxine1-console.install grep -v -e out_fb $^ >$@ +# create install files for Debian GNU/Hurd i386 by dropping +# everything which is not available on those architectures. +debian/libxine1-x.install.hurd-i386: debian/libxine1-x.install + grep -v -e dxr3 -e syncfb $^ >$@ + +debian/libxine1-misc-plugins.install.hurd-i386: debian/libxine1-misc-plugins.install + grep -v -e dxr3 -e pvr -e v4l -e alsa -e dvb -e vcdo $^ >$@ + +debian/libxine1-console.install.hurd-i386: debian/libxine1-console.install + grep -v -e out_fb $^ >$@ + debian/libxine1-%-amd64: debian/libxine1-%-i386 ln -f $^ $@
signature.asc
Description: This is a digitally signed message part.
