# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1488424636 -7200
# Node ID c5336999f3704c2dfb968838077dfdd72a6cdb8e
# Parent  eb23a9b0f828de5b0ea324cbfb1c5cd5b1755c08
Up: asciidoc, doxygen, tslib, xorg-server, xorg-xkeyboard-config; fix: eudev; add: libepoxy.

diff -r eb23a9b0f828 -r c5336999f370 asciidoc/receipt
--- a/asciidoc/receipt	Wed Mar 01 23:29:10 2017 +0200
+++ b/asciidoc/receipt	Thu Mar 02 05:17:16 2017 +0200
@@ -7,25 +7,27 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.methods.co.nz/asciidoc/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WGET_URL="$SF_MIRROR/project/asciidoc/asciidoc/$VERSION/$TARBALL"
+WGET_URL="$SF_MIRROR/asciidoc/$TARBALL"
 
 DEPENDS="python"
-BUILD_DEPENDS=""
+BUILD_DEPENDS="python"
 
 # Rules to configure and make the package.
 compile_rules()
 {
 	./configure \
 		--sysconfdir=/etc \
+		--docdir=/usr/share/doc/asciidoc-$VERSION \
 		$CONFIGURE_ARGS &&
-	make install
+	make &&
+	make install &&
+	make DESTDIR=$install docs
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr
-	cp -a $install/etc $fs
-	cp -a $install/usr/bin $fs/usr
+	cook_copy_folders etc bin
 }
diff -r eb23a9b0f828 -r c5336999f370 doxygen/receipt
--- a/doxygen/receipt	Wed Mar 01 23:29:10 2017 +0200
+++ b/doxygen/receipt	Thu Mar 02 05:17:16 2017 +0200
@@ -1,31 +1,41 @@
 # SliTaz package receipt.
 
 PACKAGE="doxygen"
-VERSION="1.7.4"
+VERSION="1.8.11"
 CATEGORY="development"
 SHORT_DESC="Source code documentation generator tool."
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
-TARBALL="$PACKAGE-$VERSION.src.tar.gz"
 WEB_SITE="http://www.stack.nl/~dimitri/doxygen/"
-WGET_URL="ftp://ftp.stack.nl/pub/users/dimitri/$TARBALL"
 TAGS="language documentation"
 
