diff options
Diffstat (limited to 'source/x/x11')
| -rw-r--r-- | source/x/x11/build/xorg-server | 2 | ||||
| -rw-r--r-- | source/x/x11/patch/xorg-server.patch | 1 | ||||
| -rw-r--r-- | source/x/x11/patch/xorg-server/fix-nouveau-segfault.diff | 12 |
3 files changed, 14 insertions, 1 deletions
diff --git a/source/x/x11/build/xorg-server b/source/x/x11/build/xorg-server index d00491fd7..0cfbf0888 100644 --- a/source/x/x11/build/xorg-server +++ b/source/x/x11/build/xorg-server @@ -1 +1 @@ -1 +2 diff --git a/source/x/x11/patch/xorg-server.patch b/source/x/x11/patch/xorg-server.patch index 1e43b86e4..cdd0ebd87 100644 --- a/source/x/x11/patch/xorg-server.patch +++ b/source/x/x11/patch/xorg-server.patch @@ -1,2 +1,3 @@ zcat $CWD/patch/xorg-server/x11.startwithblackscreen.diff.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; } zcat $CWD/patch/xorg-server/xorg-server.combo.mouse.keyboard.layout.patch.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +zcat $CWD/patch/xorg-server/fix-nouveau-segfault.diff.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/source/x/x11/patch/xorg-server/fix-nouveau-segfault.diff b/source/x/x11/patch/xorg-server/fix-nouveau-segfault.diff new file mode 100644 index 000000000..db66956f3 --- /dev/null +++ b/source/x/x11/patch/xorg-server/fix-nouveau-segfault.diff @@ -0,0 +1,12 @@ +--- ./render/mipict.c.orig 2018-05-10 11:32:37.000000000 -0500 ++++ ./render/mipict.c 2018-05-30 00:01:50.648530333 -0500 +@@ -394,6 +394,9 @@ + CARD32 r, g, b, a; + miIndexedPtr pIndexed; + ++ if(! format) ++ *pixel = (color->alpha >> 8 << 24) | (color->red >> 8 << 16) | (color->green & 0xff00) | (color->blue >> 8); ++ else + switch (format->type) { + case PictTypeDirect: + r = color->red >> (16 - Ones(format->direct.redMask)); |