From 01f574d3db4fb3b74bc43b1c8743c886ea203c6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?coadde=20=5BM=C3=A1rcio=20Alexandre=20Silva=20Delgado=5D?= Date: Fri, 1 Aug 2014 00:29:57 -0300 Subject: rebuild xorg-server-libre --- libre-testing/xorg-server-libre/PKGBUILD | 135 ---------- .../xorg-server-libre/autoconfig-sis.patch | 21 -- .../xorg-server-libre/glamor-upstream-fix.patch | 178 ------------- .../xorg-server-libre/xorg-server.install | 18 -- libre-testing/xorg-server-libre/xvfb-run | 180 ------------- libre-testing/xorg-server-libre/xvfb-run.1 | 282 --------------------- libre/xorg-server-libre/10-quirks.conf | 10 - libre/xorg-server-libre/CVE-2013-6424.diff | 49 ---- libre/xorg-server-libre/PKGBUILD | 101 ++++---- .../autoconfig-nvidia-libre.patch | 26 ++ libre/xorg-server-libre/glamor-upstream-fix.patch | 178 +++++++++++++ libre/xorg-server-libre/xorg-server.install | 18 ++ 12 files changed, 277 insertions(+), 919 deletions(-) delete mode 100644 libre-testing/xorg-server-libre/PKGBUILD delete mode 100644 libre-testing/xorg-server-libre/autoconfig-sis.patch delete mode 100644 libre-testing/xorg-server-libre/glamor-upstream-fix.patch delete mode 100644 libre-testing/xorg-server-libre/xorg-server.install delete mode 100644 libre-testing/xorg-server-libre/xvfb-run delete mode 100644 libre-testing/xorg-server-libre/xvfb-run.1 delete mode 100644 libre/xorg-server-libre/10-quirks.conf delete mode 100644 libre/xorg-server-libre/CVE-2013-6424.diff create mode 100644 libre/xorg-server-libre/autoconfig-nvidia-libre.patch create mode 100644 libre/xorg-server-libre/glamor-upstream-fix.patch create mode 100644 libre/xorg-server-libre/xorg-server.install diff --git a/libre-testing/xorg-server-libre/PKGBUILD b/libre-testing/xorg-server-libre/PKGBUILD deleted file mode 100644 index 6f0b4b79e..000000000 --- a/libre-testing/xorg-server-libre/PKGBUILD +++ /dev/null @@ -1,135 +0,0 @@ -# $Id: PKGBUILD 217822 2014-07-24 23:42:11Z lcarlier $ -# Maintainer: AndyRTR -# Maintainer: Jan de Groot -# Maintainer (Parabola): Márcio Silva - -pkgbase=xorg-server -pkgname=('xorg-server-libre') -pkgver=1.16.0 -pkgrel=5 # build first with 0.1 and then rebuild it after xf86-input-evdev rebuild -arch=('i686' 'x86_64') -license=('custom') -url="http://xorg.freedesktop.org" -makedepends=('pixman' 'libx11' 'mesa' 'mesa-libgl' 'xf86driproto' 'xcmiscproto' 'xtrans' 'bigreqsproto' 'randrproto' - 'inputproto' 'fontsproto' 'videoproto' 'presentproto' 'compositeproto' 'recordproto' 'scrnsaverproto' - 'resourceproto' 'xineramaproto' 'libxkbfile' 'libxfont' 'renderproto' 'libpciaccess' 'libxv' - 'xf86dgaproto' 'libxmu' 'libxrender' 'libxi' 'dmxproto' 'libxaw' 'libdmx' 'libxtst' 'libxres' - 'xorg-xkbcomp' 'xorg-util-macros' 'xorg-font-util' 'glproto' 'dri2proto' 'libgcrypt' 'libepoxy' - 'xcb-util' 'xcb-util-image' 'xcb-util-wm' 'xcb-util-keysyms' 'dri3proto' 'libxshmfence') -source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2{,.sig} - autoconfig-sis.patch - glamor-upstream-fix.patch - xvfb-run - xvfb-run.1) -sha256sums=('38330a03c5f7a38745a3f9816cf069db5b8844eebb358fd39dbabf61f32cd06b' - 'SKIP' - 'd027776fac1f7675b0a9ee817502290b1c45f9c09b0f0a6bb058c35f92361e84' - 'fbd898f0e867c77c9bf918fd2e7956c7776ecb3cc3634c61290fb03513b47987' - 'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9' - '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776') - -prepare() { - cd "${pkgbase}-${pkgver}" - # Use unofficial imedia SiS driver for supported SiS devices - patch -Np0 -i ../autoconfig-sis.patch - # merged upstream (1.16 branch) - patch -Np1 -i ../glamor-upstream-fix.patch - - # fix os name - sed -i '\|Current Operating System| s| %s %s|| - s|name.sysname, name.nodename, name.release|OSNAME, name.nodename| - s|name.version, name.machine|name.version| - ' hw/xfree86/common/xf86Init.c - sed -i 's|Linux|GNU/Linux| - ' hw/xfree86/man/{Xorg,xorg.conf}.man - sed -i '\|OSNAME| s|hurd|gnu| - \|OSNAME| s|linux|gnu/linux| - s|#define OSNAME "freebsd"|#define OSNAME "freebsd"\n#elif defined(__FreeBSD_kernel__)\n#define OSNAME "gnu/kfreebsd"| - ' hw/xfree86/loader/os.c - sed -i 's|uname -s|uname -o| - s|uname -r|uname -sr| - s|uname -orm|echo $(uname -o) $(uname -m) - $(uname -s) kernel $(uname -r)| - ' ChangeLog config.guess configure.ac configure compile -} - -build() { - cd "${pkgbase}-${pkgver}" - autoreconf -fi - ./configure --prefix=/usr \ - --enable-ipv6 \ - --enable-dri \ - --enable-dmx \ - --enable-xvfb \ - --enable-xnest \ - --enable-composite \ - --enable-xcsecurity \ - --enable-xorg \ - --enable-xephyr \ - --enable-glamor \ - --enable-xwayland \ - --enable-glx-tls \ - --enable-kdrive \ - --enable-kdrive-evdev \ - --enable-kdrive-kbd \ - --enable-kdrive-mouse \ - --enable-config-udev \ - --enable-systemd-logind \ - --enable-suid-wrapper \ - --disable-install-setuid \ - --enable-record \ - --disable-xfbdev \ - --disable-xfake \ - --disable-static \ - --libexecdir=/usr/bin \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --with-xkb-path=/usr/share/X11/xkb \ - --with-xkb-output=/var/lib/xkb \ - --with-fontrootdir=/usr/share/fonts - -# --without-dtrace \ -# --disable-linux-acpi --disable-linux-apm \ - - make - - # Disable subdirs for make install rule to make splitting easier - sed -e 's/^DMX_SUBDIRS =.*/DMX_SUBDIRS =/' \ - -e 's/^XVFB_SUBDIRS =.*/XVFB_SUBDIRS =/' \ - -e 's/^XNEST_SUBDIRS =.*/XNEST_SUBDIRS = /' \ - -e 's/^KDRIVE_SUBDIRS =.*/KDRIVE_SUBDIRS =/' \ - -e 's/^XWAYLAND_SUBDIRS =.*/XWAYLAND_SUBDIRS =/' \ - -i hw/Makefile -} - -package_xorg-server-libre() { - pkgdesc="Xorg X server, without nonfree nvidia driver support" - depends=(libepoxy libxdmcp libxfont libpciaccess libdrm pixman libgcrypt libxau xorg-server-common xf86-input-evdev libxshmfence) - # see xorg-server-*/hw/xfree86/common/xf86Module.h for ABI versions - we provide major numbers that drivers can depend on - # and /usr/lib/pkgconfig/xorg-server.pc in xorg-server-devel pkg - provides=('X-ABI-VIDEODRV_VERSION=18' 'X-ABI-XINPUT_VERSION=21' 'X-ABI-EXTENSION_VERSION=8.0' 'x-server' "$pkgbase=$pkgver") - groups=('xorg') - conflicts=('nvidia-utils' 'glamor-egl' "$pkgbase") - replaces=('nvidia-utils' 'glamor-egl' "$pkgbase") - install=xorg-server.install - - cd "${pkgbase}-${pkgver}" - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/etc/X11/xorg.conf.d" - - # Needed for non-mesa drivers, libgl will restore it - mv "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so" \ - "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.xorg" - - rm -rf "${pkgdir}/var" - - rm -f "${pkgdir}/usr/share/man/man1/Xserver.1" - rm -f "${pkgdir}/usr/lib/xorg/protocol.txt" - - install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server" - ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server/COPYING" - - rm -rf "${pkgdir}/usr/lib/pkgconfig" - rm -rf "${pkgdir}/usr/include" - rm -rf "${pkgdir}/usr/share/aclocal" -} diff --git a/libre-testing/xorg-server-libre/autoconfig-sis.patch b/libre-testing/xorg-server-libre/autoconfig-sis.patch deleted file mode 100644 index 0b50049db..000000000 --- a/libre-testing/xorg-server-libre/autoconfig-sis.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- hw/xfree86/common/xf86pciBus.c.orig 2011-09-24 10:53:45.421697668 +0000 -+++ hw/xfree86/common/xf86pciBus.c 2011-09-24 10:55:56.416250708 +0000 -@@ -1200,9 +1200,15 @@ - break; - } - break; -- case 0x1039: -- driverList[0] = "sis"; -- break; -+ case 0x1039: -+ switch (dev->device_id) -+ { -+ case 0x6350: case 0x6351: -+ driverList[0] = "sisimedia"; driverList[1] = "sis"; break; -+ default: -+ driverList[0] = "sis"; break; -+ } -+ break; - case 0x126f: - driverList[0] = "siliconmotion"; - break; diff --git a/libre-testing/xorg-server-libre/glamor-upstream-fix.patch b/libre-testing/xorg-server-libre/glamor-upstream-fix.patch deleted file mode 100644 index 89dd4d017..000000000 --- a/libre-testing/xorg-server-libre/glamor-upstream-fix.patch +++ /dev/null @@ -1,178 +0,0 @@ -From 3c0431b8911241552a15a43e4279c50658b50a18 Mon Sep 17 00:00:00 2001 -From: Keith Packard -Date: Wed, 16 Jul 2014 23:03:23 +0000 -Subject: glamor: Fix temp picture coordinates in glamor_composite_clipped_region - -To understand this patch, let's start at the protocol interface where -the relationship between the coordinate spaces is documented: - - static Bool - _glamor_composite(CARD8 op, - PicturePtr source, - PicturePtr mask, - PicturePtr dest, - INT16 x_source, - INT16 y_source, - INT16 x_mask, - INT16 y_mask, - INT16 x_dest, INT16 y_dest, - CARD16 width, CARD16 height, Bool fallback) - -The coordinates are passed to this function directly off the wire and -are all relative to their respective drawables. For Windows, this means -that they are relative to the upper left corner of the window, in -whatever pixmap that window is getting drawn to. - -_glamor_composite calls miComputeCompositeRegion to construct a clipped -region to actually render to. In reality, miComputeCompositeRegion clips -only to the destination these days; source clip region based clipping -would have to respect the transform, which isn't really possible. The -returned region is relative to the screen in which dest lives; offset by -dest->drawable.x and dest->drawable.y. - -What is important to realize here is that, because of clipping, the -composite region may not have the same position within the destination -drawable as x_dest, y_dest. The protocol coordinates now exist solely to -'pin' the three objects together. - - extents->x1,y1 Screen origin of clipped operation - width,height Extents of the clipped operation - x_dest,y_dest Unclipped destination-relative operation coordinate - x_source,y_source Unclipped source-relative operation coordinate - x_mask,y_mask Unclipped mask-relative operation coordinate - -One thing we want to know is what the offset is from the original -operation origin to the clipped origin - - Destination drawable relative coordinates of the clipped operation: - - x_dest_clipped = extents->x1 - dest->drawable.x - y_dest_clipped = extents->y1 - dest->drawable.y - - Offset from the original operation origin: - - x_off_clipped = x_dest_clipped - x_dest - y_off_clipped = y_dest_clipped - y_dest - - Source drawable relative coordinates of the clipped operation: - - x_source_clipped = x_source + x_off_clipped; - y_source_clipped = y_source + y_off_clipped; - - Mask drawable relative coordinates of the clipped operation: - - x_mask_clipped = x_source + x_off_clipped; - y_mask_clipped = y_source + y_off_clipped; - -This is where the original code fails -- it doesn't subtract the -destination drawable location when computing the distance that the -operation has been moved by clipping. Here's what it does when -constructing a temporary source picture: - - temp_src = - glamor_convert_gradient_picture(screen, source, - extent->x1 + x_source - x_dest, - extent->y1 + y_source - y_dest, - width, height); - ... - x_temp_src = -extent->x1 + x_dest; - y_temp_src = -extent->y1 + y_dest; - -glamor_convert_gradient_picture needs source drawable relative -coordinates, but that is not what it's getting; it's getting -screen-relative coordinates for the destination, adjusted by the -distance between the provided source and destination operation -coordinates. We want x_source_clipped and y_source_clipped: - - x_source_clipped = x_source + x_off_clipped - = x_source + x_dest_clipped - x_dest - = x_source + extents->x1 - dest->drawable.x - x_dest - -x_temp_src/y_temp_src are supposed to be the coordinates of the original -operation translated to the temporary picture: - - x_temp_src = x_source - x_source_clipped; - y_temp_src = y_source - y_source_clipped; - -Note that x_source_clipped/y_source_clipped will never be less than -x_source/y_source because all we're doing is clipping. This means that -x_temp_src/y_temp_src will always be non-positive; the original source -coordinate can never be strictly *inside* the temporary image or we -could have made the temporary image smaller. - - x_temp_src = x_source - x_source_clipped - = x_source - (x_source + x_off_clipped) - = -x_off_clipped - = x_dest - x_dest_clipped - = x_dest - (extents->x1 - dest->drawable.x) - -Again, this is off by the destination origin within the screen -coordinate space. - -The code should look like: - - temp_src = - glamor_convert_gradient_picture(screen, source, - extent->x1 + x_source - x_dest - dest->pDrawable->x, - extent->y1 + y_source - y_dest - dest->pDrawable->y, - width, height); - - x_temp_src = -extent->x1 + x_dest + dest->pDrawable->x; - y_temp_src = -extent->y1 + y_dest + dest->pDrawable->y; - -Signed-off-by: Keith Packard -Reviewed-by: Markus Wick -(cherry picked from commit 55f5bfb578e934319d1308cbb56c900c5ac7cfa7) -Signed-off-by: Julien Cristau ---- -diff --git a/glamor/glamor_render.c b/glamor/glamor_render.c -index 14ab738..e5d5d2c 100644 ---- a/glamor/glamor_render.c -+++ b/glamor/glamor_render.c -@@ -1450,8 +1450,8 @@ glamor_composite_clipped_region(CARD8 op, - || source_pixmap->drawable.height != height)))) { - temp_src = - glamor_convert_gradient_picture(screen, source, -- extent->x1 + x_source - x_dest, -- extent->y1 + y_source - y_dest, -+ extent->x1 + x_source - x_dest - dest->pDrawable->x, -+ extent->y1 + y_source - y_dest - dest->pDrawable->y, - width, height); - if (!temp_src) { - temp_src = source; -@@ -1459,8 +1459,8 @@ glamor_composite_clipped_region(CARD8 op, - } - temp_src_priv = - glamor_get_pixmap_private((PixmapPtr) (temp_src->pDrawable)); -- x_temp_src = -extent->x1 + x_dest; -- y_temp_src = -extent->y1 + y_dest; -+ x_temp_src = -extent->x1 + x_dest + dest->pDrawable->x; -+ y_temp_src = -extent->y1 + y_dest + dest->pDrawable->y; - } - - if (mask -@@ -1474,8 +1474,8 @@ glamor_composite_clipped_region(CARD8 op, - * to do reduce one convertion. */ - temp_mask = - glamor_convert_gradient_picture(screen, mask, -- extent->x1 + x_mask - x_dest, -- extent->y1 + y_mask - y_dest, -+ extent->x1 + x_mask - x_dest - dest->pDrawable->x, -+ extent->y1 + y_mask - y_dest - dest->pDrawable->y, - width, height); - if (!temp_mask) { - temp_mask = mask; -@@ -1483,8 +1483,8 @@ glamor_composite_clipped_region(CARD8 op, - } - temp_mask_priv = - glamor_get_pixmap_private((PixmapPtr) (temp_mask->pDrawable)); -- x_temp_mask = -extent->x1 + x_dest; -- y_temp_mask = -extent->y1 + y_dest; -+ x_temp_mask = -extent->x1 + x_dest + dest->pDrawable->x; -+ y_temp_mask = -extent->y1 + y_dest + dest->pDrawable->y; - } - /* Do two-pass PictOpOver componentAlpha, until we enable - * dual source color blending. --- -cgit v0.9.0.2-2-gbebe - diff --git a/libre-testing/xorg-server-libre/xorg-server.install b/libre-testing/xorg-server-libre/xorg-server.install deleted file mode 100644 index 46bf5a90a..000000000 --- a/libre-testing/xorg-server-libre/xorg-server.install +++ /dev/null @@ -1,18 +0,0 @@ -post_upgrade() { - if (( $(vercmp $2 1.16.0-3) < 0 )); then - post_install - fi -} - -post_install() { - cat <>> xorg-server has now the ability to run without root rights with - the help of systemd-logind. xserver will fail to run if not launched - from the same virtual terminal as was used to log in. - Without root rights, log files will be in ~/.local/share/xorg/ directory. - - Old behavior can be restored through Xorg.wrap config file. - See Xorg.wrap man page (man xorg.wrap). -MSG -} - diff --git a/libre-testing/xorg-server-libre/xvfb-run b/libre-testing/xorg-server-libre/xvfb-run deleted file mode 100644 index 4c2f4e0d3..000000000 --- a/libre-testing/xorg-server-libre/xvfb-run +++ /dev/null @@ -1,180 +0,0 @@ -#!/bin/sh - -# $Id: xvfb-run 2027 2004-11-16 14:54:16Z branden $ - -# This script starts an instance of Xvfb, the "fake" X server, runs a command -# with that server available, and kills the X server when done. The return -# value of the command becomes the return value of this script. -# -# If anyone is using this to build a Debian package, make sure the package -# Build-Depends on xvfb, xbase-clients, and xfonts-base. - -set -e - -PROGNAME=xvfb-run -SERVERNUM=99 -AUTHFILE= -ERRORFILE=/dev/null -STARTWAIT=3 -XVFBARGS="-screen 0 640x480x8" -LISTENTCP="-nolisten tcp" -XAUTHPROTO=. - -# Query the terminal to establish a default number of columns to use for -# displaying messages to the user. This is used only as a fallback in the event -# the COLUMNS variable is not set. ($COLUMNS can react to SIGWINCH while the -# script is running, and this cannot, only being calculated once.) -DEFCOLUMNS=$(stty size 2>/dev/null | awk '{print $2}') || true -if ! expr "$DEFCOLUMNS" : "[[:digit:]]\+$" >/dev/null 2>&1; then - DEFCOLUMNS=80 -fi - -# Display a message, wrapping lines at the terminal width. -message () { - echo "$PROGNAME: $*" | fmt -t -w ${COLUMNS:-$DEFCOLUMNS} -} - -# Display an error message. -error () { - message "error: $*" >&2 -} - -# Display a usage message. -usage () { - if [ -n "$*" ]; then - message "usage error: $*" - fi - cat <>"$ERRORFILE" 2>&1 - fi - if [ -n "$XVFB_RUN_TMPDIR" ]; then - if ! rm -r "$XVFB_RUN_TMPDIR"; then - error "problem while cleaning up temporary directory" - exit 5 - fi - fi -} - -# Parse the command line. -ARGS=$(getopt --options +ae:f:hn:lp:s:w: \ - --long auto-servernum,error-file:,auth-file:,help,server-num:,listen-tcp,xauth-protocol:,server-args:,wait: \ - --name "$PROGNAME" -- "$@") -GETOPT_STATUS=$? - -if [ $GETOPT_STATUS -ne 0 ]; then - error "internal error; getopt exited with status $GETOPT_STATUS" - exit 6 -fi - -eval set -- "$ARGS" - -while :; do - case "$1" in - -a|--auto-servernum) SERVERNUM=$(find_free_servernum) ;; - -e|--error-file) ERRORFILE="$2"; shift ;; - -f|--auth-file) AUTHFILE="$2"; shift ;; - -h|--help) SHOWHELP="yes" ;; - -n|--server-num) SERVERNUM="$2"; shift ;; - -l|--listen-tcp) LISTENTCP="" ;; - -p|--xauth-protocol) XAUTHPROTO="$2"; shift ;; - -s|--server-args) XVFBARGS="$2"; shift ;; - -w|--wait) STARTWAIT="$2"; shift ;; - --) shift; break ;; - *) error "internal error; getopt permitted \"$1\" unexpectedly" - exit 6 - ;; - esac - shift -done - -if [ "$SHOWHELP" ]; then - usage - exit 0 -fi - -if [ -z "$*" ]; then - usage "need a command to run" >&2 - exit 2 -fi - -if ! which xauth >/dev/null; then - error "xauth command not found" - exit 3 -fi - -# tidy up after ourselves -trap clean_up EXIT - -# If the user did not specify an X authorization file to use, set up a temporary -# directory to house one. -if [ -z "$AUTHFILE" ]; then - XVFB_RUN_TMPDIR="$(mktemp -d -t $PROGNAME.XXXXXX)" - AUTHFILE="$XVFB_RUN_TMPDIR/Xauthority" -fi - -# Start Xvfb. -MCOOKIE=$(mcookie) -XAUTHORITY=$AUTHFILE xauth source - << EOF >>"$ERRORFILE" 2>&1 -add :$SERVERNUM $XAUTHPROTO $MCOOKIE -EOF -XAUTHORITY=$AUTHFILE Xvfb ":$SERVERNUM" $XVFBARGS $LISTENTCP >>"$ERRORFILE" \ - 2>&1 & -XVFBPID=$! -sleep "$STARTWAIT" -if ! kill -0 $XVFBPID 2>/dev/null; then - echo "Xvfb failed to start" >&2 - exit 1 -fi - -# Start the command and save its exit status. -set +e -DISPLAY=:$SERVERNUM XAUTHORITY=$AUTHFILE "$@" 2>&1 -RETVAL=$? -set -e - -# Kill Xvfb now that the command has exited. -kill $XVFBPID - -# Return the executed command's exit status. -exit $RETVAL - -# vim:set ai et sts=4 sw=4 tw=80: diff --git a/libre-testing/xorg-server-libre/xvfb-run.1 b/libre-testing/xorg-server-libre/xvfb-run.1 deleted file mode 100644 index 137d3a196..000000000 --- a/libre-testing/xorg-server-libre/xvfb-run.1 +++ /dev/null @@ -1,282 +0,0 @@ -.\" $Id: xvfb-run.1 2138 2005-01-17 23:40:27Z branden $ -.\" -.\" Copyright 1998-2004 Branden Robinson . -.\" -.\" This is free software; you may redistribute it and/or modify -.\" it under the terms of the GNU General Public License as -.\" published by the Free Software Foundation; either version 2, -.\" or (at your option) any later version. -.\" -.\" This is distributed in the hope that it will be useful, but -.\" WITHOUT ANY WARRANTY; without even the implied warranty of -.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -.\" GNU General Public License for more details. -.\" -.\" You should have received a copy of the GNU General Public License with -.\" the Debian operating system, in /usr/share/common-licenses/GPL; if -.\" not, write to the Free Software Foundation, Inc., 59 Temple Place, -.\" Suite 330, Boston, MA 02111-1307 USA -.\" -.\" We need the URL macro from groff's www macro package, but also want -.\" things to work all right for people who don't have it. So we define -.\" our own URL macro and let the www macro package override it if it's -.\" available. -.de URL -\\$2 \(laURL: \\$1 \(ra\\$3 -.. -.if \n[.g] .mso www.tmac -.TH xvfb\-run 1 "2004\-11\-12" "Debian Project" -.SH NAME -xvfb\-run \- run specified X client or command in a virtual X server environment -.SH SYNOPSIS -.B xvfb\-run -[ -.I options -] -.I command -.SH DESCRIPTION -.B xvfb\-run -is a wrapper for the -.BR Xvfb (1x) -command which simplifies the task of running commands (typically an X -client, or a script containing a list of clients to be run) within a virtual -X server environment. -.PP -.B xvfb\-run -sets up an X authority file (or uses an existing user\-specified one), -writes a cookie to it (see -.BR xauth (1x)) -and then starts the -.B Xvfb -X server as a background process. -The process ID of -.B Xvfb -is stored for later use. -The specified -.I command -is then run using the X display corresponding to the -.B Xvfb -server -just started and the X authority file created earlier. -.PP -When the -.I command -exits, its status is saved, the -.B Xvfb -server is killed (using the process ID stored earlier), the X authority -cookie removed, and the authority file deleted (if the user did not specify -one to use). -.B xvfb\-run -then exits with the exit status of -.IR command . -.PP -.B xvfb\-run -requires the -.B xauth -command to function. -.SH OPTIONS -.TP -.B \-a\fR,\fB \-\-auto\-servernum -Try to get a free server number, starting at 99, or the argument to -.BR \-\-server\-num . -.TP -.BI \-e\ file \fR,\fB\ \-\-error\-file= file -Store output from -.B xauth -and -.B Xvfb -in -.IR file . -The default is -.IR /dev/null . -.TP -.BI \-f\ file \fR,\fB\ \-\-auth\-file= file -Store X authentication data in -.IR file . -By default, a temporary directory called -.IR xvfb\-run. PID -(where PID is the process ID of -.B xvfb\-run -itself) is created in the directory specified by the environment variable -.B TMPDIR -(or -.I /tmp -if that variable is null or unset), and the -.BR tempfile (1) -command is used to create a file in that temporary directory called -.IR Xauthority . -.TP -.B \-h\fR,\fB \-\-help -Display a usage message and exit. -.TP -.BI \-n\ servernumber \fR,\fB\ \-\-server\-num= servernumber -Use -.I servernumber -as the server number (but see the -.B \-a\fR,\fB \-\-auto\-servernum -option above). -The default is 99. -.TP -.B \-l\fR,\fB \-\-listen\-tcp -Enable TCP port listening in the X server. -For security reasons (to avoid denial\-of\-service attacks or exploits), -TCP port listening is disabled by default. -.TP -.BI \-p\ protocolname \fR,\fB\ \-\-xauth\-protocol= protocolname -Use -.I protocolname -as the X authority protocol to use. -The default is \(oq.\(cq, which -.B xauth -interprets as its own default protocol, which is MIT\-MAGIC\-COOKIE\-1. -.TP -.BI \-s\ arguments \fR,\fB\ \-\-server\-args= arguments -Pass -.I arguments -to the -.B Xvfb -server. -Be careful to quote any whitespace characters that may occur within -.I arguments -to prevent them from regarded as separators for -.BR xvfb\-run 's -own arguments. -Also, note that specification of \(oq\-nolisten tcp\(cq in -.I arguments -may override the function of -.BR xvfb\-run 's -own -.B \-l\fR,\fB \-\-listen\-tcp -option, and that specification of the server number (e.g., \(oq:1\(cq) may -be ignored because of the way the X server parses its argument list. -Use the -.B xvfb\-run -option -.BI \-n\ servernumber \fR,\fB\ \-\-server\-num= servernumber -to achieve the latter function. -The default is \(oq\-screen 0 640x480x8\(cq. -.TP -.BI \-w\ delay \fR,\fB\ \-\-wait= delay -Wait -.I delay -seconds after launching -.B Xvfb -before attempting to start the specified command. -The default is 3. -.SH ENVIRONMENT -.TP -.B COLUMNS -indicates the width of the terminal device in character cells. -This value is used for formatting diagnostic messages. -If not set, the terminal is queried using -.BR stty (1) -to determine its width. -If that fails, a value of \(oq80\(cq is assumed. -.TP -.B TMPDIR -specifies the directory in which to place -.BR xvfb\-run 's -temporary directory for storage of the X authority file; only used if the -.B \-f -or -.B \-\-auth\-file -options are not specified. -.SH "OUTPUT FILES" -.PP -Unless the -.B \-f -or -.B \-\-auth\-file -options are specified, a temporary -directory and file within it are created (and deleted) to store the X -authority cookies used by the -.B Xvfb -server and client(s) run under it. -See -.BR tempfile (1). -If \-f or \-\-auth\-file are used, then the specified X authority file is -only written to, not created or deleted (though -.B xauth -creates an authority file itself if told to use use that does not already -exist). -.PP -An error file with a user\-specified name is also created if the -.B \-e -or -.B \-\-error\-file -options are specifed; see above. -.SH "EXIT STATUS" -.B xvfb\-run -uses its exit status as well as output to standard error to communicate -diagnostics. -The exit status of \(oq1\(cq is not used, and should be interpreted as failure -of the specified command. -.TP -0 -.B xvfb\-run -only uses this exit status if the -.B \-h\fR,\fB \-\-help -option is given. -In all other situations, this may be interpreted as success of the specified -command. -.TP -2 -No command to run was specified. -.TP -3 -The -.B xauth -command is not available. -.TP -4 -The temporary directory that was going to be used already exists; since -.B xvfb\-run -produces a uniquely named directory, this may indicate an attempt by another -process on the system to exploit a temporary file race condition. -.TP -5 -A problem was encountered while cleaning up the temporary directory. -.TP -6 -A problem was encountered while using -.BR getopt (1) -to parse the command\-line arguments. -.SH EXAMPLES -.TP -.B xvfb\-run \-\-auto\-servernum \-\-server\-num=1 xlogo -runs the -.BR xlogo (1x) -demonstration client inside the -.B Xvfb -X server on the first available server number greater than or equal to 1. -.TP -.B xvfb\-run \-\-server\-args="\-screen 0 1024x768x24" ico \-faces -runs the -.BR ico (1x) -demonstration client (and passes it the -.B \-faces -argument) inside the -.B Xvfb -X server, configured with a root window of 1024 by 768 pixels and a color -depth of 24 bits. -.PP -Note that the demo X clients used in the above examples will not exit on -their own, so they will have to be killed before -.B xvfb\-run -will exit. -.SH BUGS -See -.URL "http://bugs.debian.org/xvfb" "the Debian Bug Tracking System" . -If you wish to report a bug in -.BR xvfb\-run , -please use the -.BR reportbug (1) -command. -.SH AUTHOR -.B xfvb\-run -was written by Branden Robinson and Jeff Licquia with sponsorship from -Progeny Linux Systems. -.SH "SEE ALSO" -.BR Xvfb (1x), -.BR xauth (1x) -.\" vim:set et tw=80: diff --git a/libre/xorg-server-libre/10-quirks.conf b/libre/xorg-server-libre/10-quirks.conf deleted file mode 100644 index 7afad22dc..000000000 --- a/libre/xorg-server-libre/10-quirks.conf +++ /dev/null @@ -1,10 +0,0 @@ -# Collection of quirks and blacklist/whitelists for specific devices. - - -# Accelerometer device, posts data through ABS_X/ABS_Y, making X unusable -# http://bugs.freedesktop.org/show_bug.cgi?id=22442 -Section "InputClass" - Identifier "ThinkPad HDAPS accelerometer blacklist" - MatchProduct "ThinkPad HDAPS accelerometer data" - Option "Ignore" "on" -EndSection diff --git a/libre/xorg-server-libre/CVE-2013-6424.diff b/libre/xorg-server-libre/CVE-2013-6424.diff deleted file mode 100644 index 8c664b66e..000000000 --- a/libre/xorg-server-libre/CVE-2013-6424.diff +++ /dev/null @@ -1,49 +0,0 @@ -From patchwork Wed Oct 2 13:47:54 2013 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -Subject: exa: only draw valid trapezoids -From: Maarten Lankhorst -X-Patchwork-Id: 14769 -Message-Id: <524C240A.9010607@canonical.com> -To: "X.Org Devel List" -Date: Wed, 02 Oct 2013 15:47:54 +0200 - -Fixes freedesktop.org bug https://bugs.freedesktop.org/show_bug.cgi?id=67484 - -If t->bottom is close to MIN_INT, removing top can wraparound, so do the check properly. -A similar fix should also be applied to pixman. - -Signed-off-by: Maarten Lankhorst - ---- - - -diff --git a/exa/exa_render.c b/exa/exa_render.c -index 172e2b5..807eeba 100644 ---- a/exa/exa_render.c -+++ b/exa/exa_render.c -@@ -1141,7 +1141,8 @@ exaTrapezoids(CARD8 op, PicturePtr pSrc, PicturePtr pDst, - - exaPrepareAccess(pPicture->pDrawable, EXA_PREPARE_DEST); - for (; ntrap; ntrap--, traps++) -- (*ps->RasterizeTrapezoid) (pPicture, traps, -bounds.x1, -bounds.y1); -+ if (xTrapezoidValid(traps)) -+ (*ps->RasterizeTrapezoid) (pPicture, traps, -bounds.x1, -bounds.y1); - exaFinishAccess(pPicture->pDrawable, EXA_PREPARE_DEST); - - xRel = bounds.x1 + xSrc - xDst; -diff --git a/render/picture.h b/render/picture.h -index c85353a..fcd6401 100644 ---- a/render/picture.h -+++ b/render/picture.h -@@ -211,7 +211,7 @@ typedef pixman_fixed_t xFixed; - /* whether 't' is a well defined not obviously empty trapezoid */ - #define xTrapezoidValid(t) ((t)->left.p1.y != (t)->left.p2.y && \ - (t)->right.p1.y != (t)->right.p2.y && \ -- (int) ((t)->bottom - (t)->top) > 0) -+ ((t)->bottom > (t)->top)) - - /* - * Standard NTSC luminance conversions: - diff --git a/libre/xorg-server-libre/PKGBUILD b/libre/xorg-server-libre/PKGBUILD index 0f77ca01d..cd84a2066 100644 --- a/libre/xorg-server-libre/PKGBUILD +++ b/libre/xorg-server-libre/PKGBUILD @@ -1,12 +1,12 @@ -# $Id$ +# $Id: PKGBUILD 218446 2014-07-31 12:02:24Z lcarlier $ +# Maintainer (Parabola): Márcio Silva # Maintainer: AndyRTR # Maintainer: Jan de Groot -# Maintainer (Parabola): Márcio Silva pkgbase=xorg-server pkgname=('xorg-server-libre') -pkgver=1.15.2 -pkgrel=1 # build first with 0.1 and then rebuild it after xf86-input-evdev rebuild +pkgver=1.16.0 +pkgrel=6 # build first with 0.1 and then rebuild it after xf86-input-evdev rebuild arch=('i686' 'x86_64') license=('custom') url="http://xorg.freedesktop.org" @@ -14,44 +14,52 @@ makedepends=('pixman' 'libx11' 'mesa' 'mesa-libgl' 'xf86driproto' 'xcmiscproto' 'inputproto' 'fontsproto' 'videoproto' 'presentproto' 'compositeproto' 'recordproto' 'scrnsaverproto' 'resourceproto' 'xineramaproto' 'libxkbfile' 'libxfont' 'renderproto' 'libpciaccess' 'libxv' 'xf86dgaproto' 'libxmu' 'libxrender' 'libxi' 'dmxproto' 'libxaw' 'libdmx' 'libxtst' 'libxres' - 'xorg-xkbcomp' 'xorg-util-macros' 'xorg-font-util' 'glproto' 'dri2proto' 'libgcrypt' + 'xorg-xkbcomp' 'xorg-util-macros' 'xorg-font-util' 'glproto' 'dri2proto' 'libgcrypt' 'libepoxy' 'xcb-util' 'xcb-util-image' 'xcb-util-wm' 'xcb-util-keysyms' 'dri3proto' 'libxshmfence') -source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2 +source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2{,.sig} + autoconfig-nvidia-libre.patch autoconfig-sis.patch + glamor-upstream-fix.patch xvfb-run - xvfb-run.1 - 10-quirks.conf - CVE-2013-6424.diff) -sha256sums=('3c0585607c654ded836da43a45a75492fc13454ff4149704fb08dac39f051163' + xvfb-run.1) +sha256sums=('38330a03c5f7a38745a3f9816cf069db5b8844eebb358fd39dbabf61f32cd06b' + 'SKIP' + 'eca387a72345ac9cce866a8ca3b31e6ef696f298be4863196da75009c6673363' 'd027776fac1f7675b0a9ee817502290b1c45f9c09b0f0a6bb058c35f92361e84' + 'fbd898f0e867c77c9bf918fd2e7956c7776ecb3cc3634c61290fb03513b47987' 'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9' - '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776' - '94612f5c0d34a3b7152915c2e285c7b462e9d8e38d3539bd551a339498eac166' - '89948993afd4d9aec6a0bdbaf62f494e9956bb77a0386307d497f340a818ff61') + '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776') prepare() { cd "${pkgbase}-${pkgver}" # Use unofficial imedia SiS driver for supported SiS devices patch -Np0 -i ../autoconfig-sis.patch - - # Fix CVE-2013-6424 (FS#38401) - patch -Np1 -i ../CVE-2013-6424.diff - - # fix os name - sed -i '\|Current Operating System| s| %s %s|| - s|name.sysname, name.nodename, name.release|OSNAME, name.nodename| - s|name.version, name.machine|name.version| + # NV01 (Diamond Edge 3D) and NV03 (Riva 128) is not supported by nouveau: + # http://nouveau.freedesktop.org/wiki/CodeNames/#Ancient + # Use nouveau/nv/vesa drivers for nvidia devices + # Note: nonfree "nvidia" driver support was removed on our patch version + patch -Np1 -i ../autoconfig-nvidia-libre.patch + # merged upstream (1.16 branch) + patch -Np1 -i ../glamor-upstream-fix.patch + + # fix os name: + #Build Operating System = OSNAME="--kernel-name --kernel-release --machine" OSVENDOR="" + #Current Operating System = --kernel-name --nodename --kernel-release --kernel-version --machine + # to: + #Build Operating System = OSNAME="--operating-system" OSVENDOR="--machine - kernel --kernel-release" + #Current Operating System = OSNAME="--operating-system" --nodename --machine - kernel --kernel-release --kernel-version + # see: man uname + + sed -i '\|Current Operating System| s|%s %s %s %s %s|%s %s %s - kernel %s %s| + s|name.sysname, name.nodename, name.release|OSNAME, name.nodename, name.machine| + s|name.version, name.machine|name.release, name.version| ' hw/xfree86/common/xf86Init.c sed -i 's|Linux|GNU/Linux| + s|GNU Hurd|GNU/Hurd| ' hw/xfree86/man/{Xorg,xorg.conf}.man - sed -i '\|OSNAME| s|hurd|gnu| - \|OSNAME| s|linux|gnu/linux| - s|#define OSNAME "freebsd"|#define OSNAME "freebsd"\n#elif defined(__FreeBSD_kernel__)\n#define OSNAME "gnu/kfreebsd"| - ' hw/xfree86/loader/os.c - sed -i 's|uname -s|uname -o| - s|uname -r|uname -sr| - s|uname -orm|echo $(uname -o) $(uname -m) - $(uname -s) kernel $(uname -r)| - ' ChangeLog config.guess configure.ac configure + sed -i 's|uname -srm|uname -o| + s|uname -s|uname -o| + ' ChangeLog config.guess configure.ac configure compile } build() { @@ -67,26 +75,32 @@ build() { --enable-xcsecurity \ --enable-xorg \ --enable-xephyr \ + --enable-glamor \ + --enable-xwayland \ --enable-glx-tls \ --enable-kdrive \ --enable-kdrive-evdev \ --enable-kdrive-kbd \ --enable-kdrive-mouse \ - --enable-install-setuid \ --enable-config-udev \ - --disable-config-dbus \ + --enable-systemd-logind \ + --enable-suid-wrapper \ + --disable-install-setuid \ --enable-record \ --disable-xfbdev \ --disable-xfake \ --disable-static \ - --sysconfdir=/etc/X11 \ + --libexecdir=/usr/bin \ + --sysconfdir=/etc \ --localstatedir=/var \ --with-xkb-path=/usr/share/X11/xkb \ --with-xkb-output=/var/lib/xkb \ - --with-fontrootdir=/usr/share/fonts + --with-fontrootdir=/usr/share/fonts \ + --with-os-name="$(uname -o)" \ + --with-os-vendor="$(uname -m) - kernel $(uname -r)" -# --without-dtrace \ -# --disable-linux-acpi --disable-linux-apm \ +# --without-dtrace \ +# --disable-linux-acpi --disable-linux-apm \ make @@ -95,29 +109,24 @@ build() { -e 's/^XVFB_SUBDIRS =.*/XVFB_SUBDIRS =/' \ -e 's/^XNEST_SUBDIRS =.*/XNEST_SUBDIRS = /' \ -e 's/^KDRIVE_SUBDIRS =.*/KDRIVE_SUBDIRS =/' \ + -e 's/^XWAYLAND_SUBDIRS =.*/XWAYLAND_SUBDIRS =/' \ -i hw/Makefile } package_xorg-server-libre() { pkgdesc="Xorg X server, without nonfree nvidia driver support" - depends=(libxdmcp libxfont libpciaccess libdrm pixman libgcrypt libxau xorg-server-common xf86-input-evdev libxshmfence) - backup=('etc/X11/xorg.conf.d/10-evdev.conf' 'etc/X11/xorg.conf.d/10-quirks.conf') + depends=(libepoxy libxdmcp libxfont libpciaccess libdrm pixman libgcrypt libxau xorg-server-common xf86-input-evdev libxshmfence) # see xorg-server-*/hw/xfree86/common/xf86Module.h for ABI versions - we provide major numbers that drivers can depend on # and /usr/lib/pkgconfig/xorg-server.pc in xorg-server-devel pkg - provides=('X-ABI-VIDEODRV_VERSION=15' 'X-ABI-XINPUT_VERSION=20' 'X-ABI-EXTENSION_VERSION=8.0' 'x-server' "$pkgbase=$pkgver") + provides=('X-ABI-VIDEODRV_VERSION=18' 'X-ABI-XINPUT_VERSION=21' 'X-ABI-EXTENSION_VERSION=8.0' 'x-server' "$pkgbase=$pkgver") groups=('xorg') - conflicts=('nvidia-utils' "$pkgbase") - replaces=('nvidia-utils' "$pkgbase") + conflicts=('nvidia-utils' 'glamor-egl' "$pkgbase") + replaces=('nvidia-utils' 'glamor-egl' "$pkgbase") + install=xorg-server.install cd "${pkgbase}-${pkgver}" make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/etc/X11" - mv "${pkgdir}/usr/share/X11/xorg.conf.d" "${pkgdir}/etc/X11/" - install -m644 "${srcdir}/10-quirks.conf" "${pkgdir}/etc/X11/xorg.conf.d/" - - rmdir "${pkgdir}/usr/share/X11" - # Needed for non-mesa drivers, libgl will restore it mv "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so" \ "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.xorg" diff --git a/libre/xorg-server-libre/autoconfig-nvidia-libre.patch b/libre/xorg-server-libre/autoconfig-nvidia-libre.patch new file mode 100644 index 000000000..688b495e1 --- /dev/null +++ b/libre/xorg-server-libre/autoconfig-nvidia-libre.patch @@ -0,0 +1,26 @@ +diff -Nur xorg-server-1.11.99.902.orig/hw/xfree86/common/xf86pciBus.c xorg-server-1.11.99.902/hw/xfree86/common/xf86pciBus.c +--- xorg-server-1.11.99.902.orig/hw/xfree86/common/xf86pciBus.c 2012-02-10 10:10:37.583014924 +0000 ++++ xorg-server-1.11.99.902/hw/xfree86/common/xf86pciBus.c 2012-02-10 11:16:07.148971317 +0000 +@@ -1144,7 +1144,21 @@ + int idx = 0; + + #ifdef __linux__ +- driverList[idx++] = "nouveau"; ++ switch (dev->device_id) ++ { ++ /* NV1 - Diamond Edge 3D */ ++ case 0x0008: ++ case 0x0009: ++ driverList[idx++] = "vesa"; ++ break; ++ /* NV3 - Riva 128 */ ++ case 0x0018: ++ driverList[idx++] = "nv"; ++ break; ++ default: ++ driverList[idx++] = "nouveau"; ++ break; ++ } + #endif + driverList[idx++] = "nv"; + break; diff --git a/libre/xorg-server-libre/glamor-upstream-fix.patch b/libre/xorg-server-libre/glamor-upstream-fix.patch new file mode 100644 index 000000000..89dd4d017 --- /dev/null +++ b/libre/xorg-server-libre/glamor-upstream-fix.patch @@ -0,0 +1,178 @@ +From 3c0431b8911241552a15a43e4279c50658b50a18 Mon Sep 17 00:00:00 2001 +From: Keith Packard +Date: Wed, 16 Jul 2014 23:03:23 +0000 +Subject: glamor: Fix temp picture coordinates in glamor_composite_clipped_region + +To understand this patch, let's start at the protocol interface where +the relationship between the coordinate spaces is documented: + + static Bool + _glamor_composite(CARD8 op, + PicturePtr source, + PicturePtr mask, + PicturePtr dest, + INT16 x_source, + INT16 y_source, + INT16 x_mask, + INT16 y_mask, + INT16 x_dest, INT16 y_dest, + CARD16 width, CARD16 height, Bool fallback) + +The coordinates are passed to this function directly off the wire and +are all relative to their respective drawables. For Windows, this means +that they are relative to the upper left corner of the window, in +whatever pixmap that window is getting drawn to. + +_glamor_composite calls miComputeCompositeRegion to construct a clipped +region to actually render to. In reality, miComputeCompositeRegion clips +only to the destination these days; source clip region based clipping +would have to respect the transform, which isn't really possible. The +returned region is relative to the screen in which dest lives; offset by +dest->drawable.x and dest->drawable.y. + +What is important to realize here is that, because of clipping, the +composite region may not have the same position within the destination +drawable as x_dest, y_dest. The protocol coordinates now exist solely to +'pin' the three objects together. + + extents->x1,y1 Screen origin of clipped operation + width,height Extents of the clipped operation + x_dest,y_dest Unclipped destination-relative operation coordinate + x_source,y_source Unclipped source-relative operation coordinate + x_mask,y_mask Unclipped mask-relative operation coordinate + +One thing we want to know is what the offset is from the original +operation origin to the clipped origin + + Destination drawable relative coordinates of the clipped operation: + + x_dest_clipped = extents->x1 - dest->drawable.x + y_dest_clipped = extents->y1 - dest->drawable.y + + Offset from the original operation origin: + + x_off_clipped = x_dest_clipped - x_dest + y_off_clipped = y_dest_clipped - y_dest + + Source drawable relative coordinates of the clipped operation: + + x_source_clipped = x_source + x_off_clipped; + y_source_clipped = y_source + y_off_clipped; + + Mask drawable relative coordinates of the clipped operation: + + x_mask_clipped = x_source + x_off_clipped; + y_mask_clipped = y_source + y_off_clipped; + +This is where the original code fails -- it doesn't subtract the +destination drawable location when computing the distance that the +operation has been moved by clipping. Here's what it does when +constructing a temporary source picture: + + temp_src = + glamor_convert_gradient_picture(screen, source, + extent->x1 + x_source - x_dest, + extent->y1 + y_source - y_dest, + width, height); + ... + x_temp_src = -extent->x1 + x_dest; + y_temp_src = -extent->y1 + y_dest; + +glamor_convert_gradient_picture needs source drawable relative +coordinates, but that is not what it's getting; it's getting +screen-relative coordinates for the destination, adjusted by the +distance between the provided source and destination operation +coordinates. We want x_source_clipped and y_source_clipped: + + x_source_clipped = x_source + x_off_clipped + = x_source + x_dest_clipped - x_dest + = x_source + extents->x1 - dest->drawable.x - x_dest + +x_temp_src/y_temp_src are supposed to be the coordinates of the original +operation translated to the temporary picture: + + x_temp_src = x_source - x_source_clipped; + y_temp_src = y_source - y_source_clipped; + +Note that x_source_clipped/y_source_clipped will never be less than +x_source/y_source because all we're doing is clipping. This means that +x_temp_src/y_temp_src will always be non-positive; the original source +coordinate can never be strictly *inside* the temporary image or we +could have made the temporary image smaller. + + x_temp_src = x_source - x_source_clipped + = x_source - (x_source + x_off_clipped) + = -x_off_clipped + = x_dest - x_dest_clipped + = x_dest - (extents->x1 - dest->drawable.x) + +Again, this is off by the destination origin within the screen +coordinate space. + +The code should look like: + + temp_src = + glamor_convert_gradient_picture(screen, source, + extent->x1 + x_source - x_dest - dest->pDrawable->x, + extent->y1 + y_source - y_dest - dest->pDrawable->y, + width, height); + + x_temp_src = -extent->x1 + x_dest + dest->pDrawable->x; + y_temp_src = -extent->y1 + y_dest + dest->pDrawable->y; + +Signed-off-by: Keith Packard +Reviewed-by: Markus Wick +(cherry picked from commit 55f5bfb578e934319d1308cbb56c900c5ac7cfa7) +Signed-off-by: Julien Cristau +--- +diff --git a/glamor/glamor_render.c b/glamor/glamor_render.c +index 14ab738..e5d5d2c 100644 +--- a/glamor/glamor_render.c ++++ b/glamor/glamor_render.c +@@ -1450,8 +1450,8 @@ glamor_composite_clipped_region(CARD8 op, + || source_pixmap->drawable.height != height)))) { + temp_src = + glamor_convert_gradient_picture(screen, source, +- extent->x1 + x_source - x_dest, +- extent->y1 + y_source - y_dest, ++ extent->x1 + x_source - x_dest - dest->pDrawable->x, ++ extent->y1 + y_source - y_dest - dest->pDrawable->y, + width, height); + if (!temp_src) { + temp_src = source; +@@ -1459,8 +1459,8 @@ glamor_composite_clipped_region(CARD8 op, + } + temp_src_priv = + glamor_get_pixmap_private((PixmapPtr) (temp_src->pDrawable)); +- x_temp_src = -extent->x1 + x_dest; +- y_temp_src = -extent->y1 + y_dest; ++ x_temp_src = -extent->x1 + x_dest + dest->pDrawable->x; ++ y_temp_src = -extent->y1 + y_dest + dest->pDrawable->y; + } + + if (mask +@@ -1474,8 +1474,8 @@ glamor_composite_clipped_region(CARD8 op, + * to do reduce one convertion. */ + temp_mask = + glamor_convert_gradient_picture(screen, mask, +- extent->x1 + x_mask - x_dest, +- extent->y1 + y_mask - y_dest, ++ extent->x1 + x_mask - x_dest - dest->pDrawable->x, ++ extent->y1 + y_mask - y_dest - dest->pDrawable->y, + width, height); + if (!temp_mask) { + temp_mask = mask; +@@ -1483,8 +1483,8 @@ glamor_composite_clipped_region(CARD8 op, + } + temp_mask_priv = + glamor_get_pixmap_private((PixmapPtr) (temp_mask->pDrawable)); +- x_temp_mask = -extent->x1 + x_dest; +- y_temp_mask = -extent->y1 + y_dest; ++ x_temp_mask = -extent->x1 + x_dest + dest->pDrawable->x; ++ y_temp_mask = -extent->y1 + y_dest + dest->pDrawable->y; + } + /* Do two-pass PictOpOver componentAlpha, until we enable + * dual source color blending. +-- +cgit v0.9.0.2-2-gbebe + diff --git a/libre/xorg-server-libre/xorg-server.install b/libre/xorg-server-libre/xorg-server.install new file mode 100644 index 000000000..46bf5a90a --- /dev/null +++ b/libre/xorg-server-libre/xorg-server.install @@ -0,0 +1,18 @@ +post_upgrade() { + if (( $(vercmp $2 1.16.0-3) < 0 )); then + post_install + fi +} + +post_install() { + cat <>> xorg-server has now the ability to run without root rights with + the help of systemd-logind. xserver will fail to run if not launched + from the same virtual terminal as was used to log in. + Without root rights, log files will be in ~/.local/share/xorg/ directory. + + Old behavior can be restored through Xorg.wrap config file. + See Xorg.wrap man page (man xorg.wrap). +MSG +} + -- cgit v1.2.3-2-g168b