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

Jan de Groot jgc at archlinux.org
Mon Jul 12 13:35:43 EDT 2010


    Date: Monday, July 12, 2010 @ 13:35:43
  Author: jgc
Revision: 85368

upgpkg: xf86-video-sis 0.10.3-1
Update to 0.10.3, remove upstream-applied patch and use upstream license file

Modified:
  xf86-video-sis/trunk/PKGBUILD
Deleted:
  xf86-video-sis/trunk/LICENSE
  xf86-video-sis/trunk/fix-bios-read-on-650-760.patch

--------------------------------+
 LICENSE                        |  172 ---------------------------------------
 PKGBUILD                       |   23 ++---
 fix-bios-read-on-650-760.patch |   23 -----
 3 files changed, 9 insertions(+), 209 deletions(-)

Deleted: LICENSE
===================================================================
--- LICENSE	2010-07-12 17:32:14 UTC (rev 85367)
+++ LICENSE	2010-07-12 17:35:43 UTC (rev 85368)
@@ -1,172 +0,0 @@
-Copyright (C) 1998, 1999 by Alan Hourihane, Wigan, England.
-Parts Copyright (C) 2001-2005 Thomas Winischhofer, Vienna, Austria.
-
-Licensed under the following terms:
-
-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 appears in all copies and that both that copyright
-notice and this permission notice appear in supporting documentation, and
-and that the name of the copyright holder not be used in advertising
-or publicity pertaining to distribution of the software without specific,
-written prior permission. The copyright holder makes no representations
-about the suitability of this software for any purpose.  It is provided
-"as is" without expressed or implied warranty.
-
-THE COPYRIGHT HOLDER DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
-EVENT SHALL THE COPYRIGHT HOLDER 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 (C) 2001-2005 by Thomas Winischhofer, Vienna, Austria
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1) Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-2) Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-3) The name of the author may not be used to endorse or promote products
-   derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-/**************************************************************************
-
-Copyright 2000 Silicon Integrated Systems Corp, Inc., HsinChu, Taiwan.
-Copyright 2003 Eric Anholt
-All Rights Reserved.
-
-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
-on the rights to use, copy, modify, merge, publish, distribute, sub
-license, 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 NON-INFRINGEMENT. IN NO EVENT SHALL
-ERIC ANHOLT OR SILICON INTEGRATED SYSTEMS CORP 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.
-
-**************************************************************************/
-
-/*
- * Authors:
- *   Sung-Ching Lin <sclin at sis.com.tw>
- *   Eric Anholt <anholt at FreeBSD.org>
- */
-
-
-/**************************************************************************
-
-Copyright 2003 Eric Anholt
-All Rights Reserved.
-
-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
-on the rights to use, copy, modify, merge, publish, distribute, sub
-license, 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 NON-INFRINGEMENT. IN NO EVENT SHALL
-ERIC ANHOLT 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.
-
-**************************************************************************/
-
-/*
- * Authors:
- *   Eric Anholt <anholt at FreeBSD.org>
- */
-
-
-/*
- * Copyright 2005 Eric Anholt
- * All Rights Reserved.
- *
- * 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.
- *
- * Authors:
- *    Eric Anholt <anholt at FreeBSD.org>
- *    Jim Duchek <jim at linuxpimps.com>	-- Utah GLX 6326 code
- *    Alan Cox <alan at redhat.com>	-- 6326 Debugging
- *
- */
-
-
-/*
- * Common header definitions for SiS 2D/3D/DRM suite
- *
- * Copyright (C) 2003 Eric Anholt
- *
- * 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 the copyright holder not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission.  The copyright holder makes no representations
- * about the suitability of this software for any purpose.  It is provided
- * "as is" without express or implied warranty.
- *
- * THE COPYRIGHT HOLDER DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL THE COPYRIGHT HOLDER 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.
- *
- * Author:
- *   	Eric Anholt <anholt at FreeBSD.org>
- *
- */

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-07-12 17:32:14 UTC (rev 85367)
+++ PKGBUILD	2010-07-12 17:35:43 UTC (rev 85368)
@@ -2,8 +2,8 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=xf86-video-sis
-pkgver=0.10.2
-pkgrel=4
+pkgver=0.10.3
+pkgrel=1
 pkgdesc="X.org SiS video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
@@ -13,20 +13,15 @@
 conflicts=('xorg-server<1.8.0')
 options=('!libtool')
 groups=('xorg-video-drivers')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-        fix-bios-read-on-650-760.patch
-        LICENSE)
-md5sums=('f04baa307e49e9f0e5a5c3d2e89a5576'
-         '827d289307badeae3778180ab19b7363'
-         'e33e023e3d811d28a8ed3bfbd2bf5672')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('158673747e240b0c33499685a32d46bdaead7cd5')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/fix-bios-read-on-650-760.patch" || return 1
-  ./configure --prefix=/usr \
-      --enable-dri || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+  ./configure --prefix=/usr --enable-dri
+  make
+  make DESTDIR="${pkgdir}" install
 
-  install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" || return 1
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
 }

Deleted: fix-bios-read-on-650-760.patch
===================================================================
--- fix-bios-read-on-650-760.patch	2010-07-12 17:32:14 UTC (rev 85367)
+++ fix-bios-read-on-650-760.patch	2010-07-12 17:35:43 UTC (rev 85368)
@@ -1,23 +0,0 @@
-From 8370499d4035ec7a5c8e1f1b04d5a6c404883442 Mon Sep 17 00:00:00 2001
-From: Matteo Delfino <kendatsuba at gmail.com>
-Date: Wed, 21 Oct 2009 14:26:45 +0000
-Subject: Fix BIOS read on 650 and 760. (#19070)
-
-Signed-off-by: Matteo Delfino <kendatsuba at gmail.com>
-Signed-off-by: Adam Jackson <ajax at redhat.com>
----
-diff --git a/src/sis_driver.c b/src/sis_driver.c
-index 994b02d..b19e7a9 100644
---- a/src/sis_driver.c
-+++ b/src/sis_driver.c
-@@ -4099,6 +4099,8 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
- 	     case SIS_315H:
- 	     case SIS_330:
- 	     case SIS_340:
-+	     case SIS_650:
-+	     case SIS_760:
- 	     case XGI_40:     readpci = TRUE;
- 			      break;
- 	     case XGI_20:     readpci = TRUE;
---
-cgit v0.8.2



More information about the arch-commits mailing list