summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2015-12-29 19:29:32 (GMT)
committerWaldemar Brodkorb <wbx@openadk.org>2015-12-29 19:29:44 (GMT)
commita60a17cd488cbe017b95f52bcb0f881d7a4a5846 (patch)
tree6256c2f07571ae20f424c39b247752b5e32ea226
parente17110aeb3863c1292eb3e58b7597174bea6cc85 (diff)
xorg: update all packages to latest stable version, remove mirror.mk entry
-rw-r--r--mk/mirrors.mk15
-rw-r--r--mk/package.mk2
-rw-r--r--package/bdftopcf/Makefile2
-rw-r--r--package/bigreqsproto/Makefile2
-rw-r--r--package/cairo/Makefile4
-rw-r--r--package/compositeproto/Makefile2
-rw-r--r--package/damageproto/Makefile2
-rw-r--r--package/dri2proto/Makefile2
-rw-r--r--package/dri3proto/Makefile2
-rw-r--r--package/fixesproto/Makefile2
-rw-r--r--package/font-adobe-100dpi/Makefile2
-rw-r--r--package/font-adobe-75dpi/Makefile2
-rw-r--r--package/font-bh-100dpi/Makefile2
-rw-r--r--package/font-bh-75dpi/Makefile2
-rw-r--r--package/font-bh-lucidatypewriter-100dpi/Makefile2
-rw-r--r--package/font-bh-lucidatypewriter-75dpi/Makefile2
-rw-r--r--package/font-bh-ttf/Makefile2
-rw-r--r--package/font-bh-type1/Makefile2
-rw-r--r--package/font-bitstream-100dpi/Makefile2
-rw-r--r--package/font-bitstream-75dpi/Makefile2
-rw-r--r--package/font-bitstream-type1/Makefile2
-rw-r--r--package/font-misc-misc/Makefile2
-rw-r--r--package/font-util/Makefile6
-rw-r--r--package/font-xfree86-type1/Makefile2
-rw-r--r--package/fontcacheproto/Makefile6
-rw-r--r--package/fontsproto/Makefile2
-rw-r--r--package/freetype/Makefile4
-rw-r--r--package/glproto/Makefile2
-rw-r--r--package/inputproto/Makefile6
-rw-r--r--package/kbproto/Makefile6
-rw-r--r--package/libICE/Makefile8
-rw-r--r--package/libSM/Makefile8
-rw-r--r--package/libX11/Makefile6
-rw-r--r--package/libX11/patches/patch-ltmain_sh11
-rw-r--r--package/libX11/patches/patch-src_util_Makefile_in44
-rw-r--r--package/libXScrnSaver/Makefile8
-rw-r--r--package/libXau/Makefile8
-rw-r--r--package/libXaw/Makefile8
-rw-r--r--package/libXcomposite/Makefile8
-rw-r--r--package/libXcursor/Makefile8
-rw-r--r--package/libXdamage/Makefile8
-rw-r--r--package/libXdmcp/Makefile8
-rw-r--r--package/libXext/Makefile8
-rw-r--r--package/libXfixes/Makefile8
-rw-r--r--package/libXfont/Makefile2
-rw-r--r--package/libXft/Makefile8
-rw-r--r--package/libXft/patches/patch-src_xftglyphs_c17
-rw-r--r--package/libXi/Makefile10
-rw-r--r--package/libXinerama/Makefile8
-rw-r--r--package/libXmu/Makefile8
-rw-r--r--package/libXp/Makefile8
-rw-r--r--package/libXpm/Makefile8
-rw-r--r--package/libXrandr/Makefile8
-rw-r--r--package/libXrender/Makefile8
-rw-r--r--package/libXt/Makefile6
-rw-r--r--package/libXtst/Makefile6
-rw-r--r--package/libXv/Makefile8
-rw-r--r--package/libXxf86dga/Makefile2
-rw-r--r--package/libXxf86vm/Makefile8
-rw-r--r--package/libdrm/Makefile4
-rw-r--r--package/libfontenc/Makefile6
-rw-r--r--package/libgpg-error/src/src/syscfg/lock-obj-pub.i686-openadk-linux-gnu.h23
-rw-r--r--package/libgpg-error/src/src/syscfg/lock-obj-pub.i686-openadk-linux-uclibc.h23
-rw-r--r--package/libpciaccess/Makefile6
-rw-r--r--package/libpciaccess/patches/patch-src_freebsd_pci_c18
-rw-r--r--package/libpciaccess/patches/patch-src_linux_sysfs_c138
-rw-r--r--package/libpciaccess/patches/patch-src_netbsd_pci_c18
-rw-r--r--package/libpciaccess/patches/patch-src_openbsd_pci_c26
-rw-r--r--package/libpciaccess/patches/patch-src_pciaccess_private_h10
-rw-r--r--package/libpciaccess/patches/patch-src_solx_devfs_c10
-rw-r--r--package/libpciaccess/patches/patch-src_x86_pci_c10
-rw-r--r--package/libpthread-stubs/Makefile2
-rw-r--r--package/libxkbfile/Makefile8
-rw-r--r--package/libxshmfence/Makefile6
-rw-r--r--package/mkfontdir/Makefile2
-rw-r--r--package/mkfontscale/Makefile2
-rw-r--r--package/presentproto/Makefile2
-rw-r--r--package/randrproto/Makefile6
-rw-r--r--package/recordproto/Makefile2
-rw-r--r--package/renderproto/Makefile2
-rw-r--r--package/resourceproto/Makefile2
-rw-r--r--package/scrnsaverproto/Makefile2
-rw-r--r--package/setxkbmap/Makefile6
-rw-r--r--package/videoproto/Makefile6
-rw-r--r--package/xauth/Makefile6
-rw-r--r--package/xbitmaps/Makefile2
-rw-r--r--package/xcmiscproto/Makefile6
-rw-r--r--package/xconsole/Makefile6
-rw-r--r--package/xdm/Makefile2
-rw-r--r--package/xdpyinfo/Makefile6
-rw-r--r--package/xextproto/Makefile2
-rw-r--r--package/xf86-input-evdev/Makefile2
-rw-r--r--package/xf86-input-keyboard/Makefile6
-rw-r--r--package/xf86-input-mouse/Makefile2
-rw-r--r--package/xf86-video-ati/Makefile2
-rw-r--r--package/xf86-video-cirrus/Makefile2
-rw-r--r--package/xf86-video-fbdev/Makefile2
-rw-r--r--package/xf86-video-geode/Makefile2
-rw-r--r--package/xf86-video-intel/Makefile9
-rw-r--r--package/xf86-video-modesetting/Makefile2
-rw-r--r--package/xf86-video-siliconmotion/Makefile2
-rw-r--r--package/xf86dga/Makefile2
-rw-r--r--package/xf86dgaproto/Makefile2
-rw-r--r--package/xf86driproto/Makefile2
-rw-r--r--package/xf86vidmodeproto/Makefile2
-rw-r--r--package/xineramaproto/Makefile2
-rw-r--r--package/xinput/Makefile6
-rw-r--r--package/xorg-server/Makefile8
-rw-r--r--package/xorg-server/patches/patch-hw_xfree86_os-support_xf86_OSlib_h16
-rw-r--r--package/xproto/Makefile6
-rw-r--r--package/xrdb/Makefile6
-rw-r--r--package/xset/Makefile6
-rw-r--r--package/xsetroot/Makefile6
-rw-r--r--package/xsm/Makefile11
-rw-r--r--package/xtrans/Makefile6
-rw-r--r--package/xvinfo/Makefile6
116 files changed, 276 insertions, 569 deletions
diff --git a/mk/mirrors.mk b/mk/mirrors.mk
index accef2f..e8c1aef 100644
--- a/mk/mirrors.mk
+++ b/mk/mirrors.mk
@@ -16,21 +16,6 @@ MASTER_SITE_KERNEL?= \
ftp://www.kernel.org/pub/linux/ \
http://www.kernel.org/pub/linux/ \
-MASTER_SITE_XORG?= \
- http://www.x.org/releases/individual/xserver/ \
- http://www.x.org/releases/individual/proto/ \
- http://www.x.org/releases/individual/app/ \
- http://www.x.org/releases/individual/xcb/ \
- http://www.x.org/releases/individual/lib/ \
- http://www.x.org/releases/individual/driver/ \
- http://www.x.org/releases/individual/util/ \
- http://xorg.freedesktop.org/releases/individual/app/ \
- http://xorg.freedesktop.org/releases/individual/lib/ \
- http://xorg.freedesktop.org/releases/individual/driver/ \
- http://www.x.org/releases/X11R7.7/src/everything/ \
- http://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.7/src/everything/ \
- http://xorg.freedesktop.org/releases/X11R7.7/src/everything/ \
-
MASTER_SITE_GNU?= \
http://ftp.gnu.org/gnu/ \
ftp://ftp.gnu.org/gnu/ \
diff --git a/mk/package.mk b/mk/package.mk
index 2a7a8dd..486b21b 100644
--- a/mk/package.mk
+++ b/mk/package.mk
@@ -11,6 +11,8 @@ endif
endif
AUTOTOOL_ENV+= PATH='${HOST_PATH}' \
+ PKG_CONFIG_LIBDIR='${STAGING_TARGET_DIR}/usr/lib/pkgconfig:${STAGING_TARGET_DIR}/usr/share/pkgconfig' \
+ PKG_CONFIG_SYSROOT_DIR='${STAGING_TARGET_DIR}' \
${COMMON_ENV}
CONFIGURE_ENV+= PATH='${TARGET_PATH}' \
diff --git a/package/bdftopcf/Makefile b/package/bdftopcf/Makefile
index bdb9afe..b676370 100644
--- a/package/bdftopcf/Makefile
+++ b/package/bdftopcf/Makefile
@@ -10,7 +10,7 @@ PKG_HASH:= b9f172527fb78f1d02859f0e24675bfc0152ea589abab733a80a1256f6e91e69
PKG_DESCR:= font converter utility
PKG_BUILDDEP:= libXfont
PKG_SECTION:= x11/fonts
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_SITES:= http://www.x.org/releases/individual/app/
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
diff --git a/package/bigreqsproto/Makefile b/package/bigreqsproto/Makefile
index 2102d98..d9fac79 100644
--- a/package/bigreqsproto/Makefile
+++ b/package/bigreqsproto/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 2
PKG_DESCR:= big requests extension headers
PKG_SECTION:= dev/header
PKG_HASH:= de68a1a9dd1a1219ad73531bff9f662bc62fcd777387549c43cd282399f4a6ea
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_SITES:= http://www.x.org/releases/individual/proto/
PKG_OPTS:= dev devonly
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
diff --git a/package/cairo/Makefile b/package/cairo/Makefile
index 4d85da1..82b3d14 100644
--- a/package/cairo/Makefile
+++ b/package/cairo/Makefile
@@ -45,10 +45,6 @@ HOST_CONFIGURE_ARGS+= --enable-ft=yes \
--disable-test-surfaces \
--disable-full-testing
-ifeq (,$(filter arm,$(ADK_TARGET_ARCH)))
-TARGET_CFLAGS:= $(filter-out -Os,$(TARGET_CFLAGS))
-endif
-
ifneq ($(ADK_PACKAGE_CAIRO_WITH_XRENDER),)
CONFIGURE_ARGS+= --enable-xlib-xrender=yes
else
diff --git a/package/compositeproto/Makefile b/package/compositeproto/Makefile
index ef64a07..685ecdd 100644
--- a/package/compositeproto/Makefile
+++ b/package/compositeproto/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 1
PKG_HASH:= 22195b7e50036440b1c6b3b2d63eb03dfa6e71c8a1263ed1f07b0f31ae7dad50
PKG_DESCR:= composite headers
PKG_SECTION:= dev/header
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_SITES:= http://www.x.org/releases/individual/proto/
PKG_OPTS:= dev devonly
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
diff --git a/package/damageproto/Makefile b/package/damageproto/Makefile
index 600d0b2..b8eb185 100644
--- a/package/damageproto/Makefile
+++ b/package/damageproto/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 1
PKG_HASH:= f65ccbf1de9750a527ea6e85694085b179f2d06495cbdb742b3edb2149fef303
PKG_DESCR:= x damage extension headers
PKG_SECTION:= dev/header
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_SITES:= http://www.x.org/releases/individual/proto/
PKG_OPTS:= dev devonly
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
diff --git a/package/dri2proto/Makefile b/package/dri2proto/Makefile
index 2cd861e..19c90dc 100644
--- a/package/dri2proto/Makefile
+++ b/package/dri2proto/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 1
PKG_HASH:= 7e65b031eaa6ebe23c75583d4abd993ded7add8009b4200a4db7aa10728b0f61
PKG_DESCR:= dri2 protocol headers
PKG_SECTION:= dev/header
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_SITES:= http://www.x.org/releases/individual/proto/
PKG_OPTS:= dev devonly
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
diff --git a/package/dri3proto/Makefile b/package/dri3proto/Makefile
index 04f9905..f78b62c 100644
--- a/package/dri3proto/Makefile
+++ b/package/dri3proto/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 1
PKG_HASH:= e1a0dad3009ecde52c0bf44187df5f95cc9a7cc0e76dfc2f2bbf3e909fe03fa9
PKG_DESCR:= dri3 protocol headers
PKG_SECTION:= dev/header
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_SITES:= http://www.x.org/releases/individual/proto/
PKG_OPTS:= dev devonly
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
diff --git a/package/fixesproto/Makefile b/package/fixesproto/Makefile
index 2bc2637..b7554b2 100644
--- a/package/fixesproto/Makefile
+++ b/package/fixesproto/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 1
PKG_DESCR:= xfixes extension headers
PKG_SECTION:= dev/header
PKG_HASH:= 67865a0e3cdc7dec1fd676f0927f7011ad4036c18eb320a2b41dbd56282f33b8
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_SITES:= http://www.x.org/releases/individual/proto/
PKG_OPTS:= dev devonly
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
diff --git a/package/font-adobe-100dpi/Makefile b/package/font-adobe-100dpi/Makefile
index 1b87288..1f4a9a1 100644
--- a/package/font-adobe-100dpi/Makefile
+++ b/package/font-adobe-100dpi/Makefile
@@ -12,7 +12,7 @@ PKG_SECTION:= x11/fonts
PKG_DEPENDS:= font-util
PKG_BUILDDEP:= font-util
PKG_URL:= http://www.x.org/
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_SITES:= http://www.x.org/releases/individual/font/
PKG_HOST_DEPENDS:= !netbsd !openbsd !cygwin !freebsd !mirbsd
diff --git a/package/font-adobe-75dpi/Makefile b/package/font-adobe-75dpi/Makefile
index 09ab584..e822096 100644
--- a/package/font-adobe-75dpi/Makefile
+++ b/package/font-adobe-75dpi/Makefile
@@ -12,7 +12,7 @@ PKG_SECTION:= x11/fonts
PKG_DEPENDS:= font-util
PKG_BUILDDEP:= font-util
PKG_URL:= http://www.x.org/
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_SITES:= http://www.x.org/releases/individual/font/
PKG_HOST_DEPENDS:= !netbsd !openbsd !cygwin !freebsd !mirbsd
diff --git a/package/font-bh-100dpi/Makefile b/package/font-bh-100dpi/Makefile
index d7ef385..4d7f0f7 100644
--- a/package/font-bh-100dpi/Makefile
+++ b/package/font-bh-100dpi/Makefile
@@ -11,7 +11,7 @@ PKG_DESCR:= x fonts
PKG_SECTION:= x11/fonts
PKG_BUILDDEP:= font-util
PKG_URL:= http://www.x.org/
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_SITES:= http://www.x.org/releases/individual/font/
PKG_HOST_DEPENDS:= !netbsd !openbsd !cygwin !freebsd !mirbsd
diff --git a/package/font-bh-75dpi/Makefile b/package/font-bh-75dpi/Makefile
index ec8725d..4e74525 100644
--- a/package/font-bh-75dpi/Makefile
+++ b/package/font-bh-75dpi/Makefile
@@ -11,7 +11,7 @@ PKG_DESCR:= x fonts
PKG_SECTION:= x11/fonts
PKG_BUILDDEP:= font-util
PKG_URL:= http://www.x.org/
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_SITES:= http://www.x.org/releases/individual/font/
PKG_HOST_DEPENDS:= !netbsd !openbsd !cygwin !freebsd !mirbsd
diff --git a/package/font-bh-lucidatypewriter-100dpi/Makefile b/package/font-bh-lucidatypewriter-100dpi/Makefile
index fa3ba24..7f01126 100644
--- a/package/font-bh-lucidatypewriter-100dpi/Makefile
+++ b/package/font-bh-lucidatypewriter-100dpi/Makefile
@@ -11,7 +11,7 @@ PKG_DESCR:= x fonts
PKG_SECTION:= x11/fonts
PKG_BUILDDEP:= font-util
PKG_URL:= http://www.x.org/
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_SITES:= http://www.x.org/releases/individual/font/
PKG_HOST_DEPENDS:= !netbsd !openbsd !cygwin !freebsd !mirbsd
diff --git a/package/font-bh-lucidatypewriter-75dpi/Makefile b/package/font-bh-lucidatypewriter-75dpi/Makefile
index 7adcad2..b5fd10f 100644
--- a/package/font-bh-lucidatypewriter-75dpi/Makefile
+++ b/package/font-bh-lucidatypewriter-75dpi/Makefile
@@ -11,7 +11,7 @@ PKG_DESCR:= x fonts
PKG_SECTION:= x11/fonts
PKG_BUILDDEP:= font-util
PKG_URL:= http://www.x.org/
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_SITES:= http://www.x.org/releases/individual/font/
PKG_HOST_DEPENDS:= !netbsd !openbsd !cygwin !freebsd !mirbsd
diff --git a/package/font-bh-ttf/Makefile b/package/font-bh-ttf/Makefile
index 51120a1..203dcb3 100644
--- a/package/font-bh-ttf/Makefile
+++ b/package/font-bh-ttf/Makefile
@@ -11,7 +11,7 @@ PKG_DESCR:= x fonts
PKG_SECTION:= x11/fonts
PKG_BUILDDEP:= font-util
PKG_URL:= http://www.x.org/
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_SITES:= http://www.x.org/releases/individual/font/
PKG_HOST_DEPENDS:= !netbsd !openbsd !cygwin !freebsd !mirbsd
diff --git a/package/font-bh-type1/Makefile b/package/font-bh-type1/Makefile
index 0201bc3..e485ff5 100644
--- a/package/font-bh-type1/Makefile
+++ b/package/font-bh-type1/Makefile
@@ -11,7 +11,7 @@ PKG_DESCR:= x fonts
PKG_SECTION:= x11/fonts
PKG_BUILDDEP:= font-util
PKG_URL:= http://www.x.org/
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_SITES:= http://www.x.org/releases/individual/font/
PKG_HOST_DEPENDS:= !netbsd !openbsd !cygwin !freebsd !mirbsd
diff --git a/package/font-bitstream-100dpi/Makefile b/package/font-bitstream-100dpi/Makefile
index 5481e13..3e72935 100644
--- a/package/font-bitstream-100dpi/Makefile
+++ b/package/font-bitstream-100dpi/Makefile
@@ -11,7 +11,7 @@ PKG_DESCR:= x fonts
PKG_SECTION:= x11/fonts
PKG_BUILDDEP:= font-util
PKG_URL:= http://www.x.org/
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_SITES:= http://www.x.org/releases/individual/font/
PKG_HOST_DEPENDS:= !netbsd !openbsd !cygwin !freebsd !mirbsd
diff --git a/package/font-bitstream-75dpi/Makefile b/package/font-bitstream-75dpi/Makefile
index a831bf8..f6009a6 100644
--- a/package/font-bitstream-75dpi/Makefile
+++ b/package/font-bitstream-75dpi/Makefile
@@ -11,7 +11,7 @@ PKG_DESCR:= x fonts
PKG_SECTION:= x11/fonts
PKG_BUILDDEP:= font-util
PKG_URL:= http://www.x.org/
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_SITES:= http://www.x.org/releases/individual/font/
PKG_HOST_DEPENDS:= !netbsd !openbsd !cygwin !freebsd !mirbsd
diff --git a/package/font-bitstream-type1/Makefile b/package/font-bitstream-type1/Makefile
index 5dbafe0..fd79364 100644
--- a/package/font-bitstream-type1/Makefile
+++ b/package/font-bitstream-type1/Makefile
@@ -11,7 +11,7 @@ PKG_DESCR:= x fonts
PKG_SECTION:= x11/fonts
PKG_BUILDDEP:= font-util
PKG_URL:= http://www.x.org/
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_SITES:= http://www.x.org/releases/individual/font/
PKG_HOST_DEPENDS:= !netbsd !openbsd !cygwin !freebsd !mirbsd
diff --git a/package/font-misc-misc/Makefile b/package/font-misc-misc/Makefile
index 498d422..43ba411 100644
--- a/package/font-misc-misc/Makefile
+++ b/package/font-misc-misc/Makefile
@@ -11,7 +11,7 @@ PKG_DESCR:= x fonts
PKG_SECTION:= x11/fonts
PKG_BUILDDEP:= font-util
PKG_URL:= http://www.x.org/
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_SITES:= http://www.x.org/releases/individual/font/
PKG_HOST_DEPENDS:= !netbsd !openbsd !cygwin !freebsd !mirbsd
diff --git a/package/font-util/Makefile b/package/font-util/Makefile
index 60b3adb..ec25592 100644
--- a/package/font-util/Makefile
+++ b/package/font-util/Makefile
@@ -4,13 +4,13 @@
include ${ADK_TOPDIR}/rules.mk
PKG_NAME:= font-util
-PKG_VERSION:= 1.3.0
+PKG_VERSION:= 1.3.1
PKG_RELEASE:= 1
-PKG_HASH:= f3791f3808c418f66f6b58af20997928592aba8604aa30a2b6a149b5c7fefca5
+PKG_HASH:= 34ebb0c9c14e0a392cdd5ea055c92489ad88d55ae148b2f1cfded0f3f63f2b5b
PKG_DESCR:= font utility
PKG_SECTION:= x11/fonts
PKG_URL:= http://www.x.org/
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_SITES:= http://www.x.org/releases/individual/font/
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
diff --git a/package/font-xfree86-type1/Makefile b/package/font-xfree86-type1/Makefile
index e9f8223..3fa93b9 100644
--- a/package/font-xfree86-type1/Makefile
+++ b/package/font-xfree86-type1/Makefile
@@ -11,7 +11,7 @@ PKG_DESCR:= x fonts
PKG_SECTION:= x11/fonts
PKG_BUILDDEP:= font-util
PKG_URL:= http://www.x.org/
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_SITES:= http://www.x.org/releases/individual/font/
PKG_HOST_DEPENDS:= !netbsd !openbsd !cygwin !freebsd !mirbsd
diff --git a/package/fontcacheproto/Makefile b/package/fontcacheproto/Makefile
index 286a0cc..3c8262c 100644
--- a/package/fontcacheproto/Makefile
+++ b/package/fontcacheproto/Makefile
@@ -4,11 +4,11 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= fontcacheproto
-PKG_VERSION:= 0.1.2
+PKG_VERSION:= 0.1.3
PKG_RELEASE:= 1
-PKG_HASH:= 7231dee067527842f3c141914ab1168c49ff602af259b115b93d2f456b5684bf
+PKG_HASH:= 759b4863b55a25bfc8f977d8ed969da0b99b3c823f33c674d6da5825f9df9a79
PKG_SECTION:= dev/header
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_SITES:= http://www.x.org/releases/individual/proto/
PKG_OPTS:= dev devonly
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
diff --git a/package/fontsproto/Makefile b/package/fontsproto/Makefile
index 76ee6c4..215f244 100644
--- a/package/fontsproto/Makefile
+++ b/package/fontsproto/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 1
PKG_HASH:= 72c44e63044b2b66f6fa112921621ecc20c71193982de4f198d9a29cda385c5e
PKG_DESCR:= fonts extension headers
PKG_SECTION:= dev/header
-PKG_SITES:= $(MASTER_SITE_XORG)
+PKG_SITES:= http://www.x.org/releases/individual/proto/
PKG_OPTS:= dev devonly
DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz
diff --git a/package/freetype/Makefile b/package/freetype/Makefile
index 70aa31a..7d9ddf8 100644
--- a/package/freetype/Makefile
+++ b/package/freetype/Makefile
@@ -4,9 +4,9 @@
include ${ADK_TOPDIR}/rules.mk
PKG_NAME:= freetype
-PKG_VERSION:= 2.6.1
+PKG_VERSION:= 2.6.2
PKG_RELEASE:= 1
-PKG_HASH:= 0a3c7dfbda6da1e8fce29232e8e96d987ababbbf71ebc8c75659e4132c367014
+PKG_HASH:= 8da42fc4904e600be4b692555ae1dcbf532897da9c5b9fb5ebd3758c77e5c2d4
PKG_DESCR:= free, high-quality and portable font engine
PKG_SECTION:= libs/fonts
PKG_DEPENDS:= zlib
diff --git a/package/glproto/Makefile b/package/glproto/Makefile
index 9ef02d0..f32a570 100644
--- a/package/glproto/Makefile
+++ b/package/glproto/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 1
PKG_DESCR:= opengl headers
PKG_SECTION:= dev/header
PKG_HASH:= 9d8130fec2b98bd032db7730fa092dd9dec39f3de34f4bb03ceb43b9903dbc96
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_SITES:= http://www.x.org/releases/individual/proto/
PKG_OPTS:= dev devonly
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
diff --git a/package/inputproto/Makefile b/package/inputproto/Makefile
index 2b364f3..42a757d 100644
--- a/package/inputproto/Makefile
+++ b/package/inputproto/Makefile
@@ -4,13 +4,13 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= inputproto
-PKG_VERSION:= 2.3
+PKG_VERSION:= 2.3.1
PKG_RELEASE:= 1
PKG_DESCR:= input extension headers
PKG_SECTION:= dev/header
PKG_BUILDDEP:= inputproto-host
-PKG_HASH:= 98e8ab87fb71080b28536d749aa942bdad13d860d5eb3e1271084906cda711e9
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_HASH:= 23f65ac55c36ea8c378e30b4a4fd85317c95923134e3fe46569741b94c8ed4ca
+PKG_SITES:= http://www.x.org/releases/individual/proto/
PKG_OPTS:= dev devonly
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
diff --git a/package/kbproto/Makefile b/package/kbproto/Makefile
index 7eace08..b49e564 100644
--- a/package/kbproto/Makefile
+++ b/package/kbproto/Makefile
@@ -4,13 +4,13 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= kbproto
-PKG_VERSION:= 1.0.6
+PKG_VERSION:= 1.0.7
PKG_RELEASE:= 1
PKG_DESCR:= keyboard protocol headers
PKG_SECTION:= dev/header
PKG_BUILDDEP:= kbproto-host
-PKG_HASH:= 01fd22286ca9c2a93ca7bb686dbb2f3c108ceb944cd3dfdc9ceeb50f9b7f4505
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_HASH:= 828cb275b91268b1a3ea950d5c0c5eb076c678fdf005d517411f89cc8c3bb416
+PKG_SITES:= http://www.x.org/releases/individual/proto/
PKG_OPTS:= dev devonly
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
diff --git a/package/libICE/Makefile b/package/libICE/Makefile
index c74d8c6..d2048f6 100644
--- a/package/libICE/Makefile
+++ b/package/libICE/Makefile
@@ -4,14 +4,14 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= libICE
-PKG_VERSION:= 1.0.8
-PKG_RELEASE:= 2
-PKG_HASH:= 8332018b07ec38a4a35a360b39f7391c58d053ce5f676aa457b1a686b0277cc0
+PKG_VERSION:= 1.0.9
+PKG_RELEASE:= 1
+PKG_HASH:= 7812a824a66dd654c830d21982749b3b563d9c2dfe0b88b203cefc14a891edc0
PKG_DESCR:= inter-client exchange library
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= xtrans xproto
HOST_BUILDDEP:= xtrans-host xproto-host
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_SITES:= http://www.x.org/releases/individual/lib/
PKG_LIBNAME:= libice
PKG_OPTS:= dev
diff --git a/package/libSM/Makefile b/package/libSM/Makefile
index 979a227..3b01905 100644
--- a/package/libSM/Makefile
+++ b/package/libSM/Makefile
@@ -4,15 +4,15 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= libSM
-PKG_VERSION:= 1.2.1
-PKG_RELEASE:= 2
-PKG_HASH:= c7f3660fd5c0ea80ef311e46261eca7c3025ad02c17e545d690a73d70deec7d5
+PKG_VERSION:= 1.2.2
+PKG_RELEASE:= 1
+PKG_HASH:= 14bb7c669ce2b8ff712fbdbf48120e3742a77edcd5e025d6b3325ed30cf120f4
PKG_DESCR:= session management library
PKG_SECTION:= x11/libs
PKG_DEPENDS:= libuuid
PKG_BUILDDEP:= libICE util-linux
HOST_BUILDDEP:= libICE-host xtrans-host
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_SITES:= http://www.x.org/releases/individual/lib/
PKG_LIBNAME:= libsm
PKG_OPTS:= dev
diff --git a/package/libX11/Makefile b/package/libX11/Makefile
index 634fbd1..26a172f 100644
--- a/package/libX11/Makefile
+++ b/package/libX11/Makefile
@@ -4,9 +4,9 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= libX11
-PKG_VERSION:= 1.6.2
+PKG_VERSION:= 1.6.3
PKG_RELEASE:= 1
-PKG_HASH:= b93739bcd517723121f508bcaf0c213c1bae9c5eacffdca571ff0d86c30ead3e
+PKG_HASH:= 0b03b9d22f4c9e59b4ba498f294e297f013cae27050dfa0f3496640200db5376
PKG_DESCR:= x11 client-side library
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= libX11-host xproto xextproto xtrans libXdmcp libXau xcb-proto
@@ -14,7 +14,7 @@ PKG_BUILDDEP+= xcmiscproto bigreqsproto kbproto inputproto libxcb
HOST_BUILDDEP:= xproto-host xextproto-host kbproto-host libpthread-stubs-host
HOST_BUILDDEP+= inputproto-host libXau-host xcb-proto-host libxcb-host xtrans-host
PKG_DEPENDS:= libxdmcp libxcb libxau
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_SITES:= http://www.x.org/releases/individual/lib/
PKG_LIBNAME:= libx11
PKG_OPTS:= dev
diff --git a/package/libX11/patches/patch-ltmain_sh b/package/libX11/patches/patch-ltmain_sh
deleted file mode 100644
index 28e1f1c..0000000
--- a/package/libX11/patches/patch-ltmain_sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- libX11-1.5.0.orig/ltmain.sh 2012-06-02 08:37:28.000000000 +0200
-+++ libX11-1.5.0/ltmain.sh 2013-04-29 17:55:12.000000000 +0200
-@@ -5853,7 +5853,7 @@ func_mode_link ()
- # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
- -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
-- -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
-+ -O*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*)
- func_quote_for_eval "$arg"
- arg="$func_quote_for_eval_result"
- func_append compile_command " $arg"
diff --git a/package/libX11/patches/patch-src_util_Makefile_in b/package/libX11/patches/patch-src_util_Makefile_in
deleted file mode 100644
index a654379..0000000
--- a/package/libX11/patches/patch-src_util_Makefile_in
+++ /dev/null
@@ -1,44 +0,0 @@
---- libX11-1.5.0.orig/src/util/Makefile.in 2012-06-02 08:37:33.000000000 +0200
-+++ libX11-1.5.0/src/util/Makefile.in 2013-10-04 09:47:19.000000000 +0200
-@@ -144,7 +144,7 @@ LD = @LD@
- LDFLAGS = @LDFLAGS_FOR_BUILD@
- LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
- LIBOBJS = @LIBOBJS@
--LIBS = @LIBS@
-+LIBS =
- LIBTOOL = @LIBTOOL@
- LIB_MAN_DIR = @LIB_MAN_DIR@
- LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
-@@ -265,9 +265,6 @@ target_alias = @target_alias@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--makekeys_CFLAGS = \
-- $(X11_CFLAGS) \
-- $(CWARNFLAGS)
-
- makekeys_CPPFLAGS = \
- -I$(top_srcdir)/include
-@@ -355,18 +352,18 @@ distclean-compile:
- @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
-
- makekeys-makekeys.o: makekeys.c
--@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(makekeys_CPPFLAGS) $(CPPFLAGS) $(makekeys_CFLAGS) $(CFLAGS) -MT makekeys-makekeys.o -MD -MP -MF $(DEPDIR)/makekeys-makekeys.Tpo -c -o makekeys-makekeys.o `test -f 'makekeys.c' || echo '$(srcdir)/'`makekeys.c
-+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(makekeys_CPPFLAGS) $(CPPFLAGS) $(makekeys_CFLAGS) $(CFLAGS_FOR_BUILD) -MT makekeys-makekeys.o -MD -MP -MF $(DEPDIR)/makekeys-makekeys.Tpo -c -o makekeys-makekeys.o `test -f 'makekeys.c' || echo '$(srcdir)/'`makekeys.c
- @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/makekeys-makekeys.Tpo $(DEPDIR)/makekeys-makekeys.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='makekeys.c' object='makekeys-makekeys.o' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(makekeys_CPPFLAGS) $(CPPFLAGS) $(makekeys_CFLAGS) $(CFLAGS) -c -o makekeys-makekeys.o `test -f 'makekeys.c' || echo '$(srcdir)/'`makekeys.c
-+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(makekeys_CPPFLAGS) $(CPPFLAGS) $(makekeys_CFLAGS) $(CFLAGS_FOR_BUILD) -c -o makekeys-makekeys.o `test -f 'makekeys.c' || echo '$(srcdir)/'`makekeys.c
-
- makekeys-makekeys.obj: makekeys.c
--@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(makekeys_CPPFLAGS) $(CPPFLAGS) $(makekeys_CFLAGS) $(CFLAGS) -MT makekeys-makekeys.obj -MD -MP -MF $(DEPDIR)/makekeys-makekeys.Tpo -c -o makekeys-makekeys.obj `if test -f 'makekeys.c'; then $(CYGPATH_W) 'makekeys.c'; else $(CYGPATH_W) '$(srcdir)/makekeys.c'; fi`
-+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(makekeys_CPPFLAGS) $(CPPFLAGS) $(makekeys_CFLAGS) $(CFLAGS_FOR_BUILD) -MT makekeys-makekeys.obj -MD -MP -MF $(DEPDIR)/makekeys-makekeys.Tpo -c -o makekeys-makekeys.obj `if test -f 'makekeys.c'; then $(CYGPATH_W) 'makekeys.c'; else $(CYGPATH_W) '$(srcdir)/makekeys.c'; fi`
- @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/makekeys-makekeys.Tpo $(DEPDIR)/makekeys-makekeys.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='makekeys.c' object='makekeys-makekeys.obj' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(makekeys_CPPFLAGS) $(CPPFLAGS) $(makekeys_CFLAGS) $(CFLAGS) -c -o makekeys-makekeys.obj `if test -f 'makekeys.c'; then $(CYGPATH_W) 'makekeys.c'; else $(CYGPATH_W) '$(srcdir)/makekeys.c'; fi`
-+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(makekeys_CPPFLAGS) $(CPPFLAGS) $(makekeys_CFLAGS) $(CFLAGS_FOR_BUILD) -c -o makekeys-makekeys.obj `if test -f 'makekeys.c'; then $(CYGPATH_W) 'makekeys.c'; else $(CYGPATH_W) '$(srcdir)/makekeys.c'; fi`
-
- mostlyclean-libtool:
- -rm -f *.lo
diff --git a/package/libXScrnSaver/Makefile b/package/libXScrnSaver/Makefile
index 8886e2c..a57df03 100644
--- a/package/libXScrnSaver/Makefile
+++ b/package/libXScrnSaver/Makefile
@@ -4,14 +4,14 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= libXScrnSaver
-PKG_VERSION:= 1.2.1
-PKG_RELEASE:= 2
-PKG_HASH:= 326fb02e20ceaf9a8959b02c190a872c7e8c940e191e364fd516a685538a5f1e
+PKG_VERSION:= 1.2.2
+PKG_RELEASE:= 1
+PKG_HASH:= e12ba814d44f7b58534c0d8521e2d4574f7bf2787da405de4341c3b9f4cc8d96
PKG_DESCR:= screensaver library
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= scrnsaverproto libXext
PKG_URL:= http://xorg.freedesktop.org/
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_SITES:= http://www.x.org/releases/individual/lib/
PKG_LIBNAME:= libxscrnsaver
PKG_OPTS:= dev
diff --git a/package/libXau/Makefile b/package/libXau/Makefile
index 871d518..d60e429 100644
--- a/package/libXau/Makefile
+++ b/package/libXau/Makefile
@@ -4,14 +4,14 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= libXau
-PKG_VERSION:= 1.0.7
-PKG_RELEASE:= 2
-PKG_HASH:= cbb81b4ba0f585faac8b9914b0bdbef6e0ef886a30c70d6584e2b30efeda9ac4
+PKG_VERSION:= 1.0.8
+PKG_RELEASE:= 1
+PKG_HASH:= c343b4ef66d66a6b3e0e27aa46b37ad5cab0f11a5c565eafb4a1c7590bc71d7b
PKG_DESCR:= x11 authorisation library
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= xproto
HOST_BUILDDEP:= xproto-host
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_SITES:= http://www.x.org/releases/individual/lib/
PKG_LIBNAME:= libxau
PKG_OPTS:= dev
diff --git a/package/libXaw/Makefile b/package/libXaw/Makefile
index af749e2..7791aef 100644
--- a/package/libXaw/Makefile
+++ b/package/libXaw/Makefile
@@ -4,13 +4,13 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= libXaw
-PKG_VERSION:= 1.0.11
-PKG_RELEASE:= 2
-PKG_HASH:= ef4dd840b2896401c75d68cf0296a7243b5953f22261f8e8c4a92b53e771fc90
+PKG_VERSION:= 1.0.13
+PKG_RELEASE:= 1
+PKG_HASH:= 7e74ac3e5f67def549722ff0333d6e6276b8becd9d89615cda011e71238ab694
PKG_DESCR:= athena widget library
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= libXext libXmu libXpm
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_SITES:= http://www.x.org/releases/individual/lib/
PKG_LIBNAME:= libxaw
PKG_OPTS:= dev
diff --git a/package/libXcomposite/Makefile b/package/libXcomposite/Makefile
index 070bc5c..6286190 100644
--- a/package/libXcomposite/Makefile
+++ b/package/libXcomposite/Makefile
@@ -4,13 +4,13 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= libXcomposite
-PKG_VERSION:= 0.4.3
-PKG_RELEASE:= 2
-PKG_HASH:= 25853e4da06ddfd3ae0384b4d3621293850b41645697f3de659bc640ea3268b7
+PKG_VERSION:= 0.4.4
+PKG_RELEASE:= 1
+PKG_HASH:= 83c04649819c6f52cda1b0ce8bcdcc48ad8618428ad803fb07f20b802f1bdad1
PKG_DESCR:= composite library
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= libX11 compositeproto libXfixes
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_SITES:= http://www.x.org/releases/individual/lib/
PKG_LIBNAME:= libxcomposite
PKG_OPTS:= dev
diff --git a/package/libXcursor/Makefile b/package/libXcursor/Makefile
index 0c6bb0f..425a7aa 100644
--- a/package/libXcursor/Makefile
+++ b/package/libXcursor/Makefile
@@ -4,13 +4,13 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= libXcursor
-PKG_VERSION:= 1.1.13
-PKG_RELEASE:= 2
-PKG_HASH:= df4475096192ad60c1300df7b5e2509019ad1a733a0cadcad13b5d3f4b7d615b
+PKG_VERSION:= 1.1.14
+PKG_RELEASE:= 1
+PKG_HASH:= be0954faf274969ffa6d95b9606b9c0cfee28c13b6fc014f15606a0c8b05c17b
PKG_DESCR:= cursor library
PKG_SECTION:= x11/libs
-PKG_SITES:= ${MASTER_SITE_XORG}
PKG_BUILDDEP:= libXfixes libXrender
+PKG_SITES:= http://www.x.org/releases/individual/lib/
PKG_LIBNAME:= libxcursor
PKG_OPTS:= dev
diff --git a/package/libXdamage/Makefile b/package/libXdamage/Makefile
index 68611a2..f935c29 100644
--- a/package/libXdamage/Makefile
+++ b/package/libXdamage/Makefile
@@ -4,13 +4,13 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= libXdamage
-PKG_VERSION:= 1.1.3
-PKG_RELEASE:= 2
-PKG_HASH:= fda20802ccccaac8807c3bf58e427a37be9579cc2ea6162b0b956644fa65e806
+PKG_VERSION:= 1.1.4
+PKG_RELEASE:= 1
+PKG_HASH:= 4bb3e9d917f5f593df2277d452926ee6ad96de7b7cd1017cbcf4579fe5d3442b
PKG_DESCR:= client interface to the damage extension
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= libXfixes damageproto
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_SITES:= http://www.x.org/releases/individual/lib/
PKG_LIBNAME:= libxdamage
PKG_OPTS:= dev
diff --git a/package/libXdmcp/Makefile b/package/libXdmcp/Makefile
index eb7b63a..4e7dff4 100644
--- a/package/libXdmcp/Makefile
+++ b/package/libXdmcp/Makefile
@@ -4,13 +4,13 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= libXdmcp
-PKG_VERSION:= 1.1.1
-PKG_RELEASE:= 2
-PKG_HASH:= ae6e677911e2696a2976b2f565f116ba9ce99e89cc7e140c4a791270c3aff96f
+PKG_VERSION:= 1.1.2
+PKG_RELEASE:= 1
+PKG_HASH:= 6f7c7e491a23035a26284d247779174dedc67e34e93cc3548b648ffdb6fc57c0
PKG_DESCR:= display manager control protocol library
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= xproto
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_SITES:= http://www.x.org/releases/individual/lib/
PKG_LIBNAME:= libxdmcp
PKG_OPTS:= dev
diff --git a/package/libXext/Makefile b/package/libXext/Makefile
index 1f57eee..d5c903c 100644
--- a/package/libXext/Makefile
+++ b/package/libXext/Makefile
@@ -4,13 +4,13 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= libXext
-PKG_VERSION:= 1.3.1
-PKG_RELEASE:= 2
-PKG_HASH:= fa0d5ed2fa7dc7be3b2e0b95a1bb8f0cbaabfaff124904f7e5bc70d3159980d1
+PKG_VERSION:= 1.3.3
+PKG_RELEASE:= 1
+PKG_HASH:= eb0b88050491fef4716da4b06a4d92b4fc9e76f880d6310b2157df604342cfe5
PKG_DESCR:= client interface to extensions of the x protocol
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= libX11 xextproto libXext-host
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_SITES:= http://www.x.org/releases/individual/lib/
PKG_LIBNAME:= libxext
PKG_OPTS:= dev
diff --git a/package/libXfixes/Makefile b/package/libXfixes/Makefile
index bfbe81c..402fa05 100644
--- a/package/libXfixes/Makefile
+++ b/package/libXfixes/Makefile
@@ -4,14 +4,14 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= libXfixes
-PKG_VERSION:= 5.0
-PKG_RELEASE:= 2
-PKG_HASH:= 3c25f2fcf2983834b932756399cb538e69beb0d739f992f9719073fcedaa4405
+PKG_VERSION:= 5.0.1
+PKG_RELEASE:= 1
+PKG_HASH:= 81b692856c0e7ab2778a34a32aa6b3f455b9b58cf388f009cba872ed933ae9c0
PKG_DESCR:= x11 fixes library
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= fixesproto xextproto xproto libX11
PKG_URL:= http://xorg.freedesktop.org/
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_SITES:= http://www.x.org/releases/individual/lib/
PKG_LIBNAME:= libxfixes
PKG_OPTS:= dev
diff --git a/package/libXfont/Makefile b/package/libXfont/Makefile
index 3cef23e..7da1a7d 100644
--- a/package/libXfont/Makefile
+++ b/package/libXfont/Makefile
@@ -11,7 +11,7 @@ PKG_DESCR:= x11 font library
PKG_SECTION:= x11/libs
PKG_DEPENDS:= libfreetype
PKG_BUILDDEP:= freetype fontcacheproto fontsproto libfontenc xtrans
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_SITES:= http://www.x.org/releases/individual/lib/
PKG_LIBNAME:= libxfont
PKG_OPTS:= dev
diff --git a/package/libXft/Makefile b/package/libXft/Makefile
index bb51420..0a775b2 100644
--- a/package/libXft/Makefile
+++ b/package/libXft/Makefile
@@ -4,13 +4,13 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= libXft
-PKG_VERSION:= 2.3.1
-PKG_RELEASE:= 2
-PKG_HASH:= df3765d1454bb148fc0886f0723dc9f40430243a06e94414475c6af2a72e8915
+PKG_VERSION:= 2.3.2
+PKG_RELEASE:= 1
+PKG_HASH:= 26cdddcc70b187833cbe9dc54df1864ba4c03a7175b2ca9276de9f05dce74507
PKG_DESCR:= freetype library
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= libXrender fontconfig
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_SITES:= http://www.x.org/releases/individual/lib/
PKG_LIBNAME:= libxft
PKG_OPTS:= dev
diff --git a/package/libXft/patches/patch-src_xftglyphs_c b/package/libXft/patches/patch-src_xftglyphs_c
deleted file mode 100644
index c8da32c..0000000
--- a/package/libXft/patches/patch-src_xftglyphs_c
+++ /dev/null
@@ -1,17 +0,0 @@
---- libXft-2.3.1.orig/src/xftglyphs.c 2012-06-02 18:36:35.000000000 +0200
-+++ libXft-2.3.1/src/xftglyphs.c 2014-01-02 14:41:02.000000000 +0100
-@@ -21,10 +21,10 @@
- */
-
- #include "xftint.h"
--#include <freetype/ftoutln.h>
--#include <freetype/ftlcdfil.h>
--
--#include <freetype/ftsynth.h>
-+#include <ft2build.h>
-+#include FT_OUTLINE_H
-+#include FT_LCD_FILTER_H
-+#include FT_SYNTHESIS_H
-
- /*
- * Validate the memory info for a font
diff --git a/package/libXi/Makefile b/package/libXi/Makefile
index 74ff116..635901a 100644
--- a/package/libXi/Makefile
+++ b/package/libXi/Makefile
@@ -4,14 +4,14 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= libXi
-PKG_VERSION:= 1.6.1
-PKG_RELEASE:= 2
-PKG_HASH:= a2aab210068af017314888c64c3a7dd6b5a7933fe50ab89b6e039aadc07dac46
+PKG_VERSION:= 1.7.6
+PKG_RELEASE:= 1
+PKG_HASH:= 4e88fa7decd287e58140ea72238f8d54e4791de302938c83695fc0c9ac102b7e
PKG_DESCR:= client interface to the xinput extension
PKG_SECTION:= x11/libs
-PKG_BUILDDEP:= xproto xextproto libXext libXi-host
+PKG_BUILDDEP:= xproto xextproto libXext libXfixes
PKG_URL:= http://xorg.freedesktop.org/
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_SITES:= http://www.x.org/releases/individual/lib/
PKG_LIBNAME:= libxi
PKG_OPTS:= dev
diff --git a/package/libXinerama/Makefile b/package/libXinerama/Makefile
index 1bb3f3b..bb989ea 100644
--- a/package/libXinerama/Makefile
+++ b/package/libXinerama/Makefile
@@ -4,14 +4,14 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= libXinerama
-PKG_VERSION:= 1.1.2
-PKG_RELEASE:= 2
-PKG_HASH:= 5f21113464febeac0536e140ff36a8e0cd8ae919ce690c4768f479ea48473fed
+PKG_VERSION:= 1.1.3
+PKG_RELEASE:= 1
+PKG_HASH:= 0ba243222ae5aba4c6a3d7a394c32c8b69220a6872dbb00b7abae8753aca9a44
PKG_DESCR:= xinerama library
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= xineramaproto libXinerama-host
HOST_BUILDDEP:= xineramaproto-host libXext-host
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_SITES:= http://www.x.org/releases/individual/lib/
PKG_LIBNAME:= libxinerama
PKG_OPTS:= dev
diff --git a/package/libXmu/Makefile b/package/libXmu/Makefile
index 80cbc5e..65164d1 100644
--- a/package/libXmu/Makefile
+++ b/package/libXmu/Makefile
@@ -4,13 +4,13 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= libXmu
-PKG_VERSION:= 1.1.1
-PKG_RELEASE:= 2
-PKG_HASH:= e7f7f227c8f430de81984d9725113ecd8994d07de372abf334b1c3dec31ceaf1
+PKG_VERSION:= 1.1.2
+PKG_RELEASE:= 1
+PKG_HASH:= e5fd4bacef068f9509b8226017205040e38d3fba8d2de55037200e7176c13dba
PKG_DESCR:= miscellaneous utility functions for x libraries
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= libXt libXext
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_SITES:= http://www.x.org/releases/individual/lib/
PKG_LIBNAME:= libxmu
PKG_OPTS:= dev
diff --git a/package/libXp/Makefile b/package/libXp/Makefile
index 51b73bb..1cb59e2 100644
--- a/package/libXp/Makefile
+++ b/package/libXp/Makefile
@@ -4,13 +4,13 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= libXp
-PKG_VERSION:= 1.0.1
-PKG_RELEASE:= 2
-PKG_HASH:= 8204fe105909f0312922a51773413183831d45e4c3a800f897fc8b89d2ba8dfb
+PKG_VERSION:= 1.0.3
+PKG_RELEASE:= 1
+PKG_HASH:= f6b8cc4ef05d3eafc9ef5fc72819dd412024b4ed60197c0d5914758125817e9c
PKG_DESCR:= x11 printing library
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= libXext printproto
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_SITES:= http://www.x.org/releases/individual/lib/
PKG_LIBNAME:= libxp
PKG_OPTS:= dev
diff --git a/package/libXpm/Makefile b/package/libXpm/Makefile
index 8a86f3f..c3acfd7 100644
--- a/package/libXpm/Makefile
+++ b/package/libXpm/Makefile
@@ -4,13 +4,13 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= libXpm
-PKG_VERSION:= 3.5.10
-PKG_RELEASE:= 2
-PKG_HASH:= f73f06928a140fd2090c439d1d55c6682095044495af6bf886f8e66cf21baee5
+PKG_VERSION:= 3.5.11
+PKG_RELEASE:= 1
+PKG_HASH:= 53ddf924441b7ed2de994d4934358c13d9abf4828b1b16e1255ade5032b31df7
PKG_DESCR:= common operation for the xpm pixmap format
PKG_BUILDDEP:= libX11 libXt
PKG_SECTION:= x11/libs
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_SITES:= http://www.x.org/releases/individual/lib/
PKG_LIBNAME:= libxpm
PKG_OPTS:= dev
diff --git a/package/libXrandr/Makefile b/package/libXrandr/Makefile
index 216e792..396d140 100644
--- a/package/libXrandr/Makefile
+++ b/package/libXrandr/Makefile
@@ -4,13 +4,13 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= libXrandr
-PKG_VERSION:= 1.3.2
-PKG_RELEASE:= 2
-PKG_HASH:= c117a84ceda5a0744806efd4948594d4ec28a86c245768d721dbdabff1f7e073
+PKG_VERSION:= 1.5.0
+PKG_RELEASE:= 1
+PKG_HASH:= 1b594a149e6b124aab7149446f2fd886461e2935eca8dca43fe83a70cf8ec451
PKG_DESCR:= xrandr library
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= randrproto
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_SITES:= http://www.x.org/releases/individual/lib/
PKG_LIBNAME:= libxrandr
PKG_OPTS:= dev
diff --git a/package/libXrender/Makefile b/package/libXrender/Makefile
index 905661b..c088c3a 100644
--- a/package/libXrender/Makefile
+++ b/package/libXrender/Makefile
@@ -4,16 +4,16 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= libXrender
-PKG_VERSION:= 0.9.7
-PKG_RELEASE:= 2
-PKG_HASH:= 89f36e896018f5b8c00768af59e052019ae79fab69a647eb1fe61b565d7dd18e
+PKG_VERSION:= 0.9.9
+PKG_RELEASE:= 1
+PKG_HASH:= beeac64ff8d225f775019eb7c688782dee9f4cc7b412a65538f8dde7be4e90fe
PKG_DESCR:= x11 rendering library
PKG_SECTION:= x11/libs
HOST_BUILDDEP:= renderproto-host xproto-host xextproto-host libXau-host
HOST_BUILDDEP+= xcb-proto-host libpthread-stubs-host libxcb-host kbproto-host
HOST_BUILDDEP+= inputproto-host xtrans-host libX11-host
PKG_BUILDDEP:= renderproto libX11
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_SITES:= http://www.x.org/releases/individual/lib/
PKG_LIBNAME:= libxrender
PKG_OPTS:= dev
diff --git a/package/libXt/Makefile b/package/libXt/Makefile
index aa4b275..e0c6e91 100644
--- a/package/libXt/Makefile
+++ b/package/libXt/Makefile
@@ -4,15 +4,15 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= libXt
-PKG_VERSION:= 1.1.4
+PKG_VERSION:= 1.1.5
PKG_RELEASE:= 1
-PKG_HASH:= 823109a0d14dfaef7ede1b3fd28318078daa2cc2f005c439a21c33bdac3d3784
+PKG_HASH:= b59bee38a9935565fa49dc1bfe84cb30173e2e07e1dcdf801430d4b54eb0caa3
PKG_DESCR:= x toolkit intrinsics libraries
PKG_SECTION:= x11/libs
PKG_DEPENDS:= libsm libice libuuid libx11 libxau libxdmcp libxcb
PKG_BUILDDEP:= libSM libX11 kbproto util-macros-host xproto-host
HOST_BUILDDEP:= util-macros-host libICE-host libSM-host
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_SITES:= http://www.x.org/releases/individual/lib/
PKG_LIBNAME:= libxt
PKG_OPTS:= dev
diff --git a/package/libXtst/Makefile b/package/libXtst/Makefile
index 6c42782..fc5ae71 100644
--- a/package/libXtst/Makefile
+++ b/package/libXtst/Makefile
@@ -4,9 +4,9 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= libXtst
-PKG_VERSION:= 1.2.1
+PKG_VERSION:= 1.2.2
PKG_RELEASE:= 2
-PKG_HASH:= 99d7c7335439c00b8d1664d77f1ea2d857598a5ed52d32826d879cb3863cbb7a
+PKG_HASH:= 221838960c7b9058cd6795c1c3ee8e25bae1c68106be314bc3036a4f26be0e6c
PKG_DESCR:= client interface to the record extension to the x protocol
PKG_SECTION:= x11/libs
PKG_BUILDDEP+= recordproto libXi
@@ -14,7 +14,7 @@ HOST_BUILDDEP:= recordproto-host xproto-host xextproto-host
HOST_BUILDDEP+= inputproto-host kbproto-host xtrans-host
HOST_BUILDDEP+= xcb-proto-host libXau-host libpthread-stubs-host
HOST_BUILDDEP+= libX11-host libXext-host libXi-host
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_SITES:= http://www.x.org/releases/individual/lib/
PKG_LIBNAME:= libxtst
PKG_OPTS:= dev
diff --git a/package/libXv/Makefile b/package/libXv/Makefile
index 20a7da2..aa24d52 100644
--- a/package/libXv/Makefile
+++ b/package/libXv/Makefile
@@ -4,13 +4,13 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= libXv
-PKG_VERSION:= 1.0.7
-PKG_RELEASE:= 2
-PKG_HASH:= e597d2d4443ce25048ffb808a6276f28afb1a92f10d0d645abd4079c9b813570
+PKG_VERSION:= 1.0.10
+PKG_RELEASE:= 1
+PKG_HASH:= 89a664928b625558268de81c633e300948b3752b0593453d7815f8775bab5293
PKG_DESCR:= xvideo extensions library
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= libX11 videoproto libXext
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_SITES:= http://www.x.org/releases/individual/lib/
PKG_LIBNAME:= libxv
PKG_OPTS:= dev
diff --git a/package/libXxf86dga/Makefile b/package/libXxf86dga/Makefile
index a84ee9e..e2860d3 100644
--- a/package/libXxf86dga/Makefile
+++ b/package/libXxf86dga/Makefile
@@ -10,7 +10,7 @@ PKG_HASH:= e6361620a15ceba666901ca8423e8be0c6ed0271a7088742009160349173766b
PKG_DESCR:= client library for the xfree86-dga extension
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= xf86dgaproto libXext libXaw
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_SITES:= http://www.x.org/releases/individual/lib/
PKG_LIBNAME:= libxxf86dga
PKG_OPTS:= dev
diff --git a/package/libXxf86vm/Makefile b/package/libXxf86vm/Makefile
index 4c38a61..a9f5e20 100644
--- a/package/libXxf86vm/Makefile
+++ b/package/libXxf86vm/Makefile
@@ -4,13 +4,13 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= libXxf86vm
-PKG_VERSION:= 1.1.2
-PKG_RELEASE:= 2
-PKG_HASH:= a19c1e743a21da2c7243b47354afd911f0dbb79d6ac8fe560da1846863c181f6
+PKG_VERSION:= 1.1.4
+PKG_RELEASE:= 1
+PKG_HASH:= 5108553c378a25688dcb57dca383664c36e293d60b1505815f67980ba9318a99
PKG_DESCR:= interface to the xfree86-vidmode extension
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= xf86vidmodeproto libXext
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_SITES:= http://www.x.org/releases/individual/lib/
PKG_LIBNAME:= libxxf86vm
PKG_OPTS:= dev
diff --git a/package/libdrm/Makefile b/package/libdrm/Makefile
index a64e2c0..3debeeb 100644
--- a/package/libdrm/Makefile
+++ b/package/libdrm/Makefile
@@ -4,9 +4,9 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= libdrm
-PKG_VERSION:= 2.4.62
+PKG_VERSION:= 2.4.65
PKG_RELEASE:= 1
-PKG_HASH:= f7df6b73c8d787cdde7e49eae6e761313f606b784051004b1cb2e81bf2d490fa
+PKG_HASH:= b4382d6018464ba5bece2d7a4b87eb0eba24d891ff2ba29549be9511bd231c2f
PKG_DESCR:= drm library
PKG_SECTION:= libs/video
PKG_BUILDDEP:= libpthread-stubs cairo libpciaccess
diff --git a/package/libfontenc/Makefile b/package/libfontenc/Makefile
index b6c609a..90d7661 100644
--- a/package/libfontenc/Makefile
+++ b/package/libfontenc/Makefile
@@ -4,14 +4,14 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= libfontenc
-PKG_VERSION:= 1.1.1
+PKG_VERSION:= 1.1.3
PKG_RELEASE:= 1
-PKG_HASH:= 5ef1a4fefb154fe783f667f9d3f8500c719bfe385d29bb89802b458e00396e65
+PKG_HASH:= 6fba26760ca8d5045f2b52ddf641c12cedc19ee30939c6478162b7db8b6220fb
PKG_DESCR:= helps to deal with different encodings of fonts
PKG_SECTION:= x11/libs
PKG_DEPENDS:= zlib
PKG_BUILDDEP:= xproto zlib
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_SITES:= http://www.x.org/releases/individual/lib/
PKG_OPTS:= dev
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
diff --git a/package/libgpg-error/src/src/syscfg/lock-obj-pub.i686-openadk-linux-gnu.h b/package/libgpg-error/src/src/syscfg/lock-obj-pub.i686-openadk-linux-gnu.h
new file mode 100644
index 0000000..b97273b
--- /dev/null
+++ b/package/libgpg-error/src/src/syscfg/lock-obj-pub.i686-openadk-linux-gnu.h
@@ -0,0 +1,23 @@
+## lock-obj-pub.i686-pc-linux-gnu.h
+## File created by gen-posix-lock-obj - DO NOT EDIT
+## To be included by mkheader into gpg-error.h
+
+typedef struct
+{
+ long _vers;
+ union {
+ volatile char _priv[24];
+ long _x_align;
+ long *_xp_align;
+ } u;
+} gpgrt_lock_t;
+
+#define GPGRT_LOCK_INITIALIZER {1,{{0,0,0,0,0,0,0,0, \
+ 0,0,0,0,0,0,0,0, \
+ 0,0,0,0,0,0,0,0}}}
+##
+## Local Variables:
+## mode: c
+## buffer-read-only: t
+## End:
+##
diff --git a/package/libgpg-error/src/src/syscfg/lock-obj-pub.i686-openadk-linux-uclibc.h b/package/libgpg-error/src/src/syscfg/lock-obj-pub.i686-openadk-linux-uclibc.h
new file mode 100644
index 0000000..b97273b
--- /dev/null
+++ b/package/libgpg-error/src/src/syscfg/lock-obj-pub.i686-openadk-linux-uclibc.h
@@ -0,0 +1,23 @@
+## lock-obj-pub.i686-pc-linux-gnu.h
+## File created by gen-posix-lock-obj - DO NOT EDIT
+## To be included by mkheader into gpg-error.h
+
+typedef struct
+{
+ long _vers;
+ union {
+ volatile char _priv[24];
+ long _x_align;
+ long *_xp_align;
+ } u;
+} gpgrt_lock_t;
+
+#define GPGRT_LOCK_INITIALIZER {1,{{0,0,0,0,0,0,0,0, \
+ 0,0,0,0,0,0,0,0, \
+ 0,0,0,0,0,0,0,0}}}
+##
+## Local Variables:
+## mode: c
+## buffer-read-only: t
+## End:
+##
diff --git a/package/libpciaccess/Makefile b/package/libpciaccess/Makefile
index 72d64aa..13abcdb 100644
--- a/package/libpciaccess/Makefile
+++ b/package/libpciaccess/Makefile
@@ -4,12 +4,12 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= libpciaccess
-PKG_VERSION:= 0.13.2
+PKG_VERSION:= 0.13.4
PKG_RELEASE:= 1
-PKG_HASH:= b5459e347166113cefac80003dc5c431a8399ae936b3efcd2cef6437fbe88602
+PKG_HASH:= 74d92bda448e6fdb64fee4e0091255f48d625d07146a121653022ed3a0ca1f2f
PKG_DESCR:= pci access library
PKG_SECTION:= x11/libs
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_SITES:= http://www.x.org/releases/individual/lib/
PKG_OPTS:= dev
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
diff --git a/package/libpciaccess/patches/patch-src_freebsd_pci_c b/package/libpciaccess/patches/patch-src_freebsd_pci_c
deleted file mode 100644
index 3a1c22f..0000000
--- a/package/libpciaccess/patches/patch-src_freebsd_pci_c
+++ /dev/null
@@ -1,18 +0,0 @@
---- libpciaccess-0.13.2.orig/src/freebsd_pci.c 2013-07-21 00:54:34.000000000 +0200
-+++ libpciaccess-0.13.2/src/freebsd_pci.c 2014-03-24 13:26:10.476152263 +0100
-@@ -579,6 +579,7 @@ pci_device_freebsd_open_legacy_io(struct
-
- ret->base = base;
- ret->size = size;
-+ ret->is_legacy = 1;
- return ret;
- #elif defined(PCI_MAGIC_IO_RANGE)
- ret->memory = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED,
-@@ -588,6 +589,7 @@ pci_device_freebsd_open_legacy_io(struct
-
- ret->base = base;
- ret->size = size;
-+ ret->is_legacy = 1;
- return ret;
- #else
- return NULL;
diff --git a/package/libpciaccess/patches/patch-src_linux_sysfs_c b/package/libpciaccess/patches/patch-src_linux_sysfs_c
deleted file mode 100644
index eb91062..0000000
--- a/package/libpciaccess/patches/patch-src_linux_sysfs_c
+++ /dev/null
@@ -1,138 +0,0 @@
---- libpciaccess-0.13.2.orig/src/linux_sysfs.c 2013-07-21 00:54:34.000000000 +0200
-+++ libpciaccess-0.13.2/src/linux_sysfs.c 2014-03-24 21:01:44.000000000 +0100
-@@ -41,11 +41,12 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <fcntl.h>
-+#include <limits.h>
- #include <sys/mman.h>
- #include <dirent.h>
- #include <errno.h>
-
--#if defined(__i386__) || defined(__x86_64__) || defined(__arm__)
-+#if defined(__i386__) || defined(__x86_64__)
- #include <sys/io.h>
- #else
- #define inb(x) -1
-@@ -759,6 +760,7 @@ pci_device_linux_sysfs_open_device_io(st
-
- ret->base = base;
- ret->size = size;
-+ ret->is_legacy = 0;
-
- return ret;
- }
-@@ -796,6 +798,7 @@ pci_device_linux_sysfs_open_legacy_io(st
-
- ret->base = base;
- ret->size = size;
-+ ret->is_legacy = 1;
-
- return ret;
- }
-@@ -813,10 +816,14 @@ pci_device_linux_sysfs_read32(struct pci
- {
- uint32_t ret;
-
-- if (handle->fd > -1)
-- pread(handle->fd, &ret, 4, port + handle->base);
-- else
-+ if (handle->fd > -1) {
-+ if (handle->is_legacy)
-+ pread(handle->fd, &ret, 4, port + handle->base);
-+ else
-+ pread(handle->fd, &ret, 4, port);
-+ } else {
- ret = inl(port + handle->base);
-+ }
-
- return ret;
- }
-@@ -826,10 +833,14 @@ pci_device_linux_sysfs_read16(struct pci
- {
- uint16_t ret;
-
-- if (handle->fd > -1)
-- pread(handle->fd, &ret, 2, port + handle->base);
-- else
-+ if (handle->fd > -1) {
-+ if (handle->is_legacy)
-+ pread(handle->fd, &ret, 2, port + handle->base);
-+ else
-+ pread(handle->fd, &ret, 2, port);
-+ } else {
- ret = inw(port + handle->base);
-+ }
-
- return ret;
- }
-@@ -839,10 +850,14 @@ pci_device_linux_sysfs_read8(struct pci_
- {
- uint8_t ret;
-
-- if (handle->fd > -1)
-- pread(handle->fd, &ret, 1, port + handle->base);
-- else
-+ if (handle->fd > -1) {
-+ if (handle->is_legacy)
-+ pread(handle->fd, &ret, 1, port + handle->base);
-+ else
-+ pread(handle->fd, &ret, 1, port);
-+ } else {
- ret = inb(port + handle->base);
-+ }
-
- return ret;
- }
-@@ -851,30 +866,42 @@ static void
- pci_device_linux_sysfs_write32(struct pci_io_handle *handle, uint32_t port,
- uint32_t data)
- {
-- if (handle->fd > -1)
-- pwrite(handle->fd, &data, 4, port + handle->base);
-- else
-+ if (handle->fd > -1) {
-+ if (handle->is_legacy)
-+ pwrite(handle->fd, &data, 4, port + handle->base);
-+ else
-+ pwrite(handle->fd, &data, 4, port);
-+ } else {
- outl(data, port + handle->base);
-+ }
- }
-
- static void
- pci_device_linux_sysfs_write16(struct pci_io_handle *handle, uint32_t port,
- uint16_t data)
- {
-- if (handle->fd > -1)
-- pwrite(handle->fd, &data, 2, port + handle->base);
-- else
-+ if (handle->fd > -1) {
-+ if (handle->is_legacy)
-+ pwrite(handle->fd, &data, 2, port + handle->base);
-+ else
-+ pwrite(handle->fd, &data, 2, port);
-+ } else {
- outw(data, port + handle->base);
-+ }
- }
-
- static void
- pci_device_linux_sysfs_write8(struct pci_io_handle *handle, uint32_t port,
- uint8_t data)
- {
-- if (handle->fd > -1)
-- pwrite(handle->fd, &data, 1, port + handle->base);
-- else
-+ if (handle->fd > -1) {
-+ if (handle->is_legacy)
-+ pwrite(handle->fd, &data, 1, port + handle->base);
-+ else
-+ pwrite(handle->fd, &data, 1, port);
-+ } else {
- outb(data, port + handle->base);
-+ }
- }
-
- static int
diff --git a/package/libpciaccess/patches/patch-src_netbsd_pci_c b/package/libpciaccess/patches/patch-src_netbsd_pci_c
deleted file mode 100644
index 9b7a31b..0000000
--- a/package/libpciaccess/patches/patch-src_netbsd_pci_c
+++ /dev/null
@@ -1,18 +0,0 @@
---- libpciaccess-0.13.2.orig/src/netbsd_pci.c 2013-07-21 00:54:34.000000000 +0200
-+++ libpciaccess-0.13.2/src/netbsd_pci.c 2014-03-24 13:26:10.484152334 +0100
-@@ -733,6 +733,7 @@ pci_device_netbsd_open_legacy_io(struct
-
- ret->base = base;
- ret->size = size;
-+ ret->is_legacy = 1;
- return ret;
- #elif defined(__amd64__)
- struct x86_64_iopl_args ia;
-@@ -743,6 +744,7 @@ pci_device_netbsd_open_legacy_io(struct
-
- ret->base = base;
- ret->size = size;
-+ ret->is_legacy = 1;
- return ret;
- #else
- return NULL;
diff --git a/package/libpciaccess/patches/patch-src_openbsd_pci_c b/package/libpciaccess/patches/patch-src_openbsd_pci_c
deleted file mode 100644
index 0c7180b..0000000
--- a/package/libpciaccess/patches/patch-src_openbsd_pci_c
+++ /dev/null
@@ -1,26 +0,0 @@
---- libpciaccess-0.13.2.orig/src/openbsd_pci.c 2013-07-21 00:54:34.000000000 +0200
-+++ libpciaccess-0.13.2/src/openbsd_pci.c 2014-03-24 13:26:10.484152334 +0100
-@@ -412,6 +412,7 @@ pci_device_openbsd_open_legacy_io(struct
-
- ret->base = base;
- ret->size = size;
-+ ret->is_legacy = 1;
- return ret;
- #elif defined(__amd64__)
- struct amd64_iopl_args ia;
-@@ -422,6 +423,7 @@ pci_device_openbsd_open_legacy_io(struct
-
- ret->base = base;
- ret->size = size;
-+ ret->is_legacy = 1;
- return ret;
- #elif defined(PCI_MAGIC_IO_RANGE)
- ret->memory = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED,
-@@ -431,6 +433,7 @@ pci_device_openbsd_open_legacy_io(struct
-
- ret->base = base;
- ret->size = size;
-+ ret->is_legacy = 1;
- return ret;
- #else
- return NULL;
diff --git a/package/libpciaccess/patches/patch-src_pciaccess_private_h b/package/libpciaccess/patches/patch-src_pciaccess_private_h
deleted file mode 100644
index e3ec7d0..0000000
--- a/package/libpciaccess/patches/patch-src_pciaccess_private_h
+++ /dev/null
@@ -1,10 +0,0 @@
---- libpciaccess-0.13.2.orig/src/pciaccess_private.h 2013-07-21 00:54:34.000000000 +0200
-+++ libpciaccess-0.13.2/src/pciaccess_private.h 2014-03-24 13:26:10.492152406 +0100
-@@ -109,6 +109,7 @@ struct pci_io_handle {
- pciaddr_t size;
- void *memory;
- int fd;
-+ int is_legacy;
- };
-
- struct pci_device_private {
diff --git a/package/libpciaccess/patches/patch-src_solx_devfs_c b/package/libpciaccess/patches/patch-src_solx_devfs_c
deleted file mode 100644
index f6ee2c0..0000000
--- a/package/libpciaccess/patches/patch-src_solx_devfs_c
+++ /dev/null
@@ -1,10 +0,0 @@
---- libpciaccess-0.13.2.orig/src/solx_devfs.c 2013-07-21 00:54:34.000000000 +0200
-+++ libpciaccess-0.13.2/src/solx_devfs.c 2014-03-24 13:26:10.496152442 +0100
-@@ -911,6 +911,7 @@ pci_device_solx_devfs_open_legacy_io(str
- if (sysi86(SI86V86, V86SC_IOPL, PS_IOPL) == 0) {
- ret->base = base;
- ret->size = size;
-+ ret->is_legacy = 1;
- return ret;
- }
- #endif
diff --git a/package/libpciaccess/patches/patch-src_x86_pci_c b/package/libpciaccess/patches/patch-src_x86_pci_c
deleted file mode 100644
index 07c18d4..0000000
--- a/package/libpciaccess/patches/patch-src_x86_pci_c
+++ /dev/null
@@ -1,10 +0,0 @@
---- libpciaccess-0.13.2.orig/src/x86_pci.c 2013-07-21 00:54:34.000000000 +0200
-+++ libpciaccess-0.13.2/src/x86_pci.c 2014-03-24 13:26:10.496152442 +0100
-@@ -558,6 +558,7 @@ pci_device_x86_open_legacy_io(struct pci
-
- ret->base = base;
- ret->size = size;
-+ ret->is_legacy = 1;
-
- return ret;
- }
diff --git a/package/libpthread-stubs/Makefile b/package/libpthread-stubs/Makefile
index 563ff87..b06e726 100644
--- a/package/libpthread-stubs/Makefile
+++ b/package/libpthread-stubs/Makefile
@@ -11,7 +11,7 @@ PKG_DESCR:= pthread stubs
PKG_SECTION:= dev/header
PKG_BUILDDEP:= libpthread-stubs-host
PKG_URL:= http://xcb.freedesktop.org/
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_SITES:= http://xcb.freedesktop.org/dist/
PKG_OPTS:= dev devonly
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
diff --git a/package/libxkbfile/Makefile b/package/libxkbfile/Makefile
index f829822..4281279 100644
--- a/package/libxkbfile/Makefile
+++ b/package/libxkbfile/Makefile
@@ -4,13 +4,13 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= libxkbfile
-PKG_VERSION:= 1.0.8
-PKG_RELEASE:= 2
-PKG_HASH:= e7a95626b9c74c8a4765302890907f35d8a7e701840a69e3fb21160cd735ac80
+PKG_VERSION:= 1.0.9
+PKG_RELEASE:= 1
+PKG_HASH:= 95df50570f38e720fb79976f603761ae6eff761613eb56f258c3cb6bab4fd5e3
PKG_DESCR:= keyboard configuration extension library
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= kbproto libX11
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_SITES:= http://www.x.org/releases/individual/lib/
PKG_OPTS:= dev
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
diff --git a/package/libxshmfence/Makefile b/package/libxshmfence/Makefile
index a5df355..f5ceb35 100644
--- a/package/libxshmfence/Makefile
+++ b/package/libxshmfence/Makefile
@@ -4,12 +4,12 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= libxshmfence
-PKG_VERSION:= 1.1
+PKG_VERSION:= 1.2
PKG_RELEASE:= 1
-PKG_HASH:= 36a6c67c71c6f262be0f2f29349d33ad157ba1fea64a55acd35b90c3816a4cdc
+PKG_HASH:= 58467a0e36fc4ec749dc55f81a4ab3b822c82b6dfb7d36bdb6b28c9fd2a5ccaf
PKG_DESCR:= interface to shared-memory fences
PKG_SECTION:= x11/libs
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_SITES:= http://www.x.org/releases/individual/lib/
PKG_OPTS:= dev
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
diff --git a/package/mkfontdir/Makefile b/package/mkfontdir/Makefile
index 9cf460b..c3da6c7 100644
--- a/package/mkfontdir/Makefile
+++ b/package/mkfontdir/Makefile
@@ -10,7 +10,7 @@ PKG_HASH:= bccc5fb7af1b614eabe4a22766758c87bfc36d66191d08c19d2fa97674b7b5b7
PKG_DESCR:= font utility
PKG_SECTION:= x11/fonts
PKG_DEPENDS:= mkfontscale
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_SITES:= http://www.x.org/releases/individual/app/
PKG_OPTS:= noscripts
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
diff --git a/package/mkfontscale/Makefile b/package/mkfontscale/Makefile
index 94f01a3..431fba9 100644
--- a/package/mkfontscale/Makefile
+++ b/package/mkfontscale/Makefile
@@ -10,7 +10,7 @@ PKG_HASH:= 53515d688c8d0ed24f74374d9c33e36a20b024d59b8127d9f23b481ab5e98150
PKG_DESCR:= font utility
PKG_SECTION:= x11/fonts
PKG_BUILDDEP:= freetype libfontenc
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_SITES:= http://www.x.org/releases/individual/app/
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
diff --git a/package/presentproto/Makefile b/package/presentproto/Makefile
index d4ecb55..b2e8ccd 100644
--- a/package/presentproto/Makefile
+++ b/package/presentproto/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 1
PKG_HASH:= 02f8042cb351dd5c3699a0dbdb2ab25f86532efe3e1e3e97897e7f44b5c67040
PKG_DESCR:= present protocol headers
PKG_SECTION:= dev/header
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_SITES:= http://www.x.org/releases/individual/proto/
PKG_OPTS:= dev devonly
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
diff --git a/package/randrproto/Makefile b/package/randrproto/Makefile
index 9f9f940..8815c66 100644
--- a/package/randrproto/Makefile
+++ b/package/randrproto/Makefile
@@ -4,12 +4,12 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= randrproto
-PKG_VERSION:= 1.4.0
+PKG_VERSION:= 1.5.0
PKG_RELEASE:= 1
-PKG_HASH:= b2c44b63a22f37eef5a2e4ec325e8e6c2ee8b235ef516357535570def6210c88
+PKG_HASH:= 8f8a716d6daa6ba05df97d513960d35a39e040600bf04b313633f11679006fab
PKG_DESCR:= xrandr protcol headers
PKG_SECTION:= dev/header
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_SITES:= http://www.x.org/releases/individual/proto/
PKG_OPTS:= dev devonly
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
diff --git a/package/recordproto/Makefile b/package/recordproto/Makefile
index dd74c69..708274d 100644
--- a/package/recordproto/Makefile
+++ b/package/recordproto/Makefile
@@ -10,7 +10,7 @@ PKG_DESCR:= record extension headers
PKG_SECTION:= dev/header
PKG_BUILDDEP:= recordproto-host
PKG_HASH:= 485f792570dd7afe49144227f325bf2827bc7d87aae6a8ab6c1de2b06b1c68c5
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_SITES:= http://www.x.org/releases/individual/proto/
PKG_OPTS:= dev devonly
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
diff --git a/package/renderproto/Makefile b/package/renderproto/Makefile
index 2fe5981..ab5611d 100644
--- a/package/renderproto/Makefile
+++ b/package/renderproto/Makefile
@@ -10,7 +10,7 @@ PKG_DESCR:= x rendering extension headers
PKG_SECTION:= dev/header
PKG_BUILDDEP:= renderproto-host
PKG_HASH:= a0a4be3cad9381ae28279ba5582e679491fc2bec9aab8a65993108bf8dbce5fe
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_SITES:= http://www.x.org/releases/individual/proto/
PKG_OPTS:= dev devonly
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
diff --git a/package/resourceproto/Makefile b/package/resourceproto/Makefile
index 5df0e4f..0efa2fd 100644
--- a/package/resourceproto/Makefile
+++ b/package/resourceproto/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 1
PKG_DESCR:= resource extension headers
PKG_SECTION:= dev/header
PKG_HASH:= 469029d14fdeeaa7eed1be585998ff4cb92cf664f872d1d69c04140815b78734
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_SITES:= http://www.x.org/releases/individual/proto/
PKG_OPTS:= dev devonly
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
diff --git a/package/scrnsaverproto/Makefile b/package/scrnsaverproto/Makefile
index 684cb86..2a3b589 100644
--- a/package/scrnsaverproto/Makefile
+++ b/package/scrnsaverproto/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 1
PKG_DESCR:= screensaver headers
PKG_SECTION:= dev/header
PKG_HASH:= d8dee19c52977f65af08fad6aa237bacee11bc5a33e1b9b064e8ac1fd99d6e79
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_SITES:= http://www.x.org/releases/individual/proto/
PKG_OPTS:= dev devonly
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
diff --git a/package/setxkbmap/Makefile b/package/setxkbmap/Makefile
index 9aa3f29..9f7a0a9 100644
--- a/package/setxkbmap/Makefile
+++ b/package/setxkbmap/Makefile
@@ -4,13 +4,13 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= setxkbmap
-PKG_VERSION:= 1.3.0
+PKG_VERSION:= 1.3.1
PKG_RELEASE:= 1
-PKG_HASH:= f5b87e965725c251e1251ab8e37d5189ddeefa4099b864d52e2bcad4f75304ca
+PKG_HASH:= e24a73669007fa3b280eba4bdc7f75715aeb2e394bf2d63f5cc872502ddde264
PKG_DESCR:= set keyboard utility
PKG_SECTION:= x11/utils
PKG_DEPENDS:= libxkbfile
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_SITES:= http://www.x.org/releases/individual/app/
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
diff --git a/package/videoproto/Makefile b/package/videoproto/Makefile
index 846e114..a47e923 100644
--- a/package/videoproto/Makefile
+++ b/package/videoproto/Makefile
@@ -4,12 +4,12 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= videoproto
-PKG_VERSION:= 2.3.1
+PKG_VERSION:= 2.3.2
PKG_RELEASE:= 1
PKG_DESCR:= x11 video protocol headers
PKG_SECTION:= dev/header
-PKG_HASH:= c7c91429426a1c2cf34a6c29bd6f19ad0551f7766d8f4562a2cec0edddec14c7
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_HASH:= 70eaa52beb83d07b71d81b9e4a396ba53c825472c4998f9e7b9889325b2a4346
+PKG_SITES:= http://www.x.org/releases/individual/proto/
PKG_OPTS:= dev devonly
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
diff --git a/package/xauth/Makefile b/package/xauth/Makefile
index a7c4c8c..22a0556 100644
--- a/package/xauth/Makefile
+++ b/package/xauth/Makefile
@@ -4,15 +4,15 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= xauth
-PKG_VERSION:= 1.0.7
+PKG_VERSION:= 1.0.9
PKG_RELEASE:= 1
-PKG_HASH:= 461afbfc508ff5ac2e600c41dd5da92fe05c389cefbb20425958bdee99b683d6
+PKG_HASH:= 0709070caf23ba2fb99536907b75be1fe31853999c62d3e87a6a8d26ba8a8cdb
PKG_DESCR:= authority file utility
PKG_SECTION:= x11/utils
PKG_DEPENDS:= libx11 libxext libxmu
PKG_BUILDDEP:= libX11 libXext libXmu
PKG_URL:= http://www.x.org
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_SITES:= http://www.x.org/releases/individual/app/
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
diff --git a/package/xbitmaps/Makefile b/package/xbitmaps/Makefile
index 4307749..f23adb2 100644
--- a/package/xbitmaps/Makefile
+++ b/package/xbitmaps/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 1
PKG_HASH:= 3bc89e05be4179ce4d3dbba1ae554da4591d41f7a489d9e2735a18cfd8378188
PKG_DESCR:= prerequiste for xsetroot
PKG_SECTION:= x11/libs
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_SITES:= http://www.x.org/releases/individual/data/
PKG_OPTS:= dev devonly
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
diff --git a/package/xcmiscproto/Makefile b/package/xcmiscproto/Makefile
index 384de4a..ac0918a 100644
--- a/package/xcmiscproto/Makefile
+++ b/package/xcmiscproto/Makefile
@@ -4,12 +4,12 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= xcmiscproto
-PKG_VERSION:= 1.2.1
+PKG_VERSION:= 1.2.2
PKG_RELEASE:= 1
PKG_DESCR:= xc-misc extension headers
PKG_SECTION:= dev/header
-PKG_HASH:= 33415e374f63acc4dbd0ad59425f0c8876e567bad3d8563479ff955cb3bec300
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_HASH:= 48013cfbe4bd5580925a854a43e2bccbb4c7a5a31128070644617b6dc7f8ef85
+PKG_SITES:= http://www.x.org/releases/individual/proto/
PKG_OPTS:= dev devonly
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
diff --git a/package/xconsole/Makefile b/package/xconsole/Makefile
index a5a03de..d0b6c8d 100644
--- a/package/xconsole/Makefile
+++ b/package/xconsole/Makefile
@@ -4,14 +4,14 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= xconsole
-PKG_VERSION:= 1.0.4
+PKG_VERSION:= 1.0.6
PKG_RELEASE:= 1
-PKG_HASH:= 71fabb3f41af726ef2a81d50100d8741ba0b4e7bcb40fad102d9cee943444ca2
+PKG_HASH:= 28151453a0a687462516de133bac0287b488a2ff56da78331fee34bc1bf3e7d5
PKG_DESCR:= console application
PKG_SECTION:= x11/utils
PKG_BUILDDEP:= libXaw
PKG_URL:= http://xorg.freedesktop.org/
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_SITES:= http://www.x.org/releases/individual/app/
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
diff --git a/package/xdm/Makefile b/package/xdm/Makefile
index fe044a2..b3e6b53 100644
--- a/package/xdm/Makefile
+++ b/package/xdm/Makefile
@@ -12,7 +12,7 @@ PKG_SECTION:= x11/apps
PKG_BUILDDEP:= pam
PKG_DEPENDS:= xconsole pam xsm
PKG_URL:= http://xorg.freedesktop.org/
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_SITES:= http://www.x.org/releases/individual/app/
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
diff --git a/package/xdpyinfo/Makefile b/package/xdpyinfo/Makefile
index 0dd6628..387f4ef 100644
--- a/package/xdpyinfo/Makefile
+++ b/package/xdpyinfo/Makefile
@@ -4,15 +4,15 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= xdpyinfo
-PKG_VERSION:= 1.3.0
+PKG_VERSION:= 1.3.2
PKG_RELEASE:= 1
-PKG_HASH:= 2725676eb968a3cf3b2f2da07bd208606295a48753bed4cc14f21f95848f7b33
+PKG_HASH:= ef39935e8e9b328e54a85d6218d410d6939482da6058db1ee1b39749d98cbcf2
PKG_DESCR:= display info utility
PKG_SECTION:= x11/utils
PKG_DEPENDS:= libxtst
PKG_BUILDDEP:= libXtst
PKG_URL:= http://www.x.org/
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_SITES:= http://www.x.org/releases/individual/app/
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
diff --git a/package/xextproto/Makefile b/package/xextproto/Makefile
index 8f7793f..bcaa887 100644
--- a/package/xextproto/Makefile
+++ b/package/xextproto/Makefile
@@ -10,7 +10,7 @@ PKG_DESCR:= x protocol extensions headers
PKG_SECTION:= dev/header
PKG_BUILDDEP:= xextproto-host
PKG_HASH:= 1b1bcdf91221e78c6c33738667a57bd9aaa63d5953174ad8ed9929296741c9f5
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_SITES:= http://www.x.org/releases/individual/proto/
PKG_OPTS:= dev devonly
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
diff --git a/package/xf86-input-evdev/Makefile b/package/xf86-input-evdev/Makefile
index 2f4cf91..12ba75a 100644
--- a/package/xf86-input-evdev/Makefile
+++ b/package/xf86-input-evdev/Makefile
@@ -11,7 +11,7 @@ PKG_DESCR:= x11 driver for evdev
PKG_SECTION:= x11/drivers
PKG_DEPENDS:= xorg-server libudev
PKG_BUILDDEP:= xorg-server eudev
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_SITES:= http://www.x.org/releases/individual/driver/
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
PKG_LIBC_DEPENDS:= glibc
diff --git a/package/xf86-input-keyboard/Makefile b/package/xf86-input-keyboard/Makefile
index 07a9c9a..eb54c5c 100644
--- a/package/xf86-input-keyboard/Makefile
+++ b/package/xf86-input-keyboard/Makefile
@@ -4,15 +4,15 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= xf86-input-keyboard
-PKG_VERSION:= 1.8.0
+PKG_VERSION:= 1.8.1
PKG_RELEASE:= 1
-PKG_HASH:= a803ec6ee5c48fd6a24917902f49201459baa575459f9c585b25eeda77c32da7
+PKG_HASH:= 8f7c645f4b17ed0a0607c92dfac87deafee9f3b975df6f87e0f606bab49e7754
PKG_DESCR:= x11 driver for keyboard
PKG_SECTION:= x11/drivers
PKG_DEPENDS:= xorg-server
PKG_BUILDDEP:= xorg-server
PKG_NEEDS:= c++
-PKG_SITES:= $(MASTER_SITE_XORG)
+PKG_SITES:= http://www.x.org/releases/individual/driver/
DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz
diff --git a/package/xf86-input-mouse/Makefile b/package/xf86-input-mouse/Makefile
index 56eb879..5eba9b8 100644
--- a/package/xf86-input-mouse/Makefile
+++ b/package/xf86-input-mouse/Makefile
@@ -12,7 +12,7 @@ PKG_SECTION:= x11/drivers
PKG_DEPENDS:= xorg-server
PKG_BUILDDEP:= xorg-server
PKG_NEEDS:= c++
-PKG_SITES:= $(MASTER_SITE_XORG)
+PKG_SITES:= http://www.x.org/releases/individual/driver/
DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz
diff --git a/package/xf86-video-ati/Makefile b/package/xf86-video-ati/Makefile
index 2997761..59ada0b 100644
--- a/package/xf86-video-ati/Makefile
+++ b/package/xf86-video-ati/Makefile
@@ -12,7 +12,7 @@ PKG_SECTION:= x11/drivers
PKG_DEPENDS:= xorg-server libdrm mesa libudev
PKG_BUILDDEP:= xorg-server libdrm xf86driproto mesa eudev
PKG_NEEDS:= c++
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_SITES:= http://www.x.org/releases/individual/driver/
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
diff --git a/package/xf86-video-cirrus/Makefile b/package/xf86-video-cirrus/Makefile
index 52f4d9b..fe9e0d5 100644
--- a/package/xf86-video-cirrus/Makefile
+++ b/package/xf86-video-cirrus/Makefile
@@ -12,7 +12,7 @@ PKG_SECTION:= x11/drivers
PKG_DEPENDS:= xorg-server
PKG_BUILDDEP:= xorg-server
PKG_NEEDS:= c++
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_SITES:= http://www.x.org/releases/individual/driver/
PKG_SYSTEM_DEPENDS:= qemu-x86 qemu-x86_64
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
diff --git a/package/xf86-video-fbdev/Makefile b/package/xf86-video-fbdev/Makefile
index 2dd6ea0..4df0982 100644
--- a/package/xf86-video-fbdev/Makefile
+++ b/package/xf86-video-fbdev/Makefile
@@ -12,7 +12,7 @@ PKG_SECTION:= x11/drivers
PKG_DEPENDS:= xorg-server
PKG_BUILDDEP:= xorg-server
PKG_NEEDS:= c++
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_SITES:= http://www.x.org/releases/individual/driver/
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
diff --git a/package/xf86-video-geode/Makefile b/package/xf86-video-geode/Makefile
index 13ea4b9..db44dca 100644
--- a/package/xf86-video-geode/Makefile
+++ b/package/xf86-video-geode/Makefile
@@ -12,7 +12,7 @@ PKG_SECTION:= x11/drivers
PKG_DEPENDS:= xorg-server
PKG_BUILDDEP:= xorg-server
PKG_NEEDS:= c++
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_SITES:= http://www.x.org/releases/individual/driver/
PKG_SYSTEM_DEPENDS:= pcengines-alix1c
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
diff --git a/package/xf86-video-intel/Makefile b/package/xf86-video-intel/Makefile
index 561b338..573bddb 100644
--- a/package/xf86-video-intel/Makefile
+++ b/package/xf86-video-intel/Makefile
@@ -4,23 +4,24 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= xf86-video-intel
-PKG_VERSION:= 2.99.917
+PKG_VERSION:= 82293901da23d79fd074e5255fda5c95405d52de
PKG_RELEASE:= 1
-PKG_HASH:= 1888f2733f8dccf4ab24bc56ba62eeac41c231b98365027438702d6c55216576
+PKG_HASH:= b30dfa89f26f0f88c561f615d3c260d57bc095870d77b4ee565263c31bc52ce0
PKG_DESCR:= x11 driver for intel vga chips
PKG_SECTION:= x11/drivers
PKG_DEPENDS:= xorg-server libdrm mesa libudev
PKG_BUILDDEP:= xorg-server libdrm xf86driproto mesa eudev
PKG_NEEDS:= c++
-PKG_SITES:= $(MASTER_SITE_XORG)
+PKG_SITES:= git://anongit.freedesktop.org/xorg/driver/xf86-video-intel
PKG_SYSTEM_DEPENDS:= ibm-x40
-DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz
include $(ADK_TOPDIR)/mk/package.mk
$(eval $(call PKG_template,XF86_VIDEO_INTEL,xf86-video-intel,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
+AUTOTOOL_STYLE:= autogen
+
xf86-video-intel-install:
$(INSTALL_DIR) $(IDIR_XF86_VIDEO_INTEL)/usr/lib/xorg/modules/drivers
$(CP) $(WRKINST)/usr/lib/xorg/modules/drivers/*.so \
diff --git a/package/xf86-video-modesetting/Makefile b/package/xf86-video-modesetting/Makefile
index b68ad99..e8585d0 100644
--- a/package/xf86-video-modesetting/Makefile
+++ b/package/xf86-video-modesetting/Makefile
@@ -12,7 +12,7 @@ PKG_SECTION:= x11/drivers
PKG_DEPENDS:= xorg-server
PKG_BUILDDEP:= xorg-server
PKG_NEEDS:= c++
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_SITES:= http://www.x.org/releases/individual/driver/
PKG_SYSTEM_DEPENDS:= qemu-x86 qemu-x86_64
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
diff --git a/package/xf86-video-siliconmotion/Makefile b/package/xf86-video-siliconmotion/Makefile
index 8a2b753..a57ac49 100644
--- a/package/xf86-video-siliconmotion/Makefile
+++ b/package/xf86-video-siliconmotion/Makefile
@@ -12,7 +12,7 @@ PKG_SECTION:= x11/drivers
PKG_DEPENDS:= xorg-server
PKG_BUILDDEP:= xorg-server
PKG_NEEDS:= c++
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_SITES:= http://www.x.org/releases/individual/driver/
PKG_SYSTEM_DEPENDS:= lemote-yeelong
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
diff --git a/package/xf86dga/Makefile b/package/xf86dga/Makefile
index fcbf51e..b91a062 100644
--- a/package/xf86dga/Makefile
+++ b/package/xf86dga/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 1
PKG_HASH:= dce95dbb8310ad214d60ba2e1fcdb56a41a10bd4843d7f953a8108cbebd1ebf9
PKG_SECTION:= dev/header
PKG_BUILDDEP:= libXxf86dga
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_SITES:= http://www.x.org/releases/individual/app/
PKG_OPTS:= dev devonly
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
diff --git a/package/xf86dgaproto/Makefile b/package/xf86dgaproto/Makefile
index b66c765..ca7beb4 100644
--- a/package/xf86dgaproto/Makefile
+++ b/package/xf86dgaproto/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 1
PKG_DESCR:= xfree86-dga headers
PKG_SECTION:= dev/header
PKG_HASH:= 73bc6fc830cce5a0ec9c750d4702601fc0fca12d6353ede8b4c0092c9c4ca2af
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_SITES:= http://www.x.org/releases/individual/proto/
PKG_OPTS:= dev devonly
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
diff --git a/package/xf86driproto/Makefile b/package/xf86driproto/Makefile
index dfca5d5..255551c 100644
--- a/package/xf86driproto/Makefile
+++ b/package/xf86driproto/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 1
PKG_DESCR:= x dri protocol headers
PKG_SECTION:= dev/header
PKG_HASH:= d23f12deffd03e582e897ed6a7df3ea7f66ee8577f0f61374dcdf2ebffdce1be
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_SITES:= http://www.x.org/releases/individual/proto/
PKG_OPTS:= dev devonly
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
diff --git a/package/xf86vidmodeproto/Makefile b/package/xf86vidmodeproto/Makefile
index e0f3e01..9db41cc 100644
--- a/package/xf86vidmodeproto/Makefile
+++ b/package/xf86vidmodeproto/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 1
PKG_DESCR:= xfree86-vidmodeextension extension headers
PKG_SECTION:= dev/header
PKG_HASH:= c3512b11cefa7558576551f8582c6e7071c8a24d78176059d94b84b48b262979
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_SITES:= http://www.x.org/releases/individual/proto/
PKG_OPTS:= dev devonly
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
diff --git a/package/xineramaproto/Makefile b/package/xineramaproto/Makefile
index 10f95bb..6edff35 100644
--- a/package/xineramaproto/Makefile
+++ b/package/xineramaproto/Makefile
@@ -10,7 +10,7 @@ PKG_DESCR:= xinerama extension headers
PKG_SECTION:= dev/header
PKG_BUILDDEP:= xineramaproto-host
PKG_HASH:= d99e121edf7b310008d7371ac5dbe3aa2810996d476b754dc78477cc26e5e7c1
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_SITES:= http://www.x.org/releases/individual/proto/
PKG_OPTS:= dev devonly
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
diff --git a/package/xinput/Makefile b/package/xinput/Makefile
index 846dfd2..ccf805c 100644
--- a/package/xinput/Makefile
+++ b/package/xinput/Makefile
@@ -4,15 +4,15 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= xinput
-PKG_VERSION:= 1.6.0
+PKG_VERSION:= 1.6.2
PKG_RELEASE:= 1
-PKG_HASH:= a3117a323cc32c80428dd1604df8d0f87ecbfb03a4975c187475a04f7201dfb7
+PKG_HASH:= 2c8ca5ff2a8703cb7d898629a4311db720dbd30d0c162bfe37f18849a727bd42
PKG_DESCR:= input utility
PKG_SECTION:= x11/utils
PKG_DEPENDS:= libxi libxinerama libxrandr
PKG_BUILDDEP:= libXi libXinerama libXrandr
PKG_URL:= http://xorg.freedesktop.org/
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_SITES:= http://www.x.org/releases/individual/app/
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile
index f275ab1..8968c45 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.16.3
+PKG_VERSION:= 1.18.0
PKG_RELEASE:= 1
-PKG_HASH:= 293d6a73a560f9f7f5cc8a05d84445a3aabfdf43683925d0f93c8f8502536c84
+PKG_HASH:= a1bfa91ecbee765e3935dbb6a9204668ab84eb31a6978815c97ab6064585d71b
PKG_DESCR:= xorg server
PKG_SECTION:= x11/drivers
PKG_DEPENDS:= libxfont pixman libpciaccess libxkbfile
@@ -21,7 +21,7 @@ PKG_BUILDDEP+= libpciaccess xf86dgaproto recordproto
PKG_BUILDDEP+= xineramaproto presentproto
PKG_NEEDS:= threads rt c++
PKG_URL:= http://www.x.org/
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_SITES:= http://www.x.org/releases/individual/xserver/
PKG_OPTS:= dev
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
@@ -117,8 +117,6 @@ ifeq (${ADK_PACKAGE_XORG_SERVER_WITH_DRI},y)
${CP} ${WRKINST}/usr/lib/xorg/modules/extensions/*.so \
$(IDIR_XORG_SERVER)/usr/lib/xorg/modules/extensions
endif
- ${CP} ${WRKINST}/usr/lib/xorg/modules/multimedia/*.so \
- $(IDIR_XORG_SERVER)/usr/lib/xorg/modules/multimedia
ifeq (${ADK_TARGET_SYSTEM_LEMOTE_YEELONG},y)
${CP} ./files/xorg.conf.lemote-yeelong \
$(IDIR_XORG_SERVER)/etc/X11/xorg.conf
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
deleted file mode 100644
index 2fa3bed..0000000
--- a/package/xorg-server/patches/patch-hw_xfree86_os-support_xf86_OSlib_h
+++ /dev/null
@@ -1,16 +0,0 @@
---- 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
diff --git a/package/xproto/Makefile b/package/xproto/Makefile
index d7bae7e..8f749c4 100644
--- a/package/xproto/Makefile
+++ b/package/xproto/Makefile
@@ -4,13 +4,13 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= xproto
-PKG_VERSION:= 7.0.27
+PKG_VERSION:= 7.0.28
PKG_RELEASE:= 1
PKG_DESCR:= x window system core protocol headers
PKG_SECTION:= dev/header
-PKG_HASH:= 693d6ae50cb642fc4de6ab1f69e3f38a8e5a67eb41ac2aca253240f999282b6b
+PKG_HASH:= 6cabc8ce3fa2b1a2427871167b62c24d5b08a58bd3e81ed7aaf08f2bf6dbcfed
PKG_BUILDDEP:= xproto-host
-PKG_SITES:= $(MASTER_SITE_XORG)
+PKG_SITES:= http://www.x.org/releases/individual/proto/
PKG_OPTS:= dev devonly
DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz
diff --git a/package/xrdb/Makefile b/package/xrdb/Makefile
index 6675162..f1516ff 100644
--- a/package/xrdb/Makefile
+++ b/package/xrdb/Makefile
@@ -4,14 +4,14 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= xrdb
-PKG_VERSION:= 1.0.7
+PKG_VERSION:= 1.1.0
PKG_RELEASE:= 1
-PKG_HASH:= 1e55d713ed09dbc021dcf55b45c413d2b61c990ca5f164c01b0e781ef1a6c798
+PKG_HASH:= 44b0b6b7b7eb80b83486dfea67c880f6b0059052386c7ddec4d58fd2ad9ae8e9
PKG_DESCR:= resource database management tools
PKG_SECTION:= x11/utils
PKG_DEPENDS:= libx11 libxmu
PKG_BUILDDEP:= libX11 libXmu
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_SITES:= http://www.x.org/releases/individual/app/
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
diff --git a/package/xset/Makefile b/package/xset/Makefile
index f02d010..2a235ec 100644
--- a/package/xset/Makefile
+++ b/package/xset/Makefile
@@ -4,14 +4,14 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= xset
-PKG_VERSION:= 1.2.2
+PKG_VERSION:= 1.2.3
PKG_RELEASE:= 1
-PKG_HASH:= ccb9ff191fdd551ab0da7b2edae6949342284fcc0c74fe9efcbff619d5858f94
+PKG_HASH:= 5ecb2bb2cbf3c9349b735080b155a08c97b314dacedfc558c7f5a611ee1297f7
PKG_DESCR:= set utility
PKG_SECTION:= x11/utils
PKG_BUILDDEP:= libXmu
PKG_URL:= http://xorg.freedesktop.org/
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_SITES:= http://www.x.org/releases/individual/app/
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
diff --git a/package/xsetroot/Makefile b/package/xsetroot/Makefile
index 43b3006..b384023 100644
--- a/package/xsetroot/Makefile
+++ b/package/xsetroot/Makefile
@@ -4,14 +4,14 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= xsetroot
-PKG_VERSION:= 1.1.0
+PKG_VERSION:= 1.1.1
PKG_RELEASE:= 1
-PKG_HASH:= 318436be836d2b4c04d9acab4a3538744e07c8891b24f7c4a3823b6ea4c8275f
+PKG_HASH:= 6cdd48757d18835251124138b4a8e4008c3bbc51cf92533aa39c6ed03277168b
PKG_DESCR:= set root window
PKG_SECTION:= x11/utils
PKG_DEPENDS:= xbitmaps libx11 libxmu libxcursor
PKG_BUILDDEP:= xbitmaps libXcursor libXmu
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_SITES:= http://www.x.org/releases/individual/app/
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
diff --git a/package/xsm/Makefile b/package/xsm/Makefile
index 30f26f0..177e1e4 100644
--- a/package/xsm/Makefile
+++ b/package/xsm/Makefile
@@ -4,15 +4,15 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= xsm
-PKG_VERSION:= 1.0.2
+PKG_VERSION:= 1.0.3
PKG_RELEASE:= 1
-PKG_HASH:= 3f0134f1d763eb2f26819a122b9161942cf7860c4582931f6fa3943d3a4952f7
+PKG_HASH:= f70815139d62416dbec5915ec37db66f325932a69f6350bb1a74c0940cdc796a
PKG_DESCR:= session manager
PKG_SECTION:= x11/utils
PKG_DEPENDS:= libxaw
PKG_BUILDDEP:= libXaw
PKG_URL:= http://xorg.freedesktop.org/
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_SITES:= http://www.x.org/releases/individual/app/
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
@@ -21,12 +21,9 @@ include $(ADK_TOPDIR)/mk/package.mk
$(eval $(call PKG_template,XSM,xsm,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
xsm-install:
- $(INSTALL_DIR) $(IDIR_XSM)/usr/lib/X11
- $(CP) $(WRKINST)/usr/lib/X11/* \
- $(IDIR_XSM)/usr/lib/X11
$(INSTALL_DIR) $(IDIR_XSM)/usr/share/X11
$(CP) $(WRKINST)/usr/share/X11/* \
- $(IDIR_XSM)/usr/lib/X11
+ $(IDIR_XSM)/usr/share/X11
$(INSTALL_DIR) $(IDIR_XSM)/usr/bin
$(INSTALL_BIN) $(WRKINST)/usr/bin/xsm \
$(IDIR_XSM)/usr/bin
diff --git a/package/xtrans/Makefile b/package/xtrans/Makefile
index 90108fe..862111f 100644
--- a/package/xtrans/Makefile
+++ b/package/xtrans/Makefile
@@ -4,13 +4,13 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= xtrans
-PKG_VERSION:= 1.3.3
+PKG_VERSION:= 1.3.5
PKG_RELEASE:= 1
PKG_DESCR:= network protocol transport library
PKG_SECTION:= dev/header
PKG_BUILDDEP:= xtrans-host
-PKG_HASH:= afb636c4efc8aec006ffc829e88337327b82206c8ece1e91e1afcc2f0732083b
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_HASH:= b7a577c1b6c75030145e53b4793db9c88f9359ac49e7d771d4385d21b3e5945d
+PKG_SITES:= http://www.x.org/releases/individual/lib/
PKG_OPTS:= dev devonly
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
diff --git a/package/xvinfo/Makefile b/package/xvinfo/Makefile
index ce2c47b..765c927 100644
--- a/package/xvinfo/Makefile
+++ b/package/xvinfo/Makefile
@@ -4,14 +4,14 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= xvinfo
-PKG_VERSION:= 1.1.1
+PKG_VERSION:= 1.1.3
PKG_RELEASE:= 1
-PKG_HASH:= 0d26f9efd5274e6ce4186603457deba60d79fd95a0600bc940306783c3b8a97d
+PKG_HASH:= 1c1c2f97abfe114389e94399cc7bf3dfd802ed30ad41ba23921d005bd8a6c39f
PKG_DESCR:= print out x-video extension adaptor information
PKG_SECTION:= x11/utils
PKG_BUILDDEP:= libXv
PKG_URL:= http://xorg.freedesktop.org/
-PKG_SITES:= ${MASTER_SITE_XORG}
+PKG_SITES:= http://www.x.org/releases/individual/app/
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz