update xorg-server to latest stable version

7 files changed, 36 insertions, 65 deletions

diff --git a/package/fontsproto/Makefile b/package/fontsproto/Makefile
index f21021f4c..76ee6c4af 100644
--- a/package/fontsproto/Makefile
+++ b/package/fontsproto/Makefile
@@ -4,18 +4,18 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		fontsproto
-PKG_VERSION:=		2.1.2
+PKG_VERSION:=		2.1.3
 PKG_RELEASE:=		1
-PKG_HASH:=		aaf2375a617afdc1500069a838c0694f59f19d592fc9d9ffa05bd4f37b8504c1
+PKG_HASH:=		72c44e63044b2b66f6fa112921621ecc20c71193982de4f198d9a29cda385c5e
 PKG_DESCR:=		fonts extension headers
 PKG_SECTION:=		dev/header
-PKG_SITES:=		${MASTER_SITE_XORG}
+PKG_SITES:=		$(MASTER_SITE_XORG)
 PKG_OPTS:=		dev devonly
 
-DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
+DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.gz
 
 include $(ADK_TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,FONTSPROTO,fontsproto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,FONTSPROTO,fontsproto,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS)))
 
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk
diff --git a/package/xf86-input-keyboard/Makefile b/package/xf86-input-keyboard/Makefile
index d1952f056..4d1e542f1 100644
--- a/package/xf86-input-keyboard/Makefile
+++ b/package/xf86-input-keyboard/Makefile
@@ -11,20 +11,19 @@ PKG_DESCR:=		x11 driver for keyboard
 PKG_SECTION:=		x11/drivers
 PKG_DEPENDS:=		xorg-server libstdcxx
 PKG_BUILDDEP:=		xorg-server
-PKG_SITES:=		${MASTER_SITE_XORG}
+PKG_SITES:=		$(MASTER_SITE_XORG)
 
-DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
+DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.gz
 
-PKG_ARCH_DEPENDS:=      !m68k
 PKG_CFLINE_XF86_INPUT_KEYBOARD:=	depends on ADK_TARGET_WITH_INPUT || ADK_TARGET_QEMU_WITH_GRAPHIC
 
 include $(ADK_TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,XF86_INPUT_KEYBOARD,xf86-input-keyboard,$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,XF86_INPUT_KEYBOARD,xf86-input-keyboard,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
 
 xf86-input-keyboard-install:
-	${INSTALL_DIR} ${IDIR_XF86_INPUT_KEYBOARD}/usr/lib/xorg/modules/input
-	${CP} ${WRKINST}/usr/lib/xorg/modules/input/kbd_drv.so \
-		${IDIR_XF86_INPUT_KEYBOARD}/usr/lib/xorg/modules/input/
+	$(INSTALL_DIR) $(IDIR_XF86_INPUT_KEYBOARD)/usr/lib/xorg/modules/input
+	$(CP) $(WRKINST)/usr/lib/xorg/modules/input/kbd_drv.so \
+		$(IDIR_XF86_INPUT_KEYBOARD)/usr/lib/xorg/modules/input/
 
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk
diff --git a/package/xf86-input-mouse/Makefile b/package/xf86-input-mouse/Makefile
index 7418d7df5..8dc89b835 100644
--- a/package/xf86-input-mouse/Makefile
+++ b/package/xf86-input-mouse/Makefile
@@ -4,27 +4,26 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		xf86-input-mouse
-PKG_VERSION:=		1.9.0
+PKG_VERSION:=		1.9.1
 PKG_RELEASE:=		1
-PKG_HASH:=		aae699ff0cec4ad2e4e420f49d04e103f4af278c36fc1bbdc3eb388ad5fd50ee
+PKG_HASH:=		e348aff7068affbc53620cc6ee67821064b32ace681c7c200c6ad3e74719b8da
 PKG_DESCR:=		x11 driver for mouse
 PKG_SECTION:=		x11/drivers
 PKG_DEPENDS:=		xorg-server libstdcxx
 PKG_BUILDDEP:=		xorg-server
-PKG_SITES:=		${MASTER_SITE_XORG}
+PKG_SITES:=		$(MASTER_SITE_XORG)
 
-DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
+DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.gz
 
-PKG_ARCH_DEPENDS:=      !m68k
 PKG_CFLINE_XF86_INPUT_MOUSE:=	depends on ADK_TARGET_WITH_INPUT || ADK_TARGET_QEMU_WITH_GRAPHIC
 
 include $(ADK_TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,XF86_INPUT_MOUSE,xf86-input-mouse,$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,XF86_INPUT_MOUSE,xf86-input-mouse,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
 
 xf86-input-mouse-install:
-	${INSTALL_DIR} ${IDIR_XF86_INPUT_MOUSE}/usr/lib/xorg/modules/input
-	${CP} ${WRKINST}/usr/lib/xorg/modules/input/mouse_drv.so \
-		${IDIR_XF86_INPUT_MOUSE}/usr/lib/xorg/modules/input/
+	$(INSTALL_DIR) $(IDIR_XF86_INPUT_MOUSE)/usr/lib/xorg/modules/input
+	$(CP) $(WRKINST)/usr/lib/xorg/modules/input/mouse_drv.so \
+		$(IDIR_XF86_INPUT_MOUSE)/usr/lib/xorg/modules/input/
 
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk
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) {
- 
diff --git a/package/xproto/Makefile b/package/xproto/Makefile
index f1f716775..d7bae7eb3 100644
--- a/package/xproto/Makefile
+++ b/package/xproto/Makefile
@@ -4,24 +4,24 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		xproto
-PKG_VERSION:=		7.0.23
+PKG_VERSION:=		7.0.27
 PKG_RELEASE:=		1
 PKG_DESCR:=		x window system core protocol headers
 PKG_SECTION:=		dev/header
-PKG_HASH:=		07efb40fdd23943ec554920eaf1fe175f70d20127c7a0ee8ab818bd88226f696
+PKG_HASH:=		693d6ae50cb642fc4de6ab1f69e3f38a8e5a67eb41ac2aca253240f999282b6b
 PKG_BUILDDEP:=		xproto-host
-PKG_SITES:=		${MASTER_SITE_XORG}
+PKG_SITES:=		$(MASTER_SITE_XORG)
 PKG_OPTS:=		dev devonly
 
-DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
+DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.gz
 
 include $(ADK_TOPDIR)/mk/host.mk
 include $(ADK_TOPDIR)/mk/package.mk
 
-$(eval $(call HOST_template,XPROTO,xproto,$(PKG_VERSION)-${PKG_RELEASE}))
-$(eval $(call PKG_template,XPROTO,xproto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call HOST_template,XPROTO,xproto,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,XPROTO,xproto,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS)))
 
 HOST_STYLE:=		auto
 
-include ${ADK_TOPDIR}/mk/host-bottom.mk
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk
+include $(ADK_TOPDIR)/mk/host-bottom.mk
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk