diff --git a/vesa-2.2.0-panelid.patch b/vesa-2.2.0-panelid.patch new file mode 100644 index 0000000..3a0f09e --- /dev/null +++ b/vesa-2.2.0-panelid.patch @@ -0,0 +1,15 @@ +diff -up xf86-video-vesa-2.2.0/src/vesa.c.jx xf86-video-vesa-2.2.0/src/vesa.c +--- xf86-video-vesa-2.2.0/src/vesa.c.jx 2009-02-05 16:15:07.000000000 -0500 ++++ xf86-video-vesa-2.2.0/src/vesa.c 2009-02-20 17:39:49.000000000 -0500 +@@ -671,6 +671,11 @@ VESAPreInit(ScrnInfoPtr pScrn, int flags + + if ((pScrn->monitor->DDC = pVesa->monitor) != NULL) + xf86SetDDCproperties(pScrn, pVesa->monitor); ++ else { ++ void *panelid = VBEReadPanelID(pVesa->pVbe); ++ VBEInterpretPanelID(pScrn->scrnIndex, panelid); ++ xfree(panelid); ++ } + + xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, DEBUG_VERB, + "Searching for matching VESA mode(s):\n"); diff --git a/xorg-x11-drv-vesa.spec b/xorg-x11-drv-vesa.spec index 3f80687..b866daa 100644 --- a/xorg-x11-drv-vesa.spec +++ b/xorg-x11-drv-vesa.spec @@ -5,13 +5,15 @@ Summary: Xorg X11 vesa video driver Name: xorg-x11-drv-vesa Version: 2.2.0 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://www.x.org Source0: http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2 License: MIT Group: User Interface/X Hardware Support BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch0: vesa-2.2.0-panelid.patch + ExcludeArch: s390 s390x BuildRequires: xorg-x11-server-sdk >= 1.4.99.1-0.15 @@ -24,6 +26,7 @@ X.Org X11 vesa video driver. %prep %setup -q -n %{tarball}-%{version} +%patch0 -p1 -b .panelid %build #autoreconf -v --install || exit 1 @@ -48,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man4/vesa.4* %changelog +* Fri Feb 20 2009 Adam Jackson 2.2.0-2 +- Check VBE PanelID if DDC fails. + * Tue Feb 17 2009 Adam Jackson 2.2.0-1 - vesa 2.2.0