rpms/xorg-x11-server/devel xorg-x11-server-1.1.1-glcore-visual-matching.patch, NONE, 1.1 xorg-x11-server-1.1.1-maxpixclock-option.patch, NONE, 1.1 xorg-x11-server-1.1.1-vt-activate-is-a-terrible-api.patch, 1.2, 1.3 xorg-x11-server.spec, 1.195, 1.196
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Dec 18 21:18:03 UTC 2006
- Previous message (by thread): rpms/am-utils/FC-6 am-utils-6.1.5-UTS_RELEASE.patch, NONE, 1.1 am-utils.init, 1.4, 1.5 am-utils.spec, 1.39, 1.40 am-utils-6.1.1-linuxNfsMountCheck.patch, 1.1, NONE
- Next message (by thread): rpms/selinux-policy/devel policy-20061106.patch, 1.43, 1.44 selinux-policy.spec, 1.367, 1.368
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: ajackson
Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19233
Modified Files:
xorg-x11-server-1.1.1-vt-activate-is-a-terrible-api.patch
xorg-x11-server.spec
Added Files:
xorg-x11-server-1.1.1-glcore-visual-matching.patch
xorg-x11-server-1.1.1-maxpixclock-option.patch
Log Message:
* Mon Dec 18 2006 Adam Jackson <ajax at redhat.com> 1.1.1-56
- RHEL5 sync:
- xorg-x11-server-1.1.1-maxpixclock-option.patch: Allow the maximum pixel
clock of a monitor to be specified in the config file.
- xorg-x11-server-1.1.1-glcore-visual-matching.patch: Fix a client crash
when creating software indirect GLX contexts.
- xorg-x11-server-1.1.1-vt-activate-is-a-terrible-api.patch: During server
init, abort if either VT activation ioctl fails. During shutdown, be
sure to wait for the VT switch to finish before exiting.
xorg-x11-server-1.1.1-glcore-visual-matching.patch:
xf86glx.c | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
--- NEW FILE xorg-x11-server-1.1.1-glcore-visual-matching.patch ---
--- xorg-server-1.1.1/GL/mesa/X/xf86glx.c.glcore-visual 2006-07-05 14:31:36.000000000 -0400
+++ xorg-server-1.1.1/GL/mesa/X/xf86glx.c 2006-12-11 12:14:30.000000000 -0500
@@ -311,17 +311,22 @@
{
__GLXMESAscreen *mesaScreen = (__GLXMESAscreen *) screen;
const __GLcontextModes *modes;
- unsigned i = 0;
+ XMesaVisual *xmv;
for ( modes = screen->modes ; modes != NULL ; modes = modes->next ) {
if ( modes->visualID == vid ) {
break;
}
-
- i++;
}
- return (modes != NULL) ? mesaScreen->xm_vis[i] : NULL;
+ if (!modes)
+ return NULL;
+
+ for (xmv = mesaScreen->xm_vis; xmv; xmv++)
+ if ((*xmv)->mesa_visual.visualID == vid)
+ return *xmv;
+
+ return NULL;
}
static void init_screen_visuals(__GLXMESAscreen *screen)
xorg-x11-server-1.1.1-maxpixclock-option.patch:
common/xf86Config.c | 9 ++++++---
common/xf86Mode.c | 6 ++++++
ddc/ddcProperty.c | 11 +++++++----
3 files changed, 19 insertions(+), 7 deletions(-)
--- NEW FILE xorg-x11-server-1.1.1-maxpixclock-option.patch ---
--- xorg-server-1.1.1/hw/xfree86/common/xf86Mode.c.maxpixclock 2006-11-02 16:00:56.000000000 -0500
+++ xorg-server-1.1.1/hw/xfree86/common/xf86Mode.c 2006-11-02 16:32:15.000000000 -0500
@@ -1413,6 +1413,12 @@
scrp->monitor->vrefresh[i].lo,
scrp->monitor->vrefresh[i].hi);
}
+ if (scrp->monitor->maxPixClock) {
+ xf86DrvMsg(scrp->scrnIndex, X_INFO,
+ "%s: Using maximum pixel clock of %.2f MHz\n",
+ scrp->monitor->id,
+ (float)scrp->monitor->maxPixClock / 1000.0);
+ }
}
/*
--- xorg-server-1.1.1/hw/xfree86/common/xf86Config.c.maxpixclock 2006-11-02 16:00:56.000000000 -0500
+++ xorg-server-1.1.1/hw/xfree86/common/xf86Config.c 2006-11-02 16:00:56.000000000 -0500
@@ -2230,12 +2230,15 @@
}
typedef enum {
- MON_REDUCEDBLANKING
+ MON_REDUCEDBLANKING,
+ MON_MAX_PIX_CLOCK,
} MonitorValues;
static OptionInfoRec MonitorOptions[] = {
{ MON_REDUCEDBLANKING, "ReducedBlanking", OPTV_BOOLEAN,
{0}, FALSE },
+ { MON_MAX_PIX_CLOCK, "MaxPixClock", OPTV_FREQ,
+ {0}, FALSE },
{ -1, NULL, OPTV_NONE,
{0}, FALSE },
};
@@ -2382,11 +2385,11 @@
return FALSE;
}
- /* Check wether this Monitor accepts Reduced Blanking modelines */
xf86ProcessOptions(-1, monitorp->options, MonitorOptions);
-
xf86GetOptValBool(MonitorOptions, MON_REDUCEDBLANKING,
&monitorp->reducedblanking);
+ xf86GetOptValFreq(MonitorOptions, MON_MAX_PIX_CLOCK, OPTUNITS_KHZ,
+ &monitorp->maxPixClock);
return TRUE;
}
--- xorg-server-1.1.1/hw/xfree86/ddc/ddcProperty.c.maxpixclock 2006-11-02 16:00:56.000000000 -0500
+++ xorg-server-1.1.1/hw/xfree86/ddc/ddcProperty.c 2006-11-02 16:00:56.000000000 -0500
@@ -303,7 +303,7 @@
{
DisplayModePtr Modes = NULL, Mode;
int i, clock;
- Bool have_hsync = FALSE, have_vrefresh = FALSE;
+ Bool have_hsync = FALSE, have_vrefresh = FALSE, have_maxpixclock = FALSE;
int preferred;
if (!Monitor || !DDC)
@@ -342,6 +342,7 @@
/* Skip EDID ranges if they were specified in the config file */
have_hsync = (Monitor->nHsync != 0);
have_vrefresh = (Monitor->nVrefresh != 0);
+ have_maxpixclock = (Monitor->maxPixClock != 0);
/* Go through the detailed monitor sections */
for (i = 0; i < DET_TIMINGS; i++)
@@ -380,9 +381,11 @@
* ranges, each one might have a different maximum, but I've
* yet to find such a monitor so LA LA LA I CAN'T HEAR YOU.
*/
- clock = DDC->det_mon[i].section.ranges.max_clock * 1000;
- if (clock > Monitor->maxPixClock)
- Monitor->maxPixClock = clock;
+ if (!have_maxpixclock) {
+ clock = DDC->det_mon[i].section.ranges.max_clock * 1000;
+ if (clock > Monitor->maxPixClock)
+ Monitor->maxPixClock = clock;
+ }
break;
case DT:
xorg-x11-server-1.1.1-vt-activate-is-a-terrible-api.patch:
lnx_init.c | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
Index: xorg-x11-server-1.1.1-vt-activate-is-a-terrible-api.patch
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server-1.1.1-vt-activate-is-a-terrible-api.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xorg-x11-server-1.1.1-vt-activate-is-a-terrible-api.patch 11 Dec 2006 21:22:32 -0000 1.2
+++ xorg-x11-server-1.1.1-vt-activate-is-a-terrible-api.patch 18 Dec 2006 21:18:01 -0000 1.3
@@ -1,5 +1,5 @@
--- xorg-server-1.1.1/hw/xfree86/os-support/linux/lnx_init.c.vt-activate 2006-07-05 14:31:41.000000000 -0400
-+++ xorg-server-1.1.1/hw/xfree86/os-support/linux/lnx_init.c 2006-12-04 17:29:47.000000000 -0500
++++ xorg-server-1.1.1/hw/xfree86/os-support/linux/lnx_init.c 2006-12-14 22:00:25.000000000 -0500
@@ -248,14 +248,20 @@
#endif
/*
@@ -25,3 +25,13 @@
if (ioctl(xf86Info.consoleFd, VT_GETMODE, &VT) < 0)
FatalError("xf86OpenConsole: VT_GETMODE failed %s\n",
+@@ -352,6 +358,9 @@
+ if (ioctl(xf86Info.consoleFd, VT_ACTIVATE, activeVT) < 0)
+ xf86Msg(X_WARNING, "xf86CloseConsole: VT_ACTIVATE failed: %s\n",
+ strerror(errno));
++ if (ioctl(xf86Info.consoleFd, VT_WAITACTIVE, activeVT) < 0)
++ xf86Msg(X_WARNING, "xf86CloseConsole: VT_WAITACTIVE failed: %s\n",
++ strerror(errno));
+ activeVT = -1;
+ }
+
Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -r1.195 -r1.196
--- xorg-x11-server.spec 11 Dec 2006 21:22:32 -0000 1.195
+++ xorg-x11-server.spec 18 Dec 2006 21:18:01 -0000 1.196
@@ -8,7 +8,7 @@
Summary: X.Org X11 X server
Name: xorg-x11-server
Version: 1.1.1
-Release: 55%{?dist}
+Release: 56%{?dist}
URL: http://www.x.org
License: MIT/X11
Group: User Interface/X
@@ -35,6 +35,7 @@
Patch15: xorg-x11-server-1.1.1-automake-1.10-fixes.patch
Patch16: xorg-x11-server-1.1.1-xkb-vidmode-switch.patch
Patch17: xorg-x11-server-1.1.1-lid-close-crash.patch
+Patch18: xorg-x11-server-1.1.1-glcore-visual-matching.patch
# OpenGL compositing manager feature/optimization patches.
Patch100: xorg-x11-server-1.1.0-no-move-damage.patch
@@ -68,6 +69,7 @@
Patch2008: xorg-x11-server-1.1.1-edid-hex-dump.patch
Patch3000: xorg-x11-server-1.1.1-autoconfig.patch
+Patch3001: xorg-x11-server-1.1.1-maxpixclock-option.patch
%define moduledir %{_libdir}/xorg/modules
%define drimoduledir %{_libdir}/dri
@@ -340,6 +342,7 @@
%patch15 -p1 -b .automake-1.10
%patch16 -p1 -b .xkb-vidmode-switch
%patch17 -p1 -b .lid-close-crash
+%patch18 -p1 -b .glcore-visual
%patch100 -p0 -b .no-move-damage
%patch101 -p0 -b .dont-backfill-bg-none
@@ -369,6 +372,7 @@
%patch2008 -p1 -b .hexdump
%patch3000 -p1 -b .autoconfig
+%patch3001 -p1 -b .maxpixclock
%build
#FONTDIR="${datadir}/X11/fonts"
@@ -683,6 +687,16 @@
# -------------------------------------------------------------------
%changelog
+* Mon Dec 18 2006 Adam Jackson <ajax at redhat.com> 1.1.1-56
+- RHEL5 sync:
+ - xorg-x11-server-1.1.1-maxpixclock-option.patch: Allow the maximum pixel
+ clock of a monitor to be specified in the config file.
+ - xorg-x11-server-1.1.1-glcore-visual-matching.patch: Fix a client crash
+ when creating software indirect GLX contexts.
+ - xorg-x11-server-1.1.1-vt-activate-is-a-terrible-api.patch: During server
+ init, abort if either VT activation ioctl fails. During shutdown, be
+ sure to wait for the VT switch to finish before exiting.
+
* Mon Dec 11 2006 Adam Jackson <ajax at redhat.com> 1.1.1-55
- xorg-x11-server-1.1.1-lid-close-crash.patch: Added, backport from head.
(#197921)
- Previous message (by thread): rpms/am-utils/FC-6 am-utils-6.1.5-UTS_RELEASE.patch, NONE, 1.1 am-utils.init, 1.4, 1.5 am-utils.spec, 1.39, 1.40 am-utils-6.1.1-linuxNfsMountCheck.patch, 1.1, NONE
- Next message (by thread): rpms/selinux-policy/devel policy-20061106.patch, 1.43, 1.44 selinux-policy.spec, 1.367, 1.368
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list