From 9582d1970fd2acddb5a9e91a098b8d1a3c663465 Mon Sep 17 00:00:00 2001 From: Xavier Bachelot Date: May 25 2008 21:32:00 +0000 Subject: unbreak ActiveDevice --- diff --git a/openchrome-0.2.902-unbreak_ActiveDevice.patch b/openchrome-0.2.902-unbreak_ActiveDevice.patch new file mode 100644 index 0000000..a8f3474 --- /dev/null +++ b/openchrome-0.2.902-unbreak_ActiveDevice.patch @@ -0,0 +1,22 @@ +Index: src/via_driver.c +=================================================================== +--- src/via_driver.c (revision 568) ++++ src/via_driver.c (working copy) +@@ -1338,13 +1346,13 @@ + /* ActiveDevice Option for device selection */ + //pVia->ActiveDevice = 0x00; + if ((s = xf86GetOptValString(VIAOptions, OPTION_ACTIVEDEVICE))) { +- if (xf86strstr(s, "CRT")) ++ if (strstr(s, "CRT")) + pVia->ActiveDevice |= VIA_DEVICE_CRT; +- if (xf86strstr(s, "LCD")) ++ if (strstr(s, "LCD")) + pVia->ActiveDevice |= VIA_DEVICE_LCD; +- if (xf86strstr(s, "DFP")) /* just treat this the same as LCD */ ++ if (strstr(s, "DFP")) /* just treat this the same as LCD */ + pVia->ActiveDevice |= VIA_DEVICE_LCD; +- if (xf86strstr(s, "TV")) ++ if (strstr(s, "TV")) + pVia->ActiveDevice |= VIA_DEVICE_TV; + } + diff --git a/xorg-x11-drv-openchrome.spec b/xorg-x11-drv-openchrome.spec index 0daf489..670d856 100644 --- a/xorg-x11-drv-openchrome.spec +++ b/xorg-x11-drv-openchrome.spec @@ -9,7 +9,7 @@ Summary: Xorg X11 openchrome video driver Name: xorg-x11-drv-openchrome Version: 0.2.902 -Release: 3%{?dist} +Release: 4%{?dist} URL: http://www.openchrome.org License: MIT Group: User Interface/X Hardware Support @@ -21,6 +21,7 @@ Source1: openchrome.xinf Patch1: openchrome-0.2.902-re_enable_AGPDMA.patch Patch2: openchrome-0.2.902-report_version.patch Patch3: openchrome-0.2.902-chipset_revision.patch +Patch4: openchrome-0.2.902-unbreak_ActiveDevice.patch ExclusiveArch: %{ix86} x86_64 @@ -60,6 +61,7 @@ X.Org X11 openchrome video driver XvMC development package. %patch1 -p0 -b .agpdma %patch2 -p0 -b .version %patch3 -p0 -b .chiprev +%patch4 -p0 -b .activedevice %build %configure --disable-static --enable-dri @@ -107,6 +109,9 @@ fi %changelog +* Sun May 25 2008 Xavier Bachelot - 0.2.902-4 +- Unbreak ActiveDevice option. + * Thu Apr 17 2008 Xavier Bachelot - 0.2.902-3 - Strip leading /trunk/ from patch #2 and #3.