diff --git a/openchrome-0.2.902-Xv_on_LCD.patch b/openchrome-0.2.902-Xv_on_LCD.patch deleted file mode 100644 index 42a1dea..0000000 --- a/openchrome-0.2.902-Xv_on_LCD.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: src/via_swov.c -=================================================================== ---- src/via_swov.c (revision 536) -+++ src/via_swov.c (revision 568) -@@ -1728,5 +1728,8 @@ - * Enable video on secondary - */ -- if ((pVia->Chipset == VIA_P4M900 || pVia->Chipset == VIA_VM800) -+ if ((pVia->Chipset == VIA_P4M900 || -+ pVia->Chipset == VIA_K8M890 || -+ pVia->Chipset == VIA_VM800 || -+ pVia->Chipset == VIA_CX700) - && pVia->pBIOSInfo->PanelActive) { - /* V1_ON_SND_DISPLAY */ diff --git a/openchrome-0.2.902-chipset_revision.patch b/openchrome-0.2.902-chipset_revision.patch deleted file mode 100644 index ff4422b..0000000 --- a/openchrome-0.2.902-chipset_revision.patch +++ /dev/null @@ -1,11 +0,0 @@ -Index: src/via_driver.c -=================================================================== ---- src/via_driver.c (revision 565) -+++ src/via_driver.c (revision 566) -@@ -1066,5 +1066,5 @@ - struct pci_device *bridge = via_host_bridge(); - -- pci_device_cfg_read_u32(bridge, &pVia->ChipRev, 0xF6); -+ pci_device_cfg_read_u8(bridge, &pVia->ChipRev, 0xF6); - #else - pVia->ChipRev = pciReadByte(pciTag(0, 0, 0), 0xF6); diff --git a/openchrome-0.2.902-disable_XvDMA_P4M890_K8M890.patch b/openchrome-0.2.902-disable_XvDMA_P4M890_K8M890.patch deleted file mode 100644 index f922e28..0000000 --- a/openchrome-0.2.902-disable_XvDMA_P4M890_K8M890.patch +++ /dev/null @@ -1,20 +0,0 @@ -Index: src/via_driver.c -=================================================================== ---- src/via_driver.c (revision 571) -+++ src/via_driver.c (working copy) -@@ -829,6 +829,7 @@ - case VIA_K8M890: - pVia->VideoEngine = VIDEO_ENGINE_CME; - pVia->agpEnable = FALSE; -+ pVia->dmaXV = FALSE; - break; - case VIA_P4M900: - pVia->VideoEngine = VIDEO_ENGINE_CME; -@@ -845,6 +846,7 @@ - break; - case VIA_P4M890: - pVia->VideoEngine = VIDEO_ENGINE_CME; -+ pVia->dmaXV = FALSE; - break; - } - diff --git a/openchrome-0.2.902-re_enable_AGPDMA.patch b/openchrome-0.2.902-re_enable_AGPDMA.patch deleted file mode 100644 index 036e2b2..0000000 --- a/openchrome-0.2.902-re_enable_AGPDMA.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: src/via_driver.c -=================================================================== ---- src/via_driver.c (revision 562) -+++ src/via_driver.c (working copy) -@@ -817,12 +817,10 @@ - pVia->DRIIrqEnable = FALSE; - break; - case VIA_K8M800: -- pVia->agpEnable = FALSE; - pVia->DRIIrqEnable = FALSE; - break; - case VIA_VM800: -- pVia->agpEnable = FALSE; - break; - case VIA_K8M890: - pVia->VideoEngine = VIDEO_ENGINE_CME; - pVia->agpEnable = FALSE; diff --git a/openchrome-0.2.902-report_version.patch b/openchrome-0.2.902-report_version.patch deleted file mode 100644 index 0e171e9..0000000 --- a/openchrome-0.2.902-report_version.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: src/via_driver.c -=================================================================== ---- src/via_driver.c (revision 557) -+++ src/via_driver.c (revision 565) -@@ -601,4 +601,7 @@ - xf86Msg(X_NOTICE, - "For support, please refer to http://www.openchrome.org/.\n"); -+#ifdef BUILDCOMMENT -+ xf86Msg(X_NOTICE, BUILDCOMMENT"\n"); -+#endif - } - return scrn != NULL; diff --git a/openchrome-0.2.902-sync_pciids.patch b/openchrome-0.2.902-sync_pciids.patch deleted file mode 100644 index e03e59d..0000000 --- a/openchrome-0.2.902-sync_pciids.patch +++ /dev/null @@ -1,49 +0,0 @@ -Index: via_id.c -=================================================================== ---- src/via_id.c -+++ src/via_id.c -@@ -74,7 +74,8 @@ - {"Packard Bell Quasar2 (MSI MS6786)", VIA_KM400, 0x1631, 0xD002, VIA_DEVICE_CRT}, - {"Epox EP-8KMM3I", VIA_KM400, 0x1695, 0x9023, VIA_DEVICE_CRT}, - {"ASRock Inc. K7VM2/3/4", VIA_KM400, 0x1849, 0x7205, VIA_DEVICE_CRT}, -- {"ACorp KM400QP", VIA_KM400, 0x1915, 0x1100, VIA_DEVICE_CRT| VIA_DEVICE_TV}, -+ {"ACorp KM400QP", VIA_KM400, 0x1915, 0x1100, VIA_DEVICE_CRT | VIA_DEVICE_TV}, -+ {"Mercury P4VM800M7 (1.0)", VIA_KM400, 0x3344, 0x1122, VIA_DEVICE_CRT}, - {"Soyo K7VME", VIA_KM400, 0xA723, 0x10FD, VIA_DEVICE_CRT}, - - /*** K8M800, K8N800, K8N800A ***/ -@@ -125,6 +126,7 @@ - {"Fujitsu/Siemens Amilo L7310", VIA_PM800, 0x1734, 0x10AB, VIA_DEVICE_CRT | VIA_DEVICE_LCD}, - {"ASRock P4VM8", VIA_PM800, 0x1849, 0x3118, VIA_DEVICE_CRT}, - {"Chaintech MPM800-3", VIA_PM800, 0x270F, 0x7671, VIA_DEVICE_CRT}, -+ {"KamLAB KINO-LUKE-533-R20", VIA_PM800, 0x3344, 0x1122, VIA_DEVICE_CRT}, - - /*** P4M800Pro, VN800, CN700 ***/ - {"Clevo/RoverBook Partner E419L", VIA_VM800, 0x1019, 0x0F75, VIA_DEVICE_CRT | VIA_DEVICE_LCD}, -@@ -164,6 +166,7 @@ - - /*** P4M900, VN896, CN896 ***/ - {"VIA Epia SN", VIA_P4M900, 0x0908, 0x1975, VIA_DEVICE_CRT}, -+ {"Hewlett Packard 2133 Mini-Note", VIA_P4M900, 0x103C, 0x3030, VIA_DEVICE_CRT | VIA_DEVICE_LCD}, - {"Asustek P5VD2-VM", VIA_P4M900, 0x1043, 0x81CE, VIA_DEVICE_CRT}, - {"Asustek P5VD2-VM SE", VIA_P4M900, 0x1043, 0x8252, VIA_DEVICE_CRT}, - {"Mitac 8515", VIA_P4M900, 0x1071, 0x8515, VIA_DEVICE_CRT | VIA_DEVICE_LCD}, -@@ -187,15 +190,18 @@ - {"VIA VT3324 (CX700)", VIA_CX700, 0x1106, 0x3157, VIA_DEVICE_CRT}, - {"MSI Fuzzy CX700/CX700D", VIA_CX700, 0x1462, 0x8020, VIA_DEVICE_CRT | VIA_DEVICE_LCD | VIA_DEVICE_TV}, - {"FIC CE260", VIA_CX700, 0x1509, 0x2D30, VIA_DEVICE_LCD}, -+ {"FIC CE261", VIA_CX700, 0x1509, 0x2F07, VIA_DEVICE_LCD}, - {"Packard Bell EasyNote XS", VIA_CX700, 0x1631, 0xC201, VIA_DEVICE_LCD}, /* aka Everex Cloudbook CE1200V */ - - /*** P4M890, VN890 ***/ - {"PCChips P29G", VIA_P4M890, 0x1019, 0x1629, VIA_DEVICE_CRT}, -+ {"PCChips ????", VIA_P4M890, 0x1019, 0x2174, VIA_DEVICE_CRT}, - {"Asustek P5V-VM ULTRA", VIA_P4M890, 0x1043, 0x81B5, VIA_DEVICE_CRT}, - {"Asustek P5V-VM DH", VIA_P4M890, 0x1043, 0x81CE, VIA_DEVICE_CRT}, - {"Mitac 8615", VIA_P4M890, 0x1071, 0x8615, VIA_DEVICE_CRT | VIA_DEVICE_LCD}, - {"VIA VT3343 (P4M890)", VIA_P4M890, 0x1106, 0x3343, VIA_DEVICE_CRT}, - {"MSI P4M890M-L/IL (MS-7255)", VIA_P4M890, 0x1462, 0x7255, VIA_DEVICE_CRT}, -+ {"Biostar P4M890-M7 TE", VIA_P4M890, 0x1565, 0x1207, VIA_DEVICE_CRT}, - {"ASRock P4VM890", VIA_P4M890, 0x1849, 0x3343, VIA_DEVICE_CRT}, - - /* keep this */ diff --git a/openchrome-0.2.902-unbreak_ActiveDevice.patch b/openchrome-0.2.902-unbreak_ActiveDevice.patch deleted file mode 100644 index a8f3474..0000000 --- a/openchrome-0.2.902-unbreak_ActiveDevice.patch +++ /dev/null @@ -1,22 +0,0 @@ -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/openchrome-0.2.903-re_enable_AGPDMA.patch b/openchrome-0.2.903-re_enable_AGPDMA.patch new file mode 100644 index 0000000..267cd1f --- /dev/null +++ b/openchrome-0.2.903-re_enable_AGPDMA.patch @@ -0,0 +1,17 @@ +--- src/via_driver.c.agpdma 2008-07-01 00:32:07.000000000 +0200 ++++ src/via_driver.c 2008-08-20 23:27:34.000000000 +0200 +@@ -820,14 +820,12 @@ + pVia->DRIIrqEnable = FALSE; + break; + case VIA_K8M800: +- pVia->agpEnable = FALSE; + pVia->DRIIrqEnable = FALSE; + break; + case VIA_PM800: + pVia->VideoEngine = VIDEO_ENGINE_CME; + break; + case VIA_VM800: +- pVia->agpEnable = FALSE; + break; + case VIA_K8M890: + pVia->VideoEngine = VIDEO_ENGINE_CME; diff --git a/openchrome-0.2.903-sync_pciids.patch b/openchrome-0.2.903-sync_pciids.patch new file mode 100644 index 0000000..1911481 --- /dev/null +++ b/openchrome-0.2.903-sync_pciids.patch @@ -0,0 +1,18 @@ +--- src/via_id.c ++++ src/via_id.c +@@ -158,6 +158,7 @@ + {"Asustek P5V800-MX", VIA_VM800, 0x3344, 0x1122, VIA_DEVICE_CRT}, + + /*** K8M890 ***/ ++ {"IBM AnyPlace Kiosk 3xx", VIA_K8M890, 0x1106, 0x3230, VIA_DEVICE_CRT | VIA_DEVICE_LCD}, + {"Asustek A8V-VM", VIA_K8M890, 0x1043, 0x81B5, VIA_DEVICE_CRT}, + {"Asustek M2V-MX SE", VIA_K8M890, 0x1043, 0x8297, VIA_DEVICE_CRT}, + {"Foxconn K8M890M2MA-RS2H", VIA_K8M890, 0x105B, 0x0C84, VIA_DEVICE_CRT}, +@@ -196,6 +197,7 @@ + {"Samsung Q1B", VIA_CX700, 0x144D, 0xC02C, VIA_DEVICE_CRT | VIA_DEVICE_LCD}, + {"FIC CE260", VIA_CX700, 0x1509, 0x2D30, VIA_DEVICE_LCD}, + {"FIC CE261", VIA_CX700, 0x1509, 0x2F07, VIA_DEVICE_LCD}, ++ {"Gigabyte M704 / RoverPC A700GQ", VIA_CX700, 0x161F, 0x2060, VIA_DEVICE_CRT | VIA_DEVICE_LCD}, + {"Packard Bell EasyNote XS", VIA_CX700, 0x1631, 0xC201, VIA_DEVICE_LCD}, /* aka Everex Cloudbook CE1200V */ + + /*** P4M890, VN890 ***/ diff --git a/sources b/sources index 465bbad..b858333 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -73fa951e78095be0087e3ac938610546 xf86-video-openchrome-0.2.902.tar.bz2 +c0820787e89958c9114d359b6a3cd464 xf86-video-openchrome-0.2.903.tar.bz2 diff --git a/xorg-x11-drv-openchrome.spec b/xorg-x11-drv-openchrome.spec index 05627ae..43c975c 100644 --- a/xorg-x11-drv-openchrome.spec +++ b/xorg-x11-drv-openchrome.spec @@ -8,8 +8,8 @@ Summary: Xorg X11 openchrome video driver Name: xorg-x11-drv-openchrome -Version: 0.2.902 -Release: 7%{?dist} +Version: 0.2.903 +Release: 1%{?dist} URL: http://www.openchrome.org License: MIT Group: User Interface/X Hardware Support @@ -18,13 +18,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: http://www.openchrome.org/releases/%{tarball}-%{version}.tar.bz2 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 -Patch5: openchrome-0.2.902-Xv_on_LCD.patch -Patch6: openchrome-0.2.902-disable_XvDMA_P4M890_K8M890.patch -Patch7: openchrome-0.2.902-sync_pciids.patch +# Patches from upstream trunk : +Patch1: openchrome-0.2.903-sync_pciids.patch +# Fedora specific patches : +Patch100: openchrome-0.2.903-re_enable_AGPDMA.patch ExclusiveArch: %{ix86} x86_64 @@ -61,13 +58,8 @@ X.Org X11 openchrome video driver XvMC development package. %prep %setup -q -n %{tarball}-%{version} -%patch1 -p0 -b .agpdma -%patch2 -p0 -b .version -%patch3 -p0 -b .chiprev -%patch4 -p0 -b .activedevice -%patch5 -p0 -b .xv_lcd -%patch6 -p0 -b .XvDMA -%patch7 -p0 -b .pciids +%patch1 -p0 -b .pciids +%patch100 -p0 -b .agpdma %build %configure --disable-static --enable-dri @@ -115,6 +107,9 @@ fi %changelog +* Wed Aug 20 2008 Xavier Bachelot - 0.2.903-1 +- Update to 0.2.903. + * Sat Jun 07 2008 Xavier Bachelot - 0.2.902-7 - Fix Xv on LCD for K8M890.