rpms/xorg-x11-server/devel .cvsignore, 1.78, 1.79 commitid, 1.36, 1.37 sources, 1.73, 1.74 xorg-x11-server.spec, 1.492, 1.493 xserver-1.5.0-bg-none-root.patch, 1.7, 1.8 xserver-1.6.99-default-modes.patch, 1.1, 1.2 xserver-1.7.0-randr-gamma-restore.patch, 1.1, 1.2 xserver-1.7.0-glx-versioning.patch, 1.1, NONE xserver-1.7.1-glx14-swrast.patch, 1.1, NONE xserver-1.7.1-libcrypto.patch, 1.1, NONE xserver-1.7.3-exa-master.patch, 1.1, NONE
Peter Hutterer
whot at fedoraproject.org
Thu Jan 21 07:31:42 UTC 2010
Author: whot
Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13694
Modified Files:
.cvsignore commitid sources xorg-x11-server.spec
xserver-1.5.0-bg-none-root.patch
xserver-1.6.99-default-modes.patch
xserver-1.7.0-randr-gamma-restore.patch
Removed Files:
xserver-1.7.0-glx-versioning.patch
xserver-1.7.1-glx14-swrast.patch xserver-1.7.1-libcrypto.patch
xserver-1.7.3-exa-master.patch
Log Message:
* Wed Jan 20 2010 Peter Hutterer <peter.hutterer at redhat.com> 1.7.99.3-1.20100120
- Update to today's git master.
- Disable prelease warning patch - this is a prerelease
- Remove upstreamed patches.
- Remove shave files, shave was purged.
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/.cvsignore,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- .cvsignore 7 Jan 2010 02:14:19 -0000 1.78
+++ .cvsignore 21 Jan 2010 07:31:41 -0000 1.79
@@ -1 +1 @@
-xorg-server-1.7.3.tar.bz2
+xorg-server-20100120.tar.xz
Index: commitid
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/commitid,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- commitid 3 Sep 2009 03:11:21 -0000 1.36
+++ commitid 21 Jan 2010 07:31:41 -0000 1.37
@@ -1 +1 @@
-84eb4c66a4a09c360cef260fb2f35dfb6d8a93c6
+6f6a99abc12ddee82898fdabfb50c17e90e094b9
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/sources,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- sources 7 Jan 2010 02:14:19 -0000 1.73
+++ sources 21 Jan 2010 07:31:41 -0000 1.74
@@ -1 +1 @@
-4c63b22cad9ed8ae8b86561f0f92c327 xorg-server-1.7.3.tar.bz2
+c4ccc0dd1f6b4092d7029526291d0a4d xorg-server-20100120.tar.xz
Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.492
retrieving revision 1.493
diff -u -p -r1.492 -r1.493
--- xorg-x11-server.spec 7 Jan 2010 02:14:19 -0000 1.492
+++ xorg-x11-server.spec 21 Jan 2010 07:31:41 -0000 1.493
@@ -14,12 +14,12 @@
# Fix rhpxl to no longer need vesamodes/extramodes
%define pkgname xorg-server
-#define gitdate 20090903
+%define gitdate 20100120
Summary: X.Org X11 X server
Name: xorg-x11-server
-Version: 1.7.3
-Release: 7%{dist}
+Version: 1.7.99.3
+Release: 1.%{gitdate}%{dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X
@@ -71,18 +71,11 @@ Patch6027: xserver-1.6.0-displayfd.patch
Patch6028: xserver-1.6.99-randr-error-debugging.patch
Patch6030: xserver-1.6.99-right-of.patch
Patch6033: xserver-1.6.99-default-modes.patch
-Patch6044: xserver-1.6.99-hush-prerelease-warning.patch
+#Patch6044: xserver-1.6.99-hush-prerelease-warning.patch
Patch6045: xserver-1.7.0-randr-gamma-restore.patch
-Patch6047: xserver-1.7.0-glx-versioning.patch
-#Patch6048: xserver-1.7.0-exa-fix-mixed.patch
Patch6049: xserver-1.7.1-multilib.patch
Patch6051: xserver-1.7.1-gamma-kdm-fix.patch
-Patch6052: xserver-1.7.1-libcrypto.patch
-Patch6066: xserver-1.7.1-glx14-swrast.patch
-
-Patch6067: xserver-1.7.3-exa-master.patch
-Patch6068: xserver-1.7.3-fb-backport.patch
%define moduledir %{_libdir}/xorg/modules
%define drimoduledir %{_libdir}/dri
@@ -108,6 +101,7 @@ BuildRequires: automake autoconf libtool
BuildRequires: xorg-x11-util-macros >= 1.1.5
BuildRequires: xorg-x11-proto-devel >= 7.4-27
+BuildRequires: xorg-x11-font-utils
BuildRequires: xorg-x11-xtrans-devel >= 1.2.2-1
BuildRequires: libXfont-devel libXau-devel libxkbfile-devel libXres-devel
@@ -368,7 +362,6 @@ install -m 644 %{SOURCE10} $RPM_BUILD_RO
%define inst_srcdir %{buildroot}/%{xserver_source_dir}
mkdir -p %{inst_srcdir}/{Xext,xkb,GL,hw/{xquartz/bundle,xfree86/common}}
cp cpprules.in %{inst_srcdir}
-cp shave*in %{inst_srcdir}
cp {,%{inst_srcdir}/}hw/xquartz/bundle/cpprules.in
cp xkb/README.compiled %{inst_srcdir}/xkb
cp hw/xfree86/xorgconf.cpp %{inst_srcdir}/hw/xfree86
@@ -511,6 +504,12 @@ rm -rf $RPM_BUILD_ROOT
%{xserver_source_dir}
%changelog
+* Wed Jan 20 2010 Peter Hutterer <peter.hutterer at redhat.com> 1.7.99.3-1.20100120
+- Update to today's git master.
+- Disable prelease warning patch - this is a prerelease
+- Remove upstreamed patches.
+- Remove shave files, shave was purged.
+
* Tue Jan 05 2010 Peter Hutterer <peter.hutterer at redhat.com> 1.7.3-7
- Require xkeyboard-config, not xkbdata. xkbdata has been replaced by
xkeyboard-config.
xserver-1.5.0-bg-none-root.patch:
dix/globals.c | 1 +
dix/window.c | 12 +++++++-----
hw/xfree86/common/xf86Init.c | 11 +++++++++++
hw/xfree86/common/xf86str.h | 5 ++++-
include/opaque.h | 1 +
os/utils.c | 4 +++-
6 files changed, 27 insertions(+), 7 deletions(-)
Index: xserver-1.5.0-bg-none-root.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xserver-1.5.0-bg-none-root.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- xserver-1.5.0-bg-none-root.patch 4 Aug 2009 06:10:30 -0000 1.7
+++ xserver-1.5.0-bg-none-root.patch 21 Jan 2010 07:31:41 -0000 1.8
@@ -1,6 +1,6 @@
-From b4e4b980663692a3af5787eeaf2d48eb6c0188ed Mon Sep 17 00:00:00 2001
-From: Fedora X Ninjas <airlied at redhat.com>
-Date: Tue, 4 Aug 2009 14:45:58 +1000
+From eff3bb9c6f0b71a57705885a3fe6e6469d252d2b Mon Sep 17 00:00:00 2001
+From: Fedora X Ninjas <x at fedoraproject.org>
+Date: Wed, 20 Jan 2010 14:46:12 +1300
Subject: [PATCH] Add nr for background=none root
---
@@ -25,7 +25,7 @@ index c24a94f..907a5e8 100644
int cursorScreenDevPriv[MAXSCREENS];
diff --git a/dix/window.c b/dix/window.c
-index 32e26d9..0bf1d52 100644
+index caff1cb..be1d1c4 100644
--- a/dix/window.c
+++ b/dix/window.c
@@ -466,22 +466,24 @@ InitRootWindow(WindowPtr pWin)
@@ -59,7 +59,7 @@ index 32e26d9..0bf1d52 100644
MapWindow(pWin, serverClient);
}
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
-index e84da4e..2a0f47a 100644
+index 6707448..776b898 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -77,6 +77,7 @@
@@ -70,7 +70,7 @@ index e84da4e..2a0f47a 100644
#include "xf86VGAarbiter.h"
#include "globals.h"
-@@ -234,6 +235,7 @@ xf86CreateRootWindow(WindowPtr pWin)
+@@ -254,6 +255,7 @@ xf86CreateRootWindow(WindowPtr pWin)
int ret = TRUE;
int err = Success;
ScreenPtr pScreen = pWin->drawable.pScreen;
@@ -78,7 +78,7 @@ index e84da4e..2a0f47a 100644
RootWinPropPtr pProp;
CreateWindowProcPtr CreateWindow = (CreateWindowProcPtr)
dixLookupPrivate(&pScreen->devPrivates, xf86CreateRootWindowKey);
-@@ -285,6 +287,15 @@ xf86CreateRootWindow(WindowPtr pWin)
+@@ -305,6 +307,15 @@ xf86CreateRootWindow(WindowPtr pWin)
}
}
@@ -95,10 +95,10 @@ index e84da4e..2a0f47a 100644
return (ret);
}
diff --git a/hw/xfree86/common/xf86str.h b/hw/xfree86/common/xf86str.h
-index 5c3ee44..e3c7841 100644
+index de1f1b6..5c3aa00 100644
--- a/hw/xfree86/common/xf86str.h
+++ b/hw/xfree86/common/xf86str.h
-@@ -516,7 +516,7 @@ typedef struct _confdrirec {
+@@ -503,7 +503,7 @@ typedef struct _confdrirec {
} confDRIRec, *confDRIPtr;
/* These values should be adjusted when new fields are added to ScrnInfoRec */
@@ -107,8 +107,8 @@ index 5c3ee44..e3c7841 100644
#define NUM_RESERVED_POINTERS 14
#define NUM_RESERVED_FUNCS 11
-@@ -800,6 +800,9 @@ typedef struct _ScrnInfoRec {
- ClockRangesPtr clockRanges;
+@@ -775,6 +775,9 @@ typedef struct _ScrnInfoRec {
+ ClockRangePtr clockRanges;
int adjustFlags;
+ /* -nr support */
@@ -130,10 +130,10 @@ index b3c7c70..fcc8c95 100644
extern _X_EXPORT Bool CoreDump;
diff --git a/os/utils.c b/os/utils.c
-index 00abd63..7bfdf8b 100644
+index d7c8388..40583d0 100644
--- a/os/utils.c
+++ b/os/utils.c
-@@ -514,6 +514,7 @@ void UseMsg(void)
+@@ -513,6 +513,7 @@ void UseMsg(void)
#endif
ErrorF("-nolisten string don't listen on protocol\n");
ErrorF("-noreset don't reset after last client exists\n");
@@ -141,7 +141,7 @@ index 00abd63..7bfdf8b 100644
ErrorF("-reset reset after last client exists\n");
ErrorF("-p # screen-saver pattern duration (minutes)\n");
ErrorF("-pn accept failure to listen on all ports\n");
-@@ -861,6 +862,8 @@ ProcessCommandLine(int argc, char *argv[])
+@@ -856,6 +857,8 @@ ProcessCommandLine(int argc, char *argv[])
defaultBackingStore = WhenMapped;
else if ( strcmp( argv[i], "-wr") == 0)
whiteRoot = TRUE;
@@ -151,5 +151,5 @@ index 00abd63..7bfdf8b 100644
if(++i < argc) {
long reqSizeArg = atol(argv[i]);
--
-1.6.0.6
+1.6.6
xserver-1.6.99-default-modes.patch:
xf86Crtc.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
Index: xserver-1.6.99-default-modes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xserver-1.6.99-default-modes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xserver-1.6.99-default-modes.patch 21 Aug 2009 18:33:32 -0000 1.1
+++ xserver-1.6.99-default-modes.patch 21 Jan 2010 07:31:41 -0000 1.2
@@ -1,6 +1,6 @@
-From 50552b0ee81b23b997bebd798b19b4a7e234a55f Mon Sep 17 00:00:00 2001
+From 8cdd51d13aa003c888cd2a3a42664e2dc60c354c Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax at redhat.com>
-Date: Fri, 21 Aug 2009 13:51:45 -0400
+Date: Wed, 20 Jan 2010 14:55:12 +1300
Subject: [PATCH] tweak default mode list yet again
---
@@ -8,19 +8,19 @@ Subject: [PATCH] tweak default mode list
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
-index 4f14a75..c6fd910 100644
+index 23f4a87..0ce631a 100644
--- a/hw/xfree86/modes/xf86Crtc.c
+++ b/hw/xfree86/modes/xf86Crtc.c
-@@ -1567,7 +1567,7 @@ xf86ProbeOutputModes (ScrnInfoPtr scrn, int maxX, int maxY)
+@@ -1578,7 +1578,7 @@ xf86ProbeOutputModes (ScrnInfoPtr scrn, int maxX, int maxY)
int min_clock = 0;
int max_clock = 0;
double clock;
- Bool add_default_modes = TRUE;
+ Bool add_default_modes;
+ Bool debug_modes = config->debug_modes ||
+ xf86Initialising;
enum { sync_config, sync_edid, sync_default } sync_source = sync_default;
-
- while (output->probed_modes != NULL)
-@@ -1610,6 +1610,9 @@ xf86ProbeOutputModes (ScrnInfoPtr scrn, int maxX, int maxY)
+@@ -1623,6 +1623,9 @@ xf86ProbeOutputModes (ScrnInfoPtr scrn, int maxX, int maxY)
}
output_modes = (*output->funcs->get_modes) (output);
@@ -31,5 +31,5 @@ index 4f14a75..c6fd910 100644
edid_monitor = output->MonInfo;
--
-1.6.4
+1.6.6
xserver-1.7.0-randr-gamma-restore.patch:
xf86RandR12.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
Index: xserver-1.7.0-randr-gamma-restore.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xserver-1.7.0-randr-gamma-restore.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xserver-1.7.0-randr-gamma-restore.patch 7 Jan 2010 02:14:20 -0000 1.1
+++ xserver-1.7.0-randr-gamma-restore.patch 21 Jan 2010 07:31:41 -0000 1.2
@@ -8,35 +8,6 @@ Subject: [PATCH] randr gamma reload hack
hw/xfree86/modes/xf86RandR12.c | 6 ++++++
2 files changed, 10 insertions(+), 0 deletions(-)
-diff --git a/hw/xfree86/loader/sdksyms.c b/hw/xfree86/loader/sdksyms.c
-index 12af6b7..656d07b 100644
---- a/hw/xfree86/loader/sdksyms.c
-+++ b/hw/xfree86/loader/sdksyms.c
-@@ -1056,6 +1056,8 @@ _X_HIDDEN void *xorg_symbols[] = {
- (void *) &noXFree86VidModeExtension,
- (void *) &noXFixesExtension,
- (void *) &noPanoramiXExtension,
-+ (void *) &noSELinuxExtension,
-+ (void *) &selinuxEnforcingState,
- (void *) &noXvExtension,
- (void *) &noDRI2Extension,
- (void *) &defaultTextFont,
-@@ -1069,6 +1071,7 @@ _X_HIDDEN void *xorg_symbols[] = {
- (void *) &defaultScreenSaverBlanking,
- (void *) &defaultScreenSaverAllowExposures,
- (void *) &display,
-+ (void *) &displayfd,
- (void *) &defaultBackingStore,
- (void *) &disableBackingStore,
- (void *) &enableBackingStore,
-@@ -1078,6 +1081,7 @@ _X_HIDDEN void *xorg_symbols[] = {
- (void *) &maxBigRequestSize,
- (void *) &party_like_its_1989,
- (void *) &whiteRoot,
-+ (void *) &bgNoneRoot,
- (void *) &CoreDump,
- (void *) &DontPropagateMasks,
- (void *) &screenIsSaved,
diff --git a/hw/xfree86/modes/xf86RandR12.c b/hw/xfree86/modes/xf86RandR12.c
index 6ea9d26..41bac11 100644
--- a/hw/xfree86/modes/xf86RandR12.c
--- xserver-1.7.0-glx-versioning.patch DELETED ---
--- xserver-1.7.1-glx14-swrast.patch DELETED ---
--- xserver-1.7.1-libcrypto.patch DELETED ---
--- xserver-1.7.3-exa-master.patch DELETED ---
More information about the scm-commits
mailing list