wok diff xorg-server-Xfbdev/receipt @ rev 16430

svkbd: fix version
author Pascal Bellard <pascal.bellard@slitaz.org>
date Fri Apr 18 10:26:47 2014 +0000 (2014-04-18)
parents 7bae09de1061
children 9e01bc6321ea
line diff
     1.1 --- a/xorg-server-Xfbdev/receipt	Wed Mar 12 03:53:08 2014 +0100
     1.2 +++ b/xorg-server-Xfbdev/receipt	Fri Apr 18 10:26:47 2014 +0000
     1.3 @@ -9,91 +9,17 @@
     1.4  WANTED="xorg-server"
     1.5  SOURCE="xorg-server"
     1.6  WEB_SITE="http://www.x.org/"
     1.7 -HOST_ARCH="i486 arm"
     1.8 +HOST_ARCH="i486"
     1.9  
    1.10  DEPENDS="xorg-libXfont xorg-libXau xorg-libXdmcp zlib pixman libgcrypt \
    1.11  xorg-libxkbfile xorg-xkeyboard-config"
    1.12  
    1.13 -#
    1.14 -# This is the default Xserver for ARM platform until full Xorg or Xorg light
    1.15 -# dont cross compile nicely. Note: on the RPi the Xorg driver is fbdev so
    1.16 -# using Kdrive Xfbdev is a light and fast solution.
    1.17 -#
    1.18 -case "$ARCH" in
    1.19 -	arm)
    1.20 -		unset WANTED
    1.21 -		SOURCE="xorg-server"
    1.22 -		TARBALL="$SOURCE-$VERSION.tar.bz2"
    1.23 -		WGET_URL="http://xorg.freedesktop.org/releases/individual/xserver/$TARBALL"
    1.24 -		PROVIDE="xorg-server"
    1.25 -		BUILD_DEPENDS="xorg-libxkbfile-dev xorg-libpciaccess-dev pixman-dev \
    1.26 -xorg-util-macros xorg-libXfont-dev libgcrypt-dev xorg-resourceproto \
    1.27 -xorg-bigreqsproto xorg-xcmiscproto xorg-renderproto xorg-damageproto \
    1.28 -xorg-compositeproto xorg-xf86dgaproto  xorg-randrproto xorg-recordproto \
    1.29 -xorg-videoproto xorg-xtrans libgpg-error-dev libgcrypt-dev freetype-dev \
    1.30 -libxcb-dev bzip2-dev"
    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 -lgcrypt \
    1.34 --lm -lz -lcrypto -lxkbfile -lXfont -lfreetype -lXau -lfontenc -lXdmcp" 
    1.35 -		export XSERVERLIBS_LIBS="-L${ARM_LIBS} -lrt -lpthread -lgcrypt \
    1.36 --lm -lz -lcrypto -lxkbfile -lXfont -lfreetype -lXau -lfontenc -lXdmcp" ;;
    1.37 -esac
    1.38 -
    1.39 -# Rules to configure and make the package.
    1.40 -compile_rules()
    1.41 -{
    1.42 -	case "$ARCH" in
    1.43 -		arm*)
    1.44 -			./configure \
    1.45 -				--prefix=/usr \
    1.46 -				--sysconfdir=/etc \
    1.47 -				--localstatedir=/var \
    1.48 -				--with-module-dir=/usr/lib/X11/modules \
    1.49 -				--with-xkb-output=/var/lib/xkb \
    1.50 -				--with-serverconfig-path=/etc/X11 \
    1.51 -				--with-fontrootdir=/usr/share/fonts \
    1.52 -				--with-os-name="SliTaz ARM" \
    1.53 -				--with-vendor-web="http://arm.slitaz.org/" \
    1.54 -				--with-builder-addr="$MAINTAINER" \
    1.55 -				--enable-install-setuid \
    1.56 -				--enable-kdrive \
    1.57 -				--enable-kdrive-kbd \
    1.58 -				--enable-kdrive-mouse \
    1.59 -				--enable-kdrive-evdev \
    1.60 -				--enable-xfbdev \
    1.61 -				--disable-config-dbus \
    1.62 -				--disable-config-udev \
    1.63 -				--disable-screensaver \
    1.64 -				--disable-glx \
    1.65 -				--disable-dri \
    1.66 -				--disable-dri2 \
    1.67 -				--disable-xinerama \
    1.68 -				--disable-libdrm \
    1.69 -				--disable-xvfb \
    1.70 -				--disable-xnest \
    1.71 -				--disable-xephyr \
    1.72 -				--disable-xfake \
    1.73 -				--disable-xv \
    1.74 -				--disable-xorg \
    1.75 -				${CONFIGURE_ARGS} &&
    1.76 -			make && make install ;;
    1.77 -		*)
    1.78 -			echo "Nothing to do for: $ARCH" ;;
    1.79 -	esac
    1.80 -}
    1.81 -
    1.82  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.83  genpkg_rules()
    1.84  {
    1.85  	mkdir -p $fs/usr/bin
    1.86  	cp -a $install/usr/bin/Xfbdev $fs/usr/bin
    1.87  	chmod 4711 $fs/usr/bin/Xfbdev
    1.88 -	case "$ARCH" in
    1.89 -		arm) 
    1.90 -			cp -a $install/etc $fs 
    1.91 -			cp -a $install/var $fs ;;
    1.92 -	esac
    1.93  }
    1.94  
    1.95  # We need /var/tmp rw to let xkbcomp builr XKB definition.