SliTaz Repositories

     1.1 --- a/xorg-server-light/receipt	Wed Mar 12 01:33:20 2014 +0100
     1.2 +++ b/xorg-server-light/receipt	Wed Mar 12 20:54:03 2014 +0100
     1.3 @@ -1,44 +1,47 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="xorg-server-light"
     1.7 -VERSION="1.12.4"
     1.8 +VERSION="1.12.1"
     1.9  CATEGORY="x-window"
    1.10  SHORT_DESC="Xorg core server light version (no dri, gl, and friends)."
    1.11  MAINTAINER="pankso@slitaz.org"
    1.12  LICENSE="MIT"
    1.13 -SUGGESTED="xorg-xf86-video-vesa"
    1.14  SOURCE="xorg-server"
    1.15  TARBALL="$SOURCE-$VERSION.tar.bz2"
    1.16  WEB_SITE="http://www.x.org/"
    1.17  WGET_URL="http://xorg.freedesktop.org/releases/individual/xserver/$TARBALL"
    1.18  PROVIDE="xorg-server"
    1.19 -#HOST_ARCH="i486 arm"
    1.20 +HOST_ARCH="i486 arm"
    1.21  
    1.22 +SUGGESTED="xorg-xf86-video-vesa xorg-xf86-video-fbdev"
    1.23  DEPENDS="xorg-xkeyboard-config xorg-libpciaccess xorg-libXxf86vm \
    1.24 -xorg-libXfont xorg-libXau xorg-base-fonts libgcrypt pixman udev \
    1.25 -xorg-xf86-input-evdev libgpg-error libgcrypt freetype libxcb bzip2"
    1.26 -BUILD_DEPENDS="xorg-libxkbfile-dev xorg-libpciaccess-dev xorg-libXxf86vm-dev \
    1.27 -xorg-libXfont-dev libgpg-error-dev libgcrypt-dev pixman-dev udev-dev perl \
    1.28 -flex xorg-dev-proto freetype-dev libxcb-dev bzip2-dev"
    1.29 -
    1.30 -# Handle cross compilation: ARM can't find -lmd
    1.31 -case "$ARCH" in
    1.32 -	arm)
    1.33 -		BUILD_DEPENDS="xorg-libxkbfile-dev xorg-libpciaccess-dev pixman-dev \
    1.34 +xorg-libXfont xorg-libXau xorg-base-fonts libgcrypt pixman \
    1.35 +xorg-xf86-input-evdev libgpg-error libgcrypt freetype libxcb \
    1.36 +xorg-libXcomposite bzip2"
    1.37 +BUILD_DEPENDS="xorg-libxkbfile-dev xorg-libpciaccess-dev pixman-dev \
    1.38  xorg-util-macros xorg-libXfont-dev libgcrypt-dev xorg-resourceproto \
    1.39  xorg-bigreqsproto xorg-xcmiscproto xorg-renderproto xorg-damageproto \
    1.40  xorg-compositeproto xorg-xf86dgaproto  xorg-randrproto xorg-recordproto \
    1.41  xorg-videoproto xorg-xtrans libgpg-error-dev libgcrypt-dev freetype-dev \
    1.42 -libxcb-dev bzip2-dev" 
    1.43 -		ARCH_ARGS="--disable-config-udev --disable-xf86vidmode"
    1.44 -		export ARM_LIBS="/cross/$arch/sysroot/usr/lib" 
    1.45 -		export LIBTOOL=${HOST_SYSTEM}-libtool 
    1.46 -		export XSERVERCFLAGS_LIBS="-L${ARM_LIBS} -lrt -lpthread -lmd -lgcrypt \
    1.47 --lm -lz -lcrypto -lxkbfile -lXfont -lfreetype -lXau -lfontenc -lXdmcp" 
    1.48 -		export XSERVERLIBS_LIBS="-L${ARM_LIBS} -lrt -lpthread -lmd -lgcrypt \
    1.49 --lm -lz -lcrypto -lxkbfile -lXfont -lfreetype -lXau -lfontenc -lXdmcp" ;;
    1.50 +libxcb-dev xorg-libXcomposite-dev xorg-libXxf86vm-dev bzip2-dev"
    1.51 +
    1.52 +# Handle arch installation
    1.53 +case "$SLITAZ_ARCH" in
    1.54 +	i?86) DEPENDS="$DEPENDS udev" ;;
    1.55 +esac
    1.56 +
    1.57 +# Handle cross compilation. ARM use build host: perl flex
    1.58 +case "$ARCH" in
    1.59 +	arm)
    1.60 +		#--disable-static
    1.61 +		ARCH_ARGS="--disable-config-udev --enable-malloc0returnsnull" 
    1.62 +		OS_NAME="SliTaz ARM"
    1.63 +		VENDOR="http://arm.slitaz.org" ;;
    1.64  	i?86)
    1.65 -		ARCH_ARGS="--enable-config-udev" ;;
    1.66 +		BUILD_DEPENDS="$BUILD_DEPENDS perl flex udev-dev"
    1.67 +		ARCH_ARGS="--enable-config-udev" 
    1.68 +		OS_NAME="SliTaz GNU/Linux"
    1.69 +		VENDOR="http://www.slitaz.org" ;;
    1.70  esac
    1.71  
    1.72  # Rules to configure and make the package.
    1.73 @@ -52,8 +55,8 @@
    1.74  		--with-xkb-output=/var/lib/xkb \
    1.75  		--with-serverconfig-path=/etc/X11 \
    1.76  		--with-fontrootdir=/usr/share/fonts \
    1.77 -		--with-os-name="SliTaz GNU/Linux" \
    1.78 -		--with-vendor-web="http://www.slitaz.org/" \
    1.79 +		--with-os-name="$OS_NAME" \
    1.80 +		--with-vendor-web="$VENDOR" \
    1.81  		--with-builder-addr="$MAINTAINER" \
    1.82  		--enable-install-setuid \
    1.83  		--enable-xorg \
    1.84 @@ -70,10 +73,19 @@
    1.85  		--disable-xephyr \
    1.86  		--disable-xfake \
    1.87  		--disable-xv \
    1.88 +		--disable-ipv6 \
    1.89 +		--disable-docs \
    1.90 +		--disable-devel-docs \
    1.91  		${CONFIGURE_ARGS} ${ARCH_ARGS} &&
    1.92  	make && make install
    1.93  }
    1.94  
    1.95 +# Be sure it as cross compile
    1.96 +testsuite()
    1.97 +{
    1.98 +	readelf -h $install/usr/bin/Xorg
    1.99 +}
   1.100 +
   1.101  # Rules to gen a SliTaz package suitable for Tazpkg.
   1.102  genpkg_rules()
   1.103  {