Date: Thursday, July 12, 2012 @ 13:49:23
Author: ibiru
Revision: 163472
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
nouveau-dri/repos/extra-i686/LICENSE
(from rev 163471, nouveau-dri/trunk/LICENSE)
nouveau-dri/repos/extra-i686/PKGBUILD
(from rev 163471, nouveau-dri/trunk/PKGBUILD)
nouveau-dri/repos/extra-i686/mesa-8.0.3-llvm-3.1-fixes.patch
(from rev 163471, nouveau-dri/trunk/mesa-8.0.3-llvm-3.1-fixes.patch)
nouveau-dri/repos/extra-x86_64/LICENSE
(from rev 163471, nouveau-dri/trunk/LICENSE)
nouveau-dri/repos/extra-x86_64/PKGBUILD
(from rev 163471, nouveau-dri/trunk/PKGBUILD)
nouveau-dri/repos/extra-x86_64/mesa-8.0.3-llvm-3.1-fixes.patch
(from rev 163471, nouveau-dri/trunk/mesa-8.0.3-llvm-3.1-fixes.patch)
Deleted:
nouveau-dri/repos/extra-i686/LICENSE
nouveau-dri/repos/extra-i686/PKGBUILD
nouveau-dri/repos/extra-i686/mesa-8.0.3-llvm-3.1-fixes.patch
nouveau-dri/repos/extra-x86_64/LICENSE
nouveau-dri/repos/extra-x86_64/PKGBUILD
nouveau-dri/repos/extra-x86_64/mesa-8.0.3-llvm-3.1-fixes.patch
----------------------------------------------+
extra-i686/LICENSE | 164 ++++++++++++-------------
extra-i686/PKGBUILD | 112 ++++++++---------
extra-i686/mesa-8.0.3-llvm-3.1-fixes.patch | 92 +++++++-------
extra-x86_64/LICENSE | 164 ++++++++++++-------------
extra-x86_64/PKGBUILD | 112 ++++++++---------
extra-x86_64/mesa-8.0.3-llvm-3.1-fixes.patch | 92 +++++++-------
6 files changed, 368 insertions(+), 368 deletions(-)
Deleted: extra-i686/LICENSE
===================================================================
--- extra-i686/LICENSE 2012-07-12 17:48:19 UTC (rev 163471)
+++ extra-i686/LICENSE 2012-07-12 17:49:23 UTC (rev 163472)
@@ -1,82 +0,0 @@
-Disclaimer
-
-Mesa is a 3-D graphics library with an API which is very similar to
-that of OpenGL*
-To the extent that Mesa utilizes the OpenGL command syntax or state
-machine, it is being used with authorization from Silicon Graphics,
-Inc.(SGI). However, the author does not possess an OpenGL license
-from SGI, and makes no claim that Mesa is in any way a compatible
-replacement for OpenGL or associated with SGI. Those who want a
-licensed implementation of OpenGL should contact a licensed
-vendor.
-
-Please do not refer to the library as MesaGL (for legal
-reasons). It's just Mesa or The Mesa 3-D graphics
-library
-
-* OpenGL is a trademark of Silicon Graphics Incorporated.
-
-License / Copyright Information
-
-The Mesa distribution consists of several components. Different copyrights
-and licenses apply to different components. For example, GLUT is copyrighted
-by Mark Kilgard, some demo programs are copyrighted by SGI, some of the Mesa
-device drivers are copyrighted by their authors. See below for a list of
-Mesa's main components and the license for each.
-
-The core Mesa library is licensed according to the terms of the MIT license.
-This allows integration with the XFree86, Xorg and DRI projects.
-
-The default Mesa license is as follows:
-
-Copyright (C) 1999-2007 Brian Paul 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,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-BRIAN PAUL 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.
-
-Attention, Contributors
-
-When contributing to the Mesa project you must agree to the licensing terms
-of the component to which you're contributing.
-The following section lists the primary components of the Mesa distribution
-and their respective licenses.
-
-
-Mesa Component Licenses
-
-Component Location Primary Author License
-----------------------------------------------------------------------------
-Main Mesa code src/mesa/ Brian Paul Mesa (MIT)
-
-Device drivers src/mesa/drivers/* See drivers See drivers
-
-Ext headers include/GL/glext.h SGI SGI Free B
- include/GL/glxext.h
-
-GLUT src/glut/ Mark Kilgard Mark's copyright
-
-Mesa GLU library src/glu/mesa/ Brian Paul GNU-LGPL
-
-SGI GLU library src/glu/sgi/ SGI SGI Free B
-
-demo programs progs/demos/ various see source files
-
-X demos progs/xdemos/ Brian Paul see source files
-
-SGI demos progs/samples/ SGI SGI copyright
-
-RedBook demos progs/redbook/ SGI SGI copyright
Copied: nouveau-dri/repos/extra-i686/LICENSE (from rev 163471,
nouveau-dri/trunk/LICENSE)
===================================================================
--- extra-i686/LICENSE (rev 0)
+++ extra-i686/LICENSE 2012-07-12 17:49:23 UTC (rev 163472)
@@ -0,0 +1,82 @@
+Disclaimer
+
+Mesa is a 3-D graphics library with an API which is very similar to
+that of OpenGL*
+To the extent that Mesa utilizes the OpenGL command syntax or state
+machine, it is being used with authorization from Silicon Graphics,
+Inc.(SGI). However, the author does not possess an OpenGL license
+from SGI, and makes no claim that Mesa is in any way a compatible
+replacement for OpenGL or associated with SGI. Those who want a
+licensed implementation of OpenGL should contact a licensed
+vendor.
+
+Please do not refer to the library as MesaGL (for legal
+reasons). It's just Mesa or The Mesa 3-D graphics
+library
+
+* OpenGL is a trademark of Silicon Graphics Incorporated.
+
+License / Copyright Information
+
+The Mesa distribution consists of several components. Different copyrights
+and licenses apply to different components. For example, GLUT is copyrighted
+by Mark Kilgard, some demo programs are copyrighted by SGI, some of the Mesa
+device drivers are copyrighted by their authors. See below for a list of
+Mesa's main components and the license for each.
+
+The core Mesa library is licensed according to the terms of the MIT license.
+This allows integration with the XFree86, Xorg and DRI projects.
+
+The default Mesa license is as follows:
+
+Copyright (C) 1999-2007 Brian Paul 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,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+BRIAN PAUL 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.
+
+Attention, Contributors
+
+When contributing to the Mesa project you must agree to the licensing terms
+of the component to which you're contributing.
+The following section lists the primary components of the Mesa distribution
+and their respective licenses.
+
+
+Mesa Component Licenses
+
+Component Location Primary Author License
+----------------------------------------------------------------------------
+Main Mesa code src/mesa/ Brian Paul Mesa (MIT)
+
+Device drivers src/mesa/drivers/* See drivers See drivers
+
+Ext headers include/GL/glext.h SGI SGI Free B
+ include/GL/glxext.h
+
+GLUT src/glut/ Mark Kilgard Mark's copyright
+
+Mesa GLU library src/glu/mesa/ Brian Paul GNU-LGPL
+
+SGI GLU library src/glu/sgi/ SGI SGI Free B
+
+demo programs progs/demos/ various see source files
+
+X demos progs/xdemos/ Brian Paul see source files
+
+SGI demos progs/samples/ SGI SGI copyright
+
+RedBook demos progs/redbook/ SGI SGI copyright
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2012-07-12 17:48:19 UTC (rev 163471)
+++ extra-i686/PKGBUILD 2012-07-12 17:49:23 UTC (rev 163472)
@@ -1,56 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <j...@archlinux.org>
-# Maintainer: Andreas Radke <andy...@archlinux.org>
-
-pkgname=nouveau-dri
-pkgver=8.0.3
-pkgrel=3
-arch=('i686' 'x86_64')
-makedepends=('glproto>=1.4.15' 'libdrm-old' 'libdrm-nouveau1'
'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libx11>=1.4.99.1'
'libxt>=1.1.1'
- 'gcc-libs>=4.6.1' 'dri2proto>=2.6' 'python2' 'libxml2' 'imake'
'llvm' 'udev>=183')
-url="http://mesa3d.sourceforge.net";
-license=('custom')
-source=(LICENSE
- mesa-8.0.3-llvm-3.1-fixes.patch
- ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2
-)
-md5sums=('5c65a0fe315dd347e09b1f2826a1df5a'
- 'c452ed3392468170726c004c2f4e02ca'
- 'cc5ee15e306b8c15da6a478923797171')
-
-build() {
- cd ${srcdir}/?esa-*
-
- patch -Np1 -i "${srcdir}/mesa-8.0.3-llvm-3.1-fixes.patch"
-
- autoreconf -vfi
- ./configure --prefix=/usr \
- --with-dri-driverdir=/usr/lib/xorg/modules/dri \
- --with-gallium-drivers=nouveau \
- --with-dri-drivers=nouveau \
- --enable-gallium-llvm \
- --enable-gallium-egl \
- --enable-shared-glapi \
- --enable-gbm \
- --enable-glx-tls \
- --enable-dri \
- --enable-glx \
- --enable-osmesa \
- --enable-gles1 \
- --enable-gles2 \
- --enable-egl \
- --enable-texture-float \
- --enable-xa \
- --enable-shared-dricore
- make
-}
-
-package() {
- depends=("libgl=${pkgver}" 'libdrm-nouveau1')
- pkgdesc="Mesa classic DRI + Gallium3D drivers for Nouveau"
-
- # classic mesa driver for nv10 , nv20 nouveau_vieux_dri.so
- make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/nouveau DESTDIR="${pkgdir}"
install
- # gallium3D driver for nv30 - nv40 - nv50 nouveau_dri.so
- make -C ${srcdir}/?esa-*/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}"
install
-}
Copied: nouveau-dri/repos/extra-i686/PKGBUILD (from rev 163471,
nouveau-dri/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-07-12 17:49:23 UTC (rev 163472)
@@ -0,0 +1,56 @@
+# $Id$
+# Maintainer: Jan de Groot <j...@archlinux.org>
+# Maintainer: Andreas Radke <andy...@archlinux.org>
+
+pkgname=nouveau-dri
+pkgver=8.0.4
+pkgrel=1
+arch=('i686' 'x86_64')
+makedepends=('glproto>=1.4.15' 'libdrm-old' 'libdrm-nouveau1'
'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libx11>=1.4.99.1'
'libxt>=1.1.1'
+ 'gcc-libs>=4.6.1' 'dri2proto>=2.6' 'python2' 'libxml2' 'imake'
'llvm' 'udev>=183')
+url="http://mesa3d.sourceforge.net";
+license=('custom')
+source=(LICENSE
+ mesa-8.0.3-llvm-3.1-fixes.patch
+ ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2
+)
+md5sums=('5c65a0fe315dd347e09b1f2826a1df5a'
+ 'c452ed3392468170726c004c2f4e02ca'
+ 'd546f988adfdf986cff45b1efa2d8a46')
+
+build() {
+ cd ${srcdir}/?esa-*
+
+ patch -Np1 -i "${srcdir}/mesa-8.0.3-llvm-3.1-fixes.patch"
+
+ autoreconf -vfi
+ ./configure --prefix=/usr \
+ --with-dri-driverdir=/usr/lib/xorg/modules/dri \
+ --with-gallium-drivers=nouveau \
+ --with-dri-drivers=nouveau \
+ --enable-gallium-llvm \
+ --enable-gallium-egl \
+ --enable-shared-glapi \
+ --enable-gbm \
+ --enable-glx-tls \
+ --enable-dri \
+ --enable-glx \
+ --enable-osmesa \
+ --enable-gles1 \
+ --enable-gles2 \
+ --enable-egl \
+ --enable-texture-float \
+ --enable-xa \
+ --enable-shared-dricore
+ make
+}
+
+package() {
+ depends=("libgl=${pkgver}" 'libdrm-nouveau1')
+ pkgdesc="Mesa classic DRI + Gallium3D drivers for Nouveau"
+
+ # classic mesa driver for nv10 , nv20 nouveau_vieux_dri.so
+ make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/nouveau DESTDIR="${pkgdir}"
install
+ # gallium3D driver for nv30 - nv40 - nv50 nouveau_dri.so
+ make -C ${srcdir}/?esa-*/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}"
install
+}
Deleted: extra-i686/mesa-8.0.3-llvm-3.1-fixes.patch
===================================================================
--- extra-i686/mesa-8.0.3-llvm-3.1-fixes.patch 2012-07-12 17:48:19 UTC (rev
163471)
+++ extra-i686/mesa-8.0.3-llvm-3.1-fixes.patch 2012-07-12 17:49:23 UTC (rev
163472)
@@ -1,46 +0,0 @@
-diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
-index a50a51d..f1bb4d9 100644
---- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
-+++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
-@@ -235,7 +235,24 @@ lp_disassemble(const void* func)
- int AsmPrinterVariant = AsmInfo->getAssemblerDialect();
- #endif
-
--#if HAVE_LLVM >= 0x0300
-+#if HAVE_LLVM >= 0x0301
-+ OwningPtr<const MCRegisterInfo> MRI(T->createMCRegInfo(Triple));
-+ if (!MRI) {
-+ debug_printf("error: no register info for target %s\n", Triple.c_str());
-+ return;
-+ }
-+
-+ OwningPtr<const MCInstrInfo> MII(T->createMCInstrInfo());
-+ if (!MII) {
-+ debug_printf("error: no instruction info for target %s\n",
Triple.c_str());
-+ return;
-+ }
-+#endif
-+
-+#if HAVE_LLVM >= 0x0301
-+ OwningPtr<MCInstPrinter> Printer(
-+ T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *MII, *MRI,
*STI));
-+#elif HAVE_LLVM == 0x0300
- OwningPtr<MCInstPrinter> Printer(
- T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *STI));
- #elif HAVE_LLVM >= 0x0208
-diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-index fe7616b..68f8808 100644
---- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-+++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-@@ -62,7 +62,11 @@
- extern "C" void
- lp_register_oprofile_jit_event_listener(LLVMExecutionEngineRef EE)
- {
-+#if HAVE_LLVM >= 0x0301
-+
llvm::unwrap(EE)->RegisterJITEventListener(llvm::JITEventListener::createOProfileJITEventListener());
-+#else
-
llvm::unwrap(EE)->RegisterJITEventListener(llvm::createOProfileJITEventListener());
-+#endif
- }
-
-
Copied: nouveau-dri/repos/extra-i686/mesa-8.0.3-llvm-3.1-fixes.patch (from rev
163471, nouveau-dri/trunk/mesa-8.0.3-llvm-3.1-fixes.patch)
===================================================================
--- extra-i686/mesa-8.0.3-llvm-3.1-fixes.patch (rev 0)
+++ extra-i686/mesa-8.0.3-llvm-3.1-fixes.patch 2012-07-12 17:49:23 UTC (rev
163472)
@@ -0,0 +1,46 @@
+diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
+index a50a51d..f1bb4d9 100644
+--- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
++++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
+@@ -235,7 +235,24 @@ lp_disassemble(const void* func)
+ int AsmPrinterVariant = AsmInfo->getAssemblerDialect();
+ #endif
+
+-#if HAVE_LLVM >= 0x0300
++#if HAVE_LLVM >= 0x0301
++ OwningPtr<const MCRegisterInfo> MRI(T->createMCRegInfo(Triple));
++ if (!MRI) {
++ debug_printf("error: no register info for target %s\n", Triple.c_str());
++ return;
++ }
++
++ OwningPtr<const MCInstrInfo> MII(T->createMCInstrInfo());
++ if (!MII) {
++ debug_printf("error: no instruction info for target %s\n",
Triple.c_str());
++ return;
++ }
++#endif
++
++#if HAVE_LLVM >= 0x0301
++ OwningPtr<MCInstPrinter> Printer(
++ T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *MII, *MRI,
*STI));
++#elif HAVE_LLVM == 0x0300
+ OwningPtr<MCInstPrinter> Printer(
+ T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *STI));
+ #elif HAVE_LLVM >= 0x0208
+diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
+index fe7616b..68f8808 100644
+--- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
++++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
+@@ -62,7 +62,11 @@
+ extern "C" void
+ lp_register_oprofile_jit_event_listener(LLVMExecutionEngineRef EE)
+ {
++#if HAVE_LLVM >= 0x0301
++
llvm::unwrap(EE)->RegisterJITEventListener(llvm::JITEventListener::createOProfileJITEventListener());
++#else
+
llvm::unwrap(EE)->RegisterJITEventListener(llvm::createOProfileJITEventListener());
++#endif
+ }
+
+
Deleted: extra-x86_64/LICENSE
===================================================================
--- extra-x86_64/LICENSE 2012-07-12 17:48:19 UTC (rev 163471)
+++ extra-x86_64/LICENSE 2012-07-12 17:49:23 UTC (rev 163472)
@@ -1,82 +0,0 @@
-Disclaimer
-
-Mesa is a 3-D graphics library with an API which is very similar to
-that of OpenGL*
-To the extent that Mesa utilizes the OpenGL command syntax or state
-machine, it is being used with authorization from Silicon Graphics,
-Inc.(SGI). However, the author does not possess an OpenGL license
-from SGI, and makes no claim that Mesa is in any way a compatible
-replacement for OpenGL or associated with SGI. Those who want a
-licensed implementation of OpenGL should contact a licensed
-vendor.
-
-Please do not refer to the library as MesaGL (for legal
-reasons). It's just Mesa or The Mesa 3-D graphics
-library
-
-* OpenGL is a trademark of Silicon Graphics Incorporated.
-
-License / Copyright Information
-
-The Mesa distribution consists of several components. Different copyrights
-and licenses apply to different components. For example, GLUT is copyrighted
-by Mark Kilgard, some demo programs are copyrighted by SGI, some of the Mesa
-device drivers are copyrighted by their authors. See below for a list of
-Mesa's main components and the license for each.
-
-The core Mesa library is licensed according to the terms of the MIT license.
-This allows integration with the XFree86, Xorg and DRI projects.
-
-The default Mesa license is as follows:
-
-Copyright (C) 1999-2007 Brian Paul 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,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-BRIAN PAUL 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.
-
-Attention, Contributors
-
-When contributing to the Mesa project you must agree to the licensing terms
-of the component to which you're contributing.
-The following section lists the primary components of the Mesa distribution
-and their respective licenses.
-
-
-Mesa Component Licenses
-
-Component Location Primary Author License
-----------------------------------------------------------------------------
-Main Mesa code src/mesa/ Brian Paul Mesa (MIT)
-
-Device drivers src/mesa/drivers/* See drivers See drivers
-
-Ext headers include/GL/glext.h SGI SGI Free B
- include/GL/glxext.h
-
-GLUT src/glut/ Mark Kilgard Mark's copyright
-
-Mesa GLU library src/glu/mesa/ Brian Paul GNU-LGPL
-
-SGI GLU library src/glu/sgi/ SGI SGI Free B
-
-demo programs progs/demos/ various see source files
-
-X demos progs/xdemos/ Brian Paul see source files
-
-SGI demos progs/samples/ SGI SGI copyright
-
-RedBook demos progs/redbook/ SGI SGI copyright
Copied: nouveau-dri/repos/extra-x86_64/LICENSE (from rev 163471,
nouveau-dri/trunk/LICENSE)
===================================================================
--- extra-x86_64/LICENSE (rev 0)
+++ extra-x86_64/LICENSE 2012-07-12 17:49:23 UTC (rev 163472)
@@ -0,0 +1,82 @@
+Disclaimer
+
+Mesa is a 3-D graphics library with an API which is very similar to
+that of OpenGL*
+To the extent that Mesa utilizes the OpenGL command syntax or state
+machine, it is being used with authorization from Silicon Graphics,
+Inc.(SGI). However, the author does not possess an OpenGL license
+from SGI, and makes no claim that Mesa is in any way a compatible
+replacement for OpenGL or associated with SGI. Those who want a
+licensed implementation of OpenGL should contact a licensed
+vendor.
+
+Please do not refer to the library as MesaGL (for legal
+reasons). It's just Mesa or The Mesa 3-D graphics
+library
+
+* OpenGL is a trademark of Silicon Graphics Incorporated.
+
+License / Copyright Information
+
+The Mesa distribution consists of several components. Different copyrights
+and licenses apply to different components. For example, GLUT is copyrighted
+by Mark Kilgard, some demo programs are copyrighted by SGI, some of the Mesa
+device drivers are copyrighted by their authors. See below for a list of
+Mesa's main components and the license for each.
+
+The core Mesa library is licensed according to the terms of the MIT license.
+This allows integration with the XFree86, Xorg and DRI projects.
+
+The default Mesa license is as follows:
+
+Copyright (C) 1999-2007 Brian Paul 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,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+BRIAN PAUL 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.
+
+Attention, Contributors
+
+When contributing to the Mesa project you must agree to the licensing terms
+of the component to which you're contributing.
+The following section lists the primary components of the Mesa distribution
+and their respective licenses.
+
+
+Mesa Component Licenses
+
+Component Location Primary Author License
+----------------------------------------------------------------------------
+Main Mesa code src/mesa/ Brian Paul Mesa (MIT)
+
+Device drivers src/mesa/drivers/* See drivers See drivers
+
+Ext headers include/GL/glext.h SGI SGI Free B
+ include/GL/glxext.h
+
+GLUT src/glut/ Mark Kilgard Mark's copyright
+
+Mesa GLU library src/glu/mesa/ Brian Paul GNU-LGPL
+
+SGI GLU library src/glu/sgi/ SGI SGI Free B
+
+demo programs progs/demos/ various see source files
+
+X demos progs/xdemos/ Brian Paul see source files
+
+SGI demos progs/samples/ SGI SGI copyright
+
+RedBook demos progs/redbook/ SGI SGI copyright
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2012-07-12 17:48:19 UTC (rev 163471)
+++ extra-x86_64/PKGBUILD 2012-07-12 17:49:23 UTC (rev 163472)
@@ -1,56 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <j...@archlinux.org>
-# Maintainer: Andreas Radke <andy...@archlinux.org>
-
-pkgname=nouveau-dri
-pkgver=8.0.3
-pkgrel=3
-arch=('i686' 'x86_64')
-makedepends=('glproto>=1.4.15' 'libdrm-old' 'libdrm-nouveau1'
'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libx11>=1.4.99.1'
'libxt>=1.1.1'
- 'gcc-libs>=4.6.1' 'dri2proto>=2.6' 'python2' 'libxml2' 'imake'
'llvm' 'udev>=183')
-url="http://mesa3d.sourceforge.net";
-license=('custom')
-source=(LICENSE
- mesa-8.0.3-llvm-3.1-fixes.patch
- ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2
-)
-md5sums=('5c65a0fe315dd347e09b1f2826a1df5a'
- 'c452ed3392468170726c004c2f4e02ca'
- 'cc5ee15e306b8c15da6a478923797171')
-
-build() {
- cd ${srcdir}/?esa-*
-
- patch -Np1 -i "${srcdir}/mesa-8.0.3-llvm-3.1-fixes.patch"
-
- autoreconf -vfi
- ./configure --prefix=/usr \
- --with-dri-driverdir=/usr/lib/xorg/modules/dri \
- --with-gallium-drivers=nouveau \
- --with-dri-drivers=nouveau \
- --enable-gallium-llvm \
- --enable-gallium-egl \
- --enable-shared-glapi \
- --enable-gbm \
- --enable-glx-tls \
- --enable-dri \
- --enable-glx \
- --enable-osmesa \
- --enable-gles1 \
- --enable-gles2 \
- --enable-egl \
- --enable-texture-float \
- --enable-xa \
- --enable-shared-dricore
- make
-}
-
-package() {
- depends=("libgl=${pkgver}" 'libdrm-nouveau1')
- pkgdesc="Mesa classic DRI + Gallium3D drivers for Nouveau"
-
- # classic mesa driver for nv10 , nv20 nouveau_vieux_dri.so
- make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/nouveau DESTDIR="${pkgdir}"
install
- # gallium3D driver for nv30 - nv40 - nv50 nouveau_dri.so
- make -C ${srcdir}/?esa-*/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}"
install
-}
Copied: nouveau-dri/repos/extra-x86_64/PKGBUILD (from rev 163471,
nouveau-dri/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2012-07-12 17:49:23 UTC (rev 163472)
@@ -0,0 +1,56 @@
+# $Id$
+# Maintainer: Jan de Groot <j...@archlinux.org>
+# Maintainer: Andreas Radke <andy...@archlinux.org>
+
+pkgname=nouveau-dri
+pkgver=8.0.4
+pkgrel=1
+arch=('i686' 'x86_64')
+makedepends=('glproto>=1.4.15' 'libdrm-old' 'libdrm-nouveau1'
'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libx11>=1.4.99.1'
'libxt>=1.1.1'
+ 'gcc-libs>=4.6.1' 'dri2proto>=2.6' 'python2' 'libxml2' 'imake'
'llvm' 'udev>=183')
+url="http://mesa3d.sourceforge.net";
+license=('custom')
+source=(LICENSE
+ mesa-8.0.3-llvm-3.1-fixes.patch
+ ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2
+)
+md5sums=('5c65a0fe315dd347e09b1f2826a1df5a'
+ 'c452ed3392468170726c004c2f4e02ca'
+ 'd546f988adfdf986cff45b1efa2d8a46')
+
+build() {
+ cd ${srcdir}/?esa-*
+
+ patch -Np1 -i "${srcdir}/mesa-8.0.3-llvm-3.1-fixes.patch"
+
+ autoreconf -vfi
+ ./configure --prefix=/usr \
+ --with-dri-driverdir=/usr/lib/xorg/modules/dri \
+ --with-gallium-drivers=nouveau \
+ --with-dri-drivers=nouveau \
+ --enable-gallium-llvm \
+ --enable-gallium-egl \
+ --enable-shared-glapi \
+ --enable-gbm \
+ --enable-glx-tls \
+ --enable-dri \
+ --enable-glx \
+ --enable-osmesa \
+ --enable-gles1 \
+ --enable-gles2 \
+ --enable-egl \
+ --enable-texture-float \
+ --enable-xa \
+ --enable-shared-dricore
+ make
+}
+
+package() {
+ depends=("libgl=${pkgver}" 'libdrm-nouveau1')
+ pkgdesc="Mesa classic DRI + Gallium3D drivers for Nouveau"
+
+ # classic mesa driver for nv10 , nv20 nouveau_vieux_dri.so
+ make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/nouveau DESTDIR="${pkgdir}"
install
+ # gallium3D driver for nv30 - nv40 - nv50 nouveau_dri.so
+ make -C ${srcdir}/?esa-*/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}"
install
+}
Deleted: extra-x86_64/mesa-8.0.3-llvm-3.1-fixes.patch
===================================================================
--- extra-x86_64/mesa-8.0.3-llvm-3.1-fixes.patch 2012-07-12 17:48:19 UTC
(rev 163471)
+++ extra-x86_64/mesa-8.0.3-llvm-3.1-fixes.patch 2012-07-12 17:49:23 UTC
(rev 163472)
@@ -1,46 +0,0 @@
-diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
-index a50a51d..f1bb4d9 100644
---- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
-+++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
-@@ -235,7 +235,24 @@ lp_disassemble(const void* func)
- int AsmPrinterVariant = AsmInfo->getAssemblerDialect();
- #endif
-
--#if HAVE_LLVM >= 0x0300
-+#if HAVE_LLVM >= 0x0301
-+ OwningPtr<const MCRegisterInfo> MRI(T->createMCRegInfo(Triple));
-+ if (!MRI) {
-+ debug_printf("error: no register info for target %s\n", Triple.c_str());
-+ return;
-+ }
-+
-+ OwningPtr<const MCInstrInfo> MII(T->createMCInstrInfo());
-+ if (!MII) {
-+ debug_printf("error: no instruction info for target %s\n",
Triple.c_str());
-+ return;
-+ }
-+#endif
-+
-+#if HAVE_LLVM >= 0x0301
-+ OwningPtr<MCInstPrinter> Printer(
-+ T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *MII, *MRI,
*STI));
-+#elif HAVE_LLVM == 0x0300
- OwningPtr<MCInstPrinter> Printer(
- T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *STI));
- #elif HAVE_LLVM >= 0x0208
-diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-index fe7616b..68f8808 100644
---- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-+++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-@@ -62,7 +62,11 @@
- extern "C" void
- lp_register_oprofile_jit_event_listener(LLVMExecutionEngineRef EE)
- {
-+#if HAVE_LLVM >= 0x0301
-+
llvm::unwrap(EE)->RegisterJITEventListener(llvm::JITEventListener::createOProfileJITEventListener());
-+#else
-
llvm::unwrap(EE)->RegisterJITEventListener(llvm::createOProfileJITEventListener());
-+#endif
- }
-
-
Copied: nouveau-dri/repos/extra-x86_64/mesa-8.0.3-llvm-3.1-fixes.patch (from
rev 163471, nouveau-dri/trunk/mesa-8.0.3-llvm-3.1-fixes.patch)
===================================================================
--- extra-x86_64/mesa-8.0.3-llvm-3.1-fixes.patch
(rev 0)
+++ extra-x86_64/mesa-8.0.3-llvm-3.1-fixes.patch 2012-07-12 17:49:23 UTC
(rev 163472)
@@ -0,0 +1,46 @@
+diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
+index a50a51d..f1bb4d9 100644
+--- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
++++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
+@@ -235,7 +235,24 @@ lp_disassemble(const void* func)
+ int AsmPrinterVariant = AsmInfo->getAssemblerDialect();
+ #endif
+
+-#if HAVE_LLVM >= 0x0300
++#if HAVE_LLVM >= 0x0301
++ OwningPtr<const MCRegisterInfo> MRI(T->createMCRegInfo(Triple));
++ if (!MRI) {
++ debug_printf("error: no register info for target %s\n", Triple.c_str());
++ return;
++ }
++
++ OwningPtr<const MCInstrInfo> MII(T->createMCInstrInfo());
++ if (!MII) {
++ debug_printf("error: no instruction info for target %s\n",
Triple.c_str());
++ return;
++ }
++#endif
++
++#if HAVE_LLVM >= 0x0301
++ OwningPtr<MCInstPrinter> Printer(
++ T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *MII, *MRI,
*STI));
++#elif HAVE_LLVM == 0x0300
+ OwningPtr<MCInstPrinter> Printer(
+ T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *STI));
+ #elif HAVE_LLVM >= 0x0208
+diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
+index fe7616b..68f8808 100644
+--- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
++++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
+@@ -62,7 +62,11 @@
+ extern "C" void
+ lp_register_oprofile_jit_event_listener(LLVMExecutionEngineRef EE)
+ {
++#if HAVE_LLVM >= 0x0301
++
llvm::unwrap(EE)->RegisterJITEventListener(llvm::JITEventListener::createOProfileJITEventListener());
++#else
+
llvm::unwrap(EE)->RegisterJITEventListener(llvm::createOProfileJITEventListener());
++#endif
+ }
+
+
