[xorg-x11-server] rebase to 1.12.99.904 snapshot
Dave Airlie
airlied at fedoraproject.org
Wed Aug 8 09:45:37 UTC 2012
commit 7a546491ef4f501da3a5184adf353c630f939039
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Aug 8 19:40:42 2012 +1000
rebase to 1.12.99.904 snapshot
.gitignore | 1 +
commitid | 2 +-
sources | 2 +-
xorg-x11-server.spec | 11 ++--
xserver-1.12.99-glx-fix.patch | 117 -----------------------------------------
xserver-1.6.99-right-of.patch | 25 +++++----
6 files changed, 22 insertions(+), 136 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8a2b10f..c8631e6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ xorg-server-1.9.1.tar.bz2
/xorg-server-1.12.3.tar.bz2
/xorg-server-20120717.tar.xz
/xorg-server-20120726.tar.xz
+/xorg-server-20120808.tar.xz
diff --git a/commitid b/commitid
index 3d69f98..8daf748 100644
--- a/commitid
+++ b/commitid
@@ -1 +1 @@
-afa53fe7cffd430cf11f25ca818cb955a78c0c1c
+c22c936b35cee60609041ccb7ee52c00b0634d7b
diff --git a/sources b/sources
index c9bdb5e..f556492 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cf47efdea83833e3348f1f7adcd19d57 xorg-server-20120726.tar.xz
+c6b0c5843a14b4d1ee967050a665ef64 xorg-server-20120808.tar.xz
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 35ae2ff..a256585 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -9,7 +9,7 @@
# check out the master branch, pull, cherry-pick, and push. FIXME describe
# rebasing, add convenience 'make' targets maybe.
-%define gitdate 20120726
+%define gitdate 20120808
%define stable_abi 1
%if !0%{?gitdate} || %{stable_abi}
@@ -42,8 +42,8 @@
Summary: X.Org X11 X server
Name: xorg-x11-server
-Version: 1.12.99.903
-Release: 6%{?gitdate:.%{gitdate}}%{dist}
+Version: 1.12.99.904
+Release: 1%{?gitdate:.%{gitdate}}%{dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X
@@ -95,8 +95,6 @@ Patch7017: xserver-1.12.2-xorg-touch-test.patch
# send keycode/event type for slow keys enable (#816764)
Patch7020: xserver-1.12-xkb-fill-in-keycode-and-event-type-for-slow-keys-ena.patch
-Patch7021: xserver-1.12.99-glx-fix.patch
-
Patch7022: 0001-linux-Refactor-xf86-En-Dis-ableIO.patch
Patch7023: 0002-linux-Make-failure-to-iopl-non-fatal.patch
Patch7024: 0003-xfree86-Change-the-semantics-of-driverFunc-GET_REQUI.patch
@@ -573,6 +571,9 @@ rm -rf $RPM_BUILD_ROOT
%{xserver_source_dir}
%changelog
+* Wed Aug 08 2012 Dave Airlie <airlied at redhat.com> 1.12.99.904-1
+- rebase to 1.12.99.904 snapshot
+
* Fri Aug 03 2012 Adam Jackson <ajax at redhat.com> 1.12.99.903-6
- Make failure to iopl non-fatal
diff --git a/xserver-1.6.99-right-of.patch b/xserver-1.6.99-right-of.patch
index f6cd6e3..bf7e7c8 100644
--- a/xserver-1.6.99-right-of.patch
+++ b/xserver-1.6.99-right-of.patch
@@ -1,7 +1,7 @@
-From d91c3a11db2657e33087464463c9aa44aaf5c8b8 Mon Sep 17 00:00:00 2001
+From 291bc9f827188461ff9717efccec1e350db537e8 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax at redhat.com>
Date: Tue, 28 Jul 2009 11:07:13 -0400
-Subject: [PATCH 4/7] RANDR: right-of placement by default
+Subject: [PATCH 3/7] RANDR: right-of placement by default
[Enhanced to add a new prefer clone option for drivers. This
allows for servers like RN50 where two heads are disjoint. - airlied]
@@ -11,10 +11,10 @@ allows for servers like RN50 where two heads are disjoint. - airlied]
2 files changed, 75 insertions(+), 9 deletions(-)
diff --git a/hw/xfree86/common/xf86str.h b/hw/xfree86/common/xf86str.h
-index 6294845..7d1fbab 100644
+index 0590262..d246634 100644
--- a/hw/xfree86/common/xf86str.h
+++ b/hw/xfree86/common/xf86str.h
-@@ -497,10 +497,13 @@ typedef struct _confdrirec {
+@@ -508,10 +508,13 @@ typedef struct _confdrirec {
} confDRIRec, *confDRIPtr;
/* These values should be adjusted when new fields are added to ScrnInfoRec */
@@ -29,7 +29,7 @@ index 6294845..7d1fbab 100644
typedef pointer (*funcPointer) (void);
/* flags for depth 24 pixmap options */
-@@ -758,6 +761,9 @@ typedef struct _ScrnInfoRec {
+@@ -769,6 +772,9 @@ typedef struct _ScrnInfoRec {
ClockRangePtr clockRanges;
int adjustFlags;
@@ -40,10 +40,10 @@ index 6294845..7d1fbab 100644
* These can be used when the minor ABI version is incremented.
* The NUM_* parameters must be reduced appropriately to keep the
diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
-index 6d5e92f..7d560f4 100644
+index 154f684..c58088d 100644
--- a/hw/xfree86/modes/xf86Crtc.c
+++ b/hw/xfree86/modes/xf86Crtc.c
-@@ -1114,6 +1114,15 @@ xf86InitialOutputPositions(ScrnInfoPtr scrn, DisplayModePtr * modes)
+@@ -1130,6 +1130,15 @@ xf86InitialOutputPositions(ScrnInfoPtr scrn, DisplayModePtr * modes)
int o;
int min_x, min_y;
@@ -59,7 +59,7 @@ index 6d5e92f..7d560f4 100644
for (o = 0; o < config->num_output; o++) {
xf86OutputPtr output = config->output[o];
-@@ -1982,6 +1991,57 @@ bestModeForAspect(xf86CrtcConfigPtr config, Bool *enabled, float aspect)
+@@ -1998,6 +2007,57 @@ bestModeForAspect(xf86CrtcConfigPtr config, Bool *enabled, float aspect)
return match;
}
@@ -117,12 +117,13 @@ index 6d5e92f..7d560f4 100644
static Bool
xf86TargetPreferred(ScrnInfoPtr scrn, xf86CrtcConfigPtr config,
DisplayModePtr * modes, Bool *enabled,
-@@ -2058,13 +2118,9 @@ xf86TargetPreferred(ScrnInfoPtr scrn, xf86CrtcConfigPtr config,
+@@ -2074,14 +2134,10 @@ xf86TargetPreferred(ScrnInfoPtr scrn, xf86CrtcConfigPtr config,
*/
if (!ret)
do {
- int i = 0;
float aspect = 0.0;
+ DisplayModePtr a = NULL, b = NULL;
- /* count the number of enabled outputs */
- for (i = 0, p = -1; nextEnabledOutput(config, enabled, &p); i++);
@@ -132,7 +133,7 @@ index 6d5e92f..7d560f4 100644
break;
p = -1;
-@@ -2365,6 +2421,8 @@ xf86InitialConfiguration(ScrnInfoPtr scrn, Bool canGrow)
+@@ -2385,6 +2441,8 @@ xf86InitialConfiguration(ScrnInfoPtr scrn, Bool canGrow)
else {
if (xf86TargetUserpref(scrn, config, modes, enabled, width, height))
xf86DrvMsg(i, X_INFO, "Using user preference for initial modes\n");
@@ -141,7 +142,7 @@ index 6d5e92f..7d560f4 100644
else if (xf86TargetPreferred
(scrn, config, modes, enabled, width, height))
xf86DrvMsg(i, X_INFO, "Using exact sizes for initial modes\n");
-@@ -2384,9 +2442,11 @@ xf86InitialConfiguration(ScrnInfoPtr scrn, Bool canGrow)
+@@ -2404,9 +2462,11 @@ xf86InitialConfiguration(ScrnInfoPtr scrn, Bool canGrow)
"Output %s enabled but has no modes\n",
config->output[o]->name);
else
@@ -157,5 +158,5 @@ index 6d5e92f..7d560f4 100644
/*
--
-1.7.10.1
+1.7.10.4
More information about the scm-commits
mailing list