From eed366a55c2b592f85e6a736264d43902b03c1a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 25 Aug 2020 00:19:42 +0200
Subject: [PATCH] xine-lib: update to 1.2.10

---
 srcpkgs/xine-lib/patches/fix-i686-musl.patch | 29 --------------------
 srcpkgs/xine-lib/template                    | 22 +++++++++++----
 2 files changed, 17 insertions(+), 34 deletions(-)
 delete 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
deleted file mode 100644
index fd9f4abf883..00000000000
--- a/srcpkgs/xine-lib/patches/fix-i686-musl.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- 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 <errno.h>
- #ifdef __i386__
-+#ifdef __GLIBC__
- #include <sys/perm.h>
- #else
-+#define iopl(x) (0)
-+#endif
-+#else
- #ifndef __sparc__
- #include <sys/io.h>
- #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 b4801c25561..ee612b34a23 100644
--- a/srcpkgs/xine-lib/template
+++ b/srcpkgs/xine-lib/template
@@ -1,10 +1,10 @@
 # Template file for 'xine-lib'
 pkgname=xine-lib
-version=1.2.9
-revision=5
+version=1.2.10
+revision=1
 build_style=gnu-configure
 configure_args="--disable-vcd --disable-gnomevfs --without-esound --disable-dxr3
- --disable-oss --disable-optimizations"
+ --disable-oss"
 hostmakedepends="automake gettext-devel libtool pkg-config perl"
 makedepends="
  zlib-devel alsa-lib-devel libxcb-devel libSM-devel libXext-devel libXv-devel
@@ -19,15 +19,27 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="http://www.xine-project.org"
 changelog="https://sourceforge.net/projects/xine/files/xine-lib/${version}/README.txt/view"
 distfiles="${SOURCEFORGE_SITE}/xine/${pkgname}-${version}.tar.xz"
-checksum=32b34e8049feb762d75a551d5d2cdb56c396fdd83e35b9b7de5fd08e498e948d
+checksum=9cb3f069d3c1ffb7456ea91a936a85bbb07ac2ab7be1e9d0d2c94ffe4110dc57
 
 case "$XBPS_TARGET_MACHINE" in
-	i686-musl) configure_args+=" --disable-dha-kmod --disable-vidix" ;;
+	i686-musl)
+		configure_args+=" --disable-dha-kmod"
+		configure_args+=" --disable-vidix"
+		configure_args+=" --disable-w32dll"
+		;;
 esac
 case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*|ppc64*) makedepends+=" libva-glx-devel libvdpau-devel glu-devel";;
 esac
 
+CFLAGS="-fcommon"
+
+post_configure() {
+	if [ "$XBPS_TARGET_MACHINE" = "i686-musl" ]; then
+		vsed -i include/config.h -e '/#include "configure.h"/a #undef __ILP32__'
+	fi
+}
+
 libxine_package() {
 	short_desc+=" - runtime library"
 	pkg_install() {