wok rev 3015

Up: Xvesa and others and add xorg-server-tinyX (use server 1.5.3)
author Christophe Lincoln <pankso@slitaz.org>
date Mon May 11 22:34:28 2009 +0200 (2009-05-11)
parents 5219b9de8e9f
children 086916aa96e8
files xorg-server-Xephyr/receipt xorg-server-Xnest/receipt xorg-server-Xvesa/receipt xorg-server-tinyX/receipt
line diff
     1.1 --- a/xorg-server-Xephyr/receipt	Mon May 11 22:32:44 2009 +0200
     1.2 +++ b/xorg-server-Xephyr/receipt	Mon May 11 22:34:28 2009 +0200
     1.3 @@ -1,20 +1,21 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="xorg-server-Xephyr"
     1.7 -VERSION="1.2.0"
     1.8 +VERSION="1.5.2"
     1.9  CATEGORY="x-window"
    1.10  SHORT_DESC="Xephyr server used to creat chrooted X env."
    1.11  MAINTAINER="pankso@slitaz.org"
    1.12  DEPENDS="freetype xorg-libXau xorg-libfontenc xorg-libXdmcp xorg-libXfont \
    1.13  xorg-libXext xorg-libX11 zlib"
    1.14 -WANTED="xorg-server"
    1.15 +WANTED="xorg-server-tinyX"
    1.16 +SOURCE="xorg-server"
    1.17  WEB_SITE="http://www.x.org/"
    1.18  
    1.19  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.20  genpkg_rules()
    1.21  {
    1.22 +	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
    1.23  	mkdir -p $fs/usr/bin
    1.24  	cp -a $_pkg/usr/bin/Xephyr $fs/usr/bin
    1.25 -	strip $fs/usr/bin/Xephyr
    1.26  	chmod 4711 $fs/usr/bin/Xephyr
    1.27  }
     2.1 --- a/xorg-server-Xnest/receipt	Mon May 11 22:32:44 2009 +0200
     2.2 +++ b/xorg-server-Xnest/receipt	Mon May 11 22:34:28 2009 +0200
     2.3 @@ -1,18 +1,20 @@
     2.4  # SliTaz package receipt.
     2.5  
     2.6  PACKAGE="xorg-server-Xnest"
     2.7 -VERSION="1.2.0"
     2.8 +VERSION="1.5.2"
     2.9  CATEGORY="x-window"
    2.10  SHORT_DESC="Xorg Xnest server."
    2.11  MAINTAINER="pankso@slitaz.org"
    2.12  DEPENDS="xorg-libXau xorg-libfontenc xorg-libXdmcp xorg-libXfont \
    2.13  xorg-base-fonts freetype xorg-libX11 xorg-libXext zlib"
    2.14 -WANTED="xorg-server"
    2.15 +WANTED="xorg-server-tinyX"
    2.16 +SOURCE="xorg-server"
    2.17  WEB_SITE="http://www.x.org/"
    2.18  
    2.19  # Rules to gen a SliTaz package suitable for Tazpkg.
    2.20  genpkg_rules()
    2.21  {
    2.22 +	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
    2.23  	mkdir -p $fs/usr/bin
    2.24  	cp -a $_pkg/usr/bin/Xnest $fs/usr/bin
    2.25  	chmod 4711 $fs/usr/bin/Xnest
     3.1 --- a/xorg-server-Xvesa/receipt	Mon May 11 22:32:44 2009 +0200
     3.2 +++ b/xorg-server-Xvesa/receipt	Mon May 11 22:34:28 2009 +0200
     3.3 @@ -1,20 +1,35 @@
     3.4  # SliTaz package receipt.
     3.5  
     3.6  PACKAGE="xorg-server-Xvesa"
     3.7 -VERSION="1.2.0"
     3.8 +VERSION="1.5.2"
     3.9  CATEGORY="x-window"
    3.10  SHORT_DESC="Xorg kdrive server Xvesa (tinyX)."
    3.11  MAINTAINER="pankso@slitaz.org"
    3.12  DEPENDS="xorg-libXau xorg-libfontenc xorg-libXdmcp xorg-libXfont \
    3.13 -xorg-base-fonts freetype zlib"
    3.14 -WANTED="xorg-server"
    3.15 +xorg-base-fonts freetype zlib hal dbus"
    3.16 +SUGGESTED="xorg-xrandr"
    3.17 +WANTED="xorg-server-tinyX"
    3.18 +SOURCE="xorg-server"
    3.19  WEB_SITE="http://www.x.org/"
    3.20  
    3.21  # Rules to gen a SliTaz package suitable for Tazpkg.
    3.22  genpkg_rules()
    3.23  {
    3.24 -	mkdir -p $fs/usr/bin
    3.25 +	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
    3.26 +	mkdir -p $fs/usr/bin $fs/etc/X11
    3.27  	cp -a $_pkg/usr/bin/Xvesa $fs/usr/bin
    3.28 -	strip $fs/usr/bin/Xvesa
    3.29  	chmod 4711 $fs/usr/bin/Xvesa
    3.30  }
    3.31 +
    3.32 +post_install()
    3.33 +{
    3.34 +	# Upgrade from 1.2.0 to 1.5.3
    3.35 +	if ! grep -q "\-keybd keyboard" $1/etc/slim.conf; then
    3.36 +		echo -n "Updating Slim configuration..."
    3.37 +		res=$(grep ^xserver_arguments $1/etc/slim.conf | \
    3.38 +			sed 's/xserver_arguments.*-screen *//' | awk '{ print $1 }')
    3.39 +		sed -i s/"-screen $res"/"-screen $res -keybd keyboard -mouse mouse,5,\/dev\/input\/mice -nolisten tcp"/ \
    3.40 +			$1/etc/slim.conf
    3.41 +		status
    3.42 +	fi
    3.43 +}
     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/xorg-server-tinyX/receipt	Mon May 11 22:34:28 2009 +0200
     4.3 @@ -0,0 +1,65 @@
     4.4 +# SliTaz package receipt.
     4.5 +
     4.6 +PACKAGE="xorg-server-tinyX"
     4.7 +VERSION="1.5.2"
     4.8 +CATEGORY="meta"
     4.9 +SHORT_DESC="Xorg tinyX servers meta package."
    4.10 +MAINTAINER="pankso@slitaz.org"
    4.11 +DEPENDS="xorg-libX11 xorg-server-Xvesa"
    4.12 +BUILD_DEPENDS="xorg-dev-proto xorg-libXfont-dev xorg-xtrans xorg-libxkbfile-dev \
    4.13 +xorg-libfontenc-dev xorg-libxkbfile"
    4.14 +SOURCE="xorg-server"
    4.15 +TARBALL="$SOURCE-$VERSION.tar.bz2"
    4.16 +WEB_SITE="http://www.x.org/"
    4.17 +WGET_URL="http://xorg.freedesktop.org/releases/individual/xserver/$TARBALL"
    4.18 +KDRIVE="
    4.19 +Xchips
    4.20 +Xvesa
    4.21 +Xephyr
    4.22 +Xi810
    4.23 +Xnvidia
    4.24 +Xepson
    4.25 +Xsmi
    4.26 +Xr128
    4.27 +Xvia
    4.28 +Xpm2
    4.29 +Xati
    4.30 +Xfake
    4.31 +Xneomagic
    4.32 +Xmach64
    4.33 +Xfbdev
    4.34 +Xmga
    4.35 +Xvfb
    4.36 +Xnest"
    4.37 +
    4.38 +# Rules to configure and make the package.
    4.39 +compile_rules()
    4.40 +{
    4.41 +	cd $src
    4.42 +	./configure \
    4.43 +		--prefix=/usr \
    4.44 +		--sysconfdir=/etc \
    4.45 +		--mandir=/usr/share/man \
    4.46 +		--localstatedir=/var \
    4.47 +		--with-module-dir=/usr/lib/X11/modules \
    4.48 +		--with-xkb-output=/var/lib/xkb \
    4.49 +		--with-serverconfig-path=/etc/X11 \
    4.50 +		--with-fontdir=/usr/share/fonts/X11 \
    4.51 +		--enable-install-setuid \
    4.52 +		--disable-xorg \
    4.53 +		--enable-kdrive \
    4.54 +		--enable-kdrive-vesa \
    4.55 +		--with-os-name="SliTaz GNU/Linux" \
    4.56 +		--with-builder-addr=$MAINTAINER \
    4.57 +		--disable-dri \
    4.58 +		--disable-xorgcfg \
    4.59 +		$CONFIGURE_ARGS &&
    4.60 +	make &&
    4.61 +	make DESTDIR=$PWD/_pkg install
    4.62 +}
    4.63 +
    4.64 +# Rules to gen a SliTaz package suitable for Tazpkg.
    4.65 +genpkg_rules()
    4.66 +{
    4.67 +	mkdir -p $fs/usr
    4.68 +}