rpm/xorg-x11-server
SHA256
1
0
Fork 0
forked from pool/xorg-x11-server
Code Pull Requests Activity

Accepting request 414921 from home:tobijk:X11:XOrg

Browse Source 
- Update to version 1.18.4:
  Another pile of backports from the devel branch, primarily in glamor,
  xwayland, and the modesetting driver.
- Remove included patches:
  + u_x86emu-include-order.patch
  + U_modesetting-set-driverPrivate-to-NULL-after-closing-fd.patch
- Update patches to reflect upstream changes:
  + U_glamor-Remove-the-FBO-cache.patch

OBS-URL: https://build.opensuse.org/request/show/414921
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=640
This commit is contained in:
Stefan Dirsch 2016-07-25 09:11:10 +00:00 committed by Git OBS Bridge
parent 6a323cf456
commit 0879a5c6a5
7 changed files with 18 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
U_glamor-Remove-the-FBO-cache.patch
View File

@ -409,5 +409,5 @@ index a70f10e..78346bf 100644
Bool glamor_pixmap_fbo_fixup(ScreenPtr screen, PixmapPtr pixmap);
-void glamor_fbo_expire(glamor_screen_private *glamor_priv);
glamor_pixmap_fbo *glamor_create_fbo_array(glamor_screen_private *glamor_priv,
int w, int h, GLenum format,
/* Return whether 'picture' is alpha-only */
static inline Bool glamor_picture_is_alpha(PicturePtr picture)

37
U_modesetting-set-driverPrivate-to-NULL-after-closing-fd.patch
View File

@ -1,37 +0,0 @@
From: Dave Airlie <airlied@gmail.com>
Date: Fri Apr 29 14:01:31 2016 +1000
Subject: [PATCH]modesetting: set driverPrivate to NULL after closing fd.
Patch-mainline: Upstream
Git-repo: git://anongit.freedesktop.org/git/xorg/xserver
Git-commit: a41a171bcbae9aeafac2865faa904f15d9b59925
References: boo#981268
Signed-off-by: Egbert Eich <eich@suse.com>
Otherwise ms_ent_priv will return NULL and things will fall apart.
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
---
hw/xfree86/drivers/modesetting/driver.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/xfree86/drivers/modesetting/driver.c b/hw/xfree86/drivers/modesetting/driver.c
index c97f33a..abf7e1a 100644
--- a/hw/xfree86/drivers/modesetting/driver.c
+++ b/hw/xfree86/drivers/modesetting/driver.c
@@ -635,7 +635,6 @@ FreeRec(ScrnInfoPtr pScrn)
ms = modesettingPTR(pScrn);
if (!ms)
return;
- pScrn->driverPrivate = NULL;
if (ms->fd > 0) {
modesettingEntPtr ms_ent;
@@ -656,6 +655,7 @@ FreeRec(ScrnInfoPtr pScrn)
ms_ent->fd = 0;
}
}
+ pScrn->driverPrivate = NULL;
free(ms->drmmode.Options);
free(ms);

47
u_x86emu-include-order.patch
View File

