SliTaz Repositories

     1.1 --- a/xorg-server-dev/receipt	Mon May 11 22:30:23 2009 +0200
     1.2 +++ b/xorg-server-dev/receipt	Mon May 11 22:32:44 2009 +0200
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="xorg-server-dev"
     1.7 -VERSION="1.2.0"
     1.8 +VERSION="1.5.2"
     1.9  CATEGORY="development"
    1.10  SHORT_DESC="Xorg server devel files needed to build drivers."
    1.11  MAINTAINER="pankso@slitaz.org"

     2.1 --- a/xorg-server/receipt	Mon May 11 22:30:23 2009 +0200
     2.2 +++ b/xorg-server/receipt	Mon May 11 22:32:44 2009 +0200
     2.3 @@ -1,37 +1,19 @@
     2.4  # SliTaz package receipt.
     2.5  
     2.6  PACKAGE="xorg-server"
     2.7 -VERSION="1.2.0"
     2.8 +VERSION="1.5.2"
     2.9  CATEGORY="x-window"
    2.10  SHORT_DESC="Xorg core server."
    2.11  MAINTAINER="pankso@slitaz.org"
    2.12 -DEPENDS="xorg xorg-libxkbfile xorg-xf86-input-mouse xorg-xf86-input-keyboard
    2.13 -    xorg-xf86-video-vesa xorg-xkeyboard-config xorg-xkbcomp freetype libSDL
    2.14 -    libiconv zlib"
    2.15 -BUILD_DEPENDS="xorg-dev-proto xorg-libXfont-dev xorg-xtrans xorg-libxkbfile-dev
    2.16 -    xorg-libfontenc-dev xorg-libxkbfile"
    2.17 +DEPENDS="xorg xorg-libxkbfile xorg-xf86-input-mouse xorg-xf86-input-keyboard \
    2.18 +xorg-xf86-video-vesa xorg-xkeyboard-config xorg-xkbcomp xorg-libpciaccess \
    2.19 +xorg-libXxf86vm openssl mesa"
    2.20 +BUILD_DEPENDS="xorg-dev-proto xorg-libXfont-dev xorg-xtrans xorg-libxkbfile-dev \
    2.21 +xorg-libfontenc-dev xorg-libpciaccess-dev xorg-libXxf86vm-dev openssl-dev \
    2.22 +dbus-dev hal-dev mesa-dev"
    2.23  TARBALL="$PACKAGE-$VERSION.tar.bz2"
    2.24  WEB_SITE="http://www.x.org/"
    2.25  WGET_URL="http://xorg.freedesktop.org/releases/individual/xserver/$TARBALL"
    2.26 -KDRIVE="
    2.27 -Xchips
    2.28 -Xvesa
    2.29 -Xephyr
    2.30 -Xi810
    2.31 -Xnvidia
    2.32 -Xepson
    2.33 -Xsmi
    2.34 -Xr128
    2.35 -Xvia
    2.36 -Xpm2
    2.37 -Xati
    2.38 -Xfake
    2.39 -Xneomagic
    2.40 -Xmach64
    2.41 -Xfbdev
    2.42 -Xmga
    2.43 -Xvfb
    2.44 -Xnest"
    2.45  
    2.46  # Rules to configure and make the package.
    2.47  compile_rules()
    2.48 @@ -47,12 +29,11 @@
    2.49  		--with-serverconfig-path=/etc/X11 \
    2.50  		--with-fontdir=/usr/share/fonts/X11 \
    2.51  		--enable-install-setuid \
    2.52 -		--enable-kdrive \
    2.53 -		--enable-kdrive-vesa \
    2.54 +		--enable-xorg \
    2.55 +		--enable-config-hal \
    2.56 +		--enable-config-dbus \
    2.57  		--with-os-name="SliTaz GNU/Linux" \
    2.58  		--with-builder-addr=$MAINTAINER \
    2.59 -		--disable-dri \
    2.60 -		--disable-xorgcfg \
    2.61  		$CONFIGURE_ARGS &&
    2.62  	make &&
    2.63  	make DESTDIR=$PWD/_pkg install
    2.64 @@ -61,37 +42,20 @@
    2.65  # Rules to gen a SliTaz package suitable for Tazpkg.
    2.66  genpkg_rules()
    2.67  {
    2.68 -	mkdir -p $fs/usr/lib $fs/var $fs/etc/X11
    2.69 -	
    2.70 +	mkdir -p $fs/usr/lib $fs/var
    2.71  	cp -a $_pkg/usr/lib/X11 $fs/usr/lib
    2.72 -	cp -a $_pkg/usr/lib/xserver $fs/usr/lib
    2.73  	cp -a $_pkg/usr/bin $fs/usr
    2.74  	cp -a $_pkg/var/lib $fs/var
    2.75 -	
    2.76 -	# Remove static libs and all krive
    2.77 +	cp -a $_pkg/etc $fs
    2.78 +	# Remove static libs and split Xnest
    2.79  	rm $fs/usr/lib/X11/*/*.*a
    2.80  	rm $fs/usr/lib/X11/*/*/*.*a
    2.81 -	for i in $KDRIVE
    2.82 -	do
    2.83 -		rm $fs/usr/bin/$i
    2.84 -	done
    2.85 +	rm $fs/usr/bin/Xnest
    2.86 +	rm $fs/usr/bin/Xvfb
    2.87  }
    2.88  
    2.89  # We need /var/tmp rw to let xkbcomp builr XKB definition.
    2.90  post_install()
    2.91  {
    2.92 -	local root
    2.93 -	root=$1
    2.94 -	chmod 1777 $root/var/tmp
    2.95 -	# Reinstall libX11 if needed...
    2.96 -	if [ ! -f $1/usr/share/X11/XKeysymDB ]; then
    2.97 -		echo "Missing file: /usr/share/X11/XKeysymDB"
    2.98 -		tazpkg get-install xorg-libX11 --forced --root=$1/
    2.99 -	fi
   2.100 +	chmod 1777 $1/var/tmp
   2.101  }
   2.102 -
   2.103 -# Kdrive Xvesa don't like /var/lib/xkb
   2.104 -post_remove()
   2.105 -{
   2.106 -	rm -rf /var/lib/xkb
   2.107 -}