-BUILD_DEPENDS="perl graphviz flex"
+TARBALL="$PACKAGE-$VERSION.src.tar.gz"
+WGET_URL="http://ftp.stack.nl/pub/doxygen/$TARBALL"
+
+BUILD_DEPENDS="cmake python" # graphviz
 
 # Rules to configure and make the package.
 compile_rules()
 {
-	sed -i 's|man/man1|share/&|' Makefile*
-	./configure --shared --prefix /usr --docdir /usr/share/doc \
-		--install /usr/bin/install &&
+	mkdir build &&
+	cd    build &&
+
+	cmake -G "Unix Makefiles" \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		.. &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make install &&
+
+	mkdir -p $install/usr/share/man/man1 &&
+	for i in ../doc/*.1; do
+		sed "s|@VERSION@|$VERSION|g; s|@DATE@|$(date +%Y)|g" $i > \
+			$install/usr/share/man/man1
+	done
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr
-	cp -a $install/usr/bin $fs/usr
+	cook_copy_folders bin
 }
diff -r eb23a9b0f828 -r c5336999f370 eudev/receipt
--- a/eudev/receipt	Wed Mar 01 23:29:10 2017 +0200
+++ b/eudev/receipt	Thu Mar 02 05:17:16 2017 +0200
@@ -44,12 +44,13 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/lib/firmware
+	mkdir -p $fs/lib/firmware $fs/usr/lib
 
 	cp -a $install/sbin $fs
 	cp -a $install/etc $fs
 	cp -a $install/lib/libudev.so* $fs/lib
 	cp -a $install/lib/udev $fs/lib
+	cp -a $install/usr/lib/libudev.so $fs/usr/lib
 
 	# Copy rules files to udev conf dir
 	mv -f $fs/lib/udev/rules.d $fs/etc/udev
diff -r eb23a9b0f828 -r c5336999f370 libepoxy-dev/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libepoxy-dev/receipt	Thu Mar 02 05:17:16 2017 +0200
@@ -0,0 +1,18 @@
+# SliTaz package receipt.
+
+PACKAGE="libepoxy-dev"
+VERSION="1.3.1"
+CATEGORY="x-window"
+SHORT_DESC="Library for handling OpenGL function pointer management (development files)"
+MAINTAINER="al.bobylev@gmail.com"
+LICENSE="MIT"
+WEB_SITE="https://github.com/anholt/libepoxy/"
+
+WANTED="libepoxy"
+DEPENDS="libepoxy"
+
+# Rules to gen a SliTaz package suitable for Tazpkg.
+genpkg_rules()
+{
+	cook_copy_files *.h *.la *.pc
+}
diff -r eb23a9b0f828 -r c5336999f370 libepoxy/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libepoxy/receipt	Thu Mar 02 05:17:16 2017 +0200
@@ -0,0 +1,26 @@
+# SliTaz package receipt.
+
+PACKAGE="libepoxy"
+VERSION="1.3.1"
+CATEGORY="x-window"
+SHORT_DESC="Library for handling OpenGL function pointer management"
+MAINTAINER="al.bobylev@gmail.com"
+LICENSE="MIT"
+WEB_SITE="https://github.com/anholt/libepoxy/"
+
+TARBALL="$PACKAGE-$VERSION.tar.bz2"
+WGET_URL="${WEB_SITE}releases/download/v$VERSION/$TARBALL"
+
+BUILD_DEPENDS="xorg-util-macros python mesa-dev"
+
+# Rules to configure and make the package.
+compile_rules()
+{
+	./configure $CONFIGURE_ARGS && make && make install
+}
+
+# Rules to gen a SliTaz package suitable for Tazpkg.
+genpkg_rules()
+{
+	cook_copy_files *.so*
+}
diff -r eb23a9b0f828 -r c5336999f370 slitaz-base-files/receipt
--- a/slitaz-base-files/receipt	Wed Mar 01 23:29:10 2017 +0200
+++ b/slitaz-base-files/receipt	Thu Mar 02 05:17:16 2017 +0200
@@ -13,6 +13,7 @@
 WGET_URL="http://hg.slitaz.org/$PACKAGE/archive/$VERSION.tar.bz2"
 
 DEPENDS="gettext-base"
+BUILD_DEPENDS="gettext"
 
 CONFIG_FILES="
 /etc/adduser.conf
diff -r eb23a9b0f828 -r c5336999f370 tslib-dev/receipt
--- a/tslib-dev/receipt	Wed Mar 01 23:29:10 2017 +0200
+++ b/tslib-dev/receipt	Thu Mar 02 05:17:16 2017 +0200
@@ -6,18 +6,14 @@
 SHORT_DESC="Abstraction layer for touchscreen panel events, development files."
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="LGPL2"
-WEB_SITE="http://tslib.berlios.de/"
-WANTED="tslib"
+WEB_SITE="https://sourceforge.net/projects/tslib.berlios/"
 HOST_ARCH="i486 arm"
 
-DEPENDS="pkg-config"
+WANTED="tslib"
+DEPENDS="tslib"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr/lib/ts
-	cp -a $install/usr/lib/ts/*a $fs/usr/lib/ts
-	cp -a $install/usr/lib/*a $fs/usr/lib
-	cp -a $install/usr/lib/pkgconfig $fs/usr/lib
-	cp -a $install/usr/include $fs/usr
+	cook_copy_files *.h *.la *.pc
 }
diff -r eb23a9b0f828 -r c5336999f370 tslib/receipt
--- a/tslib/receipt	Wed Mar 01 23:29:10 2017 +0200
+++ b/tslib/receipt	Thu Mar 02 05:17:16 2017 +0200
@@ -2,14 +2,16 @@
 
 PACKAGE="tslib"
 VERSION="1.0"
-CATEGORY="development"
+CATEGORY="x-window"
 SHORT_DESC="Abstraction layer for touchscreen panel events."
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="LGPL2"
-WEB_SITE="http://tslib.berlios.de/"
+WEB_SITE="https://sourceforge.net/projects/tslib.berlios/"
+HOST_ARCH="i486 arm"
+CONFIG_FILES="/etc/ts.conf"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WGET_URL="http://download.berlios.de/$PACKAGE/$TARBALL"
-HOST_ARCH="i486 arm"
+WGET_URL="$SF_MIRROR/tslib.berlios/$TARBALL"
 
 BUILD_DEPENDS="libtool automake autoconf"
 
@@ -31,9 +33,6 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr/lib/ts
-	cp -a $install/usr/lib/ts/*.so* $fs/usr/lib/ts
-	cp -a $install/usr/lib/*.so* $fs/usr/lib
-	cp -a $install/usr/bin $fs/usr
-	cp -a $install/etc $fs
+	cook_copy_folders etc bin
+	cook_copy_files *.so*
 }
diff -r eb23a9b0f828 -r c5336999f370 xorg-server-Xephyr/receipt
--- a/xorg-server-Xephyr/receipt	Wed Mar 01 23:29:10 2017 +0200
+++ b/xorg-server-Xephyr/receipt	Thu Mar 02 05:17:16 2017 +0200
@@ -1,24 +1,25 @@
 # SliTaz package receipt.
 
 PACKAGE="xorg-server-Xephyr"
-VERSION="1.12.4"
+VERSION="1.18.4"
 CATEGORY="x-window"
 SHORT_DESC="The Xephyr Xorg server."
 MAINTAINER="pankso@slitaz.org"
 LICENSE="MIT"
+WEB_SITE="https://www.x.org/wiki/"
+
 WANTED="xorg-server"
-SOURCE="xorg-server"
-WEB_SITE="http://www.x.org/"
-
-DEPENDS="xorg-libXfont xorg-libXau xorg-libXdmcp zlib pixman libgcrypt \
-xorg-libXv libxcb libdrm mesa"
+DEPENDS="bzlib expat freetype libdrm libepoxy libgcrypt libgpg-error libpng \
+libxcb mesa pixman tslib xcb-util xcb-util-image xcb-util-keysyms \
+xcb-util-renderutil xcb-util-wm xorg-libfontenc xorg-libX11 xorg-libXau \
+xorg-libXdamage xorg-libXdmcp xorg-libXext xorg-libXfixes xorg-libXfont \
+xorg-libxshmfence xorg-libXxf86vm zlib"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr/bin
-	cp -a $install/usr/bin/Xephyr $fs/usr/bin
-	chmod 4711 $fs/usr/bin/Xephyr
+	cook_copy_files Xephyr
+	# chmod 4711 $fs/usr/bin/Xephyr
 }
 
 # We need /var/tmp rw to let xkbcomp builr XKB definition.
diff -r eb23a9b0f828 -r c5336999f370 xorg-server-Xfbdev/receipt
--- a/xorg-server-Xfbdev/receipt	Wed Mar 01 23:29:10 2017 +0200
+++ b/xorg-server-Xfbdev/receipt	Thu Mar 02 05:17:16 2017 +0200
@@ -1,28 +1,28 @@
 # SliTaz package receipt.
 
 PACKAGE="xorg-server-Xfbdev"
-VERSION="1.12.4"
+VERSION="1.18.4"
 CATEGORY="x-window"
 SHORT_DESC="Xfbdev framebuffer Xorg server."
 MAINTAINER="pankso@slitaz.org"
 LICENSE="MIT"
-WANTED="xorg-server"
-SOURCE="xorg-server"
-WEB_SITE="http://www.x.org/"
+WEB_SITE="https://www.x.org/wiki/"
 HOST_ARCH="i486"
 
-DEPENDS="xorg-libXfont xorg-libXau xorg-libXdmcp zlib pixman libgcrypt \
-xorg-libxkbfile xorg-xkeyboard-config"
+WANTED="xorg-server"
+DEPENDS="bzlib expat freetype libdrm libgcrypt libgpg-error libpng libxcb mesa \
+pixman tslib xorg-libfontenc xorg-libX11 xorg-libXau xorg-libXdamage \
+xorg-libXdmcp xorg-libXext xorg-libXfixes xorg-libXfont xorg-libxshmfence \
+xorg-libXxf86vm zlib"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr/bin
-	cp -a $install/usr/bin/Xfbdev $fs/usr/bin
-	chmod 4711 $fs/usr/bin/Xfbdev
+	cook_copy_files Xfbdev
+	# chmod 4711 $fs/usr/bin/Xfbdev
 }
 
-# We need /var/tmp rw to let xkbcomp builr XKB definition.
+# We need /var/tmp rw to let xkbcomp build XKB definition.
 post_install()
 {
 	chmod 1777 "$1/var/tmp"
diff -r eb23a9b0f828 -r c5336999f370 xorg-server-Xnest/receipt
--- a/xorg-server-Xnest/receipt	Wed Mar 01 23:29:10 2017 +0200
+++ b/xorg-server-Xnest/receipt	Thu Mar 02 05:17:16 2017 +0200
@@ -1,24 +1,24 @@
 # SliTaz package receipt.
 
 PACKAGE="xorg-server-Xnest"
-VERSION="1.12.4"
+VERSION="1.18.4"
 CATEGORY="x-window"
 SHORT_DESC="Xorg Xnest server."
 MAINTAINER="pankso@slitaz.org"
 LICENSE="MIT"
+WEB_SITE="https://www.x.org/wiki/"
+
 WANTED="xorg-server"
-SOURCE="xorg-server"
-WEB_SITE="http://www.x.org/"
-
-DEPENDS="xorg-libXfont xorg-base-fonts xorg-libXext zlib pixman libgcrypt \
-xorg-xkeyboard-config"
+DEPENDS="bzlib expat freetype libdrm libgcrypt libgpg-error libpng libxcb mesa \
+pixman xorg-libfontenc xorg-libX11 xorg-libXau xorg-libXdamage xorg-libXdmcp \
+xorg-libXext xorg-libXfixes xorg-libXfont xorg-libxshmfence xorg-libXxf86vm \
+zlib"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr/bin
-	cp -a $install/usr/bin/Xnest $fs/usr/bin
-	chmod 4711 $fs/usr/bin/Xnest
+	cook_copy_files Xnest
+	# chmod 4711 $fs/usr/bin/Xnest
 }
 
 # We need /var/tmp rw to let xkbcomp builr XKB definition.
diff -r eb23a9b0f828 -r c5336999f370 xorg-server-Xvfb/receipt
--- a/xorg-server-Xvfb/receipt	Wed Mar 01 23:29:10 2017 +0200
+++ b/xorg-server-Xvfb/receipt	Thu Mar 02 05:17:16 2017 +0200
@@ -1,23 +1,24 @@
 # SliTaz package receipt.
 
 PACKAGE="xorg-server-Xvfb"
-VERSION="1.12.4"
+VERSION="1.18.4"
 CATEGORY="x-window"
 SHORT_DESC="Xvfb Xorg server."
 MAINTAINER="pankso@slitaz.org"
 LICENSE="MIT"
+WEB_SITE="https://www.x.org/wiki/"
+
 WANTED="xorg-server"
-SOURCE="xorg-server"
-WEB_SITE="http://www.x.org/"
-
-DEPENDS="xorg-libXfont zlib pixman libgcrypt xorg-libXv"
+DEPENDS="bzlib expat freetype libdrm libgcrypt libgpg-error libpng libxcb mesa \
+pixman xorg-libfontenc xorg-libX11 xorg-libXau xorg-libXdamage xorg-libXdmcp \
+xorg-libXext xorg-libXfixes xorg-libXfont xorg-libxshmfence xorg-libXxf86vm \
+zlib"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr/bin
-	cp -a $install/usr/bin/Xvfb $fs/usr/bin
-	chmod 4711 $fs/usr/bin/Xvfb
+	cook_copy_files Xvfb
+	# chmod 4711 $fs/usr/bin/Xvfb
 }
 
 # We need /var/tmp rw to let xkbcomp builr XKB definition.
diff -r eb23a9b0f828 -r c5336999f370 xorg-server-dev/receipt
--- a/xorg-server-dev/receipt	Wed Mar 01 23:29:10 2017 +0200
+++ b/xorg-server-dev/receipt	Thu Mar 02 05:17:16 2017 +0200
@@ -1,14 +1,15 @@
 # SliTaz package receipt.
 
 PACKAGE="xorg-server-dev"
-VERSION="1.12.4"
+VERSION="1.18.4"
 CATEGORY="development"
 SHORT_DESC="Xorg server devel files needed to build drivers."
 MAINTAINER="pankso@slitaz.org"
 LICENSE="MIT"
-WEB_SITE="http://www.x.org/"
+WEB_SITE="https://www.x.org/wiki"
 HOST_ARCH="i486 arm"
 
+WANTED="xorg-server"
 DEPENDS="xorg-libxkbfile-dev xorg-libpciaccess-dev xorg-libXxf86vm-dev \
 xorg-libXfont-dev libgcrypt-dev pixman-dev udev-dev mesa-dev pkg-config \
 perl flex xorg-server xorg-xf86driproto xorg-xcmiscproto xorg-bigreqsproto \
@@ -20,24 +21,13 @@
 
 # Use devel files from ARCH default Xserver
 case "$ARCH" in
-	i?86) 
-		WANTED="xorg-server" ;;
-	arm) 
-		WANTED="xorg-server-light" 
+	arm)
+		WANTED="xorg-server-light"
 		DEPENDS="" ;;
 esac
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr/lib $fs/usr/share
-
-	cp -a $install/usr/lib/pkgconfig $fs/usr/lib
-	cp -a $install/usr/lib/X11 $fs/usr/lib
-	cp -a $install/usr/share/aclocal $fs/usr/share
-	cp -a $install/usr/include $fs/usr
-
-	rm $fs/usr/lib/X11/*/*.so*
-	rm $fs/usr/lib/X11/*/*/*.*so*
+	cook_copy_files *.h *.la *.pc *.m4
 }
