# HG changeset patch # User Christophe Lincoln # Date 1199400566 -3600 # Node ID cbb407df42346e4427c8e8934e956d16ca658d95 # Parent fe64923e0658f3c2543e7c119cb2db1a8074df2f Modified Xorg server and libs to build without xcb diff -r fe64923e0658 -r cbb407df4234 xorg-dev-proto/receipt --- a/xorg-dev-proto/receipt Thu Jan 03 23:48:10 2008 +0100 +++ b/xorg-dev-proto/receipt Thu Jan 03 23:49:26 2008 +0100 @@ -7,7 +7,6 @@ MAINTAINER="pankso@slitaz.org" WEB_SITE="http://www.x.org/" DEPENDS=" -xcb-proto xorg-bigreqsproto xorg-compositeproto xorg-damageproto diff -r fe64923e0658 -r cbb407df4234 xorg-dev/receipt --- a/xorg-dev/receipt Thu Jan 03 23:48:10 2008 +0100 +++ b/xorg-dev/receipt Thu Jan 03 23:49:26 2008 +0100 @@ -8,8 +8,6 @@ WANTED="xorg" WEB_SITE="http://www.x.org/" BUILD=" -libpthread-stubs -libxcb-dev xorg-libfontenc-dev xorg-libICE-dev xorg-libSM-dev diff -r fe64923e0658 -r cbb407df4234 xorg-inputproto/receipt --- a/xorg-inputproto/receipt Thu Jan 03 23:48:10 2008 +0100 +++ b/xorg-inputproto/receipt Thu Jan 03 23:49:26 2008 +0100 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="xorg-inputproto" -VERSION="1.4.2.1" +VERSION="1.3.2" CATEGORY="x-window" SHORT_DESC="Xorg server module." MAINTAINER="pankso@slitaz.org" diff -r fe64923e0658 -r cbb407df4234 xorg-libX11-dev/receipt --- a/xorg-libX11-dev/receipt Thu Jan 03 23:48:10 2008 +0100 +++ b/xorg-libX11-dev/receipt Thu Jan 03 23:49:26 2008 +0100 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="xorg-libX11-dev" -VERSION="1.1.3" +VERSION="1.1.1" CATEGORY="x-window" SHORT_DESC="Xorg module devel files." MAINTAINER="pankso@slitaz.org" diff -r fe64923e0658 -r cbb407df4234 xorg-libX11/receipt --- a/xorg-libX11/receipt Thu Jan 03 23:48:10 2008 +0100 +++ b/xorg-libX11/receipt Thu Jan 03 23:49:26 2008 +0100 @@ -1,12 +1,12 @@ # SliTaz package receipt. PACKAGE="xorg-libX11" -VERSION="1.1.3" +VERSION="1.1.1" CATEGORY="x-window" SHORT_DESC="X11 main client interface to X window system." MAINTAINER="pankso@slitaz.org" DEPENDS="xorg" -BUILD_DEPENDS="xorg-proto libxcb-dev xorg-pixman-dev" +BUILD_DEPENDS="xorg-proto" SOURCE="libX11" TARBALL="$SOURCE-$VERSION.tar.gz" WEB_SITE="http://www.x.org/" @@ -18,7 +18,7 @@ cd $src ./configure --prefix=/usr --sysconfdir=/etc \ --mandir=/usr/share/man --localstatedir=/var \ - $CONFIGURE_ARGS + --without-xcb $CONFIGURE_ARGS make make DESTDIR=$PWD/_pkg install } diff -r fe64923e0658 -r cbb407df4234 xorg-libXrender-dev/receipt --- a/xorg-libXrender-dev/receipt Thu Jan 03 23:48:10 2008 +0100 +++ b/xorg-libXrender-dev/receipt Thu Jan 03 23:49:26 2008 +0100 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="xorg-libXrender-dev" -VERSION="0.9.4" +VERSION="0.9.2" CATEGORY="x-window" SHORT_DESC="Xorg module devel files." MAINTAINER="pankso@slitaz.org" diff -r fe64923e0658 -r cbb407df4234 xorg-libXrender/receipt --- a/xorg-libXrender/receipt Thu Jan 03 23:48:10 2008 +0100 +++ b/xorg-libXrender/receipt Thu Jan 03 23:49:26 2008 +0100 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="xorg-libXrender" -VERSION="0.9.4" +VERSION="0.9.2" CATEGORY="x-window" SHORT_DESC="Xorg server module." MAINTAINER="pankso@slitaz.org" diff -r fe64923e0658 -r cbb407df4234 xorg-server-Xephyr/receipt --- a/xorg-server-Xephyr/receipt Thu Jan 03 23:48:10 2008 +0100 +++ b/xorg-server-Xephyr/receipt Thu Jan 03 23:49:26 2008 +0100 @@ -3,9 +3,9 @@ PACKAGE="xorg-server-Xephyr" VERSION="1.2.0" CATEGORY="devel" -SHORT_DESC="Xorg server devel files needed to build drivers." +SHORT_DESC="Xephyr server used to creat chrooted X env." MAINTAINER="pankso@slitaz.org" -DEPENDS="freetype xorg-libXau xorg-libfontenc xorg-libXdmcp xorg-libXfont xorg-libXext xorg-libX11 libxcb" +DEPENDS="freetype xorg-libXau xorg-libfontenc xorg-libXdmcp xorg-libXfont xorg-libXext xorg-libX11" WANTED="xorg-server" WEB_SITE="http://www.x.org/" diff -r fe64923e0658 -r cbb407df4234 xorg-server/receipt --- a/xorg-server/receipt Thu Jan 03 23:48:10 2008 +0100 +++ b/xorg-server/receipt Thu Jan 03 23:49:26 2008 +0100 @@ -6,7 +6,7 @@ SHORT_DESC="Xorg server." MAINTAINER="pankso@slitaz.org" DEPENDS="xorg xorg-server-policy" -BUILD_DEPENDS="xorg-dev-proto libxcb-dev xorg-libXfont-dev" +BUILD_DEPENDS="xorg-dev-proto xorg-libXfont-dev" TARBALL="$PACKAGE-$VERSION.tar.bz2" WEB_SITE="http://www.x.org/" WGET_URL="http://xorg.freedesktop.org/releases/individual/xserver/$TARBALL" @@ -33,20 +33,21 @@ ./configure \ --prefix=/usr \ --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --localstatedir=/var \ - --with-module-dir=/usr/lib/X11/modules \ - --with-xkb-output=/var/lib/xkb \ - --with-serverconfig-path=/etc/X11 \ - --with-fontdir=/usr/share/fonts/X11 \ - --enable-install-setuid \ - --enable-kdrive \ - --enable-kdrive-vesa \ - --with-os-name="SliTaz GNU/Linux" \ - --with-builder-addr=$MAINTAINER \ - --disable-dri \ - --disable-xf86bigfont \ - $CONFIGURE_ARGS + --mandir=/usr/share/man \ + --localstatedir=/var \ + --with-module-dir=/usr/lib/X11/modules \ + --with-xkb-output=/var/lib/xkb \ + --with-serverconfig-path=/etc/X11 \ + --with-fontdir=/usr/share/fonts/X11 \ + --enable-install-setuid \ + --enable-kdrive \ + --enable-kdrive-vesa \ + --with-os-name="SliTaz GNU/Linux" \ + --with-builder-addr=$MAINTAINER \ + --disable-dri \ + --disable-xf86bigfont \ + --disable-xorgcfg \ + $CONFIGURE_ARGS make make DESTDIR=$PWD/_pkg install } @@ -60,7 +61,9 @@ cp -a $_pkg/usr/bin $fs/usr cp -a $_pkg/var/lib $fs/var - cp -a $_pkg/usr/share/X11 $fs/usr/share + + # For xorgcfg + #cp -a $_pkg/usr/share/X11 $fs/usr/share # Remove static libs and all krive rm $fs/usr/lib/X11/*/*.*a diff -r fe64923e0658 -r cbb407df4234 xorg/receipt --- a/xorg/receipt Thu Jan 03 23:48:10 2008 +0100 +++ b/xorg/receipt Thu Jan 03 23:49:26 2008 +0100 @@ -7,7 +7,6 @@ MAINTAINER="pankso@slitaz.org" WEB_SITE="http://www.x.org/" DEPENDS=" -libxcb xorg-libfontenc xorg-libICE xorg-libSM