From b618c3d0693aec564c6746238fd05d94e31d3b76 Mon Sep 17 00:00:00 2001 From: Parabola Date: Tue, 3 Apr 2012 14:54:55 +0000 Subject: Tue Apr 3 14:54:45 UTC 2012 --- testing/xf86-video-s3virge/PKGBUILD | 38 ---------- testing/xf86-video-s3virge/copyright.patch | 82 ---------------------- .../xf86-video-s3virge/s3virge-1.10.4-vga.patch | 76 -------------------- 3 files changed, 196 deletions(-) delete mode 100644 testing/xf86-video-s3virge/PKGBUILD delete mode 100644 testing/xf86-video-s3virge/copyright.patch delete mode 100644 testing/xf86-video-s3virge/s3virge-1.10.4-vga.patch (limited to 'testing/xf86-video-s3virge') diff --git a/testing/xf86-video-s3virge/PKGBUILD b/testing/xf86-video-s3virge/PKGBUILD deleted file mode 100644 index 04d446f53..000000000 --- a/testing/xf86-video-s3virge/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 150065 2012-02-12 09:45:34Z andyrtr $ -# Maintainer: Jan de Groot -# Contributor: Alexander Baldeck - -pkgname=xf86-video-s3virge -pkgver=1.10.4 -pkgrel=7 -pkgdesc="X.org S3 Virge video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc') -makedepends=('pkgconfig' 'xorg-server-devel>=1.11.99.903') -conflicts=('xorg-server<1.11.99.903') -options=(!libtool) -groups=('xorg-drivers' 'xorg') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - copyright.patch - s3virge-1.10.4-vga.patch) -md5sums=('6517bbbf808c700502d51acdc44662f8' - 'f91fb259e3632fb9130fcbe69ecd9d6a' - '45c7d912734c9f7dfc1f42077827cb8e') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/copyright.patch" - patch -Np1 -i ${srcdir}/s3virge-1.10.4-vga.patch - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xf86-video-s3virge/copyright.patch b/testing/xf86-video-s3virge/copyright.patch deleted file mode 100644 index ba988c6d6..000000000 --- a/testing/xf86-video-s3virge/copyright.patch +++ /dev/null @@ -1,82 +0,0 @@ -From c26da404906258951341c4c4ace793f2dfdc47f8 Mon Sep 17 00:00:00 2001 -From: Gaetan Nadon -Date: Sun, 13 Jun 2010 14:26:32 +0000 -Subject: COPYING: update file with Copyright notices from source code. - -Signed-off-by: Gaetan Nadon ---- -diff --git a/COPYING b/COPYING -index 7f33cbf..727ca51 100644 ---- a/COPYING -+++ b/COPYING -@@ -1,12 +1,60 @@ --This is a stub file. This package has not yet had its complete licensing --information compiled. Please see the individual source files for details on --your rights to use and modify this software. -+Copyright (C) 1994-2000 The XFree86 Project, Inc. All Rights Reserved. - --Please submit updated COPYING files to the Xorg bugzilla: -+Permission is hereby granted, free of charge, to any person obtaining a copy of -+this software and associated documentation files (the "Software"), to deal in -+the Software without restriction, including without limitation the rights to -+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies -+of the Software, and to permit persons to whom the Software is furnished to do -+so, subject to the following conditions: - --https://bugs.freedesktop.org/enter_bug.cgi?product=xorg -+The above copyright notice and this permission notice shall be included in all -+copies or substantial portions of the Software. - --All licensing questions regarding this software should be directed at the --Xorg mailing list: -+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT- -+NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -+ -+Except as contained in this notice, the name of the XFree86 Project shall not -+be used in advertising or otherwise to promote the sale, use or other dealings -+in this Software without prior written authorization from the XFree86 Project. -+ -+Written by Jake Richter Copyright (c) 1989, 1990 Panacea Inc., Londonderry, -+NH - All Rights Reserved -+ -+This code may be freely incorporated in any program without royalty, as long -+as the copyright notice stays intact. -+ -+Additions by Kevin E. Martin (martin@cs.unc.edu) -+ -+KEVIN E. MARTIN DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, -+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -+EVENT SHALL KEVIN E. MARTIN BE LIABLE FOR ANY SPECIAL, INDIRECT OR -+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF -+USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR -+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -+PERFORMANCE OF THIS SOFTWARE. -+ -+Copyright 2007 George Sapountzis -+ -+Permission is hereby granted, free of charge, to any person obtaining a -+copy of this software and associated documentation files (the "Software"), -+to deal in the Software without restriction, including without limitation -+the rights to use, copy, modify, merge, publish, distribute, sublicense, -+and/or sell copies of the Software, and to permit persons to whom the -+Software is furnished to do so, subject to the following conditions: -+ -+The above copyright notice and this permission notice (including the next -+paragraph) shall be included in all copies or substantial portions of the -+Software. -+ -+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -+SOFTWARE. - --http://lists.freedesktop.org/mailman/listinfo/xorg --- -cgit v0.9.0.2-2-gbebe diff --git a/testing/xf86-video-s3virge/s3virge-1.10.4-vga.patch b/testing/xf86-video-s3virge/s3virge-1.10.4-vga.patch deleted file mode 100644 index 3fb1fd6cf..000000000 --- a/testing/xf86-video-s3virge/s3virge-1.10.4-vga.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 92b4671ca75022a56ad9e85b347f81c12157c98f Mon Sep 17 00:00:00 2001 -From: Adam Jackson -Date: Wed, 16 Nov 2011 19:58:29 +0000 -Subject: Adapt to missing PIOOffset in videoabi 12 - -Signed-off-by: Adam Jackson ---- -diff --git a/src/s3v_driver.c b/src/s3v_driver.c -index 2ced9ac..0f754dd 100644 ---- a/src/s3v_driver.c -+++ b/src/s3v_driver.c -@@ -3516,11 +3516,17 @@ S3VEnableMmio(ScrnInfoPtr pScrn) - S3VPtr ps3v; - IOADDRESS vgaCRIndex, vgaCRReg; - unsigned char val; -- -+ unsigned int PIOOffset = 0; -+ - PVERB5(" S3VEnableMmio\n"); - - hwp = VGAHWPTR(pScrn); - ps3v = S3VPTR(pScrn); -+ -+#if ABI_VIDEODRV_VERSION < 12 -+ PIOOffset = hwp->PIOOffset; -+#endif -+ - /* - * enable chipset (seen on uninitialized secondary cards) - * might not be needed once we use the VGA softbooter -@@ -3533,17 +3539,17 @@ S3VEnableMmio(ScrnInfoPtr pScrn) - * to be set correctly already and MMIO _has_ to be - * enabled. - */ -- val = inb(hwp->PIOOffset + 0x3C3); /*@@@EE*/ -- outb(hwp->PIOOffset + 0x3C3, val | 0x01); -+ val = inb(PIOOffset + 0x3C3); /*@@@EE*/ -+ outb(PIOOffset + 0x3C3, val | 0x01); - /* - * set CR registers to color mode - * in mono mode extended CR registers - * are not accessible. (EE 05/04/99) - */ -- val = inb(hwp->PIOOffset + VGA_MISC_OUT_R); /*@@@EE*/ -- outb(hwp->PIOOffset + VGA_MISC_OUT_W, val | 0x01); -+ val = inb(PIOOffset + VGA_MISC_OUT_R); /*@@@EE*/ -+ outb(PIOOffset + VGA_MISC_OUT_W, val | 0x01); - vgaHWGetIOBase(hwp); /* Get VGA I/O base */ -- vgaCRIndex = hwp->PIOOffset + hwp->IOBase + 4; -+ vgaCRIndex = PIOOffset + hwp->IOBase + 4; - vgaCRReg = vgaCRIndex + 1; - #if 1 - /* -@@ -3562,7 +3568,7 @@ S3VEnableMmio(ScrnInfoPtr pScrn) - /* Enable new MMIO, if TRIO mmio is already */ - /* enabled, then it stays enabled. */ - outb(vgaCRReg, ps3v->EnableMmioCR53 | 0x08); -- outb(hwp->PIOOffset + VGA_MISC_OUT_W, val); -+ outb(PIOOffset + VGA_MISC_OUT_W, val); - if (S3_TRIO_3D_SERIES(ps3v->Chipset)) { - outb(vgaCRIndex, 0x40); - val = inb(vgaCRReg); -@@ -3584,7 +3590,10 @@ S3VDisableMmio(ScrnInfoPtr pScrn) - hwp = VGAHWPTR(pScrn); - ps3v = S3VPTR(pScrn); - -- vgaCRIndex = hwp->PIOOffset + hwp->IOBase + 4; -+ vgaCRIndex = hwp->IOBase + 4; -+#if ABI_VIDEODRV_VERSION < 12 -+ vgaCRIndex += hwp->PIOOffset; -+#endif - vgaCRReg = vgaCRIndex + 1; - outb(vgaCRIndex, 0x53); - /* Restore register's original state */ --- -cgit v0.9.0.2-2-gbebe -- cgit v1.2.3-54-g00ecf