-
diff -r eb23a9b0f828 -r c5336999f370 xorg-server-modules-gl/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/xorg-server-modules-gl/receipt	Thu Mar 02 05:17:16 2017 +0200
@@ -0,0 +1,21 @@
+# SliTaz package receipt.
+
+PACKAGE="xorg-server-modules-gl"
+VERSION="1.18.4"
+CATEGORY="x-window"
+SHORT_DESC="Xorg server modules depends on mesa"
+MAINTAINER="al.bobylev@gmail.com"
+LICENSE="MIT"
+WEB_SITE="https://www.x.org/wiki"
+HOST_ARCH="i486 arm"
+
+WANTED="xorg-server"
+DEPENDS="expat libdrm libepoxy libxcb mesa xorg-libX11 xorg-libXau \
+xorg-libXdamage xorg-libXdmcp xorg-libXext xorg-libXfixes xorg-libxshmfence \
+xorg-libXxf86vm"
+
+# Rules to gen a SliTaz package suitable for Tazpkg.
+genpkg_rules()
+{
+	cook_copy_files libglamoregl.so libglx.so
+}
diff -r eb23a9b0f828 -r c5336999f370 xorg-server/receipt
--- a/xorg-server/receipt	Wed Mar 01 23:29:10 2017 +0200
+++ b/xorg-server/receipt	Thu Mar 02 05:17:16 2017 +0200
@@ -1,42 +1,50 @@
 # SliTaz package receipt.
 
 PACKAGE="xorg-server"
