[arch-commits] Commit in xf86-video-savage/repos (3 files)

Tue Apr 28 04:16:53 UTC 2009

Date: Tuesday, April 28, 2009 @ 00:16:53
  Author: eric
Revision: 36850

Merged revisions 36811 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/xf86-video-savage/trunk

........
  r36811 | eric | 2009-04-27 21:57:53 -0400 (Mon, 27 Apr 2009) | 2 lines
  
  upgpkg: xf86-video-savage 2.2.1-5
      Added license, Added expat depends
........

Added:
  xf86-video-savage/repos/extra-i686/LICENSE
    (from rev 36811, xf86-video-savage/trunk/LICENSE)
Modified:
  xf86-video-savage/repos/extra-i686/	(properties)
  xf86-video-savage/repos/extra-i686/PKGBUILD

----------+
 LICENSE  |   97 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 PKGBUILD |   13 ++++----
 2 files changed, 104 insertions(+), 6 deletions(-)


Property changes on: xf86-video-savage/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /xf86-video-savage/trunk:1-34107
   + /xf86-video-savage/trunk:1-36849

Copied: xf86-video-savage/repos/extra-i686/LICENSE (from rev 36811, xf86-video-savage/trunk/LICENSE)
===================================================================

--- extra-i686/LICENSE	                        (rev 0)
+++ extra-i686/LICENSE	2009-04-28 04:16:53 UTC (rev 36850)
@@ -0,0 +1,97 @@
+Copyright (C) 1994-2000 The XFree86 Project, Inc.  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 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, 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.
+
+
+Copyright 1998-2003 VIA Technologies, Inc. All Rights Reserved.
+Copyright 2001-2003 S3 Graphics, Inc. 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, 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
+VIA, S3 GRAPHICS, AND/OR ITS SUPPLIERS 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.
+
+/*
+ * Copyright 2005  Felix Kuehling
+ * 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, 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 FELIX KUEHLING 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.
+ */
+
+/**************************************************************************
+
+Copyright 2000, 2001 ATI Technologies Inc., Ontario, Canada, and
+                     VA Linux Systems Inc., Fremont, California.
+
+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
+ATI, VA LINUX SYSTEMS AND/OR THEIR SUPPLIERS 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.
+
+**************************************************************************/

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-04-28 04:10:45 UTC (rev 36849)
+++ extra-i686/PKGBUILD	2009-04-28 04:16:53 UTC (rev 36850)
@@ -3,22 +3,22 @@
 # Contributor: Jan de Groot <jgc at archlinux.org>
 pkgname=xf86-video-savage
 pkgver=2.2.1
-pkgrel=4
+pkgrel=5
 pkgdesc="X.org savage video driver"
 _mesaver="7.4"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
-depends=("libgl>=${_mesaver}")
+license=('custom')
+depends=("libgl>=${_mesaver}" 'expat')
 makedepends=('pkgconfig' 'xorg-server>=1.6.0' "mesa>=${_mesaver}" 'xf86driproto' 'glproto>=1.4.9' 'dri2proto>=1.99.3')
 conflicts=('xorg-server<1.6.0')
 options=(!libtool)
 groups=('xorg-video-drivers')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
 	http://downloads.sourceforge.net/sourceforge/mesa3d/MesaLib-${_mesaver}.tar.bz2
-	mesa-7.1-link-shared.patch)
-md5sums=('62b8aba48b54eaefeae87df502bf219c'
-         '7ecddb341a2691e0dfdb02f697109834'
-         'f0baa948d9810f268413111ee439d24b')
+	mesa-7.1-link-shared.patch LICENSE)
+md5sums=('62b8aba48b54eaefeae87df502bf219c' '7ecddb341a2691e0dfdb02f697109834'\
+         'f0baa948d9810f268413111ee439d24b' '0f485840d3cee0a8d9952c0cd34f64c3')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -44,4 +44,5 @@
   rm -rf "${pkgdir}/usr/lib/pkgconfig"
   rm -rf "${pkgdir}/usr/include"
   rm -f "${pkgdir}/usr/lib/xorg/modules/dri/libdricore.so"
+  install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }


