diff --git a/0001-Fix-compilation-of-int10-module-on-arm.patch b/0001-Fix-compilation-of-int10-module-on-arm.patch new file mode 100644 index 0000000..7f50d50 --- /dev/null +++ b/0001-Fix-compilation-of-int10-module-on-arm.patch @@ -0,0 +1,30 @@ +From 487715ebb67cf9a75887279f4257cc93ed790594 Mon Sep 17 00:00:00 2001 +From: Hans de Goede +Date: Fri, 25 Apr 2014 09:07:04 +0200 +Subject: [PATCH] Fix compilation of int10 module on arm + +Signed-off-by: Hans de Goede +--- + hw/xfree86/int10/xf86x86emu.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/hw/xfree86/int10/xf86x86emu.c b/hw/xfree86/int10/xf86x86emu.c +index b9a4d36..f3c2850 100644 +--- a/hw/xfree86/int10/xf86x86emu.c ++++ b/hw/xfree86/int10/xf86x86emu.c +@@ -18,6 +18,12 @@ + + #define M _X86EMU_env + ++/* compiler.h defines outb/outw/outl on arm this file does not need these and ++ this interferes with the pioFuncs struct initialization */ ++#undef outb ++#undef outw ++#undef outl ++ + static void + x86emu_do_int(int num) + { +-- +1.9.0 + diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index da4c02e..aec7bfd 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -81,6 +81,8 @@ Source52: glamor_font.h Source53: glamor_program.h Source54: glamor_transform.h +Patch1: 0001-Fix-compilation-of-int10-module-on-arm.patch + # Trivial things to never merge upstream ever: # This really could be done prettier. Patch5002: xserver-1.4.99-ssh-isnt-local.patch @@ -618,6 +620,7 @@ find %{inst_srcdir}/hw/xfree86 -name \*.c -delete * Fri Apr 25 2014 Hans de Goede - 1.15.99.902-3 - Add missing BuildRequires for dbus-devel, libepoxy-devel, mesa-libEGL-devel, mesa-libgbm-devel and systemd-devel +- Fix compilation of int10 module on arm * Wed Apr 23 2014 Hans de Goede - 1.15.99.902-2 - Add --enable-glamor to configure flags