@ -1,47 +0,0 @@
Subject: [PATCH] Change include order to avoid conflict with system header
From: Andreas Schwab <schwab@suse.de>
R_SP is also defined in <sys/ucontext.h> on m68k.
Also remove duplicate definitions.
Signed-off-by: Andreas Schwab <schwab@suse.de>
Index: xorg-server-1.14.3/hw/xfree86/int10/xf86x86emu.c
===================================================================
--- xorg-server-1.14.3.orig/hw/xfree86/int10/xf86x86emu.c
+++ xorg-server-1.14.3/hw/xfree86/int10/xf86x86emu.c
@@ -7,7 +7,6 @@
#include <xorg-config.h>
#endif
-#include <x86emu.h>
#include "xf86.h"
#include "xf86_OSproc.h"
#include "xf86Pci.h"
@@ -15,6 +14,7 @@
#define _INT10_PRIVATE
#include "xf86int10.h"
#include "int10Defines.h"
+#include <x86emu.h>
#define M _X86EMU_env
Index: xorg-server-1.14.3/hw/xfree86/x86emu/x86emu/regs.h
===================================================================
--- xorg-server-1.14.3.orig/hw/xfree86/x86emu/x86emu/regs.h
+++ xorg-server-1.14.3/hw/xfree86/x86emu/x86emu/regs.h
@@ -147,14 +147,6 @@ struct i386_segment_regs {
#define R_FLG spc.FLAGS
/* special registers */
-#define R_SP spc.SP.I16_reg.x_reg
-#define R_BP spc.BP.I16_reg.x_reg
-#define R_SI spc.SI.I16_reg.x_reg
-#define R_DI spc.DI.I16_reg.x_reg
-#define R_IP spc.IP.I16_reg.x_reg
-#define R_FLG spc.FLAGS
-
-/* special registers */
#define R_ESP spc.SP.I32_reg.e_reg
#define R_EBP spc.BP.I32_reg.e_reg
#define R_ESI spc.SI.I32_reg.e_reg

3
xorg-server-1.18.3.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ea739c22517cdbe2b5f7c0a5fd05fe8a10ac0629003e71c0c7862f4bb60142cd
size 5867330

3
xorg-server-1.18.4.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:278459b2c31d61a15655d95a72fb79930c480a6bb8cf9226e48a07df8b1d31c8
size 6009508

12
xorg-x11-server.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Tue Jul 19 22:44:59 UTC 2016 - tobias.johannes.klausmann@mni.thm.de
- Update to version 1.18.4:
Another pile of backports from the devel branch, primarily in glamor,
xwayland, and the modesetting driver.
- Remove included patches:
+ u_x86emu-include-order.patch
+ U_modesetting-set-driverPrivate-to-NULL-after-closing-fd.patch
- Update patches to reflect upstream changes:
+ U_glamor-Remove-the-FBO-cache.patch
-------------------------------------------------------------------
Tue Jul 19 12:01:14 UTC 2016 - mstaudt@suse.com

6
xorg-x11-server.spec
View File

@ -42,7 +42,7 @@
Name: xorg-x11-server
%define dirsuffix 1.18.3
%define dirsuffix 1.18.4
Summary: X
License: MIT
@ -186,7 +186,6 @@ Patch9: u_xorg-wrapper-build-Build-position-independent-code.patch
Patch100: u_01-Improved-ConfineToShape.patch
Patch101: u_02-DIX-ConfineTo-Don-t-bother-about-the-bounding-box-when-grabbing-a-shaped-window.patch
# PATCH-FIX-UPSTREAM u_x86emu-include-order.patch schwab@suse.de -- Change include order to avoid conflict with system header, remove duplicate definitions
Patch102: u_x86emu-include-order.patch
Patch104: u_xorg-server-xdmcp.patch
Patch112: u_render-Cast-color-masks-to-unsigned-long-before-shifting-them.patch
@ -218,7 +217,6 @@ Patch1228: U_ephyr-enable-option-sw-cursor-by-default-in-multi-se.patch
Patch1229: U_kdrive-introduce-input-hot-plugging-support-for-udev.patch
Patch1230: U_kdrive-add-options-to-set-default-XKB-properties.patch
Patch1232: U_config-udev-distinguish-between-real-keyboards-and-o.patch
Patch1233: U_modesetting-set-driverPrivate-to-NULL-after-closing-fd.patch
%description
This package contains the X.Org Server.
@ -324,7 +322,6 @@ sh %{SOURCE92} --verify . %{SOURCE91}
#
%patch100 -p1
#%patch101 -p1
%patch102 -p1
%patch104 -p1
%patch112 -p1
@ -361,7 +358,6 @@ sh %{SOURCE92} --verify . %{SOURCE91}
%patch1230 -p1
%patch1232 -p1
%patch1233 -p1
%build
test -e source-file-list || \