Source: xine-lib-1.2
Version: 1.2.13+hg20230710-1
Severity: important
Tags: patch
User: debian-h...@lists.debian.org
Usertags: hurd
Control: found -1 1.2.12-1

Hi,

xine-lib-1.2 currently FTBFSes on hurd-i386 [1].

The problem is that the VAAPI support is not available on hurd-i386,
and libxine2-x unconditionally installs files that are built for that.
The attached patch fixes the issue, by limiting the VAAPI plugins that
were not already limited on some architectures (e.g. the wayland one)
as !hurd-any, like the libva-dev build dependency.

As I was tweaking/fixing the packaging for hurd-i386, I included also
few more Hurd-related changes:
- enable the smb plugin also on the Hurd, as samba is now built there
- change the exclusion architecture pattern for the vcdo plugin to
  !hurd-any, as it applies to any Hurd architecture and not only to
  hurd-i386

[1] 
https://buildd.debian.org/status/fetch.php?pkg=xine-lib-1.2&arch=hurd-i386&ver=1.2.13%2Bhg20230710-1&stamp=1689013434&raw=0

Thanks,
-- 
Pino
--- a/debian/control
+++ b/debian/control
@@ -30,7 +30,7 @@ Build-Depends: debhelper-compat (= 13),
  libpulse-dev,
  librsvg2-bin,
  libsdl1.2-compat-dev,
- libsmbclient-dev [!hurd-i386],
+ libsmbclient-dev,
  libspeex-dev,
  libtheora-dev,
  libv4l-dev [linux-any],
--- a/debian/libxine2-misc-plugins.install
+++ b/debian/libxine2-misc-plugins.install
@@ -9,11 +9,11 @@ debian/tmp/usr/lib/*/xine/plugins/*/xine
 debian/tmp/usr/lib/*/xine/plugins/*/xineplug_inp_network.so
 [linux-any] debian/tmp/usr/lib/*/xine/plugins/*/xineplug_inp_pvr.so
 debian/tmp/usr/lib/*/xine/plugins/*/xineplug_inp_rtp.so
-[!hurd-i386] debian/tmp/usr/lib/*/xine/plugins/*/xineplug_inp_smb.so
+debian/tmp/usr/lib/*/xine/plugins/*/xineplug_inp_smb.so
 #[linux-any] debian/tmp/usr/lib/*/xine/plugins/*/xineplug_inp_v4l.so
 [linux-any] debian/tmp/usr/lib/*/xine/plugins/*/xineplug_inp_v4l2.so
 debian/tmp/usr/lib/*/xine/plugins/*/xineplug_inp_vcd.so
-[!hurd-i386] debian/tmp/usr/lib/*/xine/plugins/*/xineplug_inp_vcdo.so
+[!hurd-any] debian/tmp/usr/lib/*/xine/plugins/*/xineplug_inp_vcdo.so
 
 # audio output plugins
 [linux-any] debian/tmp/usr/lib/*/xine/plugins/*/xineplug_ao_out_alsa.so
--- a/debian/libxine2-x.install
+++ b/debian/libxine2-x.install
@@ -5,7 +5,7 @@ debian/tmp/usr/lib/*/xine/plugins/*/xine
 debian/tmp/usr/lib/*/xine/plugins/*/xineplug_vo_out_opengl.so
 debian/tmp/usr/lib/*/xine/plugins/*/xineplug_vo_out_opengl2.so
 debian/tmp/usr/lib/*/xine/plugins/*/xineplug_vo_out_sdl.so
-[linux-any] debian/tmp/usr/lib/*/xine/plugins/*/xineplug_vo_out_vaapi.so
+[!hurd-any] debian/tmp/usr/lib/*/xine/plugins/*/xineplug_vo_out_vaapi.so
 debian/tmp/usr/lib/*/xine/plugins/*/xineplug_vo_out_xcbshm.so
 debian/tmp/usr/lib/*/xine/plugins/*/xineplug_vo_out_xcbxv.so
 debian/tmp/usr/lib/*/xine/plugins/*/xineplug_vo_out_xdirectfb.so
@@ -17,7 +17,7 @@ debian/tmp/usr/lib/*/xine/plugins/*/xine
 debian/tmp/usr/lib/*/xine/plugins/*/xineplug_vo_gl_egl_x11.so
 debian/tmp/usr/lib/*/xine/plugins/*/xineplug_vo_gl_glx.so
 [linux-any] debian/tmp/usr/lib/*/xine/plugins/*/xineplug_hw_frame_vaapi.so
-debian/tmp/usr/lib/*/xine/plugins/*/xineplug_va_display_drm.so
-debian/tmp/usr/lib/*/xine/plugins/*/xineplug_va_display_glx.so
+[!hurd-any] debian/tmp/usr/lib/*/xine/plugins/*/xineplug_va_display_drm.so
+[!hurd-any] debian/tmp/usr/lib/*/xine/plugins/*/xineplug_va_display_glx.so
 [linux-any] debian/tmp/usr/lib/*/xine/plugins/*/xineplug_va_display_wl.so
-debian/tmp/usr/lib/*/xine/plugins/*/xineplug_va_display_x11.so
+[!hurd-any] debian/tmp/usr/lib/*/xine/plugins/*/xineplug_va_display_x11.so

Reply via email to