SliTaz Repositories

     1.1 --- a/xorg-server/receipt	Wed Mar 11 10:52:53 2009 +0000
     1.2 +++ b/xorg-server/receipt	Mon May 11 22:32:44 2009 +0200
     1.3 @@ -1,37 +1,19 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="xorg-server"
     1.7 -VERSION="1.2.0"
     1.8 +VERSION="1.5.2"
     1.9  CATEGORY="x-window"
    1.10  SHORT_DESC="Xorg core server."
    1.11  MAINTAINER="pankso@slitaz.org"
    1.12 -DEPENDS="xorg xorg-libxkbfile xorg-xf86-input-mouse xorg-xf86-input-keyboard
    1.13 -    xorg-xf86-video-vesa xorg-xkeyboard-config xorg-xkbcomp freetype libSDL
    1.14 -    libiconv zlib"
    1.15 -BUILD_DEPENDS="xorg-dev-proto xorg-libXfont-dev xorg-xtrans xorg-libxkbfile-dev
    1.16 -    xorg-libfontenc-dev xorg-libxkbfile"
    1.17 +DEPENDS="xorg xorg-libxkbfile xorg-xf86-input-mouse xorg-xf86-input-keyboard \
    1.18 +xorg-xf86-video-vesa xorg-xkeyboard-config xorg-xkbcomp xorg-libpciaccess \
    1.19 +xorg-libXxf86vm openssl mesa"
    1.20 +BUILD_DEPENDS="xorg-dev-proto xorg-libXfont-dev xorg-xtrans xorg-libxkbfile-dev \
    1.21 +xorg-libfontenc-dev xorg-libpciaccess-dev xorg-libXxf86vm-dev openssl-dev \
    1.22 +dbus-dev hal-dev mesa-dev"
    1.23  TARBALL="$PACKAGE-$VERSION.tar.bz2"
    1.24  WEB_SITE="http://www.x.org/"
    1.25  WGET_URL="http://xorg.freedesktop.org/releases/individual/xserver/$TARBALL"
    1.26 -KDRIVE="
    1.27 -Xchips
    1.28 -Xvesa
    1.29 -Xephyr
    1.30 -Xi810
    1.31 -Xnvidia
    1.32 -Xepson
    1.33 -Xsmi
    1.34 -Xr128
    1.35 -Xvia
    1.36 -Xpm2
    1.37 -Xati
    1.38 -Xfake
    1.39 -Xneomagic
    1.40 -Xmach64
    1.41 -Xfbdev
    1.42 -Xmga
    1.43 -Xvfb
    1.44 -Xnest"
    1.45  
    1.46  # Rules to configure and make the package.
    1.47  compile_rules()
    1.48 @@ -47,12 +29,11 @@
    1.49  		--with-serverconfig-path=/etc/X11 \
    1.50  		--with-fontdir=/usr/share/fonts/X11 \
    1.51  		--enable-install-setuid \
    1.52 -		--enable-kdrive \
    1.53 -		--enable-kdrive-vesa \
    1.54 +		--enable-xorg \
    1.55 +		--enable-config-hal \
    1.56 +		--enable-config-dbus \
    1.57  		--with-os-name="SliTaz GNU/Linux" \
    1.58  		--with-builder-addr=$MAINTAINER \
    1.59 -		--disable-dri \
    1.60 -		--disable-xorgcfg \
    1.61  		$CONFIGURE_ARGS &&
    1.62  	make &&
    1.63  	make DESTDIR=$PWD/_pkg install
    1.64 @@ -61,37 +42,20 @@
    1.65  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.66  genpkg_rules()
    1.67  {
    1.68 -	mkdir -p $fs/usr/lib $fs/var $fs/etc/X11
    1.69 -	
    1.70 +	mkdir -p $fs/usr/lib $fs/var
    1.71  	cp -a $_pkg/usr/lib/X11 $fs/usr/lib
    1.72 -	cp -a $_pkg/usr/lib/xserver $fs/usr/lib
    1.73  	cp -a $_pkg/usr/bin $fs/usr
    1.74  	cp -a $_pkg/var/lib $fs/var
    1.75 -	
    1.76 -	# Remove static libs and all krive
    1.77 +	cp -a $_pkg/etc $fs
    1.78 +	# Remove static libs and split Xnest
    1.79  	rm $fs/usr/lib/X11/*/*.*a
    1.80  	rm $fs/usr/lib/X11/*/*/*.*a
    1.81 -	for i in $KDRIVE
    1.82 -	do
    1.83 -		rm $fs/usr/bin/$i
    1.84 -	done
    1.85 +	rm $fs/usr/bin/Xnest
    1.86 +	rm $fs/usr/bin/Xvfb
    1.87  }
    1.88  
    1.89  # We need /var/tmp rw to let xkbcomp builr XKB definition.
    1.90  post_install()
    1.91  {
    1.92 -	local root
    1.93 -	root=$1
    1.94 -	chmod 1777 $root/var/tmp
    1.95 -	# Reinstall libX11 if needed...
    1.96 -	if [ ! -f $1/usr/share/X11/XKeysymDB ]; then
    1.97 -		echo "Missing file: /usr/share/X11/XKeysymDB"
    1.98 -		tazpkg get-install xorg-libX11 --forced --root=$1/
    1.99 -	fi
   1.100 +	chmod 1777 $1/var/tmp
   1.101  }
   1.102 -
   1.103 -# Kdrive Xvesa don't like /var/lib/xkb
   1.104 -post_remove()
   1.105 -{
   1.106 -	rm -rf /var/lib/xkb
   1.107 -}