From dae0b85c1c4fda0a19e38f6515c8a83be9650a6c Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Mon, 19 Apr 2021 21:40:04 +0000 Subject: Mon Apr 19 21:40:04 UTC 2021 a/aaa_libraries-15.0-x86_64-6.txz: Rebuilt. Temporarily added the shared libraries from icu4c-68.2 and boost-1.75.0 to allow some time for things that depend on them to be recompiled. a/kernel-firmware-20210419_8528618-noarch-1.txz: Upgraded. a/less-581-x86_64-1.txz: Upgraded. a/pkgtools-15.0-noarch-38.txz: Rebuilt. upgradepkg: prefix path to installpkg with $ROOT. pkgtool.8: typo fix. Thanks to slvr32. a/sdparm-1.11-x86_64-4.txz: Rebuilt. Recompiled against sg3_utils-1.46. Thanks to USUARIONUEVO. a/udisks-1.0.5-x86_64-9.txz: Rebuilt. Recompiled against sg3_utils-1.46. Thanks to USUARIONUEVO. a/xfsprogs-5.11.0-x86_64-2.txz: Rebuilt. Recompiled against icu4c-69.1. ap/pamixer-1.4-x86_64-10.txz: Rebuilt. Recompiled against boost-1.76.0. ap/sqlite-3.35.4-x86_64-2.txz: Rebuilt. Recompiled against icu4c-69.1. d/Cython-0.29.23-x86_64-1.txz: Upgraded. d/poke-1.2-x86_64-1.txz: Upgraded. kde/kig-20.12.3-x86_64-2.txz: Rebuilt. Recompiled against boost-1.76.0. kde/krita-4.4.3-x86_64-3.txz: Rebuilt. Recompiled against boost-1.76.0. kde/plasma-workspace-5.21.4-x86_64-2.txz: Rebuilt. Patched to fix missing GTK+ window decorations and config file reading in a wayland session. Added "Full Wayland" session type (less stable / more experimental). The standard Plasma Wayland session will allow apps to use XCB rather than native Wayland, which is currently more stable. Thanks to LuckyCyborg. l/adwaita-icon-theme-40.0-noarch-1.txz: Upgraded. l/boost-1.76.0-x86_64-1.txz: Upgraded. Shared library .so-version bump. Compiled against icu4c-69.1. l/cryfs-0.10.3-x86_64-2.txz: Rebuilt. Recompiled against boost-1.76.0. l/harfbuzz-2.8.0-x86_64-2.txz: Rebuilt. Recompiled against icu4c-69.1. l/icu4c-69.1-x86_64-1.txz: Upgraded. Shared library .so-version bump. l/imagemagick-7.0.11_8-x86_64-1.txz: Upgraded. l/jasper-2.0.32-x86_64-1.txz: Upgraded. l/libdvdread-6.1.2-x86_64-1.txz: Upgraded. l/libgpod-0.8.3-x86_64-10.txz: Rebuilt. Recompiled against sg3_utils-1.46. Thanks to Toutatis and USUARIONUEVO. l/libical-3.0.10-x86_64-1.txz: Upgraded. l/libical-3.0.9-x86_64-4.txz: Rebuilt. Recompiled against icu4c-69.1. l/libqalculate-3.18.0-x86_64-2.txz: Rebuilt. Recompiled against icu4c-69.1. l/libvisio-0.1.7-x86_64-7.txz: Rebuilt. Recompiled against icu4c-69.1. l/mozilla-nss-3.64-x86_64-1.txz: Upgraded. l/mozjs78-78.10.0esr-x86_64-1.txz: Upgraded. l/openexr-2.5.5-x86_64-3.txz: Rebuilt. Recompiled against boost-1.76.0. l/python-docutils-0.17.1-x86_64-1.txz: Upgraded. l/qt5-5.15.2-x86_64-8.txz: Rebuilt. Recompiled against icu4c-69.1. Recompiled with options: -qpa "xcb;wayland" -egl -eglfs This allows using either XCB (XWayland) or native Wayland for QPA. Thanks to LuckyCyborg. l/qt5-webkit-5.212.0_alpha4-x86_64-7.txz: Rebuilt. Recompiled against icu4c-69.1. l/vte-0.64.0-x86_64-2.txz: Rebuilt. Recompiled against icu4c-69.1. n/daemon-0.8-x86_64-1.txz: Added. Thanks to ZhaoLin1457 and LuckyCyborg. n/dovecot-2.3.14-x86_64-2.txz: Rebuilt. Recompiled against icu4c-69.1. n/openssh-8.6p1-x86_64-1.txz: Upgraded. n/php-7.4.16-x86_64-2.txz: Rebuilt. Recompiled against icu4c-69.1. n/postfix-3.5.10-x86_64-2.txz: Rebuilt. Recompiled against icu4c-69.1. n/samba-4.14.2-x86_64-2.txz: Rebuilt. Recompiled against icu4c-69.1. n/tin-2.4.5-x86_64-3.txz: Rebuilt. Recompiled against icu4c-69.1. t/texlive-2020.200608-x86_64-5.txz: Rebuilt. Recompiled against icu4c-69.1. x/egl-wayland-1.1.6-x86_64-1.txz: Added. Needed for Wayland EGLstreams support. Thanks to LuckyCyborg. x/eglexternalplatform-1.1-x86_64-1.txz: Added. Needed for egl-wayland. Thanks to LuckyCyborg. x/xf86-input-libinput-1.0.1-x86_64-1.txz: Upgraded. x/xorg-server-xwayland-21.1.1-x86_64-1.txz: Upgraded. Thanks to LuckyCyborg. xap/MPlayer-20210418-x86_64-1.txz: Upgraded. xap/mozilla-firefox-88.0-x86_64-1.txz: Upgraded. This release contains security fixes and improvements. For more information, see: https://www.mozilla.org/en-US/firefox/88.0/releasenotes/ https://www.mozilla.org/security/advisories/mfsa2021-16/ https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-23994 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-23995 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-23996 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-23997 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-23998 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-23999 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-24000 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-24001 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-24002 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-29945 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-29944 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-29946 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-29947 (* Security fix *) xap/mozilla-thunderbird-78.10.0-x86_64-1.txz: Upgraded. This release contains security fixes and improvements. For more information, see: https://www.mozilla.org/en-US/thunderbird/78.10.0/releasenotes/ https://www.mozilla.org/en-US/security/advisories/mfsa2021-14/ https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-23994 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-23995 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-23998 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-23961 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-23999 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-24002 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-29945 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-29946 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-29948 (* Security fix *) --- source/x/egl-wayland/10_nvidia_wayland.json | 6 + source/x/egl-wayland/egl-wayland.SlackBuild | 143 +++++++++++++++++++ source/x/egl-wayland/egl-wayland.url | 1 + source/x/egl-wayland/slack-desc | 20 +++ .../eglexternalplatform.SlackBuild | 92 ++++++++++++ .../x/eglexternalplatform/eglexternalplatform.url | 1 + source/x/eglexternalplatform/slack-desc | 20 +++ source/x/x11/configure/xorg-server | 10 +- source/x/x11/makepkg/xorg-server | 31 ++-- source/x/xorg-server-xwayland/slack-desc | 19 +++ .../xorg-server-xwayland.SlackBuild | 157 +++++++++++++++++++++ 11 files changed, 486 insertions(+), 14 deletions(-) create mode 100644 source/x/egl-wayland/10_nvidia_wayland.json create mode 100755 source/x/egl-wayland/egl-wayland.SlackBuild create mode 100644 source/x/egl-wayland/egl-wayland.url create mode 100644 source/x/egl-wayland/slack-desc create mode 100755 source/x/eglexternalplatform/eglexternalplatform.SlackBuild create mode 100644 source/x/eglexternalplatform/eglexternalplatform.url create mode 100644 source/x/eglexternalplatform/slack-desc create mode 100644 source/x/xorg-server-xwayland/slack-desc create mode 100755 source/x/xorg-server-xwayland/xorg-server-xwayland.SlackBuild (limited to 'source/x') diff --git a/source/x/egl-wayland/10_nvidia_wayland.json b/source/x/egl-wayland/10_nvidia_wayland.json new file mode 100644 index 000000000..c08a64112 --- /dev/null +++ b/source/x/egl-wayland/10_nvidia_wayland.json @@ -0,0 +1,6 @@ +{ + "file_format_version" : "1.0.0", + "ICD" : { + "library_path" : "libnvidia-egl-wayland.so.1" + } +} diff --git a/source/x/egl-wayland/egl-wayland.SlackBuild b/source/x/egl-wayland/egl-wayland.SlackBuild new file mode 100755 index 000000000..4448e0f84 --- /dev/null +++ b/source/x/egl-wayland/egl-wayland.SlackBuild @@ -0,0 +1,143 @@ +#!/bin/bash + +# Copyright 2021 Patrick J. Volkerding, Sebeka, MN, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +cd $(dirname $0) ; CWD=$(pwd) + +PKGNAM=egl-wayland +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} + +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i586 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +rm -rf $PKG +mkdir -p $TMP $PKG +cd $TMP || exit 1 +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1 +cd $PKGNAM-$VERSION || exit 1 +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \+ -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \+ + +# Configure, build, and install: +export CFLAGS="$SLKCFLAGS" +export CXXFLAGS="$SLKCFLAGS" +mkdir meson-build +cd meson-build +meson setup \ + --prefix=/usr \ + --libdir=lib${LIBDIRSUFFIX} \ + --libexecdir=/usr/libexec \ + --bindir=/usr/bin \ + --sbindir=/usr/sbin \ + --includedir=/usr/include \ + --datadir=/usr/share \ + --mandir=/usr/man \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --buildtype=release \ + .. || exit 1 + "${NINJA:=ninja}" $NUMJOBS || exit 1 + DESTDIR=$PKG $NINJA install || exit 1 +cd .. + +# Install the NVidia ICD file: +mkdir $PKG/usr/share/egl/egl_external_platform.d/ +cp -a $CWD/10_nvidia_wayland.json $PKG/usr/share/egl/egl_external_platform.d/ +chown root:root $PKG/usr/share/egl/egl_external_platform.d/10_nvidia_wayland.json +chmod 644 $PKG/usr/share/egl/egl_external_platform.d/10_nvidia_wayland.json + +# Strip the binaries: +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + +# Compress and link manpages, if any: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi + +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a \ + AUTHORS COPYING* CREDITS INSTALL NEWS README* \ + $PKG/usr/doc/$PKGNAM-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/x/egl-wayland/egl-wayland.url b/source/x/egl-wayland/egl-wayland.url new file mode 100644 index 000000000..8b3c41756 --- /dev/null +++ b/source/x/egl-wayland/egl-wayland.url @@ -0,0 +1 @@ +https://github.com/NVIDIA/egl-wayland diff --git a/source/x/egl-wayland/slack-desc b/source/x/egl-wayland/slack-desc new file mode 100644 index 000000000..34cff0ad3 --- /dev/null +++ b/source/x/egl-wayland/slack-desc @@ -0,0 +1,20 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + + |-----handy-ruler------------------------------------------------------| +egl-wayland: egl-wayland (Wayland EGL External Platform library) +egl-wayland: +egl-wayland: Wayland EGL External Platform library. +egl-wayland: +egl-wayland: +egl-wayland: +egl-wayland: +egl-wayland: +egl-wayland: +egl-wayland: +egl-wayland: diff --git a/source/x/eglexternalplatform/eglexternalplatform.SlackBuild b/source/x/eglexternalplatform/eglexternalplatform.SlackBuild new file mode 100755 index 000000000..7c6bf4d49 --- /dev/null +++ b/source/x/eglexternalplatform/eglexternalplatform.SlackBuild @@ -0,0 +1,92 @@ +#!/bin/bash + +# Copyright 2021 Patrick J. Volkerding, Sebeka, MN, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +cd $(dirname $0) ; CWD=$(pwd) + +PKGNAM=eglexternalplatform +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} + +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i586 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi + +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +rm -rf $PKG +mkdir -p $TMP $PKG +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1 +cd $PKGNAM-$VERSION || exit 1 + +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \+ -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \+ + +mkdir -p $PKG/usr/include/ +cp -a interface/eglexternalplatform.h $PKG/usr/include/ +cp -a interface/eglexternalplatformversion.h $PKG/usr/include/ +mkdir -p $PKG/usr/share/pkgconfig/ +cp -a eglexternalplatform.pc $PKG/usr/share/pkgconfig/ +chown -R root:root $PKG/usr/include $PKG/usr/share/pkgconfig +chmod 644 $PKG/usr/include/* $PKG/usr/share/pkgconfig/* + +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a \ + AUTHORS COPYING* INSTALL NEWS README* THANKS TODO \ + $PKG/usr/doc/$PKGNAM-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +# Build the package: +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/x/eglexternalplatform/eglexternalplatform.url b/source/x/eglexternalplatform/eglexternalplatform.url new file mode 100644 index 000000000..012d3b4d6 --- /dev/null +++ b/source/x/eglexternalplatform/eglexternalplatform.url @@ -0,0 +1 @@ +https://github.com/NVIDIA/eglexternalplatform diff --git a/source/x/eglexternalplatform/slack-desc b/source/x/eglexternalplatform/slack-desc new file mode 100644 index 000000000..417bae228 --- /dev/null +++ b/source/x/eglexternalplatform/slack-desc @@ -0,0 +1,20 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + + |-----handy-ruler------------------------------------------------------| +eglexternalplatform: eglexternalplatform (EGL External Platform Interface headers) +eglexternalplatform: +eglexternalplatform: The header files for EGL External Platform Interface. +eglexternalplatform: +eglexternalplatform: +eglexternalplatform: +eglexternalplatform: +eglexternalplatform: +eglexternalplatform: +eglexternalplatform: +eglexternalplatform: diff --git a/source/x/x11/configure/xorg-server b/source/x/x11/configure/xorg-server index bd3adf4fe..c107644e0 100644 --- a/source/x/x11/configure/xorg-server +++ b/source/x/x11/configure/xorg-server @@ -1,4 +1,12 @@ +# Build Wayland X Server (currently built as standalone): +BUILD_XWAYLAND=NO + # Servers to build: +if [ "$BUILD_XWAYLAND" = "NO" ]; then + XWAYLAND_OPTION="--disable-xwayland" +else + XWAYLAND_OPTION="--enable-xwayland" +fi BUILD_SERVERS="--enable-xorg \ --enable-dmx \ --enable-xvfb \ @@ -6,7 +14,7 @@ BUILD_SERVERS="--enable-xorg \ --enable-glamor \ --enable-kdrive \ --enable-xephyr \ - --enable-xwayland \ + $XWAYLAND_OPTION \ --enable-config-udev \ --disable-config-hal \ --disable-systemd-logind" diff --git a/source/x/x11/makepkg/xorg-server b/source/x/x11/makepkg/xorg-server index cc4f4f78d..1f5faf3c4 100644 --- a/source/x/x11/makepkg/xorg-server +++ b/source/x/x11/makepkg/xorg-server @@ -29,16 +29,18 @@ cat $CWD/slack-desc/xorg-server-xephyr > ${SLACK_X_BUILD_DIR}/package-xorg-serve cd ${SLACK_X_BUILD_DIR}/package-xorg-server-xephyr /sbin/makepkg -l y -c n ${SLACK_X_BUILD_DIR}/xorg-server-xephyr-${MODULAR_PACKAGE_VERSION}-$ARCH-$BUILD.txz -rm -r ${SLACK_X_BUILD_DIR}/package-xorg-server-xwayland -mkdir -p ${SLACK_X_BUILD_DIR}/package-xorg-server-xwayland/usr/bin -mv $PKG/usr/bin/Xwayland ${SLACK_X_BUILD_DIR}/package-xorg-server-xwayland/usr/bin -# No man page yet... -#mkdir -p ${SLACK_X_BUILD_DIR}/package-xorg-server-xwayland/usr/man/man1 -#mv $PKG/usr/man/man1/Xwayland.1.gz ${SLACK_X_BUILD_DIR}/package-xorg-server-xwayland/usr/man/man1 -mkdir -p ${SLACK_X_BUILD_DIR}/package-xorg-server-xwayland/install -cat $CWD/slack-desc/xorg-server-xwayland > ${SLACK_X_BUILD_DIR}/package-xorg-server-xwayland/install/slack-desc -cd ${SLACK_X_BUILD_DIR}/package-xorg-server-xwayland -/sbin/makepkg -l y -c n ${SLACK_X_BUILD_DIR}/xorg-server-xwayland-${MODULAR_PACKAGE_VERSION}-$ARCH-$BUILD.txz +if [ -r $PKG/usr/bin/Xwayland ]; then + rm -r ${SLACK_X_BUILD_DIR}/package-xorg-server-xwayland + mkdir -p ${SLACK_X_BUILD_DIR}/package-xorg-server-xwayland/usr/bin + mv $PKG/usr/bin/Xwayland ${SLACK_X_BUILD_DIR}/package-xorg-server-xwayland/usr/bin + # No man page yet... + #mkdir -p ${SLACK_X_BUILD_DIR}/package-xorg-server-xwayland/usr/man/man1 + #mv $PKG/usr/man/man1/Xwayland.1.gz ${SLACK_X_BUILD_DIR}/package-xorg-server-xwayland/usr/man/man1 + mkdir -p ${SLACK_X_BUILD_DIR}/package-xorg-server-xwayland/install + cat $CWD/slack-desc/xorg-server-xwayland > ${SLACK_X_BUILD_DIR}/package-xorg-server-xwayland/install/slack-desc + cd ${SLACK_X_BUILD_DIR}/package-xorg-server-xwayland + /sbin/makepkg -l y -c n ${SLACK_X_BUILD_DIR}/xorg-server-xwayland-${MODULAR_PACKAGE_VERSION}-$ARCH-$BUILD.txz +fi # Build the main xorg-server package: cd $PKG @@ -48,13 +50,16 @@ if [ "$UPGRADE_PACKAGES" = "yes" ]; then /sbin/upgradepkg --install-new ${SLACK_X_BUILD_DIR}/xorg-server-xnest-${MODULAR_PACKAGE_VERSION}-$ARCH-$BUILD.txz /sbin/upgradepkg --install-new ${SLACK_X_BUILD_DIR}/xorg-server-xvfb-${MODULAR_PACKAGE_VERSION}-$ARCH-$BUILD.txz /sbin/upgradepkg --install-new ${SLACK_X_BUILD_DIR}/xorg-server-xephyr-${MODULAR_PACKAGE_VERSION}-$ARCH-$BUILD.txz - /sbin/upgradepkg --install-new ${SLACK_X_BUILD_DIR}/xorg-server-xwayland-${MODULAR_PACKAGE_VERSION}-$ARCH-$BUILD.txz + if [ -r ${SLACK_X_BUILD_DIR}/xorg-server-xwayland-${MODULAR_PACKAGE_VERSION}-$ARCH-$BUILD.txz ]; then + /sbin/upgradepkg --install-new ${SLACK_X_BUILD_DIR}/xorg-server-xwayland-${MODULAR_PACKAGE_VERSION}-$ARCH-$BUILD.txz + fi /sbin/upgradepkg --install-new ${SLACK_X_BUILD_DIR}/xorg-server-${MODULAR_PACKAGE_VERSION}-$ARCH-$BUILD.txz elif [ "$UPGRADE_PACKAGES" = "always" ]; then /sbin/upgradepkg --install-new --reinstall ${SLACK_X_BUILD_DIR}/xorg-server-xnest-${MODULAR_PACKAGE_VERSION}-$ARCH-$BUILD.txz /sbin/upgradepkg --install-new --reinstall ${SLACK_X_BUILD_DIR}/xorg-server-xvfb-${MODULAR_PACKAGE_VERSION}-$ARCH-$BUILD.txz /sbin/upgradepkg --install-new --reinstall ${SLACK_X_BUILD_DIR}/xorg-server-xephyr-${MODULAR_PACKAGE_VERSION}-$ARCH-$BUILD.txz - /sbin/upgradepkg --install-new --reinstall ${SLACK_X_BUILD_DIR}/xorg-server-xwayland-${MODULAR_PACKAGE_VERSION}-$ARCH-$BUILD.txz + if [ -r ${SLACK_X_BUILD_DIR}/xorg-server-xwayland-${MODULAR_PACKAGE_VERSION}-$ARCH-$BUILD.txz ]; then + /sbin/upgradepkg --install-new --reinstall ${SLACK_X_BUILD_DIR}/xorg-server-xwayland-${MODULAR_PACKAGE_VERSION}-$ARCH-$BUILD.txz + fi /sbin/upgradepkg --install-new --reinstall ${SLACK_X_BUILD_DIR}/xorg-server-${MODULAR_PACKAGE_VERSION}-$ARCH-$BUILD.txz fi - diff --git a/source/x/xorg-server-xwayland/slack-desc b/source/x/xorg-server-xwayland/slack-desc new file mode 100644 index 000000000..7a292b27a --- /dev/null +++ b/source/x/xorg-server-xwayland/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' on +# the right side marks the last column you can put a character in. You must make +# exactly 11 lines for the formatting to be correct. It's also customary to +# leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +xorg-server-xwayland: xorg-server-xwayland (X Clients under Wayland) +xorg-server-xwayland: +xorg-server-xwayland: Wayland is a complete window system in itself, but even so, if we're +xorg-server-xwayland: migrating away from X, it makes sense to have a good backwards +xorg-server-xwayland: compatibility story. With a few changes, the Xorg server can be +xorg-server-xwayland: modified to use Wayland input devices for input and forward either the +xorg-server-xwayland: root window or individual top-level windows as wayland surfaces. The +xorg-server-xwayland: server still runs the same 2D driver with the same acceleration code +xorg-server-xwayland: as it does when it runs natively. The main difference is that Wayland +xorg-server-xwayland: handles presentation of the windows instead of KMS. +xorg-server-xwayland: diff --git a/source/x/xorg-server-xwayland/xorg-server-xwayland.SlackBuild b/source/x/xorg-server-xwayland/xorg-server-xwayland.SlackBuild new file mode 100755 index 000000000..11c7061ff --- /dev/null +++ b/source/x/xorg-server-xwayland/xorg-server-xwayland.SlackBuild @@ -0,0 +1,157 @@ +#!/bin/bash + +# Copyright 2016, 2018, 2019 Patrick J. Volkerding, Sebeka, MN, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +cd $(dirname $0) ; CWD=$(pwd) + +PKGNAM=xorg-server-xwayland +SRCNAM=xwayland +VERSION=${VERSION:-$(echo $SRCNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} + +# Default font paths to be used by the X server: +DEF_FONTPATH="/usr/share/fonts/misc,/usr/share/fonts/local,/usr/share/fonts/TTF,/usr/share/fonts/OTF,/usr/share/fonts/Type1,/usr/share/fonts/CID,/usr/share/fonts/75dpi/:unscaled,/usr/share/fonts/100dpi/:unscaled,/usr/share/fonts/75dpi,/usr/share/fonts/100dpi,/usr/share/fonts/cyrillic" + +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i586 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +rm -rf $PKG +mkdir -p $TMP $PKG +cd $TMP || exit 1 +rm -rf $SRCNAM-$VERSION +tar xvf $CWD/$SRCNAM-$VERSION.tar.?z || exit 1 +cd $SRCNAM-$VERSION || exit 1 +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \+ -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \+ + +# Configure, build, and install: +export CFLAGS="$SLKCFLAGS" +export CXXFLAGS="$SLKCFLAGS" +mkdir meson-build +cd meson-build +meson setup \ + --prefix=/usr \ + --libdir=lib${LIBDIRSUFFIX} \ + --libexecdir=/usr/libexec \ + --bindir=/usr/bin \ + --sbindir=/usr/sbin \ + --includedir=/usr/include \ + --datadir=/usr/share \ + --mandir=/usr/man \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --buildtype=release \ + -Dxwayland_eglstream=true \ + -Ddefault_font_path="${DEF_FONTPATH}" \ + -Dbuilder_string="Build ID: $PKGNAM $VERSION-$BUILD" \ + -Dxkb_output_dir=/var/lib/xkb \ + -Dvendor_name="Slackware Linux Project" \ + -Dxdmcp=false \ + -Dxcsecurity=true \ + -Dglamor=true \ + -Ddri3=true \ + .. || exit 1 + "${NINJA:=ninja}" $NUMJOBS || exit 1 + DESTDIR=$PKG $NINJA install || exit 1 +cd .. + +# Remove unwanted files/dirs: +rm $PKG/usr/man/man1/Xserver.1* +rm -Rf $PKG/usr/lib${LIBDIRSUFFIX}/xorg +rm -Rf $PKG/usr/include/xorg +rm -Rf $PKG/usr/share/aclocal +rm -Rf $PKG/var/lib/xkb + +# Strip the binaries: +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + +# Compress and link manpages, if any: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi + +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a \ + AUTHORS COPYING* CREDITS INSTALL NEWS README* \ + $PKG/usr/doc/$PKGNAM-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz -- cgit v1.2.3