-VERSION="1.12.4"
+VERSION="1.18.4"
 CATEGORY="x-window"
 SHORT_DESC="Xorg core server."
 MAINTAINER="pankso@slitaz.org"
 LICENSE="MIT"
 SUGGESTED="xorg-xf86-input-evdev xorg-xf86-video-vesa"
+WEB_SITE="https://www.x.org/wiki/"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="http://www.x.org/"
-WGET_URL="http://xorg.freedesktop.org/releases/individual/xserver/$TARBALL"
+WGET_URL="$XORG_MIRROR/xserver/$TARBALL"
 
-# Mesa build dep make also Xorg depends on libdrm.
 DEPENDS="xorg-xkeyboard-config xorg-libpciaccess xorg-libXxf86vm \
 xorg-libXfont xorg-libXau xorg-base-fonts libgcrypt pixman udev libdrm \
 xorg-xf86-input-evdev"
-BUILD_DEPENDS="xorg-libxkbfile-dev xorg-libpciaccess-dev xorg-libXxf86vm-dev \
-xorg-libXfont-dev libgcrypt-dev pixman-dev udev-dev mesa-dev pkg-config perl \
-flex xorg-xf86driproto xorg-xcmiscproto xorg-bigreqsproto xorg-randrproto \
-xorg-dri2proto xorg-libXau-dev xorg-dev-proto libdrm-dev xorg-glproto \
-xorg-libXv-dev xorg-libXmu-dev xorg-libXrender-dev xorg-libXi-dev"
+BUILD_DEPENDS="patch xorg-util-macros  xorg-font-util-dev pixman-dev eudev-dev \
+dbus-dev xorg-dri2proto xorg-dri3proto xorg-libxshmfence-dev libdrm-dev \
+xorg-libX11-dev xorg-glproto mesa-dev libgcrypt-dev xorg-xcmiscproto \
+xorg-bigreqsproto xorg-randrproto xorg-renderproto xorg-fontsproto \
+xorg-videoproto xorg-compositeproto xorg-recordproto xorg-scrnsaverproto \
+xorg-resourceproto xorg-xf86driproto xorg-presentproto xorg-xineramaproto \
+xorg-libxkbfile-dev xorg-libXfont-dev xorg-libpciaccess-dev \
+xorg-libXxf86dga-dev libepoxy-dev xorg-libdmx-dev xorg-libXmu-dev \
+xorg-libXrender-dev xorg-libXi-dev tslib-dev xcb-util-renderutil-dev \
+xcb-util-dev xcb-util-image-dev xcb-util-wm-dev xcb-util-keysyms-dev \
+xorg-libXaw-dev xorg-libXpm-dev expat-dev"
+SPLIT="xorg-server-Xephyr xorg-server-Xfbdev xorg-server-Xnest \
+xorg-server-Xvfb xorg-server-modules-gl"
 
 # Rules to configure and make the package.
 compile_rules()
 {
-	cd $src
+	patch -Np1 -i $stuff/xorg-server-1.18.4-add_prime_support-1.patch
 
-	# Xephyr make possible to use Xorg in a chroot.
 	./configure \
-		--prefix=/usr \
 		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
 		--localstatedir=/var \
-		--with-module-dir=/usr/lib/X11/modules \
+		--disable-static \
+		--enable-glamor \
+		--enable-install-setuid \
+		--enable-suid-wrapper \
+		--disable-systemd-logind \
+		--disable-xwayland \
+		--disable-docs --disable-devel-docs \
 		--with-xkb-output=/var/lib/xkb \
-		--with-serverconfig-path=/etc/X11 \
-		--enable-install-setuid \
-		--enable-xorg \
 		--enable-kdrive \
 		--enable-kdrive-kbd \
 		--enable-kdrive-mouse \
@@ -44,33 +52,27 @@
 		--enable-xfbdev \
 		--enable-xephyr \
 		--enable-config-udev \
-		--disable-config-dbus \
-		--disable-docs \
-		--disable-devel-docs \
 		--with-fontrootdir=/usr/share/fonts/X11 \
+		--with-module-dir=/usr/lib/X11/modules \
+		--with-serverconfig-path=/etc/X11 \
 		--with-os-name="SliTaz GNU/Linux" \
 		--with-vendor-web="http://www.slitaz.org/" \
 		--with-builder-addr=$MAINTAINER \
 		$CONFIGURE_ARGS &&
 	make && make DESTDIR=$DESTDIR install
+
+	# is xorg.conf.d moved by Xorg developers to /usr/share/X11/?
+	mkdir -p $install/etc/X11/xorg.conf.d
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr/lib $fs/var $fs/etc/X11/xorg.conf.d
-	cp -a $install/usr/lib/X11 $fs/usr/lib
-	cp -a $install/usr/bin $fs/usr
-	cp -a $install/var/lib $fs/var
-	cp -a $install/etc $fs
-	# Remove static libs and split Xnest
-	rm $fs/usr/lib/X11/*/*.*a
-	rm $fs/usr/lib/X11/*/*/*.*a
-	rm $fs/usr/bin/Xnest
-	rm $fs/usr/bin/Xvfb
-	# Kdrive/tinyX --> xorg-server-Xephyr xorg-server-Xfbdev
-	rm $fs/usr/bin/Xephyr
-	rm $fs/usr/bin/Xfbdev
+	cook_copy_folders etc var bin libexec xorg.conf.d
+	cook_copy_files *.so
+	# split
+	rm $fs/usr/bin/Xephyr $fs/usr/bin/Xfbdev $fs/usr/bin/Xnest $fs/usr/bin/Xvfb
+	rm $fs/usr/lib/X11/modules/libglamoregl.so $fs/usr/lib/X11/modules/extensions/libglx.so
 }
 
 # We need /var/tmp rw to let xkbcomp builr XKB definition.
@@ -78,4 +80,3 @@
 {
 	chmod 1777 "$1/var/tmp"
 }
-
diff -r eb23a9b0f828 -r c5336999f370 xorg-server/stuff/xorg-server-1.18.4-add_prime_support-1.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/xorg-server/stuff/xorg-server-1.18.4-add_prime_support-1.patch	Thu Mar 02 05:17:16 2017 +0200
@@ -0,0 +1,97 @@
+Submitted By:            Armin K. <krejzi at email dot com>
+Date:                    2012-12-30
+Initial Package Version: 1.13.1
+Upstream Status:         Not submitted.
+Origin:                  Upstream mailing list.
+Comment:                 Rediffed for Package Version 1.17.2 by
+                         Fernando de Oliveira <famobr at yahoo dot com dot br>
+Description:             Adds PRIME support to Xorg Server to make GPU offloading work.
+
+diff -Naur xorg-server-1.17.2.orig/hw/xfree86/common/xf86Init.c xorg-server-1.17.2/hw/xfree86/common/xf86Init.c
+--- xorg-server-1.17.2.orig/hw/xfree86/common/xf86Init.c	2015-06-05 12:19:40.000000000 -0300
++++ xorg-server-1.17.2/hw/xfree86/common/xf86Init.c	2015-06-17 11:35:07.227581436 -0300
+@@ -340,6 +340,16 @@
+     return ret;
+ }
+ 
++extern void xf86AutoConfigOutputDevice(ScrnInfoPtr pScrn, ScrnInfoPtr master);                              
++static void
++xf86AutoConfigOutputDevices(void)
++{
++    int i;
++
++    for (i = 0; i < xf86NumGPUScreens; i++)
++        xf86AutoConfigOutputDevice(xf86GPUScreens[i], xf86Screens[0]);
++}
++
+ static void
+ InstallSignalHandlers(void)
+ {
+@@ -929,6 +939,8 @@
+     for (i = 0; i < xf86NumGPUScreens; i++)
+         AttachUnboundGPU(xf86Screens[0]->pScreen, xf86GPUScreens[i]->pScreen);
+ 
++    xf86AutoConfigOutputDevices();
++
+     xf86VGAarbiterWrapFunctions();
+     if (sigio_blocked)
+         OsReleaseSIGIO();
+diff -Naur xorg-server-1.17.2.orig/hw/xfree86/common/xf86platformBus.c xorg-server-1.17.2/hw/xfree86/common/xf86platformBus.c
+--- xorg-server-1.17.2.orig/hw/xfree86/common/xf86platformBus.c	2015-06-16 12:21:07.000000000 -0300
++++ xorg-server-1.17.2/hw/xfree86/common/xf86platformBus.c	2015-06-17 11:35:07.227581436 -0300
+@@ -469,6 +469,8 @@
+     return foundScreen;
+ }
+ 
++extern void xf86AutoConfigOutputDevice(ScrnInfoPtr pScrn, ScrnInfoPtr master);
++
+ int
+ xf86platformAddDevice(int index)
+ {
+@@ -537,6 +539,7 @@
+    }
+    /* attach unbound to 0 protocol screen */
+    AttachUnboundGPU(xf86Screens[0]->pScreen, xf86GPUScreens[i]->pScreen);
++   xf86AutoConfigOutputDevice(xf86GPUScreens[i], xf86Screens[0]);
+ 
+    RRResourcesChanged(xf86Screens[0]->pScreen);
+    RRTellChanged(xf86Screens[0]->pScreen);
+diff -Naur xorg-server-1.17.2.orig/hw/xfree86/modes/xf86Crtc.c xorg-server-1.17.2/hw/xfree86/modes/xf86Crtc.c
+--- xorg-server-1.17.2.orig/hw/xfree86/modes/xf86Crtc.c	2015-06-16 10:55:48.000000000 -0300
++++ xorg-server-1.17.2/hw/xfree86/modes/xf86Crtc.c	2015-06-17 11:35:07.230581367 -0300
+@@ -3387,3 +3387,35 @@
+             crtc->x = crtc->y = 0;
+         }
+ }
++
++
++void xf86AutoConfigOutputDevice(ScrnInfoPtr pScrn, ScrnInfoPtr master)
++{
++    RRProviderPtr master_provider;
++    xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(master);
++    xf86CrtcConfigPtr slave_config = XF86_CRTC_CONFIG_PTR(pScrn);
++    Bool unbound = FALSE;
++
++    if (!config || !slave_config)
++        return;
++
++    master_provider = config->randr_provider;
++
++    if ((master->capabilities & RR_Capability_SinkOffload) &&
++        pScrn->capabilities & RR_Capability_SourceOffload) {
++            /* source offload */
++            
++        DetachUnboundGPU(pScrn->pScreen);
++        unbound = TRUE;
++        AttachOffloadGPU(master->pScreen, pScrn->pScreen);
++        slave_config->randr_provider->offload_sink = master_provider;
++    }
++    if ((master->capabilities & RR_Capability_SourceOutput) &&
++               pScrn->capabilities & RR_Capability_SinkOutput) {
++        /* sink offload */
++        if (!unbound)
++            DetachUnboundGPU(pScrn->pScreen);
++        AttachOutputGPU(master->pScreen, pScrn->pScreen);
++        slave_config->randr_provider->output_source = master_provider;
++    }
++}
diff -r eb23a9b0f828 -r c5336999f370 xorg-xkeyboard-config-dev/receipt
--- a/xorg-xkeyboard-config-dev/receipt	Wed Mar 01 23:29:10 2017 +0200
+++ b/xorg-xkeyboard-config-dev/receipt	Thu Mar 02 05:17:16 2017 +0200
@@ -1,19 +1,19 @@
 # SliTaz package receipt.
 
 PACKAGE="xorg-xkeyboard-config-dev"
