rpms/xorg-x11-server/F-12 .cvsignore, 1.81, 1.82 sources, 1.76, 1.77 xorg-x11-server.spec, 1.524, 1.525 xserver-1.7.4-randr-unify-primary-compat.patch, 1.2, 1.3
Peter Hutterer
whot at fedoraproject.org
Mon Feb 8 00:34:46 UTC 2010
- Previous message: rpms/xfce4-screenshooter/devel xfce4-screenshooter.spec,1.7,1.8
- Next message: rpms/fbpanel/devel fbpanel-5.6-default-config.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 fbpanel.spec, 1.4, 1.5 sources, 1.2, 1.3 fbpanel-4.12-icon.patch, 1.1, NONE fbpanel-4.12-libdir.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: whot
Update of /cvs/pkgs/rpms/xorg-x11-server/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26668
Modified Files:
.cvsignore sources xorg-x11-server.spec
xserver-1.7.4-randr-unify-primary-compat.patch
Log Message:
* Mon Feb 08 2010 Peter Hutterer <peter.hutterer at redhat.com> 1.7.4.902-1
- xserver 1.7.4.902 (1.7.5 RC2)
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-12/.cvsignore,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- .cvsignore 8 Jan 2010 04:25:51 -0000 1.81
+++ .cvsignore 8 Feb 2010 00:34:45 -0000 1.82
@@ -1 +1 @@
-xorg-server-1.7.4.tar.bz2
+xorg-server-1.7.4.902.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-12/sources,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- sources 8 Jan 2010 04:25:51 -0000 1.76
+++ sources 8 Feb 2010 00:34:45 -0000 1.77
@@ -1 +1 @@
-75d27c3a1c12293f620a2d6518fcbdfa xorg-server-1.7.4.tar.bz2
+39862aa5f62c681a7c83533fc1225432 xorg-server-1.7.4.902.tar.bz2
Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-12/xorg-x11-server.spec,v
retrieving revision 1.524
retrieving revision 1.525
diff -u -p -r1.524 -r1.525
--- xorg-x11-server.spec 3 Feb 2010 22:51:52 -0000 1.524
+++ xorg-x11-server.spec 8 Feb 2010 00:34:45 -0000 1.525
@@ -18,8 +18,8 @@
Summary: X.Org X11 X server
Name: xorg-x11-server
-Version: 1.7.4
-Release: 7%{dist}
+Version: 1.7.4.902
+Release: 1%{dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X
@@ -523,6 +523,9 @@ rm -rf $RPM_BUILD_ROOT
%{xserver_source_dir}
%changelog
+* Mon Feb 08 2010 Peter Hutterer <peter.hutterer at redhat.com> 1.7.4.902-1
+- xserver 1.7.4.902 (1.7.5 RC2)
+
* Wed Feb 03 2010 Adam Jackson <ajax at redhat.com> 1.7.4-7
- Fix randr unify patch and re-enable.
xserver-1.7.4-randr-unify-primary-compat.patch:
common/xf86cmap.c | 27 +++------
modes/xf86Crtc.c | 151 +++++++++++++++++++++++++---------------------------
modes/xf86Crtc.h | 18 +++---
modes/xf86RandR12.c | 7 +-
4 files changed, 98 insertions(+), 105 deletions(-)
Index: xserver-1.7.4-randr-unify-primary-compat.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-12/xserver-1.7.4-randr-unify-primary-compat.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- xserver-1.7.4-randr-unify-primary-compat.patch 3 Feb 2010 22:51:52 -0000 1.2
+++ xserver-1.7.4-randr-unify-primary-compat.patch 8 Feb 2010 00:34:46 -0000 1.3
@@ -1,17 +1,17 @@
-From ecb485efa4d572f42432d5559c323037b4be3a7b Mon Sep 17 00:00:00 2001
+From 8223378890b5cce20d79a58098221017f87e7e85 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax at redhat.com>
Date: Thu, 14 Jan 2010 16:50:01 -0500
Subject: [PATCH] randr compat/primary unify
---
- hw/xfree86/common/xf86cmap.c | 28 +++-----
+ hw/xfree86/common/xf86cmap.c | 27 +++----
hw/xfree86/modes/xf86Crtc.c | 151 +++++++++++++++++++---------------------
hw/xfree86/modes/xf86Crtc.h | 18 +++--
hw/xfree86/modes/xf86RandR12.c | 6 +-
- 5 files changed, 101 insertions(+), 105 deletions(-)
+ 4 files changed, 98 insertions(+), 104 deletions(-)
diff --git a/hw/xfree86/common/xf86cmap.c b/hw/xfree86/common/xf86cmap.c
-index 08f557c..3d17965 100644
+index edd5ae9..25ece4a 100644
--- a/hw/xfree86/common/xf86cmap.c
+++ b/hw/xfree86/common/xf86cmap.c
@@ -1001,8 +1001,7 @@ xf86ChangeGammaRamp(
@@ -22,9 +22,9 @@ index 08f557c..3d17965 100644
- RRCrtcPtr crtc = config->output[config->compat_output]->crtc->randr_crtc;
+ RRCrtcPtr crtc = xf86GetPrimaryCrtc(pScrn)->randr_crtc;
- if (crtc->gammaSize != size)
- return BadValue;
-@@ -1015,8 +1014,7 @@ xf86ChangeGammaRamp(
+ if (crtc) {
+ if (crtc->gammaSize != size)
+@@ -1017,8 +1016,7 @@ xf86ChangeGammaRamp(
if(CMapScreenKey == NULL)
return BadImplementation;
@@ -34,25 +34,26 @@ index 08f557c..3d17965 100644
if(!pScreenPriv)
return BadImplementation;
-@@ -1028,8 +1026,7 @@ xf86ChangeGammaRamp(
+@@ -1030,8 +1028,7 @@ xf86ChangeGammaRamp(
/* mark all colormaps on this screen */
pLink = pScreenPriv->maps;
while(pLink) {
- pColPriv = (CMapColormapPtr)dixLookupPrivate(&pLink->cmap->devPrivates,
- CMapColormapKey);
-+ pColPriv = dixLookupPrivate(&pLink->cmap->devPrivates, CMapColormapKey);
++ pColPriv = dixLookupPrivate(&pLink->cmap->devPrivates, CMapColormapKey);
pColPriv->recalculate = TRUE;
pLink = pLink->next;
}
-@@ -1074,17 +1071,16 @@ xf86GetGammaRampSize(ScreenPtr pScreen)
+@@ -1076,18 +1073,18 @@ xf86GetGammaRampSize(ScreenPtr pScreen)
CMapScreenPtr pScreenPriv;
if (xf86_crtc_supports_gamma(pScrn)) {
- xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
- RRCrtcPtr crtc = config->output[config->compat_output]->crtc->randr_crtc;
--
+ RRCrtcPtr crtc = xf86GetPrimaryCrtc(pScrn)->randr_crtc;
- return crtc->gammaSize;
+
+ if (crtc)
+ return crtc->gammaSize;
}
- if(CMapScreenKey == NULL) return 0;
@@ -68,7 +69,7 @@ index 08f557c..3d17965 100644
return pScreenPriv->gammaElements;
}
-@@ -1103,8 +1099,7 @@ xf86GetGammaRamp(
+@@ -1106,8 +1103,7 @@ xf86GetGammaRamp(
int shift, sigbits;
if (xf86_crtc_supports_gamma(pScrn)) {
@@ -76,9 +77,9 @@ index 08f557c..3d17965 100644
- RRCrtcPtr crtc = config->output[config->compat_output]->crtc->randr_crtc;
+ RRCrtcPtr crtc = xf86GetPrimaryCrtc(pScrn)->randr_crtc;
- if (crtc->gammaSize < size)
- return BadValue;
-@@ -1122,8 +1117,7 @@ xf86GetGammaRamp(
+ if (crtc) {
+ if (crtc->gammaSize < size)
+@@ -1127,8 +1123,7 @@ xf86GetGammaRamp(
if(CMapScreenKey == NULL)
return BadImplementation;
@@ -89,10 +90,10 @@ index 08f557c..3d17965 100644
return BadImplementation;
diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
-index 0062d06..7d806d0 100644
+index 9370640..ef9cbb7 100644
--- a/hw/xfree86/modes/xf86Crtc.c
+++ b/hw/xfree86/modes/xf86Crtc.c
-@@ -1801,88 +1801,74 @@ biggestMode(DisplayModePtr a, DisplayModePtr b)
+@@ -1780,88 +1780,74 @@ biggestMode(DisplayModePtr a, DisplayModePtr b)
return b;
}
@@ -186,7 +187,7 @@ index 0062d06..7d806d0 100644
- } else {
- /* Don't change the compat output when no valid outputs found */
- output = config->output[config->compat_output];
-+ /* desperation */
++ /* desperation */
+ for (i = 0; i < config->num_output; i++) {
+ xf86OutputPtr output = config->output[i];
+ if (output->status == XF86OutputStatusUnknown)
@@ -231,7 +232,7 @@ index 0062d06..7d806d0 100644
if (!output)
return; /* punt */
-@@ -2214,7 +2200,7 @@ xf86TargetFallback(ScrnInfoPtr scrn, xf86CrtcConfigPtr config,
+@@ -2149,7 +2135,7 @@ xf86TargetFallback(ScrnInfoPtr scrn, xf86CrtcConfigPtr config,
DisplayModePtr target_mode = NULL;
Rotation target_rotation = RR_Rotate_0;
DisplayModePtr default_mode;
@@ -240,7 +241,7 @@ index 0062d06..7d806d0 100644
/* User preferred > preferred > other modes */
for (o = -1; nextEnabledOutput(config, enabled, &o); ) {
-@@ -2229,12 +2215,12 @@ xf86TargetFallback(ScrnInfoPtr scrn, xf86CrtcConfigPtr config,
+@@ -2164,12 +2150,12 @@ xf86TargetFallback(ScrnInfoPtr scrn, xf86CrtcConfigPtr config,
target_mode = default_mode;
target_preferred = default_preferred;
target_rotation = config->output[o]->initial_rotation;
@@ -255,7 +256,7 @@ index 0062d06..7d806d0 100644
/* Fill in other output modes */
for (o = -1; nextEnabledOutput(config, enabled, &o); ) {
-@@ -2629,7 +2615,7 @@ xf86SetDesiredModes (ScrnInfoPtr scrn)
+@@ -2561,7 +2547,7 @@ xf86SetDesiredModes (ScrnInfoPtr scrn)
for (c = 0; c < config->num_crtc; c++)
{
@@ -264,7 +265,7 @@ index 0062d06..7d806d0 100644
int o;
RRTransformPtr transform;
-@@ -2639,8 +2625,9 @@ xf86SetDesiredModes (ScrnInfoPtr scrn)
+@@ -2571,8 +2557,9 @@ xf86SetDesiredModes (ScrnInfoPtr scrn)
if (!crtc->enabled)
continue;
@@ -276,7 +277,7 @@ index 0062d06..7d806d0 100644
else
{
for (o = 0; o < config->num_output; o++)
-@@ -2749,7 +2736,7 @@ xf86OutputFindClosestMode (xf86OutputPtr output, DisplayModePtr desired)
+@@ -2681,7 +2668,7 @@ xf86OutputFindClosestMode (xf86OutputPtr output, DisplayModePtr desired)
/**
* When setting a mode through XFree86-VidModeExtension or XFree86-DGA,
@@ -285,7 +286,7 @@ index 0062d06..7d806d0 100644
* output. Then, find similar modes for the other outputs, as with the
* InitialConfiguration code above. The goal is to clone the desired
* mode across all outputs that are currently active.
-@@ -2760,16 +2747,19 @@ xf86SetSingleMode (ScrnInfoPtr pScrn, DisplayModePtr desired, Rotation rotation)
+@@ -2692,16 +2679,19 @@ xf86SetSingleMode (ScrnInfoPtr pScrn, DisplayModePtr desired, Rotation rotation)
{
xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
Bool ok = TRUE;
@@ -310,7 +311,7 @@ index 0062d06..7d806d0 100644
for (c = 0; c < config->num_crtc; c++)
{
-@@ -2946,6 +2936,7 @@ xf86OutputSetEDID (xf86OutputPtr output, xf86MonPtr edid_mon)
+@@ -2878,6 +2868,7 @@ xf86OutputSetEDID (xf86OutputPtr output, xf86MonPtr edid_mon)
ScrnInfoPtr scrn = output->scrn;
xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn);
int i;
@@ -318,7 +319,7 @@ index 0062d06..7d806d0 100644
#ifdef RANDR_12_INTERFACE
int size;
#endif
-@@ -2961,8 +2952,12 @@ xf86OutputSetEDID (xf86OutputPtr output, xf86MonPtr edid_mon)
+@@ -2893,8 +2884,12 @@ xf86OutputSetEDID (xf86OutputPtr output, xf86MonPtr edid_mon)
xf86PrintEDID(edid_mon);
}
@@ -370,7 +371,7 @@ index 9baa956..39ba81d 100644
*/
diff --git a/hw/xfree86/modes/xf86RandR12.c b/hw/xfree86/modes/xf86RandR12.c
-index 1b47a65..1510735 100644
+index 1fc63c4..e2ba4d6 100644
--- a/hw/xfree86/modes/xf86RandR12.c
+++ b/hw/xfree86/modes/xf86RandR12.c
@@ -805,7 +805,7 @@ xf86RandR12CreateScreenResources (ScreenPtr pScreen)
@@ -394,5 +395,5 @@ index 1b47a65..1510735 100644
if (!size)
--
-1.6.5.2
+1.6.6
- Previous message: rpms/xfce4-screenshooter/devel xfce4-screenshooter.spec,1.7,1.8
- Next message: rpms/fbpanel/devel fbpanel-5.6-default-config.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 fbpanel.spec, 1.4, 1.5 sources, 1.2, 1.3 fbpanel-4.12-icon.patch, 1.1, NONE fbpanel-4.12-libdir.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list