[arch-commits] Commit in xf86-video-neomagic/trunk (3 files)

Jan de Groot jgc at archlinux.org
Mon Jul 12 13:26:15 EDT 2010


    Date: Monday, July 12, 2010 @ 13:26:15
  Author: jgc
Revision: 85347

upgpkg: xf86-video-neomagic 1.2.5-1
Update to 1.2.5 - replace license with upstream file

Modified:
  xf86-video-neomagic/trunk/PKGBUILD
Deleted:
  xf86-video-neomagic/trunk/LICENSE
  xf86-video-neomagic/trunk/xf86UDelay-remove.patch

-------------------------+
 LICENSE                 |   70 ----------------------------------------------
 PKGBUILD                |   22 +++++---------
 xf86UDelay-remove.patch |   42 ---------------------------
 3 files changed, 9 insertions(+), 125 deletions(-)

Deleted: LICENSE
===================================================================
--- LICENSE	2010-07-12 17:26:03 UTC (rev 85346)
+++ LICENSE	2010-07-12 17:26:15 UTC (rev 85347)
@@ -1,70 +0,0 @@
-This package was downloaded from
-http://xorg.freedesktop.org/releases/individual/driver/
-
-Copyright 1998, 1999 by Precision Insight, Inc., Cedar Park, Texas.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, distribute, and sell this software and
-its documentation for any purpose is hereby granted without fee,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Precision Insight not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  Precision Insight
-and its suppliers make no representations about the suitability of this
-software for any purpose.  It is provided "as is" without express or
-implied warranty.
-
-PRECISION INSIGHT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS 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 2000 by Alan Hourihane, Sychdyn, North Wales, UK.
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name of Alan Hourihane not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission.  Alan Hourihane makes no representations
-about the suitability of this software for any purpose.  It is provided
-"as is" without express or implied warranty.
-
-ALAN HOURIHANE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL ALAN HOURIHANE 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 2002 by Shigehiro Nomura.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, distribute, and sell this software and
-its documentation for any purpose is hereby granted without fee,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Shigehiro Nomura not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  Shigehiro Nomura
-and its suppliers make no representations about the suitability of this
-software for any purpose.  It is provided "as is" without express or
-implied warranty.
-
-SHIGEHIRO NOMURA DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL SHIGEHIRO NOMURA AND/OR ITS SUPPLIERS 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.

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-07-12 17:26:03 UTC (rev 85346)
+++ PKGBUILD	2010-07-12 17:26:15 UTC (rev 85347)
@@ -2,8 +2,8 @@
 #Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=xf86-video-neomagic
-pkgver=1.2.4
-pkgrel=4
+pkgver=1.2.5
+pkgrel=1
 pkgdesc="X.org neomagic video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
@@ -13,18 +13,14 @@
 conflicts=('xorg-server<1.8.0')
 groups=('xorg-video-drivers')
 options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-        xf86UDelay-remove.patch
-        LICENSE)
-md5sums=('2d722ee9b9fe8da49109f280689c9c25'
-         '7c623f3b6deb4b0164690cc4d375712e'
-         'e2db3e2e5c75dc8084660fb30a2e2203')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('02c994e2eae191b50a8cd556e5b52d82725073b3')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/xf86UDelay-remove.patch" || return 1
-  ./configure --prefix=/usr || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
-  install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" || return 1
+  ./configure --prefix=/usr
+  make
+  make DESTDIR="${pkgdir}" install
+  install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
 }

Deleted: xf86UDelay-remove.patch
===================================================================
--- xf86UDelay-remove.patch	2010-07-12 17:26:03 UTC (rev 85346)
+++ xf86UDelay-remove.patch	2010-07-12 17:26:15 UTC (rev 85347)
@@ -1,42 +0,0 @@
-From 4e2afb88212582df60bca3ec8c447965a5a66fd5 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax at redhat.com>
-Date: Mon, 26 Oct 2009 19:43:50 +0000
-Subject: s/xf86UDelay/usleep/g
-
-cf. https://bugzilla.redhat.com/show_bug.cgi?id=523800
-
-Signed-off-by: Adam Jackson <ajax at redhat.com>
----
-diff --git a/src/neo_driver.c b/src/neo_driver.c
-index ddb6812..e4c60f2 100644
---- a/src/neo_driver.c
-+++ b/src/neo_driver.c
-@@ -114,6 +114,8 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- #include <X11/extensions/xf86dgastr.h>
- #endif
- 
-+#include <unistd.h>
-+
- /* Mandatory functions */
- static const OptionInfoRec *	NEOAvailableOptions(int chipid, int busid);
- static void     NEOIdentify(int flags);
-@@ -2489,7 +2491,7 @@ neoRestore(ScrnInfoPtr pScrn, vgaRegPtr VgaReg, NeoRegPtr restore,
-      * In some rare cases a lockup might occur if we don't delay
-      * here. (Reported by Miles Lane)
-      */
--    xf86UDelay(200000);
-+    usleep(200000);
-     /*
-      * Disable horizontal and vertical graphics and text expansions so
-      * that vgaHWRestore works properly.
-@@ -2502,7 +2504,7 @@ neoRestore(ScrnInfoPtr pScrn, vgaRegPtr VgaReg, NeoRegPtr restore,
-      * Sleep for 200ms to make sure that the two operations above have
-      * had time to take effect.
-      */
--    xf86UDelay(200000);
-+    usleep(200000);
-     /*
-      * This function handles restoring the generic VGA registers.  */
-     vgaHWRestore(pScrn, VgaReg,
---
-cgit v0.8.3-6-g21f6



More information about the arch-commits mailing list