-VERSION="2.2.1"
+VERSION="2.18"
 CATEGORY="development"
-SHORT_DESC="Xorg server keyboard devel files."
+SHORT_DESC="Keyboard configuration database for the X Window System (development files)"
 MAINTAINER="pankso@slitaz.org"
 LICENSE="MIT"
-WEB_SITE="http://www.x.org/"
+WEB_SITE="https://www.x.org/wiki/"
+HOST_ARCH="i486 arm"
+
 WANTED="xorg-xkeyboard-config"
-HOST_ARCH="i486 arm"
+DEPENDS="xorg-xkeyboard-config"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr/share
-	cp -a $install/usr/share/pkgconfig $fs/usr/share
+	cook_copy_files *.pc
 }
-
diff -r eb23a9b0f828 -r c5336999f370 xorg-xkeyboard-config/receipt
--- a/xorg-xkeyboard-config/receipt	Wed Mar 01 23:29:10 2017 +0200
+++ b/xorg-xkeyboard-config/receipt	Thu Mar 02 05:17:16 2017 +0200
@@ -1,19 +1,18 @@
 # SliTaz package receipt.
 
 PACKAGE="xorg-xkeyboard-config"
-VERSION="2.2.1"
+VERSION="2.18"
 CATEGORY="x-window"
