diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2015-01-29 06:04:34 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2015-02-06 17:48:44 +0100 |
| commit | 27a65fefdbebf3f0b3a5e860126de7edc82b2e18 (patch) | |
| tree | 60e2310160e655f2a04447e89aeef94e787c2b79 /package/xorg-server | |
| parent | 968be27a93e24f7b2c267b654e3f80c678d42a4a (diff) | |
update xorg-server to latest stable version
Diffstat (limited to 'package/xorg-server')
| -rw-r--r-- | package/xorg-server/Makefile | 13 | ||||
| -rw-r--r-- | package/xorg-server/patches/patch-hw_kdrive_linux_linux_c | 13 | ||||
| -rw-r--r-- | package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_init_c | 13 |
3 files changed, 6 insertions, 33 deletions
diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile index eba7725e2..8f486a863 100644 --- a/package/xorg-server/Makefile +++ b/package/xorg-server/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= xorg-server -PKG_VERSION:= 1.15.1 +PKG_VERSION:= 1.16.3 PKG_RELEASE:= 1 -PKG_HASH:= 0c144e98081887c93c066c0bd5725865b014ed1acd6def1319a1e350ced96d76 +PKG_HASH:= 293d6a73a560f9f7f5cc8a05d84445a3aabfdf43683925d0f93c8f8502536c84 PKG_DESCR:= xorg server PKG_SECTION:= x11/drivers PKG_DEPENDS:= libopenssl libxfont pixman libpciaccess libxkbfile @@ -26,19 +26,18 @@ PKG_OPTS:= dev DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz PKG_CFLINE_XORG_SERVER:=depends on ADK_TARGET_WITH_VGA || ADK_TARGET_QEMU_WITH_GRAPHIC -PKG_ARCH_DEPENDS:= !m68k PKG_FLAVOURS_XORG_SERVER:= WITH_DRI WITH_KDRIVE PKGFS_WITH_DRI:= mesalib -PKGFD_WITH_DRI:= enable DRI support +PKGFD_WITH_DRI:= enable dri support PKGFB_WITH_DRI:= xf86driproto glproto mesalib -PKGFD_WITH_KDRIVE:= Build Kdrive Xfbdev server +PKGFD_WITH_KDRIVE:= build kdrive xfbdev server PKG_CHOICES_XORG_SERVER:= WITH_GCRYPT WITH_CRYPTO -PKGCD_WITH_GCRYPT:= use libgcrypt for SHA1 +PKGCD_WITH_GCRYPT:= use libgcrypt for sha1 PKGCS_WITH_GCRYPT:= libgcrypt PKGCB_WITH_GCRYPT:= libgcrypt -PKGCD_WITH_CRYPTO:= use openssl libcrypto for SHA1 +PKGCD_WITH_CRYPTO:= use openssl libcrypto for sha1 PKGCS_WITH_CRYPTO:= libopenssl PKGCB_WITH_CRYPTO:= openssl diff --git a/package/xorg-server/patches/patch-hw_kdrive_linux_linux_c b/package/xorg-server/patches/patch-hw_kdrive_linux_linux_c deleted file mode 100644 index a7ad990e1..000000000 --- a/package/xorg-server/patches/patch-hw_kdrive_linux_linux_c +++ /dev/null @@ -1,13 +0,0 @@ ---- xorg-server-1.15.0.orig/hw/kdrive/linux/linux.c 2013-12-27 18:38:52.000000000 +0100 -+++ xorg-server-1.15.0/hw/kdrive/linux/linux.c 2014-03-21 12:51:06.774068258 +0100 -@@ -66,8 +66,8 @@ static void - LinuxCheckChown(const char *file) - { - struct stat st; -- __uid_t u; -- __gid_t g; -+ uid_t u; -+ gid_t g; - - if (stat(file, &st) < 0) - return; diff --git a/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_init_c b/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_init_c deleted file mode 100644 index d170fa424..000000000 --- a/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_init_c +++ /dev/null @@ -1,13 +0,0 @@ ---- xorg-server-1.15.0.orig/hw/xfree86/os-support/linux/lnx_init.c 2013-12-27 18:38:52.000000000 +0100 -+++ xorg-server-1.15.0/hw/xfree86/os-support/linux/lnx_init.c 2014-03-21 12:56:02.898707432 +0100 -@@ -83,8 +83,8 @@ xf86OpenConsole(void) - struct vt_mode VT; - struct vt_stat vts; - MessageType from = X_PROBED; -- char *tty0[] = { "/dev/tty0", "/dev/vc/0", NULL }; -- char *vcs[] = { "/dev/vc/%d", "/dev/tty%d", NULL }; -+ char *tty0[] = { "/dev/tty0", NULL }; -+ char *vcs[] = { "/dev/tty%d", NULL }; - - if (serverGeneration == 1) { - |