diff options
Diffstat (limited to 'x11-base/xorg-server/files/xorg-server-1.19.99.904-modesetting-Move-GBM-code-inside-ifdef-GLAMOR_HAS_GB.patch')
-rw-r--r-- | x11-base/xorg-server/files/xorg-server-1.19.99.904-modesetting-Move-GBM-code-inside-ifdef-GLAMOR_HAS_GB.patch | 48 |
1 files changed, 0 insertions, 48 deletions
diff --git a/x11-base/xorg-server/files/xorg-server-1.19.99.904-modesetting-Move-GBM-code-inside-ifdef-GLAMOR_HAS_GB.patch b/x11-base/xorg-server/files/xorg-server-1.19.99.904-modesetting-Move-GBM-code-inside-ifdef-GLAMOR_HAS_GB.patch deleted file mode 100644 index f0c4ed58d33d..000000000000 --- a/x11-base/xorg-server/files/xorg-server-1.19.99.904-modesetting-Move-GBM-code-inside-ifdef-GLAMOR_HAS_GB.patch +++ /dev/null @@ -1,48 +0,0 @@ -From a98a95b798a0062783ae6fd2135ad488af5efcfd Mon Sep 17 00:00:00 2001 -From: Matt Turner <mattst88@gmail.com> -Date: Sun, 15 Apr 2018 23:37:45 -0700 -Subject: [PATCH xserver 2/2] modesetting: Move GBM code inside #ifdef - GLAMOR_HAS_GBM - -Fixes a compilation error without Glamor. - -Bugzilla: https://bugs.gentoo.org/653288 -Signed-off-by: Matt Turner <mattst88@gmail.com> -Reviewed-by: Olivier Fourdan <ofourdan@redhat.com> ---- - hw/xfree86/drivers/modesetting/drmmode_display.c | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.c b/hw/xfree86/drivers/modesetting/drmmode_display.c -index 322ef050b..79e91f0f8 100644 ---- a/hw/xfree86/drivers/modesetting/drmmode_display.c -+++ b/hw/xfree86/drivers/modesetting/drmmode_display.c -@@ -998,18 +998,18 @@ static Bool - drmmode_create_bo(drmmode_ptr drmmode, drmmode_bo *bo, - unsigned width, unsigned height, unsigned bpp) - { -- uint32_t format; -- -- if (drmmode->scrn->depth == 30) -- format = GBM_FORMAT_ARGB2101010; -- else -- format = GBM_FORMAT_ARGB8888; -- - bo->width = width; - bo->height = height; - - #ifdef GLAMOR_HAS_GBM - if (drmmode->glamor) { -+ uint32_t format; -+ -+ if (drmmode->scrn->depth == 30) -+ format = GBM_FORMAT_ARGB2101010; -+ else -+ format = GBM_FORMAT_ARGB8888; -+ - #ifdef GBM_BO_WITH_MODIFIERS - uint32_t num_modifiers; - uint64_t *modifiers = NULL; --- -2.16.1 - |