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

Eric Bélanger eric at archlinux.org
Tue Apr 28 07:47:35 UTC 2009


    Date: Tuesday, April 28, 2009 @ 03:47:34
  Author: eric
Revision: 36891

Merged revisions 36795,36885,36890 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/xf86-video-intel/trunk

........
  r36795 | eric | 2009-04-27 21:26:31 -0400 (Mon, 27 Apr 2009) | 2 lines
  
  upgpkg: xf86-video-intel 2.7.0-2
      Added license, Added xineramaproto makedepends
........
  r36885 | eric | 2009-04-28 03:29:11 -0400 (Tue, 28 Apr 2009) | 2 lines
  
  upgpkg: xf86-video-intel 2.6.3-4
      Fixed accidental move of 2.7 in extra
........
  r36890 | eric | 2009-04-28 03:47:16 -0400 (Tue, 28 Apr 2009) | 2 lines
  
  upgpkg: xf86-video-intel 2.7.0-2
      License rebuild
........

Added:
  xf86-video-intel/repos/testing-x86_64/LICENSE
    (from rev 36890, xf86-video-intel/trunk/LICENSE)
Modified:
  xf86-video-intel/repos/testing-x86_64/	(properties)
  xf86-video-intel/repos/testing-x86_64/PKGBUILD

----------+
 LICENSE  |  440 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 PKGBUILD |   10 -
 2 files changed, 446 insertions(+), 4 deletions(-)


Property changes on: xf86-video-intel/repos/testing-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /xf86-video-intel/trunk:1-35727
   + /xf86-video-intel/trunk:1-36890

