wok-next diff xorg-server-light/receipt @ rev 20010

Up rsnapshot (1.4.2)
author Pascal Bellard <pascal.bellard@slitaz.org>
date Sat Oct 21 18:08:51 2017 +0200 (2017-10-21)
parents 9e01bc6321ea
children 7639f09792cf
line diff
     1.1 --- a/xorg-server-light/receipt	Sun Dec 20 15:13:45 2015 +0100
     1.2 +++ b/xorg-server-light/receipt	Sat Oct 21 18:08:51 2017 +0200
     1.3 @@ -1,101 +1,100 @@
     1.4 -# SliTaz package receipt.
     1.5 +# SliTaz package receipt v2.
     1.6  
     1.7  PACKAGE="xorg-server-light"
     1.8 -VERSION="1.12.4"
     1.9 +VERSION="1.19.3"
    1.10  CATEGORY="x-window"
    1.11 -SHORT_DESC="Xorg core server light version (no dri, gl, and friends)."
    1.12 +SHORT_DESC="Xorg core server light version (no dri, gl, and friends)"
    1.13  MAINTAINER="pankso@slitaz.org"
    1.14  LICENSE="MIT"
    1.15 -SOURCE="xorg-server"
    1.16 -TARBALL="$SOURCE-$VERSION.tar.bz2"
    1.17 -WEB_SITE="http://www.x.org/"
    1.18 -WGET_URL="http://xorg.freedesktop.org/releases/individual/xserver/$TARBALL"
    1.19 -PROVIDE="xorg-server"
    1.20 +WEB_SITE="https://www.x.org/wiki/"
    1.21  HOST_ARCH="i486 arm"
    1.22  
    1.23 -SUGGESTED="xorg-xf86-video-vesa xorg-xf86-video-fbdev"
    1.24 -DEPENDS="xorg-xkeyboard-config xorg-libpciaccess xorg-libXxf86vm \
    1.25 -xorg-libXfont xorg-libXau xorg-base-fonts libgcrypt pixman \
    1.26 -xorg-xf86-input-evdev libgpg-error libgcrypt freetype libxcb \
    1.27 -xorg-libXcomposite xorg-libXv bzip2 udev"
    1.28 -BUILD_DEPENDS="xorg-libxkbfile-dev xorg-libpciaccess-dev pixman-dev \
    1.29 +TARBALL="xorg-server-$VERSION.tar.bz2"
    1.30 +WGET_URL="$XORG_MIRROR/xserver/$TARBALL"
    1.31 +
    1.32 +BUILD_DEPENDS_arm="xorg-libxkbfile-dev xorg-libpciaccess-dev xorg-pixman-dev \
    1.33  xorg-util-macros xorg-libXfont-dev libgcrypt-dev xorg-resourceproto \
    1.34  xorg-bigreqsproto xorg-xcmiscproto xorg-renderproto xorg-damageproto \
    1.35  xorg-compositeproto xorg-xf86dgaproto  xorg-randrproto xorg-recordproto \
    1.36 -xorg-videoproto xorg-xtrans libgpg-error-dev libgcrypt-dev freetype-dev \
    1.37 +xorg-videoproto xorg-xtrans libgpg-error-dev freetype-dev \
    1.38  libxcb-dev xorg-libXcomposite-dev xorg-libXxf86vm-dev xorg-libXv-dev \
    1.39  bzip2-dev udev-dev"
    1.40 -
    1.41 -# Handle cross compilation. ARM use build host: perl flex
    1.42 -case "$ARCH" in
    1.43 -	arm)
    1.44 -		#--disable-static
    1.45 -		ARCH_ARGS="--enable-malloc0returnsnull" 
    1.46 -		OS_NAME="SliTaz ARM"
    1.47 -		VENDOR="http://arm.slitaz.org" ;;
    1.48 -	i?86)
    1.49 -		BUILD_DEPENDS="$BUILD_DEPENDS perl flex udev-dev"
    1.50 -		OS_NAME="SliTaz GNU/Linux"
    1.51 -		VENDOR="http://www.slitaz.org" ;;
    1.52 -esac
    1.53 +BUILD_DEPENDS="xorg-util-macros xorg-pixman-dev udev-dev libgcrypt-dev \
    1.54 +xorg-fixesproto xorg-damageproto xorg-xcmiscproto xorg-xtrans \
    1.55 +xorg-bigreqsproto xorg-xproto xorg-randrproto xorg-renderproto xorg-xextproto \
    1.56 +xorg-inputproto xorg-kbproto xorg-fontsproto xorg-videoproto \
    1.57 +xorg-compositeproto xorg-recordproto xorg-resourceproto xorg-presentproto \
    1.58 +xorg-libxkbfile-dev xorg-libXfont2-dev xorg-libXau-dev xorg-libpciaccess-dev"
    1.59  
    1.60  # Rules to configure and make the package.
    1.61  compile_rules()
    1.62  {
    1.63 +	# Handle cross compilation. ARM use build host: perl flex
    1.64 +	case "$ARCH" in
    1.65 +		arm)
    1.66 +			#--disable-static
    1.67 +			ARCH_ARGS="--enable-malloc0returnsnull"
    1.68 +			OS_NAME="SliTaz ARM"
    1.69 +			VENDOR="http://arm.slitaz.org" ;;
    1.70 +		i?86)
    1.71 +			OS_NAME="SliTaz GNU/Linux"
    1.72 +			VENDOR="http://www.slitaz.org" ;;
    1.73 +	esac
    1.74 +
    1.75  	./configure \
    1.76 -		--prefix=/usr \
    1.77  		--sysconfdir=/etc \
    1.78  		--localstatedir=/var \
    1.79 -		--with-module-dir=/usr/lib/X11/modules \
    1.80 -		--with-xkb-output=/var/lib/xkb \
    1.81 -		--with-serverconfig-path=/etc/X11 \
    1.82 -		--with-fontrootdir=/usr/share/fonts \
    1.83 -		--with-os-name="$OS_NAME" \
    1.84 -		--with-vendor-web="$VENDOR" \
    1.85 -		--with-builder-addr="$MAINTAINER" \
    1.86 -		--enable-install-setuid \
    1.87 -		--enable-xorg \
    1.88 -		--enable-config-udev \
    1.89 -		--disable-config-dbus \
    1.90 +		--disable-docs \
    1.91 +		--disable-devel-docs \
    1.92  		--disable-screensaver \
    1.93  		--disable-glx \
    1.94  		--disable-dri \
    1.95  		--disable-dri2 \
    1.96 +		--disable-dri3 \
    1.97  		--disable-xinerama \
    1.98 +		--disable-config-udev \
    1.99  		--disable-libdrm \
   1.100 +		--disable-systemd-logind \
   1.101 +		--enable-xorg \
   1.102  		--disable-xvfb \
   1.103  		--disable-xnest \
   1.104 -		--disable-xfbdev \
   1.105 +		--disable-glamor \
   1.106  		--disable-xephyr \
   1.107  		--disable-xfake \
   1.108 +		--disable-xfbdev \
   1.109 +		--enable-install-setuid \
   1.110  		--disable-ipv6 \
   1.111 -		--disable-docs \
   1.112 -		--disable-devel-docs \
   1.113 -		${CONFIGURE_ARGS} ${ARCH_ARGS} &&
   1.114 +		--with-vendor-web="$VENDOR" \
   1.115 +		--with-builder-addr="$MAINTAINER" \
   1.116 +		--with-os-name="$OS_NAME" \
   1.117 +		--with-fontrootdir=/usr/share/fonts/X11 \
   1.118 +		--with-xkb-output=/var/lib/xkb \
   1.119 +		--with-serverconfig-path=/etc/X11 \
   1.120 +		$CONFIGURE_ARGS $ARCH_ARGS &&
   1.121  	make && make install
   1.122  }
   1.123  
   1.124  # Be sure it as cross compile
   1.125 -testsuite()
   1.126 -{
   1.127 +testsuite() {
   1.128  	readelf -h $install/usr/bin/Xorg
   1.129  }
   1.130  
   1.131  # Rules to gen a SliTaz package suitable for Tazpkg.
   1.132  genpkg_rules()
   1.133  {
   1.134 -	mkdir -p $fs/usr/lib $fs/var $fs/etc/X11/xorg.conf.d
   1.135 -	cp -a $install/usr/lib/X11 $fs/usr/lib
   1.136 -	cp -a $install/usr/bin $fs/usr
   1.137 -	cp -a $install/var/lib $fs/var
   1.138 -	cp -a $install/etc $fs
   1.139 -	# Remove static libs and split Xnest
   1.140 -	rm $fs/usr/lib/X11/*/*.*a
   1.141 -	rm $fs/usr/lib/X11/*/*/*.*a
   1.142 +	copy @std
   1.143 +#	DEPENDS="xorg-xkeyboard-config xorg-libpciaccess xorg-libXxf86vm \
   1.144 +#	xorg-libXfont xorg-libXau xorg-base-fonts libgcrypt xorg-pixman \
   1.145 +#	xorg-xf86-input-evdev libgpg-error libgcrypt freetype libxcb \
   1.146 +#	xorg-libXcomposite xorg-libXv bzip2 udev"
   1.147 +	DEPENDS="bzlib freetype glib libgcrypt libgpg-error libharfbuzz libpng16 \
   1.148 +	pcre xorg-libXau xorg-libXdmcp xorg-libXfont2 xorg-libfontenc \
   1.149 +	xorg-libpciaccess xorg-pixman zlib"
   1.150 +	SUGGESTED="xorg-xf86-video-vesa xorg-xf86-video-fbdev"
   1.151 +	PROVIDE="xorg-server"
   1.152  }
   1.153  
   1.154 -# We need /var/tmp rw to let xkbcomp builr XKB definition.
   1.155 -post_install()
   1.156 -{
   1.157 +# We need /var/tmp rw to let xkbcomp build XKB definition.
   1.158 +post_install() {
   1.159  	chmod 1777 "$1/var/tmp"
   1.160  }