pool/xorg-x11-server
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Update to version 1.20.8+0:

Browse Source 
* Revert "dri2: Don't make reference to noClientException"
  * dix: Check for NULL spriteInfo in GetPairedDevice
  * os: Ignore dying client in ResetCurrentRequest
  * modesetting: remove unnecessary error message, fix zaphod leases
  * Fix building with `-fno-common`
  * xwayland: clear pixmaps after creation in rootless mode
  * glamor: Fix a compiler warning since the recent OOM fixes.
  * Restrict 1x1 pixmap filling optimization to GXcopy
  * Add xf86OSInputThreadInit to stub os-support as well
  * Fix old-style definition warning for xf86OSInputThreadInit()
  * xwayland/glamor-gbm: Handle DRM_FORMAT_MOD_INVALID gracefully
  * configure: Define GLAMOR_HAS_EGL_QUERY_DRIVER when available
  * modesetting: Disable atomic support by default
  * modesetting: Explicitly #include "mi.h"
  * xfree86/modes: Bail from xf86RotateRedisplay if pScreen->root is NULL
  * xwayland: Split up xwl_screen_post_damage into two phases
  * xwayland: Call glamor_block_handler from xwl_screen_post_damage
  * xwayland: Add xwl_window_create_frame_callback helper
  * xwayland: Use single frame callback for Present flips and normal updates
  * xwayland: Use frame callbacks for Present vblank events
  * xwayland: Delete all frame_callback_list nodes in xwl_unrealize_window
  * glamor: Propagate FBO allocation failure for picture to texture upload
  * glamor: Error out on out-of-memory when allocating PBO for FBO access
  * glamor: Propagate glamor_prepare_access failures in copy helpers
  * glamor: Fallback to system memory for RW PBO buffer allocation
- supersedes u_fno-common.patch

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=761
This commit is contained in:
Stefan Dirsch 2020-03-30 11:27:06 +00:00 committed by Git OBS Bridge
parent eb46b4a24e
commit 7297d0d055
7 changed files with 37 additions and 250 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_service
View File

@ -2,7 +2,7 @@
<service name="tar_scm" mode="disabled"> <service name="tar_scm" mode="disabled">
<param name="url">https://gitlab.freedesktop.org/xorg/xserver.git</param> <param name="url">https://gitlab.freedesktop.org/xorg/xserver.git</param>
<param name="scm">git</param> <param name="scm">git</param>
<param name="revision">489f4191</param> <param name="revision">f84ad082</param>
<param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param> <param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param>
<param name="versionrewrite-pattern">xorgserver(.*)</param> <param name="versionrewrite-pattern">xorgserver(.*)</param>
<param name="changesgenerate">enable</param> <param name="changesgenerate">enable</param>

2
_servicedata
View File

@ -1,4 +1,4 @@
<servicedata> <servicedata>
<service name="tar_scm"> <service name="tar_scm">
<param name="url">https://gitlab.freedesktop.org/xorg/xserver.git</param> <param name="url">https://gitlab.freedesktop.org/xorg/xserver.git</param>
<param name="changesrevision">489f4191f3c881c6c8acce97ec612167a4ae0f33</param></service></servicedata> <param name="changesrevision">f84ad082557f9cde6b8faa373eca6a0a89ba7d56</param></service></servicedata>

241
u_fno-common.patch
View File

