# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1335306310 -7200
# Node ID bcfbf12f8a328f8b44a86035985dfd9405187e69
# Parent  fae364445e650dde96b863b9399a1c0cb57b7142
Up: Xorg server (1.12.1)

diff -r fae364445e65 -r bcfbf12f8a32 xorg-server-Xfbdev/receipt
--- a/xorg-server-Xfbdev/receipt	Wed Apr 25 00:15:23 2012 +0200
+++ b/xorg-server-Xfbdev/receipt	Wed Apr 25 00:25:10 2012 +0200
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="xorg-server-Xfbdev"
-VERSION="1.9.5"
+VERSION="1.12.1"
 CATEGORY="x-window"
 SHORT_DESC="Xfbdev framebuffer Xorg server."
 MAINTAINER="pankso@slitaz.org"
@@ -14,7 +14,7 @@
 genpkg_rules()
 {
 	mkdir -p $fs/usr/bin
-	cp -a $_pkg/usr/bin/Xfbdev $fs/usr/bin
+	cp -a $install/usr/bin/Xfbdev $fs/usr/bin
 	chmod 4711 $fs/usr/bin/Xfbdev
 }
 
diff -r fae364445e65 -r bcfbf12f8a32 xorg-server-Xnest/receipt
--- a/xorg-server-Xnest/receipt	Wed Apr 25 00:15:23 2012 +0200
+++ b/xorg-server-Xnest/receipt	Wed Apr 25 00:25:10 2012 +0200
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="xorg-server-Xnest"
-VERSION="1.9.5"
+VERSION="1.12.1"
 CATEGORY="x-window"
 SHORT_DESC="Xorg Xnest server."
 MAINTAINER="pankso@slitaz.org"
@@ -15,7 +15,7 @@
 genpkg_rules()
 {
 	mkdir -p $fs/usr/bin
-	cp -a $_pkg/usr/bin/Xnest $fs/usr/bin
+	cp -a $install/usr/bin/Xnest $fs/usr/bin
 	chmod 4711 $fs/usr/bin/Xnest
 }
 
diff -r fae364445e65 -r bcfbf12f8a32 xorg-server-Xvfb/receipt
--- a/xorg-server-Xvfb/receipt	Wed Apr 25 00:15:23 2012 +0200
+++ b/xorg-server-Xvfb/receipt	Wed Apr 25 00:25:10 2012 +0200
@@ -14,7 +14,7 @@
 genpkg_rules()
 {
 	mkdir -p $fs/usr/bin
-	cp -a $_pkg/usr/bin/Xvfb $fs/usr/bin
+	cp -a $install/usr/bin/Xvfb $fs/usr/bin
 	chmod 4711 $fs/usr/bin/Xvfb
 }
 
diff -r fae364445e65 -r bcfbf12f8a32 xorg-server-dev/receipt
--- a/xorg-server-dev/receipt	Wed Apr 25 00:15:23 2012 +0200
+++ b/xorg-server-dev/receipt	Wed Apr 25 00:25:10 2012 +0200
@@ -1,29 +1,32 @@
 # SliTaz package receipt.
 
 PACKAGE="xorg-server-dev"
-VERSION="1.9.5"
+VERSION="1.12.1"
 CATEGORY="development"
 SHORT_DESC="Xorg server devel files needed to build drivers."
 MAINTAINER="pankso@slitaz.org"
-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 xorg-dri2proto xorg-xextproto xorg-xproto xorg-fontsproto xorg-inputproto xorg-kbproto xorg-randrproto xorg-renderproto xorg-videoproto \
-xorg-compositeproto xorg-recordproto xorg-scrnsaverproto xorg-xf86dgaproto xorg-fontcacheproto xorg-printproto \
-xorg-resourceproto xorg-xineramaproto xorg-xf86bigfontproto xorg-xf86miscproto xorg-trapproto"
 WANTED="xorg-server"
 WEB_SITE="http://www.x.org/"
 
+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 \
+xorg-dri2proto xorg-xextproto xorg-xproto xorg-fontsproto xorg-inputproto \
+xorg-kbproto xorg-randrproto xorg-renderproto xorg-videoproto \
+xorg-compositeproto xorg-recordproto xorg-scrnsaverproto xorg-xf86dgaproto \
+xorg-fontcacheproto xorg-printproto xorg-resourceproto xorg-xineramaproto \
+xorg-xf86bigfontproto xorg-xf86miscproto xorg-trapproto"
+
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
 	mkdir -p $fs/usr/lib $fs/usr/share
-	
-	cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib
-	cp -a $_pkg/usr/lib/X11 $fs/usr/lib
-	cp -a $_pkg/usr/share/aclocal $fs/usr/share
-	cp -a $_pkg/usr/include $fs/usr
-	
+
+	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*
 }
diff -r fae364445e65 -r bcfbf12f8a32 xorg-server/receipt
--- a/xorg-server/receipt	Wed Apr 25 00:15:23 2012 +0200
+++ b/xorg-server/receipt	Wed Apr 25 00:25:10 2012 +0200
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="xorg-server"
-VERSION="1.9.5"
+VERSION="1.12.1"
 CATEGORY="x-window"
 SHORT_DESC="Xorg core server."
 MAINTAINER="pankso@slitaz.org"
@@ -17,13 +17,14 @@
 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-dri2proto xorg-libXau-dev xorg-dev-proto libdrm-dev xorg-glproto \
+xorg-libXv-dev"
 
 # Rules to configure and make the package.
 compile_rules()
 {
 	cd $src
-	# Xephyr make possible to use Xorg in a chroot: --enable-xephyr
+	# Xephyr make possible to use Xorg in a chroot.
 	./configure \
 		--prefix=/usr \
 		--sysconfdir=/etc \
@@ -39,6 +40,7 @@
 		--enable-kdrive-mouse \
 		--enable-kdrive-evdev \
 		--enable-xfbdev \
+		--enable-xephyr \
 		--enable-config-udev \
 		--disable-config-dbus \
 		--with-fontrootdir=/usr/share/fonts \
@@ -52,10 +54,10 @@
 genpkg_rules()
 {
 	mkdir -p $fs/usr/lib $fs/var $fs/etc/X11/xorg.conf.d
-	cp -a $_pkg/usr/lib/X11 $fs/usr/lib
-	cp -a $_pkg/usr/bin $fs/usr
-	cp -a $_pkg/var/lib $fs/var
-	cp -a $_pkg/etc $fs
+	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