From 606e717f5affa6e536398bb3426d1ed871825bcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Sat, 3 Mar 2018 13:20:27 +0100 Subject: [PATCH] xine-lib: fix i686-musl build --- srcpkgs/xine-lib/patches/fix-i686-musl.patch | 29 ++++++++++++++++++++ srcpkgs/xine-lib/template | 3 ++ 2 files changed, 32 insertions(+) create mode 100644 srcpkgs/xine-lib/patches/fix-i686-musl.patch diff --git a/srcpkgs/xine-lib/patches/fix-i686-musl.patch b/srcpkgs/xine-lib/patches/fix-i686-musl.patch new file mode 100644 index 00000000000..fd9f4abf883 --- /dev/null +++ b/srcpkgs/xine-lib/patches/fix-i686-musl.patch @@ -0,0 +1,29 @@ +--- contrib/libdha/sysdep/pci_linux.c 2018-01-11 13:49:46.000000000 +0100 ++++ contrib/libdha/sysdep/pci_linux.c 2018-03-03 12:38:03.867670134 +0100 +@@ -5,8 +5,12 @@ + */ + #include + #ifdef __i386__ ++#ifdef __GLIBC__ + #include + #else ++#define iopl(x) (0) ++#endif ++#else + #ifndef __sparc__ + #include + #endif +--- src/libw32dll/wine/ldt_keeper.c 2018-01-11 13:49:47.000000000 +0100 ++++ src/libw32dll/wine/ldt_keeper.c 2018-03-03 12:44:43.660633403 +0100 +@@ -73,7 +73,11 @@ + #ifdef __cplusplus + extern "C" { + #endif ++#ifdef __GLIBC__ + int modify_ldt(int func, void *ptr, unsigned long bytecount); ++#else ++static int modify_ldt(int func, void *ptr, unsigned long bytecount) { return -ENOSYS; } ++#endif + #ifdef __cplusplus + } + #endif diff --git a/srcpkgs/xine-lib/template b/srcpkgs/xine-lib/template index a8f61ec5e1d..61950f6b1f5 100644 --- a/srcpkgs/xine-lib/template +++ b/srcpkgs/xine-lib/template @@ -20,6 +20,9 @@ homepage="http://www.xine-project.org" distfiles="${SOURCEFORGE_SITE}/xine/$pkgname-$version.tar.xz" checksum=32b34e8049feb762d75a551d5d2cdb56c396fdd83e35b9b7de5fd08e498e948d +case "$XBPS_TARGET_MACHINE" in + i686-musl) configure_args+=" --disable-dha-kmod --disable-vidix" ;; +esac case "$XBPS_TARGET_MACHINE" in i686*|x86_64*) makedepends+=" libva-glx-devel libvdpau-devel glu-devel";; esac