SliTaz Repositories

     1.1 --- a/xorg-server/receipt	Wed Mar 01 23:29:10 2017 +0200
     1.2 +++ b/xorg-server/receipt	Thu Mar 02 05:17:16 2017 +0200
     1.3 @@ -1,42 +1,50 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="xorg-server"
     1.7 -VERSION="1.12.4"
     1.8 +VERSION="1.18.4"
     1.9  CATEGORY="x-window"
    1.10  SHORT_DESC="Xorg core server."
    1.11  MAINTAINER="pankso@slitaz.org"
    1.12  LICENSE="MIT"
    1.13  SUGGESTED="xorg-xf86-input-evdev xorg-xf86-video-vesa"
    1.14 +WEB_SITE="https://www.x.org/wiki/"
    1.15 +
    1.16  TARBALL="$PACKAGE-$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 +WGET_URL="$XORG_MIRROR/xserver/$TARBALL"
    1.20  
    1.21 -# Mesa build dep make also Xorg depends on libdrm.
    1.22  DEPENDS="xorg-xkeyboard-config xorg-libpciaccess xorg-libXxf86vm \
    1.23  xorg-libXfont xorg-libXau xorg-base-fonts libgcrypt pixman udev libdrm \
    1.24  xorg-xf86-input-evdev"
    1.25 -BUILD_DEPENDS="xorg-libxkbfile-dev xorg-libpciaccess-dev xorg-libXxf86vm-dev \
    1.26 -xorg-libXfont-dev libgcrypt-dev pixman-dev udev-dev mesa-dev pkg-config perl \
    1.27 -flex xorg-xf86driproto xorg-xcmiscproto xorg-bigreqsproto xorg-randrproto \
    1.28 -xorg-dri2proto xorg-libXau-dev xorg-dev-proto libdrm-dev xorg-glproto \
    1.29 -xorg-libXv-dev xorg-libXmu-dev xorg-libXrender-dev xorg-libXi-dev"
    1.30 +BUILD_DEPENDS="patch xorg-util-macros  xorg-font-util-dev pixman-dev eudev-dev \
    1.31 +dbus-dev xorg-dri2proto xorg-dri3proto xorg-libxshmfence-dev libdrm-dev \
    1.32 +xorg-libX11-dev xorg-glproto mesa-dev libgcrypt-dev xorg-xcmiscproto \
    1.33 +xorg-bigreqsproto xorg-randrproto xorg-renderproto xorg-fontsproto \
    1.34 +xorg-videoproto xorg-compositeproto xorg-recordproto xorg-scrnsaverproto \
    1.35 +xorg-resourceproto xorg-xf86driproto xorg-presentproto xorg-xineramaproto \
    1.36 +xorg-libxkbfile-dev xorg-libXfont-dev xorg-libpciaccess-dev \
    1.37 +xorg-libXxf86dga-dev libepoxy-dev xorg-libdmx-dev xorg-libXmu-dev \
    1.38 +xorg-libXrender-dev xorg-libXi-dev tslib-dev xcb-util-renderutil-dev \
    1.39 +xcb-util-dev xcb-util-image-dev xcb-util-wm-dev xcb-util-keysyms-dev \
    1.40 +xorg-libXaw-dev xorg-libXpm-dev expat-dev"
    1.41 +SPLIT="xorg-server-Xephyr xorg-server-Xfbdev xorg-server-Xnest \
    1.42 +xorg-server-Xvfb xorg-server-modules-gl"
    1.43  
    1.44  # Rules to configure and make the package.
    1.45  compile_rules()
    1.46  {
    1.47 -	cd $src
    1.48 +	patch -Np1 -i $stuff/xorg-server-1.18.4-add_prime_support-1.patch
    1.49  
    1.50 -	# Xephyr make possible to use Xorg in a chroot.
    1.51  	./configure \
    1.52 -		--prefix=/usr \
    1.53  		--sysconfdir=/etc \
    1.54 -		--mandir=/usr/share/man \
    1.55  		--localstatedir=/var \
    1.56 -		--with-module-dir=/usr/lib/X11/modules \
    1.57 +		--disable-static \
    1.58 +		--enable-glamor \
    1.59 +		--enable-install-setuid \
    1.60 +		--enable-suid-wrapper \
    1.61 +		--disable-systemd-logind \
    1.62 +		--disable-xwayland \
    1.63 +		--disable-docs --disable-devel-docs \
    1.64  		--with-xkb-output=/var/lib/xkb \
    1.65 -		--with-serverconfig-path=/etc/X11 \
    1.66 -		--enable-install-setuid \
    1.67 -		--enable-xorg \
    1.68  		--enable-kdrive \
    1.69  		--enable-kdrive-kbd \
    1.70  		--enable-kdrive-mouse \
    1.71 @@ -44,33 +52,27 @@
    1.72  		--enable-xfbdev \
    1.73  		--enable-xephyr \
    1.74  		--enable-config-udev \
    1.75 -		--disable-config-dbus \
    1.76 -		--disable-docs \
    1.77 -		--disable-devel-docs \
    1.78  		--with-fontrootdir=/usr/share/fonts/X11 \
    1.79 +		--with-module-dir=/usr/lib/X11/modules \
    1.80 +		--with-serverconfig-path=/etc/X11 \
    1.81  		--with-os-name="SliTaz GNU/Linux" \
    1.82  		--with-vendor-web="http://www.slitaz.org/" \
    1.83  		--with-builder-addr=$MAINTAINER \
    1.84  		$CONFIGURE_ARGS &&
    1.85  	make && make DESTDIR=$DESTDIR install
    1.86 +
    1.87 +	# is xorg.conf.d moved by Xorg developers to /usr/share/X11/?
    1.88 +	mkdir -p $install/etc/X11/xorg.conf.d
    1.89  }
    1.90  
    1.91  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.92  genpkg_rules()
    1.93  {
    1.94 -	mkdir -p $fs/usr/lib $fs/var $fs/etc/X11/xorg.conf.d
    1.95 -	cp -a $install/usr/lib/X11 $fs/usr/lib
    1.96 -	cp -a $install/usr/bin $fs/usr
    1.97 -	cp -a $install/var/lib $fs/var
    1.98 -	cp -a $install/etc $fs
    1.99 -	# Remove static libs and split Xnest
   1.100 -	rm $fs/usr/lib/X11/*/*.*a
   1.101 -	rm $fs/usr/lib/X11/*/*/*.*a
   1.102 -	rm $fs/usr/bin/Xnest
   1.103 -	rm $fs/usr/bin/Xvfb
   1.104 -	# Kdrive/tinyX --> xorg-server-Xephyr xorg-server-Xfbdev
   1.105 -	rm $fs/usr/bin/Xephyr
   1.106 -	rm $fs/usr/bin/Xfbdev
   1.107 +	cook_copy_folders etc var bin libexec xorg.conf.d
   1.108 +	cook_copy_files *.so
   1.109 +	# split
   1.110 +	rm $fs/usr/bin/Xephyr $fs/usr/bin/Xfbdev $fs/usr/bin/Xnest $fs/usr/bin/Xvfb
   1.111 +	rm $fs/usr/lib/X11/modules/libglamoregl.so $fs/usr/lib/X11/modules/extensions/libglx.so
   1.112  }
   1.113  
   1.114  # We need /var/tmp rw to let xkbcomp builr XKB definition.
   1.115 @@ -78,4 +80,3 @@
   1.116  {
   1.117  	chmod 1777 "$1/var/tmp"
   1.118  }
   1.119 -