From 16e4aedad0bc7a26259f194750db8baeaa23af54 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 15 Mar 2014 11:08:24 +0100
Subject: add some musl fixes

---
 package/xorg-server/Makefile                             |  4 ++--
 .../patches/patch-hw_xfree86_common_compiler_h           | 13 +++++++++++++
 .../patches/patch-hw_xfree86_os-support_xf86_OSlib_h     | 16 ++++++++++++++++
 3 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 package/xorg-server/patches/patch-hw_xfree86_common_compiler_h
 create mode 100644 package/xorg-server/patches/patch-hw_xfree86_os-support_xf86_OSlib_h

(limited to 'package/xorg-server')

diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile
index e766b685d..4e3a33c91 100644
--- a/package/xorg-server/Makefile
+++ b/package/xorg-server/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		xorg-server
 PKG_VERSION:=		1.15.0
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		faf04f1213f9a476997a774254b3abce
 PKG_DESCR:=		Xorg server
 PKG_SECTION:=		x11/server
@@ -45,7 +45,7 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,XORG_SERVER,xorg-server,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-TARGET_CPPFLAGS+=	-D_GNU_SOURCE
+TARGET_CPPFLAGS+=	-D_GNU_SOURCE -D__gid_t=gid_t -D__uid_t=uid_t
 
 ifeq (${ADK_PACKAGE_XORG_SERVER_WITH_GCRYPT},y)
 CONFIGURE_ARGS+=	 --with-sha1=libgcrypt
diff --git a/package/xorg-server/patches/patch-hw_xfree86_common_compiler_h b/package/xorg-server/patches/patch-hw_xfree86_common_compiler_h
new file mode 100644
index 000000000..3a0eb0dbb
--- /dev/null
+++ b/package/xorg-server/patches/patch-hw_xfree86_common_compiler_h
@@ -0,0 +1,13 @@
+from alpinelinux
+
+--- xorg-server-1.15.0.orig/hw/xfree86/common/compiler.h	2013-12-15 08:48:09.000000000 +0100
++++ xorg-server-1.15.0/hw/xfree86/common/compiler.h	2014-03-14 23:25:52.000000000 +0100
+@@ -995,7 +995,7 @@ inl(unsigned short port)
+     return xf86ReadMmio32Le((void *) ioBase, port);
+ }
+ 
+-#elif defined(__arm__) && defined(__linux__)
++#elif defined(__arm__) && defined(__GLIBC__)
+ 
+ /* for Linux on ARM, we use the LIBC inx/outx routines */
+ /* note that the appropriate setup via "ioperm" needs to be done */
diff --git a/package/xorg-server/patches/patch-hw_xfree86_os-support_xf86_OSlib_h b/package/xorg-server/patches/patch-hw_xfree86_os-support_xf86_OSlib_h
new file mode 100644
index 000000000..2fa3bed60
--- /dev/null
+++ b/package/xorg-server/patches/patch-hw_xfree86_os-support_xf86_OSlib_h
@@ -0,0 +1,16 @@
+--- xorg-server-1.15.0.orig/hw/xfree86/os-support/xf86_OSlib.h	2013-12-15 08:48:09.000000000 +0100
++++ xorg-server-1.15.0/hw/xfree86/os-support/xf86_OSlib.h	2014-03-14 22:59:25.000000000 +0100
+@@ -177,12 +177,8 @@
+ #include <stdlib.h>
+ #include <sys/types.h>
+ #include <assert.h>
+-
+-#ifdef __linux__
+-#include <termio.h>
+-#else                           /* __GLIBC__ */
+ #include <termios.h>
+-#endif
++
+ #ifdef __sparc__
+ #include <sys/param.h>
+ #endif
-- 
cgit v1.2.3