diff -u xserver-xorg-video-openchrome-lts-saucy-0.3.1/debian/changelog xserver-xorg-video-openchrome-lts-saucy-0.3.1/debian/changelog --- xserver-xorg-video-openchrome-lts-saucy-0.3.1/debian/changelog +++ xserver-xorg-video-openchrome-lts-saucy-0.3.1/debian/changelog @@ -1,3 +1,17 @@ +xserver-xorg-video-openchrome-lts-saucy (1:0.3.1-0ubuntu2.2~precise2) precise-proposed; urgency=low + + *Include new patches to fix X.org 1.14 crash (LP: #1251849) + - debian/patches/fix_incompatibility_X.org_1.14.diff : + - Removing call to miInitializeBackingStore() no longer + exist in xorg server 1.14 + - Commit 17973712f083100cc041d50fca30e248846e5fd2 + * Include new patches to fix crash with Chrome 9 HC chips (LP: #1165232) + - debian/patches/fix_Chrome_9_HC_crash.diff : + - Commit 76515c8a369346d76864e55610a6a747d9b152d8 + * Update debian/control homepage field. + + -- Alberto Jovito Mon, 24 Mar 2014 00:15:34 -0430 + xserver-xorg-video-openchrome-lts-saucy (1:0.3.1-0ubuntu2.1~precise1) precise-proposed; urgency=low * Initial lts-saucy upload, i386/amd64 only. (LP: #1253041) diff -u xserver-xorg-video-openchrome-lts-saucy-0.3.1/debian/control xserver-xorg-video-openchrome-lts-saucy-0.3.1/debian/control --- xserver-xorg-video-openchrome-lts-saucy-0.3.1/debian/control +++ xserver-xorg-video-openchrome-lts-saucy-0.3.1/debian/control @@ -26,7 +26,7 @@ quilt Build-Conflicts: autoconf2.13 Standards-Version: 3.9.3 -Homepage: http://www.openchrome.org +Homepage: http://www.freedesktop.org/wiki/Openchrome Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-openchrome Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-openchrome.git diff -u xserver-xorg-video-openchrome-lts-saucy-0.3.1/debian/patches/series xserver-xorg-video-openchrome-lts-saucy-0.3.1/debian/patches/series --- xserver-xorg-video-openchrome-lts-saucy-0.3.1/debian/patches/series +++ xserver-xorg-video-openchrome-lts-saucy-0.3.1/debian/patches/series @@ -1,0 +2,2 @@ +fix_incompatibility_X.org_1.14.diff +fix_Chrome_9_HC_crash.diff only in patch2: unchanged: --- xserver-xorg-video-openchrome-lts-saucy-0.3.1.orig/debian/patches/fix_incompatibility_X.org_1.14.diff +++ xserver-xorg-video-openchrome-lts-saucy-0.3.1/debian/patches/fix_incompatibility_X.org_1.14.diff @@ -0,0 +1,15 @@ +Description: miInitializeBackingStore no longer exist in xorg server 1.14. Removing causes no regression in earlier versions from my testing +Author: James Simmons +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1251849 +Forwarded: not-needed + +--- a/src/via_driver.c ++++ b/src/via_driver.c +@@ -1864,7 +1864,6 @@ VIAScreenInit(SCREEN_INIT_ARGS_DECL) + if (!pVia->NoAccel && !viaInitExa(pScreen)) + return FALSE; + +- miInitializeBackingStore(pScreen); + xf86SetBackingStore(pScreen); + #if 0 + xf86SetSilkenMouse(pScreen); only in patch2: unchanged: --- xserver-xorg-video-openchrome-lts-saucy-0.3.1.orig/debian/patches/fix_Chrome_9_HC_crash.diff +++ xserver-xorg-video-openchrome-lts-saucy-0.3.1/debian/patches/fix_Chrome_9_HC_crash.diff @@ -0,0 +1,50 @@ +Description: As the comment suggested in via_outputs.c probing the 3rd i2c bug locks up the P4M900. So we re-enable the via_card_id handling of what outputs to test for to get around this problem. +Author: James Simmons +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1165232 +Forwarded: not-needed + +--- a/src/via_display.c ++++ b/src/via_display.c +@@ -395,7 +395,7 @@ ViaFirstCRTCSetMode(ScrnInfoPtr pScrn, D + hwp->writeCrtc(hwp, 0x18, 0xFF); + ViaCrtcMask(hwp, 0x07, 0x10, 0x10); + ViaCrtcMask(hwp, 0x09, 0x40, 0x40); +- ViaCrtcMask(hwp, 0x33, 0x07, 0x06); ++ ViaCrtcMask(hwp, 0x33, 0x06, 0x07); + ViaCrtcMask(hwp, 0x35, 0x10, 0x10); + + /* zero Maximum scan line */ +--- a/src/via_id.c ++++ b/src/via_id.c +@@ -296,6 +296,7 @@ ViaCheckCardId(ScrnInfoPtr pScrn) + (Id->Vendor == SUBVENDOR_ID(pVia->PciInfo)) && + (Id->Device == SUBSYS_ID(pVia->PciInfo))) { + xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Detected %s. Card-Ids (%4X|%4X)\n", Id->String, SUBVENDOR_ID(pVia->PciInfo), SUBSYS_ID(pVia->PciInfo)); ++ pVia->ActiveDevice = Id->Outputs; + pVia->Id = Id; + return; + } +--- a/src/via_outputs.c ++++ b/src/via_outputs.c +@@ -822,10 +822,10 @@ ViaOutputsDetect(ScrnInfoPtr pScrn) + /* + * FIXME: xf86I2CProbeAddress(pVia->pI2CBus3, 0x40) + * disables the panel on P4M900 +- * See via_tv_detect. + */ + /* TV encoder */ +- via_tv_init(pScrn); ++ if (pVia->ActiveDevice & VIA_DEVICE_TV) ++ via_tv_init(pScrn); + + if (pVia->ActiveDevice & VIA_DEVICE_DFP) { + switch (pVia->Chipset) { +@@ -1144,7 +1144,7 @@ ViaModePrimaryLegacy(xf86CrtcPtr crtc, D + /* Enable MMIO & PCI burst (1 wait state) */ + ViaSeqMask(hwp, 0x1A, 0x06, 0x06); + +- if (pBIOSInfo->analog->status == XF86OutputStatusConnected) ++ if (pBIOSInfo->analog->status == XF86OutputStatusConnected) + ViaCrtcMask(hwp, 0x36, 0x30, 0x30); + else + ViaSeqMask(hwp, 0x16, 0x00, 0x40);