SliTaz Repositories

     1.1 --- a/xorg-server-light/receipt	Mon Mar 10 12:50:19 2014 +0000
     1.2 +++ b/xorg-server-light/receipt	Wed Mar 12 01:33:20 2014 +0100
     1.3 @@ -12,7 +12,7 @@
     1.4  WEB_SITE="http://www.x.org/"
     1.5  WGET_URL="http://xorg.freedesktop.org/releases/individual/xserver/$TARBALL"
     1.6  PROVIDE="xorg-server"
     1.7 -HOST_ARCH="i486 arm"
     1.8 +#HOST_ARCH="i486 arm"
     1.9  
    1.10  DEPENDS="xorg-xkeyboard-config xorg-libpciaccess xorg-libXxf86vm \
    1.11  xorg-libXfont xorg-libXau xorg-base-fonts libgcrypt pixman udev \
    1.12 @@ -21,19 +21,22 @@
    1.13  xorg-libXfont-dev libgpg-error-dev libgcrypt-dev pixman-dev udev-dev perl \
    1.14  flex xorg-dev-proto freetype-dev libxcb-dev bzip2-dev"
    1.15  
    1.16 -# Handle arch compilation
    1.17 +# Handle cross compilation: ARM can't find -lmd
    1.18  case "$ARCH" in
    1.19  	arm)
    1.20 -		#--disable-xf86vidmode
    1.21  		BUILD_DEPENDS="xorg-libxkbfile-dev xorg-libpciaccess-dev pixman-dev \
    1.22  xorg-util-macros xorg-libXfont-dev libgcrypt-dev xorg-resourceproto \
    1.23  xorg-bigreqsproto xorg-xcmiscproto xorg-renderproto xorg-damageproto \
    1.24  xorg-compositeproto xorg-xf86dgaproto  xorg-randrproto xorg-recordproto \
    1.25  xorg-videoproto xorg-xtrans libgpg-error-dev libgcrypt-dev freetype-dev \
    1.26  libxcb-dev bzip2-dev" 
    1.27 -		ARCH_ARGS="--disable-config-udev"
    1.28 -		ARM_LIBS="/cross/$arch/sysroot/usr/lib" 
    1.29 -		export LIBTOOL=${HOST_SYSTEM}-libtool ;;
    1.30 +		ARCH_ARGS="--disable-config-udev --disable-xf86vidmode"
    1.31 +		export ARM_LIBS="/cross/$arch/sysroot/usr/lib" 
    1.32 +		export LIBTOOL=${HOST_SYSTEM}-libtool 
    1.33 +		export XSERVERCFLAGS_LIBS="-L${ARM_LIBS} -lrt -lpthread -lmd -lgcrypt \
    1.34 +-lm -lz -lcrypto -lxkbfile -lXfont -lfreetype -lXau -lfontenc -lXdmcp" 
    1.35 +		export XSERVERLIBS_LIBS="-L${ARM_LIBS} -lrt -lpthread -lmd -lgcrypt \
    1.36 +-lm -lz -lcrypto -lxkbfile -lXfont -lfreetype -lXau -lfontenc -lXdmcp" ;;
    1.37  	i?86)
    1.38  		ARCH_ARGS="--enable-config-udev" ;;
    1.39  esac
    1.40 @@ -48,12 +51,13 @@
    1.41  		--with-module-dir=/usr/lib/X11/modules \
    1.42  		--with-xkb-output=/var/lib/xkb \
    1.43  		--with-serverconfig-path=/etc/X11 \
    1.44 +		--with-fontrootdir=/usr/share/fonts \
    1.45 +		--with-os-name="SliTaz GNU/Linux" \
    1.46 +		--with-vendor-web="http://www.slitaz.org/" \
    1.47 +		--with-builder-addr="$MAINTAINER" \
    1.48  		--enable-install-setuid \
    1.49  		--enable-xorg \
    1.50  		--disable-config-dbus \
    1.51 -		--with-fontrootdir=/usr/share/fonts \
    1.52 -		--with-os-name="SliTaz GNU/Linux" \
    1.53 -		--with-builder-addr=$MAINTAINER \
    1.54  		--disable-screensaver \
    1.55  		--disable-glx \
    1.56  		--disable-dri \
    1.57 @@ -63,11 +67,9 @@
    1.58  		--disable-xvfb \
    1.59  		--disable-xnest \
    1.60  		--disable-xfbdev \
    1.61 +		--disable-xephyr \
    1.62 +		--disable-xfake \
    1.63  		--disable-xv \
    1.64 -XSERVERCFLAGS_LIBS="-L${ARM_LIBS} -lrt -lpthread -lmd -lgcrypt -lm -lz \
    1.65 --lcrypto -lpixman -lxkbfile -lXfont -lfreetype -lXau -lfontenc -lXdmcp" \
    1.66 -XSERVERLIBS_LIBS="-L${ARM_LIBS} -lrt -lpthread -lmd -lgcrypt -lm -lz \
    1.67 --lcrypto -lpixman -lxkbfile -lXfont -lfreetype -lXau -lfontenc -lXdmcp" \
    1.68  		${CONFIGURE_ARGS} ${ARCH_ARGS} &&
    1.69  	make && make install
    1.70  }