-SHORT_DESC="Xorg server keyboard definition files."
+SHORT_DESC="Keyboard configuration database for the X Window System"
 MAINTAINER="pankso@slitaz.org"
 LICENSE="MIT"
-SOURCE="xkeyboard-config"
-TARBALL="$SOURCE-$VERSION.tar.bz2"
-WEB_SITE="http://www.x.org/"
-WGET_URL="http://xorg.freedesktop.org/releases/individual/data/$SOURCE/$TARBALL"
+WEB_SITE="https://www.x.org/wiki/"
 HOST_ARCH="i486 arm"
 
-DEPENDS="xorg-xkbcomp"
-BUILD_DEPENDS="perl-xml-parser xorg-xkbcomp xorg-xproto xorg-libX11-dev intltool"
+TARBALL="xkeyboard-config-$VERSION.tar.bz2"
+WGET_URL="$XORG_MIRROR/data/xkeyboard-config/$TARBALL"
+
+BUILD_DEPENDS="libxslt xorg-xproto xorg-libX11-dev intltool"
 
 # Handle cross compilation. Use build host: xorg-xkbcomp perl-xml-parser
 case "$ARCH" in
@@ -35,7 +34,5 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr/share
-	cp -a $install/usr/share/X11 $fs/usr/share
+	cook_copy_folders X11
 }
-