[arch-commits] Commit in ati-dri/repos (3 files)

[Jan de Groot]

    Date: Monday, April 6, 2009 @ 13:09:24
  Author: jgc
Revision: 34103

Merged revisions 32226,33855 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/ati-dri/trunk

........
  r32226 | jgc | 2009-03-29 16:37:19 +0000 (Sun, 29 Mar 2009) | 1 line
  
  upgpkg: ati-dri 7.4-1
........
  r33855 | eric | 2009-04-05 02:46:22 +0000 (Sun, 05 Apr 2009) | 2 lines
  
  upgpkg: ati-dri 7.4-2
      Added license
........

Added:
  ati-dri/repos/testing-i686/LICENSE
    (from rev 33855, ati-dri/trunk/LICENSE)
Modified:
  ati-dri/repos/testing-i686/	(properties)
  ati-dri/repos/testing-i686/PKGBUILD

----------+
 LICENSE  |   29 +++++++++++++++++++++++++++++
 PKGBUILD |   17 ++++++++++-------
 2 files changed, 39 insertions(+), 7 deletions(-)


Property changes on: ati-dri/repos/testing-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /ati-dri/trunk:1-28800
   + /ati-dri/trunk:1-34101

Copied: ati-dri/repos/testing-i686/LICENSE (from rev 33855, ati-dri/trunk/LICENSE)
===================================================================
--- testing-i686/LICENSE	                        (rev 0)
+++ testing-i686/LICENSE	2009-04-06 17:09:24 UTC (rev 34103)
@@ -0,0 +1,29 @@
+/*
+Copyright (C) The Weather Channel, Inc.  2002.  All Rights Reserved.
+
+The Weather Channel (TM) funded Tungsten Graphics to develop the
+initial release of the Radeon 8500 driver under the XFree86 license.
+This notice must be preserved.
+
+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 COPYRIGHT OWNER(S) 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.
+*/
+
+

Modified: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD	2009-04-06 17:09:22 UTC (rev 34102)
+++ testing-i686/PKGBUILD	2009-04-06 17:09:24 UTC (rev 34103)
@@ -2,19 +2,21 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 # Contributor: Alexander Baldeck <alexander at archlinux.org>
 pkgname=ati-dri
-pkgver=7.3
-pkgrel=1
+pkgver=7.4
+pkgrel=2
 pkgdesc="DRI drivers for ATI/AMD videochips"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
-depends=('libdrm>=2.4.5' 'libgl>=7.3' 'expat>=2.0.1')
-makedepends=('glproto>=1.4.9' 'pkgconfig' 'libxfixes' 'libxdamage' 'libxxf86vm' 'libxext' 'dri2proto>=1.99.3' 'mesa>=7.3')
+license=('MIT')
+depends=('libdrm>=2.4.5-3' 'libgl>=7.4' 'expat>=2.0.1')
+makedepends=('glproto>=1.4.9' 'pkgconfig' 'libxfixes' 'libxdamage' 'libxxf86vm' 'libxext' 'dri2proto>=1.99.3' 'mesa>=7.4')
 conflicts=('xf86-video-ati<6.9.0-6')
 options=('!libtool')
 source=(http://downloads.sourceforge.net/sourceforge/mesa3d/MesaLib-${pkgver}.tar.bz2
-       mesa-7.1-link-shared.patch)
-md5sums=('781e7811a6ed5c97b2b8defefc8ffbc9'
-         'f0baa948d9810f268413111ee439d24b')
+       mesa-7.1-link-shared.patch
+       LICENSE)
+md5sums=('7ecddb341a2691e0dfdb02f697109834' 'f0baa948d9810f268413111ee439d24b'\
+         '7ba429de367a2b3d273d2230cc705771')
 
 build() {
   cd "${srcdir}/Mesa-${pkgver}"
@@ -31,6 +33,7 @@
   make || return 1
   cd src/mesa/drivers/dri || return 1
   make DESTDIR="${pkgdir}" install || return 1
+  install -D -m644 "${srcdir}/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
   rm -f "${pkgdir}/usr/lib/xorg/modules/dri/libdricore.so"
   rm -rf "${pkgdir}/usr/include"
   rm -rf "${pkgdir}/usr/lib/pkgconfig"