rpms/xorg-x11-server
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix compilation of int10 module on arm

Browse Source 
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
This commit is contained in:
Hans de Goede 2014-04-25 09:10:03 +02:00
parent 45f3ce9b7c
commit af523655f8
2 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
0001-Fix-compilation-of-int10-module-on-arm.patch Normal file
View File

@ -0,0 +1,30 @@
From 487715ebb67cf9a75887279f4257cc93ed790594 Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Fri, 25 Apr 2014 09:07:04 +0200
Subject: [PATCH] Fix compilation of int10 module on arm
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
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

3
xorg-x11-server.spec
View File

@ -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 <hdegoede@redhat.com> - 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 <hdegoede@redhat.com> - 1.15.99.902-2
- Add --enable-glamor to configure flags