@ -1,241 +0,0 @@
Index: xserver-1.20.7+0/hw/dmx/config/dmxconfig.c
===================================================================
--- xserver-1.20.7+0.orig/hw/dmx/config/dmxconfig.c
+++ xserver-1.20.7+0/hw/dmx/config/dmxconfig.c
@@ -72,7 +72,6 @@ typedef struct DMXConfigCmdStruct {
DMXConfigList *xinputs;
} DMXConfigCmd, *DMXConfigCmdPtr;
-DMXConfigEntryPtr dmxConfigEntry;
static DMXConfigCmd dmxConfigCmd;
static int dmxDisplaysFromCommandLine;
Index: xserver-1.20.7+0/hw/dmx/config/xdmxconfig.c
===================================================================
--- xserver-1.20.7+0.orig/hw/dmx/config/xdmxconfig.c
+++ xserver-1.20.7+0/hw/dmx/config/xdmxconfig.c
@@ -65,7 +65,6 @@ extern FILE *yyin;
#define DMX_CANVAS_WIDTH 400
#define DMX_CANVAS_HEIGHT 500
-DMXConfigEntryPtr dmxConfigEntry;
static DMXConfigVirtualPtr dmxConfigCurrent, dmxConfigNewVirtual;
static DMXConfigDisplayPtr dmxConfigCurrentDisplay, dmxConfigNewDisplay;
static int dmxConfigGrabbed, dmxConfigGrabbedFine;
Index: xserver-1.20.7+0/hw/dmx/glxProxy/glxext.c
===================================================================
--- xserver-1.20.7+0.orig/hw/dmx/glxProxy/glxext.c
+++ xserver-1.20.7+0/hw/dmx/glxProxy/glxext.c
@@ -47,8 +47,6 @@
#include "extinit.h"
#include "glx_extinit.h"
-int noGlxExtension;
-
/*
** Forward declarations.
*/
Index: xserver-1.20.7+0/hw/xwayland/Makefile.am
===================================================================
--- xserver-1.20.7+0.orig/hw/xwayland/Makefile.am
+++ xserver-1.20.7+0/hw/xwayland/Makefile.am
@@ -3,6 +3,7 @@ bin_PROGRAMS = Xwayland
Xwayland_CFLAGS = \
-I$(top_srcdir)/glamor \
-I$(top_srcdir)/dri3 \
+ -I$(top_srcdir)/hw/xfree86/common \
-DHAVE_DIX_CONFIG_H \
$(XWAYLANDMODULES_CFLAGS) \
$(DIX_CFLAGS) \
Index: xserver-1.20.7+0/hw/xwayland/xwayland.c
===================================================================
--- xserver-1.20.7+0.orig/hw/xwayland/xwayland.c
+++ xserver-1.20.7+0/hw/xwayland/xwayland.c
@@ -40,7 +40,7 @@
#ifdef XF86VIDMODE
#include <X11/extensions/xf86vmproto.h>
-_X_EXPORT Bool noXFree86VidModeExtension;
+#include "xf86Extensions.h"
#endif
void
Index: xserver-1.20.7+0/test/xi1/protocol-xchangedevicecontrol.c
===================================================================
--- xserver-1.20.7+0.orig/test/xi1/protocol-xchangedevicecontrol.c
+++ xserver-1.20.7+0/test/xi1/protocol-xchangedevicecontrol.c
@@ -37,7 +37,6 @@
#include "protocol-common.h"
-ClientRec client_window;
static ClientRec client_request;
static void
Index: xserver-1.20.7+0/test/xi2/protocol-common.c
===================================================================
--- xserver-1.20.7+0.orig/test/xi2/protocol-common.c
+++ xserver-1.20.7+0/test/xi2/protocol-common.c
@@ -48,6 +48,8 @@ void *global_userdata;
int enable_GrabButton_wrap = 1;
int enable_XISetEventMask_wrap = 1;
+void (*reply_handler) (ClientPtr client, int len, char *data, void *userdata);
+
static void
fake_init_sprite(DeviceIntPtr dev)
{
@@ -310,8 +312,6 @@ __wrap_dixLookupWindow(WindowPtr *win, X
return __real_dixLookupWindow(win, id, client, access);
}
-extern ClientRec client_window;
-
int
__wrap_dixLookupClient(ClientPtr *pClient, XID rid, ClientPtr client,
Mask access)
Index: xserver-1.20.7+0/test/xi2/protocol-common.h
===================================================================
--- xserver-1.20.7+0.orig/test/xi2/protocol-common.h
+++ xserver-1.20.7+0/test/xi2/protocol-common.h
@@ -99,7 +99,7 @@ extern void *global_userdata;
* The reply handler called from WriteToClient. Set this handler if you need
* to check the reply values.
*/
-void (*reply_handler) (ClientPtr client, int len, char *data, void *userdata);
+extern void (*reply_handler) (ClientPtr client, int len, char *data, void *userdata);
/**
* The default screen used for the windows. Initialized by init_simple().
@@ -154,4 +154,6 @@ Bool __wrap_AddResource(XID id, RESTYPE
int __wrap_dixLookupClient(ClientPtr *c, XID id, ClientPtr client, Mask access);
int __real_dixLookupClient(ClientPtr *c, XID id, ClientPtr client, Mask access);
+extern ClientRec client_window;
+
#endif /* PROTOCOL_COMMON_H */
Index: xserver-1.20.7+0/test/xi2/protocol-xigetclientpointer.c
===================================================================
--- xserver-1.20.7+0.orig/test/xi2/protocol-xigetclientpointer.c
+++ xserver-1.20.7+0/test/xi2/protocol-xigetclientpointer.c
@@ -46,7 +46,6 @@ static struct {
int win;
} test_data;
-ClientRec client_window;
static ClientRec client_request;
static void
Index: xserver-1.20.7+0/test/xi2/protocol-xigetselectedevents.c
===================================================================
--- xserver-1.20.7+0.orig/test/xi2/protocol-xigetselectedevents.c
+++ xserver-1.20.7+0/test/xi2/protocol-xigetselectedevents.c
@@ -60,8 +60,6 @@ static struct {
int mask_len;
} test_data;
-ClientRec client_window;
-
/* AddResource is called from XISetSEventMask, we don't need this */
Bool
__wrap_AddResource(XID id, RESTYPE type, void *value)
Index: xserver-1.20.7+0/test/xi2/protocol-xipassivegrabdevice.c
===================================================================
--- xserver-1.20.7+0.orig/test/xi2/protocol-xipassivegrabdevice.c
+++ xserver-1.20.7+0/test/xi2/protocol-xipassivegrabdevice.c
@@ -41,7 +41,6 @@
#include "protocol-common.h"
-ClientRec client_window;
static ClientRec client_request;
#define N_MODS 7
Index: xserver-1.20.7+0/test/xi2/protocol-xiquerydevice.c
===================================================================
--- xserver-1.20.7+0.orig/test/xi2/protocol-xiquerydevice.c
+++ xserver-1.20.7+0/test/xi2/protocol-xiquerydevice.c
@@ -54,8 +54,6 @@ struct test_data {
int num_devices_in_reply;
};
-ClientRec client_window;
-
static void reply_XIQueryDevice_data(ClientPtr client, int len, char *data,
void *closure);
static void reply_XIQueryDevice(ClientPtr client, int len, char *data,
Index: xserver-1.20.7+0/test/xi2/protocol-xiquerypointer.c
===================================================================
--- xserver-1.20.7+0.orig/test/xi2/protocol-xiquerypointer.c
+++ xserver-1.20.7+0/test/xi2/protocol-xiquerypointer.c
@@ -41,7 +41,6 @@
#include "protocol-common.h"
-ClientRec client_window;
static ClientRec client_request;
static void reply_XIQueryPointer_data(ClientPtr client, int len,
char *data, void *closure);
Index: xserver-1.20.7+0/test/xi2/protocol-xiqueryversion.c
===================================================================
--- xserver-1.20.7+0.orig/test/xi2/protocol-xiqueryversion.c
+++ xserver-1.20.7+0/test/xi2/protocol-xiqueryversion.c
@@ -58,8 +58,6 @@ struct test_data {
int minor_expected;
};
-ClientRec client_window;
-
static void
reply_XIQueryVersion(ClientPtr client, int len, char *data, void *closure)
{
Index: xserver-1.20.7+0/test/xi2/protocol-xiselectevents.c
===================================================================
--- xserver-1.20.7+0.orig/test/xi2/protocol-xiselectevents.c
+++ xserver-1.20.7+0/test/xi2/protocol-xiselectevents.c
@@ -62,8 +62,6 @@
static unsigned char *data[4096 * 20]; /* the request data buffer */
-ClientRec client_window;
-
int
__real_XISetEventMask(DeviceIntPtr dev, WindowPtr win, ClientPtr client,
int len, unsigned char *mask);
Index: xserver-1.20.7+0/test/xi2/protocol-xisetclientpointer.c
===================================================================
--- xserver-1.20.7+0.orig/test/xi2/protocol-xisetclientpointer.c
+++ xserver-1.20.7+0/test/xi2/protocol-xisetclientpointer.c
@@ -48,7 +48,6 @@
#include "protocol-common.h"
-ClientRec client_window;
static ClientRec client_request;
static void
Index: xserver-1.20.7+0/test/xi2/protocol-xiwarppointer.c
===================================================================
--- xserver-1.20.7+0.orig/test/xi2/protocol-xiwarppointer.c
+++ xserver-1.20.7+0/test/xi2/protocol-xiwarppointer.c
@@ -44,8 +44,6 @@
static int expected_x = SPRITE_X;
static int expected_y = SPRITE_Y;
-ClientRec client_window;
-
/**
* This function overrides the one in the screen rec.
*/
Index: xserver-1.20.7+0/test/misc.c
===================================================================
--- xserver-1.20.7+0.orig/test/misc.c
+++ xserver-1.20.7+0/test/misc.c
@@ -33,7 +33,6 @@
#include "tests-common.h"
-ScreenInfo screenInfo;
static void
dix_version_compare(void)

31
xorg-x11-server.changes
View File

@ -1,3 +1,34 @@
-------------------------------------------------------------------
Mon Mar 30 11:17:21 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>
- Update to version 1.20.8+0:
* Revert "dri2: Don't make reference to noClientException"
* dix: Check for NULL spriteInfo in GetPairedDevice
* os: Ignore dying client in ResetCurrentRequest
* modesetting: remove unnecessary error message, fix zaphod leases
* Fix building with `-fno-common`
* xwayland: clear pixmaps after creation in rootless mode
* glamor: Fix a compiler warning since the recent OOM fixes.
* Restrict 1x1 pixmap filling optimization to GXcopy
* Add xf86OSInputThreadInit to stub os-support as well
* Fix old-style definition warning for xf86OSInputThreadInit()
* xwayland/glamor-gbm: Handle DRM_FORMAT_MOD_INVALID gracefully
* configure: Define GLAMOR_HAS_EGL_QUERY_DRIVER when available
* modesetting: Disable atomic support by default
* modesetting: Explicitly #include "mi.h"
* xfree86/modes: Bail from xf86RotateRedisplay if pScreen->root is NULL
* xwayland: Split up xwl_screen_post_damage into two phases
* xwayland: Call glamor_block_handler from xwl_screen_post_damage
* xwayland: Add xwl_window_create_frame_callback helper
* xwayland: Use single frame callback for Present flips and normal updates
* xwayland: Use frame callbacks for Present vblank events
* xwayland: Delete all frame_callback_list nodes in xwl_unrealize_window
* glamor: Propagate FBO allocation failure for picture to texture upload
* glamor: Error out on out-of-memory when allocating PBO for FBO access
* glamor: Propagate glamor_prepare_access failures in copy helpers
* glamor: Fallback to system memory for RW PBO buffer allocation
- supersedes u_fno-common.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Feb 27 14:09:12 UTC 2020 - Stefan Dirsch <sndirsch@suse.com> Thu Feb 27 14:09:12 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>

5
xorg-x11-server.spec
View File

@ -42,7 +42,7 @@
%endif %endif
Name: xorg-x11-server Name: xorg-x11-server
Version: 1.20.7+0 Version: 1.20.8+0
Release: 0 Release: 0
URL: http://xorg.freedesktop.org/ URL: http://xorg.freedesktop.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -248,8 +248,6 @@ Patch1503: u_xfree86-Do-not-claim-pci-slots-if-fb-slot-is-already.patch
Patch1505: U_xwayland-Allow-passing-a-fd.patch Patch1505: U_xwayland-Allow-passing-a-fd.patch
Patch1600: u_fno-common.patch
%description %description
This package contains the X.Org Server. This package contains the X.Org Server.
@ -397,7 +395,6 @@ sh %{SOURCE92} --verify . %{SOURCE91}
%patch1502 -p1 %patch1502 -p1
%patch1503 -p1 %patch1503 -p1
%patch1505 -p1 %patch1505 -p1
%patch1600 -p1
%build %build
%define _lto_cflags %{nil} %define _lto_cflags %{nil}

3
xserver-1.20.7+0.tar.xz
View File

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

3
xserver-1.20.8+0.tar.xz Normal file
View File

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