diff options
Diffstat (limited to 'deps/xorg-server')
-rwxr-xr-x | deps/xorg-server/xorg-server.SlackBuild | 98 |
1 files changed, 57 insertions, 41 deletions
diff --git a/deps/xorg-server/xorg-server.SlackBuild b/deps/xorg-server/xorg-server.SlackBuild index 93390c3..dc96755 100755 --- a/deps/xorg-server/xorg-server.SlackBuild +++ b/deps/xorg-server/xorg-server.SlackBuild @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright 2007-2016 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2007-2018 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -22,53 +22,55 @@ # ----------------------------------------------------------------------------- # Condensed from the modular x11.SlackBuild -# 2016 by Eric Hameleers <alien@slackware.com> +# 2016, 2017, 2018 by Eric Hameleers <alien@slackware.com> # Note: this package contains _all_ X servers. Not just Xorg, but also: # Xnest, Xephyr, Xvfb, Xwayland. PKGNAM=xorg-server -VERSION=${VERSION:-1.18.4} -BUILD=${BUILD:-1} +VERSION=${VERSION:-1.19.6} +BUILD=${BUILD:-2} -CWD=$(pwd) +cd $(dirname $0) ; CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM -if [ -e $CWD/machine.conf ]; then - . $CWD/machine.conf ] -elif [ -e /etc/slackbuild/machine.conf ]; then - . /etc/slackbuild/machine.conf ] +# Automatically determine the architecture we're building on: +MARCH=$( uname -m ) +if [ -z "$ARCH" ]; then + case "$MARCH" in + i?86) export ARCH=i586 ;; + arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$MARCH ;; + esac +fi + +# If this variable is passed to the script, nothing will be built. +# Instead, a list of packages to be built will be output. +if [ ! -z "$PRINT_PACKAGE_NAME" ]; then + echo "${PKGNAME}-${VERSION}-${ARCH}-${BUILD}.txz" + exit 0 +fi + +# Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX: +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "arm" ]; then + SLKCFLAGS="-O2 -march=armv5te" + LIBDIRSUFFIX="" else - # Automatically determine the architecture we're building on: - MARCH=$( uname -m ) - if [ -z "$ARCH" ]; then - case "$MARCH" in - i?86) export ARCH=i486 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$MARCH ;; - esac - fi - # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX: - if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" - elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" - elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" - elif [ "$ARCH" = "armv7hl" ]; then - SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16" - LIBDIRSUFFIX="" - elif [ "$ARCH" = "arm" ]; then - SLKCFLAGS="-O2 -march=armv5te" - LIBDIRSUFFIX="" - else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" - fi + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi case "$ARCH" in @@ -135,7 +137,7 @@ CFLAGS="$SLKCFLAGS" \ --with-int10=x86emu \ --with-default-font-path="${DEF_FONTPATH}" \ --with-module-dir=/usr/lib${LIBDIRSUFFIX}/xorg/modules \ - --with-os-name="Slackware 14.2 current" \ + --with-os-name="Slackware 15.0" \ --with-os-vendor="Slackware Linux Project" \ --with-xkb-path=/etc/X11/xkb \ --with-xkb-output=/var/lib/xkb \ @@ -162,7 +164,7 @@ mkdir -p $PKG/etc/X11/xorg.conf.d $PKG/usr/share/X11/xorg.conf.d # Create a sample keyboard layout # Enable zapping by default -cat << EOF > $PKG/usr/share/X11/xorg.conf.d/90-keyboard-layout.conf +cat << EOF > $PKG/usr/share/X11/xorg.conf.d/90-keyboard-layout-evdev.conf Section "InputClass" Identifier "keyboard-all" MatchIsKeyboard "on" @@ -206,6 +208,17 @@ EndSection EOF +## Nope, we will not include 91-keyboard-layout-libinput.conf in the +## xorg-server package. It is better to put it into the xf86-input-libinput +## package so that if that driver is removed, then X.Org will fall back to +## using evdev. Perhaps we'll revisit this arrangement when evdev is a little +## bit more obsolete. :-) +## +#sed -e 's,Identifier "keyboard-all",Identifier "libinput keyboard catchall",g' \ +# -e 's,Driver "evdev",Driver "libinput",g' \ +# $PKG/usr/share/X11/xorg.conf.d/90-keyboard-layout-evdev.conf > \ +# $PKG/usr/share/X11/xorg.conf.d/91-keyboard-layout-libinput.conf + # Don't mess with my /var/log/ permissions: rmdir $PKG/var/log 2>/dev/null rmdir $PKG/var 2>/dev/null @@ -224,6 +237,9 @@ rmdir $PKG/var 2>/dev/null find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | \ grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +# Don't ship .la files: +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la + # Compress and link manpages, if any: if [ -d $PKG/usr/man ]; then ( cd $PKG/usr/man |