[arch-commits] Commit in xf86-video-apm/trunk (PKGBUILD apm-1.2.3-git.patch)

[Jan de Groot]

    Date: Sunday, May 13, 2012 @ 11:05:18
  Author: jgc
Revision: 158948

Replace checksums, adjust versioned depends, remove git patch

Modified:
  xf86-video-apm/trunk/PKGBUILD
Deleted:
  xf86-video-apm/trunk/apm-1.2.3-git.patch

---------------------+
 PKGBUILD            |    6 +++---
 apm-1.2.3-git.patch |   34 ----------------------------------
 2 files changed, 3 insertions(+), 37 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-05-13 15:04:18 UTC (rev 158947)
+++ PKGBUILD	2012-05-13 15:05:18 UTC (rev 158948)
@@ -9,12 +9,12 @@
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel>=1.11.99.902')
-conflicts=('xorg-server<1.11.99.902')
+makedepends=('xorg-server-devel>=1.12.0')
+conflicts=('xorg-server<1.12.0')
 groups=('xorg-drivers' 'xorg')
 options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('d792ba6e8c39e60e00e0790b4e08f551044b2f7c')
+sha256sums=('ae65982961fe884728497db9b805123d486d2aade2ba8e7bba9a3ee9dccf4302')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"

Deleted: apm-1.2.3-git.patch
===================================================================
--- apm-1.2.3-git.patch	2012-05-13 15:04:18 UTC (rev 158947)
+++ apm-1.2.3-git.patch	2012-05-13 15:05:18 UTC (rev 158948)
@@ -1,34 +0,0 @@
-diff --git a/src/apm.h b/src/apm.h
-index bc66714..86c7663 100644
---- a/src/apm.h
-+++ b/src/apm.h
-@@ -109,7 +109,7 @@ typedef struct {
-     char		*MemMap;
-     pointer		BltMap;
-     Bool		UnlockCalled;
--    IOADDRESS		iobase, xport, xbase;
-+    unsigned long	iobase, xport, xbase;
-     unsigned char	savedSR10;
-     CARD8		MiscOut;
-     CARD8		c9, d9, db, Rush;
-diff --git a/src/apm_driver.c b/src/apm_driver.c
-index f172bab..f77bb2b 100644
---- a/src/apm_driver.c
-+++ b/src/apm_driver.c
-@@ -418,8 +418,14 @@ ApmPreInit(ScrnInfoPtr pScrn, int flags)
- 
-     hwp = VGAHWPTR(pScrn);
-     vgaHWGetIOBase(hwp);
--    pApm->iobase = hwp->PIOOffset;
--    pApm->xport = hwp->PIOOffset + 0x3C4;
-+#if ABI_VIDEODRV_VERSION < 12
-+#define PIOOFFSET hwp->PIOOffset
-+#else
-+/* FIXME reintroduce domain support */
-+#define PIOOFFSET 0
-+#endif
-+    pApm->iobase = PIOOFFSET;
-+    pApm->xport = PIOOFFSET + 0x3C4;
- 
-     /* Set pScrn->monitor */
-     pScrn->monitor = pScrn->confScreen->monitor;