Copied: xf86-video-intel/repos/testing-x86_64/LICENSE (from rev 36890, xf86-video-intel/trunk/LICENSE)
===================================================================
--- testing-x86_64/LICENSE	                        (rev 0)
+++ testing-x86_64/LICENSE	2009-04-28 07:47:34 UTC (rev 36891)
@@ -0,0 +1,440 @@
+This package was downloaded from
+http://xorg.freedesktop.org/releases/individual/driver/
+
+This copyright file is based on xf86-video-intel 2.3.1.
+
+The files under src/modes/ and src/parser/ are stolen from the xorg-server
+source.
+
+The authors of this core are, see below for copyright declarations.
+
+* Alan Hourihane <alanh at fairlite.demon.co.uk> / <alanh at tungstengraphics.com>
+* Bob Paauwe  <bob.j.paauwe at intel.com>
+* Dave Airlie <airlied at linux.ie>
+* Dave Mueller <dave.mueller at gmx.ch>
+* David Dawes <dawes at xfree86.org>
+* Eric Anholt <eric at anholt.net>
+* Jens Owen <jens at tungstengraphics.com>
+* Jesse Barnes <jbarnes at virtuousgeek.org>
+* Jonathan Bian <jonathan.bian at intel.com>
+* Keith Packard <keithp at keithp.com>
+* Keith Whitwell <keith at tungstengraphics.com>
+* Kevin E. Martin <kevin at precisioninsight.com> / <martin at valinux.com>
+* Kristian Høgsberg <krh at redhat.com>
+* Luc Verhaegen
+* Matt Sottek <matthew.j.sottek at intel.com>
+* Rickard E. (Rik) Faith <faith at valinux.com>
+* Thomas Hellstrom
+* Wang Zhenyu <zhenyu.z.wang at intel.com>
+* Xiang Haihao <haihao.xiang at intel.com>
+
+====
+
+Most of the code is covered by the MIT/X11 license:
+
+-
+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 TUNGSTEN 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.
+-
+
+The copyright holders are:
+
+* Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas:
+src/i810_accel.c
+src/i810_wmark.c
+src/i810_reg.h
+src/i810_driver.c
+src/i810_memory.c
+src/i810_io.c
+src/i810_cursor.c
+src/i830_accel.c
+src/i830_xaa.c
+src/i830_exa.c
+
+* Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
+* Copyright 2000 VA Linux Systems, Inc.
+src/xvmc/xf86dri.h
+src/xvmc/xf86dri.c
+
+* Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
+* Copyright 2002 David Dawes
+src/i830_memory.c
+src/i830.h
+src/i830_ring.h
+src/i830_cursor.c
+src/i810_ring.h
+src/i810.h
+src/common.h
+src/xvmc/xf86dristr.h
+
+* Copyright 2000 Intel Corporation.  All Rights Reserved:
+src/i810_hwmc.c
+src/i830_video.h
+src/i810_video.c
+src/i830_video.c
+
+* Copyright 2001 Intel Corporation.  All Rights Reserved.
+src/xvmc/I810XvMC.h
+src/xvmc/I810XvMC.c
+
+* Copyright 2001 VA Linux Systems Inc., Fremont, California.
+* Copyright 2002 by David Dawes
+src/i830_dri.c
+src/i830_driver.c
+
+* Copyright 2001 VA Linux Systems Inc., Fremont, California.
+* Copyright 2002 Tungsten Graphics Inc., Cedar Park, Texas.
+src/i830_common.h
+
+* Copyright 2002 David Dawes
+* Copyright 2006 Intel Corporation
+src/i830_modes.c
+
+* Copyright 2002 Tungsten Graphics, Inc., Cedar Park, Texas.
+src/i810_common.h
+
+* Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas.
+src/i830_reg.h  
+src/i830_3d.c
+src/i915_3d.c
+src/i915_reg.h
+src/xvmc/intel_batchbuffer.c
+
+* Copyright 2005 Tungsten Graphics, Inc., Cedar Park, Texas.
+src/brw_structs.h
+src/brw_defines.h
+
+* Copyright 2005 Red Hat, Inc.
+src/i830_io.c
+
+* Copyright 2005 Adam Jackson:
+src/Makefile.am
+
+* Copyright (c) 2005 Jesse Barnes
+src/i830_exa.c
+
+* Copyright 2005 Thomas Hellstrom. All rights reserved.
+src/xvmc/driDrawable.c
+src/xvmc/driDrawable.h
+
+* Copyright 2005-2006 Luc Verhaegen.
+src/modes/xf86cvt.c
+
+* Copyright 2006 Luc Verhaegen.
+src/modes/xf86EdidModes.c
+
+* Copyright 2006 Dave Airlie <airlied at linux.ie>
+src/i830_i2c.c
+src/i830_sdvo.c
+src/i830_dvo.c
+src/sil164/sil164.c
+src/sil164/sil164.h
+src/sil164/sil164_reg.h
+src/ch7xxx/ch7xxx_reg.h
+src/ch7xxx/ch7xxx.c
+src/ch7xxx/ch7xxx.h
+
+* Copyright 2006 Intel Corporation:
+src/xvmc/i915_xvmc.c
+src/xvmc/i915_xvmc.h
+src/xvmc/i915_structs.h
+src/i915_hwmc.h
+src/i915_hwmc.c
+src/i915_video.c
+src/i915_render.c
+src/i915_3d.h
+src/exa_wm.g4i
+src/exa_wm_src_sample_argb.g4a
+src/exa_wm_mask_affine.g4a
+src/exa_wm_projective.g4i
+src/exa_sf.g4a
+src/exa_wm_affine.g4i
+src/exa_wm_mask_sample_a.g4a
+src/exa_sf_mask.g4a
+src/exa_wm_write.g4a
+src/exa_wm_mask_sample_argb.g4a
+src/exa_wm_ca.g4a
+src/exa_wm_src_affine.g4a
+src/exa_wm_xy.g4a
+src/exa_wm_noca.g4a
+src/exa_wm_ca_srcalpha.g4a
+src/exa_wm_mask_projective.g4a
+src/exa_wm_src_sample_a.g4a
+src/exa_wm_src_projective.g4a
+src/i830_lvds.c
+src/i830_sdvo.h
+src/i830_bios.c
+src/i830_bios.h
+src/i830_debug.c
+src/i830_crt.c
+src/i830_display.c
+src/i830_sdvo_regs.h
+src/i830_render.c
+src/i830_tv.c
+src/i830_display.h
+src/i830_debug.h
+src/packed_yuv_sf.g4a
+src/packed_yuv_wm.g4a
+src/i965_video.c
+src/i965_render.c
+src/ch7017/ch7017.c
+src/ch7017/ch7017_reg.h
+src/sil164/Makefile.am
+src/modes/xf86Modes.h
+src/ivch/ivch.c
+src/ivch/ivch_reg.h
+src/ivch/ivch_module.c
+
+* Copyright 2007 Intel Corporation:
+src/bios_reader/bios_dumper.c 
+src/bios_reader/bios_reader.c
+src/i830_hwmc.h
+src/i830_hwmc.c
+src/i830_quirks.c
+src/xvmc/intel_xvmc.c
+src/xvmc/intel_xvmc.h
+src/reg_dumper/idle.c
+src/reg_dumper/stepping.c
+src/reg_dumper/main.c
+src/reg_dumper/reg_dumper.h
+
+* Copyright 2007 Dave Mueller
+src/tfp410/tfp410.c
+src/tfp410/tfp410.h
+src/tfp410/tfp410_reg.h
+
+====
+
+src/i810_dga.c is  Copyright 2000 by Alan Hourihane, Sychdyn, North Wales, UK
+and covered by the following license:
+
+-
+ * 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.
+-
+
+====
+A few files a covered by the following license:
+
+-
+ * 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 holders not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission.  The copyright holders make no representations
+ * about the suitability of this software for any purpose.  It is provided "as
+ * is" without express or implied warranty.
+ *
+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL THE COPYRIGHT HOLDERS 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.
+-
+
+The copyright holders are:
+
+* Copyright 2002 Keith Packard, member of The XFree86 Project, Inc.
+src/modes/xf86RandR12.c
+
+* Copyright 2006 Keith Packard
+src/modes/xf86Crtc.c
+src/modes/xf86RandR12.h
+src/modes/xf86Rename.h
+src/local_xf86Rename.h
+src/modes/xf86DiDGA.c
+src/modes/xf86Rotate.c
+src/modes/xf86Crtc.h
+
+* Copyright 2006 Eric Anholt
+src/i2c_vid.h
+
+* Copyright 2007 Keith Packard
+src/modes/xf86Cursors.c
+
+====
+
+src/parser/xf86Parser.h and src/parser/xf86Optrec.h  are covered by a license
+similar to the MIT/X11 license, but with an additional advertising clause:
+
+* Copyright (c) 1997  Metro Link Incorporated
+* Copyright (c) 1997-2003 by The XFree86 Project, Inc.
+* Copyright (c) 1997-2001 by The XFree86 Project, Inc.
+
+- 
+ * 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,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE X CONSORTIUM 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 Metro Link shall not be
+ * used in advertising or otherwise to promote the sale, use or other dealings
+ * in this Software without prior written authorization from Metro Link.
+-
+
+====
+
+src/modes/xf86Modes.c is covered by a license similar to the MIT/X11 license,
+but with an additional advertising clause:
+
+-
+ * Copyright (c) 1997-2003 by The XFree86 Project, Inc.
+ *
+ * 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,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) 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 copyright holder(s)
+ * and author(s) 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 copyright holder(s) and author(s).
+ */
+-
+
+====
+
+src/reg_dumper/xprintf.c is covered by a license similar to the MIT/X11 license,
+but with an additional advertising clause:
+
+-
+ * Copyright (c) 2004 Alexander Gottwald
+ *
+ * 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,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE ABOVE LISTED COPYRIGHT HOLDER(S) 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(s) of the above copyright
+ * holders shall not be used in advertising or otherwise to promote the sale,
+ * use or other dealings in this Software without prior written authorization.
+ */
+-
+
+====
+
+All files generated by the buildsystem toolchain (e.g. autogen.sh) remain
+under the copyright of their authors from the respective tools.
+
+====
+
+
+A couple of files are without explicit copyright:
+
+Some tiny Makefile.am:
+src/reg_dumper/Makefile.am
+src/xvmc/Makefile.am
+src/ch7017/Makefile.am
+src/tfp410/Makefile.am
+src/ivch/Makefile.am
+src/ch7xxx/Makefile.am
+
+
+src/exa_wm_write.g4b
+src/exa_sf.g4b
+src/exa_wm_xy.g4b
+src/packed_yuv_sf.g4b
+src/exa_wm_src_sample_argb.g4b
+src/exa_sf_mask.g4b
+src/exa_wm_src_sample_a.g4b
+src/exa_wm_src_affine.g4b
+src/packed_yuv_wm.g4b
+src/exa_wm_mask_sample_argb.g4b
+src/exa_wm_ca.g4b
+src/exa_wm_mask_affine.g4b
+src/exa_wm_ca_srcalpha.g4b
+src/exa_wm_nomask.g4a
+src/exa_wm_mask_projective.g4b
+src/exa_wm_noca.g4b
+src/exa_wm_mask_sample_a.g4b
+src/exa_wm_src_projective.g4b
+
+
+src/tfp410/tfp410_module.c
+src/ch7xxx/ch7xxx_module.c
+src/ch7017/ch7017_module.c
+src/xvmc/i915_program.h
+src/xvmc/intel_batchbuffer.h
+src/scripts/clock-graph.5c
+src/scripts/clock.5c
+src/scripts/fix.5c
+src/scripts/tv.5c
+src/sil164/sil164_module.c
+src/i810_dri.h
+src/i810_dri.c
+src/i830_dri.h

Modified: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD	2009-04-28 07:47:16 UTC (rev 36890)
+++ testing-x86_64/PKGBUILD	2009-04-28 07:47:34 UTC (rev 36891)
@@ -3,21 +3,23 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 pkgname=xf86-video-intel
 pkgver=2.7.0
-pkgrel=1
+pkgrel=2
 pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
+license=('custom')
 depends=('intel-dri>=7.4' 'libpciaccess>=0.10.5' 'libdrm>=2.4.9' 'libxvmc')
-makedepends=('pkgconfig' 'xorg-server>=1.6.1' 'xf86driproto>=2.0.4' 'glproto>=1.4.9' 'mesa>=7.4')
+makedepends=('pkgconfig' 'xorg-server>=1.6.1' 'xf86driproto>=2.0.4' 'glproto>=1.4.9' 'mesa>=7.4' 'xineramaproto')
 conflicts=('xorg-server<1.6.0' 'xf86-video-i810' 'xf86-video-intel-legacy')
 options=('!libtool')
 groups=('xorg-video-drivers')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('5832172ac69b9a066a202e1578a5d3c8')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 LICENSE)
+md5sums=('5832172ac69b9a066a202e1578a5d3c8' 'b924480931774dec14515e270db4924d')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --enable-dri || 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