aboutsummaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2018-08-09 19:01:04 +0200
committerMarius Bakke <mbakke@fastmail.com>2018-08-09 21:19:47 +0200
commit88c54b1b75bb0f8f1e5399d176f2ca1e26159f64 (patch)
tree7c7593a875190efa7cfa177974494f6989325b12 /gnu
parentf71561567b369aac73a9783cef760cacecaad287 (diff)
downloadguix-88c54b1b75bb0f8f1e5399d176f2ca1e26159f64.tar.gz
guix-88c54b1b75bb0f8f1e5399d176f2ca1e26159f64.zip
gnu: xorg-server: Update to 1.20.1.
* gnu/packages/patches/xorg-server-rotate-fb.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. * gnu/packages/xorg.scm (xorg-server): Update to 1.20.1. [source](patches): Remove 'xorg-server-rotate-fb.patch'.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/local.mk1
-rw-r--r--gnu/packages/patches/xorg-server-rotate-fb.patch35
-rw-r--r--gnu/packages/xorg.scm7
3 files changed, 3 insertions, 40 deletions
diff --git a/gnu/local.mk b/gnu/local.mk
index c54a297209..305eed5c30 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1238,7 +1238,6 @@ dist_patch_DATA = \
%D%/packages/patches/xinetd-fix-fd-leak.patch \
%D%/packages/patches/xinetd-CVE-2013-4342.patch \
%D%/packages/patches/xmodmap-asprintf.patch \
- %D%/packages/patches/xorg-server-rotate-fb.patch \
%D%/packages/patches/zathura-pdf-mupdf-link-to-jpeg-libraries.patch \
%D%/packages/patches/zathura-plugindir-environment-variable.patch \
%D%/packages/patches/zstd-fix-stdin-list-without-tty.patch \
diff --git a/gnu/packages/patches/xorg-server-rotate-fb.patch b/gnu/packages/patches/xorg-server-rotate-fb.patch
deleted file mode 100644
index f47036b2a7..0000000000
--- a/gnu/packages/patches/xorg-server-rotate-fb.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-commit a85e94a50c94b07574c8701a3ff3c1243f4257f4
-Author: Olivier Fourdan <ofourdan@redhat.com>
-Date: Fri Jun 15 08:57:12 2018 +0200
-
- modesetting: use drmmode_bo_import() for rotate_fb
-
- drmmode_shadow_allocate() still uses drmModeAddFB() which may fail if
- the format is not as expected, preventing from using a rotated output.
-
- Change it to use the new function drmmode_bo_import() which takes care
- of calling the drmModeAddFB2() API.
-
- Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=106715
- Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
- Tested-by: Tomas Pelka <tpelka@redhat.com>
- Reviewed-by: Lyude Paul <lyude@redhat.com>
-
-diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.c b/hw/xfree86/drivers/modesetting/drmmode_display.c
-index 859a21a9d..ec11b3f56 100644
---- a/hw/xfree86/drivers/modesetting/drmmode_display.c
-+++ b/hw/xfree86/drivers/modesetting/drmmode_display.c
-@@ -1794,11 +1794,8 @@ drmmode_shadow_allocate(xf86CrtcPtr crtc, int width, int height)
- return NULL;
- }
-
-- ret = drmModeAddFB(drmmode->fd, width, height, crtc->scrn->depth,
-- drmmode->kbpp,
-- drmmode_bo_get_pitch(&drmmode_crtc->rotate_bo),
-- drmmode_bo_get_handle(&drmmode_crtc->rotate_bo),
-- &drmmode_crtc->rotate_fb_id);
-+ ret = drmmode_bo_import(drmmode, &drmmode_crtc->rotate_bo,
-+ &drmmode_crtc->rotate_fb_id);
-
- if (ret) {
- ErrorF("failed to add rotate fb\n");
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index b238ea4aad..9d9069bab8 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -5070,7 +5070,7 @@ over Xlib, including:
(define-public xorg-server
(package
(name "xorg-server")
- (version "1.20.0")
+ (version "1.20.1")
(source
(origin
(method url-fetch)
@@ -5079,7 +5079,7 @@ over Xlib, including:
name "-" version ".tar.bz2"))
(sha256
(base32
- "1rnka3sp8yg2bir0bjjhwn33jikj8qd8ckqcxrs94w05bwc7v5lx"))
+ "0679942x1ma2p30vlvqylpjc5v1ak1pgqysnqrj82nz7dzl9zjar"))
(patches
(list
;; See:
@@ -5093,8 +5093,7 @@ over Xlib, including:
(sha256
(base32
"0mm70y058r8s9y9jiv7q2myv0ycnaw3iqzm7d274410s0ik38w7q"))
- (file-name "xorg-server-use-intel-only-on-pre-gen4.diff"))
- (search-patch "xorg-server-rotate-fb.patch")))))
+ (file-name "xorg-server-use-intel-only-on-pre-gen4.diff"))))))
(build-system gnu-build-system)
(propagated-inputs
`(("libpciaccess" ,libpciaccess)