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

Eric Bélanger eric at archlinux.org
Tue Apr 28 01:55:54 EDT 2009


    Date: Tuesday, April 28, 2009 @ 01:55:53
  Author: eric
Revision: 36861

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

........
  r36833 | eric | 2009-04-27 22:48:29 -0400 (Mon, 27 Apr 2009) | 2 lines
  
  upgpkg: xf86-video-voodoo 1.2.1-2
      Added license, Added xf86dgaproto makedepends
........

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

----------+
 LICENSE  |   36 ++++++++++++++++++++++++++++++++++++
 PKGBUILD |   10 ++++++----
 2 files changed, 42 insertions(+), 4 deletions(-)


Property changes on: xf86-video-voodoo/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /xf86-video-voodoo/trunk:1-28889
   + /xf86-video-voodoo/trunk:1-36860

Copied: xf86-video-voodoo/repos/extra-i686/LICENSE (from rev 36833, xf86-video-voodoo/trunk/LICENSE)
===================================================================
--- extra-i686/LICENSE	                        (rev 0)
+++ extra-i686/LICENSE	2009-04-28 05:55:53 UTC (rev 36861)
@@ -0,0 +1,36 @@
+This package was downloaded from
+http://xorg.freedesktop.org/releases/individual/driver/
+
+Author: Alan Cox <alan at redhat.com>
+
+Derived from:
+XFree86 driver for Glide(tm). (Mainly for Voodoo 1 and 2 cards)
+by Henrik Harmsen (hch at cd.chalmers.se or Henrik.Harmsen at erv.ericsson.se)
+
+Portions derived from  linux/drivers/video/sstfb.c
+    -- voodoo graphics frame buffer
+    Copyright (c) 2000-2002 Ghozlane Toumi <gtoumi at laposte.net>
+Relicensed from GPL to the X license by consent of the author
+
+Other code Copyright 2004 Red Hat Inc.
+
+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 names of Red Hat, Alan Cox and Henrik Harmsen
+not be used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.  Th authors make no
+representations about the suitability of this software for any purpose.
+It is provided "as is" without express or implied warranty.
+
+THE AUTHORS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL RICHARD HECKER 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.
+
+THIS SOFTWARE IS NOT DESIGNED FOR USE IN SAFETY CRITICAL SYSTEMS OF
+ANY KIND OR FORM.

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-04-28 05:50:24 UTC (rev 36860)
+++ extra-i686/PKGBUILD	2009-04-28 05:55:53 UTC (rev 36861)
@@ -3,21 +3,23 @@
 # Contributor: Jan de Groot <jgc at archlinux.org>
 pkgname=xf86-video-voodoo
 pkgver=1.2.1
-pkgrel=1
+pkgrel=2
 pkgdesc="X.org 3dfx Voodoo1/Voodoo2 2D video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
+license=('custom')
 depends=('glibc')
-makedepends=('pkgconfig' 'xorg-server>=1.6.0')
+makedepends=('pkgconfig' 'xorg-server>=1.6.0' 'xf86dgaproto')
 conflicts=('xorg-server<1.6.0')
 groups=('xorg-video-drivers')
 options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('ed4ce3a5406ca7958865d39558259726')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 LICENSE)
+md5sums=('ed4ce3a5406ca7958865d39558259726' '235f1f4be8fc98400bd84c3c9bd7d2ee')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   ./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"
 }



More information about the arch-commits mailing list