rpms/xorg-x11-server
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to 1.15.99.903

Browse Source 
- This bumps the videodrv ABI once more, so all drivers must be rebuild
This commit is contained in:
Hans de Goede 2014-06-12 09:05:43 +02:00
parent 6d9ea9c073
commit 76b2430e67
5 changed files with 9 additions and 170 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
0001-Fix-compilation-of-int10-module-on-arm.patch
View File

@ -1,30 +0,0 @@
From 487715ebb67cf9a75887279f4257cc93ed790594 Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Fri, 25 Apr 2014 09:07:04 +0200
Subject: [PATCH] Fix compilation of int10 module on arm
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
hw/xfree86/int10/xf86x86emu.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/hw/xfree86/int10/xf86x86emu.c b/hw/xfree86/int10/xf86x86emu.c
index b9a4d36..f3c2850 100644
--- a/hw/xfree86/int10/xf86x86emu.c
+++ b/hw/xfree86/int10/xf86x86emu.c
@@ -18,6 +18,12 @@
#define M _X86EMU_env
+/* compiler.h defines outb/outw/outl on arm this file does not need these and
+ this interferes with the pioFuncs struct initialization */
+#undef outb
+#undef outw
+#undef outl
+
static void
x86emu_do_int(int num)
{
--
1.9.0

42
0001-rrcrtc-brackets-are-hard-lets-go-shopping.patch
View File

@ -1,42 +0,0 @@
From dd0c31d6b7559bb0dda6283a5d345d537f1d6b42 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@gmail.com>
Date: Tue, 30 Jul 2013 13:17:45 +1000
Subject: [PATCH] rrcrtc: brackets are hard, lets go shopping.
Slaving two outputs on a secondary GPU to a primary GPU testing
picked this up, in that we'd try to resize to the totally the
wrong thing, then as usual segfault in the rotation code.
Signed-off-by: Dave Airlie <airlied@redhat.com>
---
randr/rrcrtc.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/randr/rrcrtc.c b/randr/rrcrtc.c
index 2f76b62..40b01f0 100644
--- a/randr/rrcrtc.c
+++ b/randr/rrcrtc.c
@@ -474,7 +474,7 @@ rrCheckPixmapBounding(ScreenPtr pScreen,
xorg_list_for_each_entry(slave, &pScreen->output_slave_list, output_head) {
rrScrPrivPtr slave_priv = rrGetScrPriv(slave);
- for (c = 0; c < slave_priv->numCrtcs; c++)
+ for (c = 0; c < slave_priv->numCrtcs; c++) {
if (slave_priv->crtcs[c] == rr_crtc) {
newbox.x1 = x;
newbox.x2 = x + w;
@@ -489,8 +489,9 @@ rrCheckPixmapBounding(ScreenPtr pScreen,
newbox.y1 = slave_priv->crtcs[c]->y;
newbox.y2 = slave_priv->crtcs[c]->y + slave_priv->crtcs[c]->mode->mode.height;
}
- RegionInit(&new_crtc_region, &newbox, 1);
- RegionUnion(&total_region, &total_region, &new_crtc_region);
+ RegionInit(&new_crtc_region, &newbox, 1);
+ RegionUnion(&total_region, &total_region, &new_crtc_region);
+ }
}
newsize = RegionExtents(&total_region);
--
1.8.2.1

87
0001-shadowfb-Fix-initialization.patch
View File

@ -1,87 +0,0 @@
From a02af447e0e845979a313bb248cf3506d4926a38 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Mon, 19 May 2014 16:16:43 -0400
Subject: [PATCH] shadowfb: Fix initialization
This has to run at initial CreateWindow time, at CreateScreenResources
the root window doesn't actually exist yet.
Tested-by: Michael Thayer <michael.thayer@oracle.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
---
hw/xfree86/shadowfb/shadow.c | 26 +++++++++++++++-----------
1 file changed, 15 insertions(+), 11 deletions(-)
diff --git a/hw/xfree86/shadowfb/shadow.c b/hw/xfree86/shadowfb/shadow.c
index 10f72cc..d2481ed 100644
--- a/hw/xfree86/shadowfb/shadow.c
+++ b/hw/xfree86/shadowfb/shadow.c
@@ -29,14 +29,14 @@
#include "picturestr.h"
static Bool ShadowCloseScreen(ScreenPtr pScreen);
-static Bool ShadowCreateScreenResources(ScreenPtr pScreen);
+static Bool ShadowCreateRootWindow(WindowPtr pWin);
typedef struct {
ScrnInfoPtr pScrn;
RefreshAreaFuncPtr preRefresh;
RefreshAreaFuncPtr postRefresh;
CloseScreenProcPtr CloseScreen;
- CreateScreenResourcesProcPtr CreateScreenResources;
+ CreateWindowProcPtr CreateWindow;
} ShadowScreenRec, *ShadowScreenPtr;
static DevPrivateKeyRec ShadowScreenKeyRec;
@@ -71,10 +71,10 @@ ShadowFBInit2(ScreenPtr pScreen,
pPriv->postRefresh = postRefreshArea;
pPriv->CloseScreen = pScreen->CloseScreen;
- pPriv->CreateScreenResources = pScreen->CreateScreenResources;
+ pPriv->CreateWindow = pScreen->CreateWindow;
pScreen->CloseScreen = ShadowCloseScreen;
- pScreen->CreateScreenResources = ShadowCreateScreenResources;
+ pScreen->CreateWindow = ShadowCreateRootWindow;
return TRUE;
}
@@ -117,16 +117,21 @@ shadowfbReportPost(DamagePtr damage, RegionPtr reg, void *closure)
}
static Bool
-ShadowCreateScreenResources(ScreenPtr pScreen)
+ShadowCreateRootWindow(WindowPtr pWin)
{
Bool ret;
- WindowPtr pWin = pScreen->root;
+ ScreenPtr pScreen = pWin->drawable.pScreen;
ShadowScreenPtr pPriv = shadowfbGetScreenPrivate(pScreen);
- pScreen->CreateScreenResources = pPriv->CreateScreenResources;
- ret = pScreen->CreateScreenResources(pScreen);
- pPriv->CreateScreenResources = pScreen->CreateScreenResources;
- pScreen->CreateScreenResources = ShadowCreateScreenResources;
+ /* paranoia */
+ if (pWin != pScreen->root)
+ ErrorF("ShadowCreateRootWindow called unexpectedly\n");
+
+ /* call down, but don't hook ourselves back in; we know the first time
+ * we're called it's for the root window.
+ */
+ pScreen->CreateWindow = pPriv->CreateWindow;
+ ret = pScreen->CreateWindow(pWin);
/* this might look like it leaks, but the damage code reaps listeners
* when their drawable disappears.
@@ -159,7 +164,6 @@ ShadowCloseScreen(ScreenPtr pScreen)
ShadowScreenPtr pPriv = shadowfbGetScreenPrivate(pScreen);
pScreen->CloseScreen = pPriv->CloseScreen;
- pScreen->CreateScreenResources = pPriv->CreateScreenResources;
free(pPriv);
--
1.9.0

2
sources
View File

@ -1 +1 @@
2c67326a5a3cd84d3d554a7b3c947f8d xorg-server-20140428.tar.xz
f2b746094e708c41bc28cf545624d16b xorg-server-1.15.99.903.tar.bz2

18
xorg-x11-server.spec
View File

@ -8,7 +8,7 @@
# format, and add a PatchN: line. If you want to push something upstream,
# check out the master branch, pull, cherry-pick, and push.
%global gitdate 20140428
#global gitdate 20140428
%global stable_abi 1
%if !0%{?gitdate} || %{stable_abi}
@ -16,7 +16,7 @@
# source because rpm is a terrible language.
%global ansic_major 0
%global ansic_minor 4
%global videodrv_major 17
%global videodrv_major 18
%global videodrv_minor 0
%global xinput_major 21
%global xinput_minor 0
@ -41,8 +41,8 @@
Summary: X.Org X11 X server
Name: xorg-x11-server
Version: 1.15.99.902
Release: 8%{?gitdate:.%{gitdate}}%{dist}
Version: 1.15.99.903
Release: 1%{?gitdate:.%{gitdate}}%{dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X
@ -74,9 +74,6 @@ Source31: xserver-sdk-abi-requires.git
# maintainer convenience script
Source40: driver-abi-rebuild.sh
# Fix pending upstream
Patch1: 0001-Fix-compilation-of-int10-module-on-arm.patch
# Trivial things to never merge upstream ever:
# This really could be done prettier.
Patch5002: xserver-1.4.99-ssh-isnt-local.patch
@ -91,13 +88,10 @@ Patch7025: 0001-Always-install-vbe-and-int10-sdk-headers.patch
Patch7027: xserver-autobind-hotplug.patch
# Fix multiple monitors in reverse optimus configurations
Patch8040: 0001-rrcrtc-brackets-are-hard-lets-go-shopping.patch
Patch8041: 0001-pixmap-fix-reverse-optimus-support-with-multiple-hea.patch
# submitted: http://lists.x.org/archives/xorg-devel/2013-October/037996.html
Patch9100: exa-only-draw-valid-trapezoids.patch
# submitted: http://lists.x.org/archives/xorg-devel/2014-May/042497.html
Patch9101: 0001-shadowfb-Fix-initialization.patch
# because the display-managers are not ready yet, do not upstream
Patch10000: 0001-Fedora-hack-Make-the-suid-root-wrapper-always-start-.patch
@ -616,6 +610,10 @@ find %{inst_srcdir}/hw/xfree86 -name \*.c -delete
%changelog
* Wed Jun 11 2014 Hans de Goede <hdegoede@redhat.com> - 1.15.99.903-1
- Update to 1.15.99.903
- This bumps the videodrv ABI once more, so all drivers must be rebuild
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.15.99.902-8.20140428
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild