[arch-commits] Commit in xf86-video-openchrome/trunk (3 files)
Andreas Radke
andyrtr at nymeria.archlinux.org
Thu Mar 28 18:10:27 UTC 2013
Date: Thursday, March 28, 2013 @ 19:10:27
Author: andyrtr
Revision: 180936
upgpkg: xf86-video-openchrome 0.3.2-1
upstream update 0.3.2
Modified:
xf86-video-openchrome/trunk/PKGBUILD
Deleted:
xf86-video-openchrome/trunk/fix_system_lock.diff
xf86-video-openchrome/trunk/no-mibstore.patch
----------------------+
PKGBUILD | 18 ++++----------
fix_system_lock.diff | 59 -------------------------------------------------
no-mibstore.patch | 11 ---------
3 files changed, 5 insertions(+), 83 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-03-28 15:21:03 UTC (rev 180935)
+++ PKGBUILD 2013-03-28 18:10:27 UTC (rev 180936)
@@ -3,31 +3,23 @@
# Maintainer: Juergen Hoetzel <juergen at hoetzel.info>
pkgname=xf86-video-openchrome
-pkgver=0.3.1
-pkgrel=5
+pkgver=0.3.2
+pkgrel=1
pkgdesc="X.Org Openchrome drivers"
arch=(i686 x86_64)
license=('custom')
url="http://www.openchrome.org"
-depends=('libdrm' 'libxvmc')
+depends=('libdrm' 'libxvmc' 'systemd')
makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto')
conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15' 'xf86-video-via' 'xf86-video-unichrome' 'openchrome' 'unichrome-dri')
replaces=('openchrome' 'xf86-video-via')
groups=('xorg-drivers' 'xorg')
options=('!libtool' '!emptydirs' '!makeflags')
-source=(http://xorg.freedesktop.org/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2
- fix_system_lock.diff
- no-mibstore.patch)
-sha1sums=('89e56dcfe851345f72c61a95b4fa5ab6ad7e0d83'
- '539ba65df1755af97799f49410e4091b8d222eca'
- 'af0d7cace699b105e4405e48abc2f433032a7483')
+source=(http://xorg.freedesktop.org/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('e5be9a8200410b3e3e66349bab4c8acd1ead4402')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
- # https://bugs.freedesktop.org/show_bug.cgi?id=53307
- patch -Np1 -i ${srcdir}/fix_system_lock.diff
- # https://bugs.freedesktop.org/show_bug.cgi?id=62112
- patch -Np1 -i ../no-mibstore.patch
./configure --prefix=/usr
make
}
Deleted: fix_system_lock.diff
===================================================================
--- fix_system_lock.diff 2013-03-28 15:21:03 UTC (rev 180935)
+++ fix_system_lock.diff 2013-03-28 18:10:27 UTC (rev 180936)
@@ -1,59 +0,0 @@
-From 76515c8a369346d76864e55610a6a747d9b152d8 Mon Sep 17 00:00:00 2001
-From: James Simmons <jsimmons at infradead.org>
-Date: Sat, 12 Jan 2013 21:02:12 +0000
-Subject: 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.
-
----
-diff --git a/src/via_display.c b/src/via_display.c
-index 97473f0..aaf4267 100644
---- a/src/via_display.c
-+++ b/src/via_display.c
-@@ -395,7 +395,7 @@ ViaFirstCRTCSetMode(ScrnInfoPtr pScrn, DisplayModePtr mode)
- 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 */
-diff --git a/src/via_id.c b/src/via_id.c
-index 7764782..7321b26 100644
---- a/src/via_id.c
-+++ b/src/via_id.c
-@@ -297,6 +297,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;
- }
-diff --git a/src/via_outputs.c b/src/via_outputs.c
-index 808e570..c07b1d2 100644
---- a/src/via_outputs.c
-+++ b/src/via_outputs.c
-@@ -873,10 +873,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) {
-@@ -1195,7 +1195,7 @@ ViaModePrimaryLegacy(xf86CrtcPtr crtc, DisplayModePtr mode)
- /* 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);
---
-cgit v0.9.0.2-2-gbebe
Deleted: no-mibstore.patch
===================================================================
--- no-mibstore.patch 2013-03-28 15:21:03 UTC (rev 180935)
+++ no-mibstore.patch 2013-03-28 18:10:27 UTC (rev 180936)
@@ -1,11 +0,0 @@
-diff -rup a/src/via_driver.c b/src/via_driver.c
---- a/src/via_driver.c 2013-03-10 16:11:57.614059200 +0100
-+++ b/src/via_driver.c 2013-03-10 16:12:46.374062244 +0100
-@@ -1873,7 +1873,6 @@ VIAScreenInit(SCREEN_INIT_ARGS_DECL)
- if (!pVia->NoAccel && !viaInitExa(pScreen))
- return FALSE;
-
-- miInitializeBackingStore(pScreen);
- xf86SetBackingStore(pScreen);
- #if 0
- xf86SetSilkenMouse(pScreen);
\ No newline at end of file
More information about the arch-commits
mailing list