rpms/xorg-x11-server/devel xorg-x11-server-1.1.1-edid-hex-dump.patch, NONE, 1.1 xorg-x11-server-1.1.1-omit-needless-modes.patch, NONE, 1.1 xorg-x11-server-1.1.1-pclose-confusion.patch, NONE, 1.1 xorg-x11-server.spec, 1.171, 1.172
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Sep 20 22:50:57 UTC 2006
Author: ajackson
Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4506
Modified Files:
xorg-x11-server.spec
Added Files:
xorg-x11-server-1.1.1-edid-hex-dump.patch
xorg-x11-server-1.1.1-omit-needless-modes.patch
xorg-x11-server-1.1.1-pclose-confusion.patch
Log Message:
* Wed Sep 20 2006 Adam Jackson <ajackson at redhat.com> 1.1.1-40.fc6
- xorg-x11-server-1.1.1-pclose-confusion.patch: Be sure to call Pclose()
on pipes created with Popen(), since the additional magic done by Popen()
relative to popen() is not undone by plain pclose(). (Third base!)
- xorg-x11-server-1.1.1-edid-hex-dump.patch: Backport EDID hex dump code
from git.
xorg-x11-server-1.1.1-edid-hex-dump.patch:
print_edid.c | 15 +++++++++++++++
1 files changed, 15 insertions(+)
--- NEW FILE xorg-x11-server-1.1.1-edid-hex-dump.patch ---
diff --git a/hw/xfree86/ddc/print_edid.c b/hw/xfree86/ddc/print_edid.c
index 2b96488..609738a 100644
--- a/hw/xfree86/ddc/print_edid.c
+++ b/hw/xfree86/ddc/print_edid.c
@@ -30,10 +30,16 @@ static void print_dpms_features(int scrn
static void print_whitepoint(int scrnIndex, struct disp_features *);
static void print_number_sections(int scrnIndex, int);
+#define EDID_WIDTH 16
+
xf86MonPtr
xf86PrintEDID(xf86MonPtr m)
{
+ CARD16 i, j;
+ char buf[EDID_WIDTH * 2 + 1];
+
if (!(m)) return NULL;
+
print_vendor(m->scrnIndex,&m->vendor);
print_version(m->scrnIndex,&m->ver);
print_display(m->scrnIndex,&m->features, &m->ver);
@@ -41,6 +47,15 @@ xf86PrintEDID(xf86MonPtr m)
print_std_timings(m->scrnIndex,m->timings2);
print_detailed_monitor_section(m->scrnIndex,m->det_mon);
print_number_sections(m->scrnIndex,m->no_sections);
+
+ xf86DrvMsg(m->scrnIndex, X_INFO, "EDID (in hex):\n");
+
+ for (i = 0; i < 128; i += j) {
+ for (j = 0; j < EDID_WIDTH; ++j) {
+ sprintf(&buf[j * 2], "%02x", m->rawData[i + j]);
+ }
+ xf86DrvMsg(m->scrnIndex, X_INFO, "\t%s\n", buf);
+ }
return m;
}
xorg-x11-server-1.1.1-omit-needless-modes.patch:
vbeModes.c | 3 +++
1 files changed, 3 insertions(+)
--- NEW FILE xorg-x11-server-1.1.1-omit-needless-modes.patch ---
--- xorg-server-1.1.1/hw/xfree86/vbe/vbeModes.c.omit-needless-modes 2006-07-05 14:31:42.000000000 -0400
+++ xorg-server-1.1.1/hw/xfree86/vbe/vbeModes.c 2006-09-11 15:07:41.000000000 -0400
@@ -183,6 +183,8 @@ CheckMode(ScrnInfoPtr pScrn, vbeInfoPtr
xf86ErrorFVerb(DEBUG_VERB,
"Mode: %x (%dx%d)\n", id, mode->XResolution, mode->YResolution);
+ if (mode->XResolution == 0 && mode->YResolution == 0)
+ goto skip;
xf86ErrorFVerb(DEBUG_VERB,
" ModeAttributes: 0x%x\n", mode->ModeAttributes);
xf86ErrorFVerb(DEBUG_VERB,
@@ -271,6 +273,7 @@ CheckMode(ScrnInfoPtr pScrn, vbeInfoPtr
}
}
+skip:
if (!modeOK) {
VBEFreeModeInfo(mode);
return NULL;
xorg-x11-server-1.1.1-pclose-confusion.patch:
ddxList.c | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE xorg-x11-server-1.1.1-pclose-confusion.patch ---
--- xorg-server-1.1.1/xkb/ddxList.c.pclose 2006-07-05 14:38:48.000000000 -0400
+++ xorg-server-1.1.1/xkb/ddxList.c 2006-09-18 14:10:34.000000000 -0400
@@ -268,7 +268,7 @@
#ifndef WIN32
if (haveDir)
fclose(in);
- else if ((rval=pclose(in))!=0) {
+ else if ((rval=Pclose(in))!=0) {
if (xkbDebugFlags)
ErrorF("xkbcomp returned exit code %d\n",rval);
}
Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -r1.171 -r1.172
--- xorg-x11-server.spec 20 Sep 2006 16:22:27 -0000 1.171
+++ xorg-x11-server.spec 20 Sep 2006 22:50:54 -0000 1.172
@@ -3,7 +3,7 @@
Summary: X.Org X11 X server
Name: xorg-x11-server
Version: 1.1.1
-Release: 39%{?dist}
+Release: 40%{?dist}
URL: http://www.x.org
License: MIT/X11
Group: User Interface/X
@@ -21,6 +21,7 @@
Patch6: xorg-x11-server-1.1.1-builderstring.patch
Patch7: xorg-x11-server-1.1.1-xkb-in-xnest.patch
Patch8: xorg-x11-server-1.1.1-xvfb-composite-crash.patch
+Patch9: xorg-x11-server-1.1.1-pclose-confusion.patch
# OpenGL compositing manager feature/optimization patches.
Patch100: xorg-x11-server-1.1.0-no-move-damage.patch
@@ -48,6 +49,7 @@
Patch2005: xorg-x11-server-1.1.1-Xdmx-render-fix-fdo7482.patch
Patch2006: xorg-x11-server-1.1.1-revert-xkb-change.patch
Patch2007: xorg-x11-server-1.1.1-aiglx-locking.patch
+Patch2008: xorg-x11-server-1.1.1-edid-hex-dump.patch
# autoconfiguration feature patches
Patch3001: xorg-x11-server-1.1.0-edid-mode-injection-1.patch
@@ -340,6 +342,7 @@
%patch6 -p1 -b .builderstring
%patch7 -p1 -b .xkb-in-xnest
%patch8 -p1 -b .xvfb-render-fix
+%patch9 -p1 -b .pclose
%patch100 -p0 -b .no-move-damage
%patch101 -p0 -b .dont-backfill-bg-none
@@ -363,6 +366,7 @@
%patch2005 -p1 -b .Xdmx
%patch2006 -p1 -b .revert-xkb-change
%patch2007 -p1 -b .aiglx-locking
+%patch2008 -p1 -b .hexdump
%patch3001 -p1 -b .edid1
%patch3002 -p1 -b .edid2
@@ -710,6 +714,13 @@
# -------------------------------------------------------------------
%changelog
+* Wed Sep 20 2006 Adam Jackson <ajackson at redhat.com> 1.1.1-40.fc6
+- xorg-x11-server-1.1.1-pclose-confusion.patch: Be sure to call Pclose()
+ on pipes created with Popen(), since the additional magic done by Popen()
+ relative to popen() is not undone by plain pclose(). (Third base!)
+- xorg-x11-server-1.1.1-edid-hex-dump.patch: Backport EDID hex dump code
+ from git.
+
* Wed Sep 20 2006 Kristian Høgsberg <krh at redhat.com> 1.1.1-39.fc6
- Bump xorg-x11-proto-devel BuildRequires version and add Conflict
line for older mesa releases, so GLX_EXT_texture_from_pixmap opcodes
More information about the fedora-cvs-commits
mailing list