diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-08 12:58:54 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-08 12:58:54 +0100 |
| commit | f3e1c3cf993b0ba54afa0ff9552ffefd39828b23 (patch) | |
| tree | 1f5d52b7dff4a5c60e17c8f0fd7f7412c946a0ee /package/xorg-server | |
| parent | d77656116191a166ed0477cf16830480a2406fc5 (diff) | |
| parent | d93c019f2cfdf53be59f02600cc25c547ba24edc (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/xorg-server')
| -rw-r--r-- | package/xorg-server/Makefile | 4 | ||||
| -rw-r--r-- | package/xorg-server/patches/patch-hw_kdrive_linux_linux_c | 13 |
2 files changed, 16 insertions, 1 deletions
diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile index 3faa23e49..3305779ab 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.12.2 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= a95c896fbe8322c3c8d518a13eb74c7a PKG_DESCR:= Xorg server PKG_SECTION:= x11/server @@ -43,6 +43,8 @@ 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 + ifeq (${ADK_PACKAGE_XORG_SERVER_WITH_GCRYPT},y) CONFIGURE_ARGS+= --with-sha1=libgcrypt endif diff --git a/package/xorg-server/patches/patch-hw_kdrive_linux_linux_c b/package/xorg-server/patches/patch-hw_kdrive_linux_linux_c new file mode 100644 index 000000000..2a8477cb8 --- /dev/null +++ b/package/xorg-server/patches/patch-hw_kdrive_linux_linux_c @@ -0,0 +1,13 @@ +--- xorg-server-1.12.2.orig/hw/kdrive/linux/linux.c 2012-05-17 19:09:03.000000000 +0200 ++++ xorg-server-1.12.2/hw/kdrive/linux/linux.c 2013-12-22 20:10:03.000000000 +0100 +@@ -66,8 +66,8 @@ static void + LinuxCheckChown(char *file) + { + struct stat st; +- __uid_t u; +- __gid_t g; ++ uid_t u; ++ gid_t g; + + if (stat(file, &st) < 0) + return; |