[arch-commits] Commit in mesa/repos/staging-x86_64 (4 files)
andyrtr at archlinux.org
andyrtr at archlinux.org
Fri Oct 5 15:41:37 UTC 2012
Date: Friday, October 5, 2012 @ 11:41:36
Author: andyrtr
Revision: 168066
archrelease: copy trunk to staging-x86_64
Added:
mesa/repos/staging-x86_64/LICENSE
(from rev 168065, mesa/trunk/LICENSE)
mesa/repos/staging-x86_64/PKGBUILD
(from rev 168065, mesa/trunk/PKGBUILD)
mesa/repos/staging-x86_64/pthread_fix.diff
(from rev 168065, mesa/trunk/pthread_fix.diff)
Deleted:
mesa/repos/staging-x86_64/pthread_fix.diff
------------------+
LICENSE | 82 ++++++++++++++
PKGBUILD | 297 +++++++++++++++++++++++++++++++++++++++++++++++++++++
pthread_fix.diff | 46 ++++----
3 files changed, 402 insertions(+), 23 deletions(-)
Copied: mesa/repos/staging-x86_64/LICENSE (from rev 168065, mesa/trunk/LICENSE)
===================================================================
--- LICENSE (rev 0)
+++ LICENSE 2012-10-05 15:41:36 UTC (rev 168066)
@@ -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
Copied: mesa/repos/staging-x86_64/PKGBUILD (from rev 168065, mesa/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2012-10-05 15:41:36 UTC (rev 168066)
@@ -0,0 +1,297 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Maintainer: Andreas Radke <andyrtr at archlinux.org>
+
+pkgbase=mesa
+pkgname=('libglapi' 'libgl' 'mesa' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel' 'ati-dri' 'intel-dri' 'svga-dri' 'nouveau-dri')
+
+_git=true
+_gitdate=20121005
+#_git=false
+
+if [ "${_git}" = "true" ]; then
+ pkgver=8.99.git_$_gitdate
+ else
+ pkgver=8.0.4
+fi
+pkgrel=1
+arch=('i686' 'x86_64')
+makedepends=('glproto>=1.4.16' 'libdrm>=2.4.39' 'libxxf86vm>=1.1.2' 'libxdamage>=1.1.3' 'expat>=2.1.0' 'libx11>=1.5.0' 'libxt>=1.1.3'
+ 'gcc-libs>=4.7.1-6' 'dri2proto>=2.8' 'python2' 'libxml2' 'imake' 'llvm' 'systemd' 'libvdpau>=0.5')
+url="http://mesa3d.sourceforge.net"
+license=('custom')
+options=('!libtool')
+source=(LICENSE
+ pthread_fix.diff)
+if [ "${_git}" = "true" ]; then
+ # mesa git shot from 9.0 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/log/?h=9.0
+ #source=(${source[@]} 'ftp://ftp.archlinux.org/other/mesa/mesa-41d14eaf193c6b1eb87fe1998808a887f1c6c698.tar.gz')
+ source=(${source[@]} "MesaLib-git${_gitdate}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-542f6feda9bf18267dbd337943a5e871400d425a.tar.gz")
+ else
+ source=(${source[@]} "ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2"
+ #source=(${source[@]} "ftp://ftp.freedesktop.org/pub/mesa/8.0/MesaLib-8.0-rc2.tar.bz2"
+)
+fi
+md5sums=('5c65a0fe315dd347e09b1f2826a1df5a'
+ '03956ac54a44467678120f485b626633'
+ '52760839a596df5058fcbb63a2bb10da')
+
+build() {
+ cd ${srcdir}/?esa-*
+
+ # build fix from master http://cgit.freedesktop.org/mesa/mesa/commit/?id=dd4fde8f674f5e3efa19e929f97de4ecfd82391b
+ patch -Np1 -i ${srcdir}/pthread_fix.diff
+
+ COMMONOPTS="--prefix=/usr \
+ --sysconfdir=/etc \
+ --with-dri-driverdir=/usr/lib/xorg/modules/dri \
+ --with-gallium-drivers=r300,r600,radeonsi,nouveau,svga,swrast \
+ --with-dri-drivers=i915,i965,r200,radeon,nouveau,swrast \
+ --enable-gallium-llvm \
+ --enable-egl \
+ --enable-gallium-egl \
+ --with-egl-platforms=x11,drm \
+ --enable-shared-glapi \
+ --enable-gbm \
+ --enable-glx-tls \
+ --enable-dri \
+ --enable-glx \
+ --enable-osmesa \
+ --enable-gles1 \
+ --enable-gles2 \
+ --enable-texture-float \
+ --enable-xa \
+ --enable-vdpau "
+
+# not default:
+# --enable-gallium-egl enable optional EGL state tracker (not required for
+# EGL support in Gallium with OpenGL and OpenGL ES)
+# [default=disable]
+# --enable-xa enable build of the XA X Acceleration API [default=no]
+
+
+if [ "${_git}" = "true" ]; then
+ ./autogen.sh \
+ $COMMONOPTS
+ else
+ autoreconf -vfi
+ ./configure \
+ $COMMONOPTS
+fi
+
+ make
+}
+
+package_libglapi() {
+ depends=('glibc')
+ pkgdesc="free implementation of the GL API -- shared library. The Mesa GL API module is responsible for dispatching all the gl* functions"
+
+ make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" install
+
+ install -m755 -d "${pkgdir}/usr/share/licenses/libglapi"
+ install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libglapi/"
+}
+
+package_libgl() {
+ depends=('libdrm>=2.4.39' 'libxxf86vm>=1.1.2' 'libxdamage>=1.1.3' 'expat>=2.1.0' 'libglapi' 'gcc-libs')
+ pkgdesc="Mesa 3-D graphics library and DRI software rasterizer"
+
+ # fix linking because of splitted package
+ make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" install
+
+ # libGL & libdricore
+ make -C ${srcdir}/?esa-*/src/glx DESTDIR="${pkgdir}" install
+ make -C ${srcdir}/?esa-*/src/mesa/libdricore DESTDIR="${pkgdir}" install
+
+ # fix linking because of splitted package - cleanup
+ make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" uninstall
+
+
+ make -C ${srcdir}/?esa-*/src/gallium/targets/dri-swrast DESTDIR="${pkgdir}" install
+
+ # See FS#26284
+ install -m755 -d "${pkgdir}/usr/lib/xorg/modules/extensions"
+ ln -s libglx.xorg "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so"
+
+ install -m755 -d "${pkgdir}/usr/share/licenses/libgl"
+ install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libgl/"
+}
+
+package_mesa() {
+ # check also gl.pc
+ depends=('libgl' 'libx11>=1.5.0' 'libxext>=1.3.1' 'libxdamage' 'libxfixes' 'libxcb' 'libxxf86vm')
+ optdepends=('opengl-man-pages: for the OpenGL API man pages')
+ pkgdesc="Mesa 3-D graphics libraries and include files"
+
+ make -C ${srcdir}/?esa-*/src/mesa DESTDIR="${pkgdir}" install-glHEADERS
+ make -C ${srcdir}/?esa-*/src/mesa/drivers/dri DESTDIR="${pkgdir}" install-driincludeHEADERS
+ make -C ${srcdir}/?esa-*/src/mesa DESTDIR="${pkgdir}" install-pkgconfigDATA
+ make -C ${srcdir}/?esa-*/src/mesa/drivers/dri DESTDIR="${pkgdir}" install-pkgconfigDATA
+ make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/common DESTDIR="${pkgdir}" install-sysconfDATA
+
+ make -C ${srcdir}/?esa-*/src/gallium/targets/xa-vmwgfx DESTDIR="${pkgdir}" install
+
+ install -m755 -d "${pkgdir}/usr/share/licenses/mesa"
+ install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa/"
+}
+
+package_osmesa() {
+ depends=('libglapi' 'gcc-libs')
+ optdepends=('opengl-man-pages: for the OpenGL API man pages')
+ pkgdesc="Mesa 3D off-screen rendering library"
+
+ # fix linking because of splitted package
+ make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" install
+
+ make -C ${srcdir}/?esa-*/src/mesa/drivers/osmesa DESTDIR="${pkgdir}" install
+
+ # fix linking because of splitted package - cleanup
+ make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" uninstall
+
+ install -m755 -d "${pkgdir}/usr/share/licenses/osmesa"
+ install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/osmesa/"
+}
+
+package_libgbm() {
+ depends=('systemd' 'libglapi' 'libdrm')
+ pkgdesc="Mesa gbm library"
+
+ # fix linking because of splitted package
+ make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" install
+
+ make -C ${srcdir}/?esa-*/src/gbm DESTDIR="${pkgdir}" install
+
+ # fix linking because of splitted package - cleanup
+ make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" uninstall
+
+ install -m755 -d "${pkgdir}/usr/share/licenses/libgbm"
+ install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libgbm/"
+}
+
+package_libgles() {
+ depends=('libglapi' 'libdrm' 'khrplatform-devel')
+ pkgdesc="Mesa GLES libraries and headers"
+
+ # fix linking because of splitted package
+ make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" install
+
+ make -C ${srcdir}/?esa-*/src/mapi/es1api DESTDIR="${pkgdir}" install
+ make -C ${srcdir}/?esa-*/src/mapi/es2api DESTDIR="${pkgdir}" install
+
+ # fix linking because of splitted package - cleanup
+ make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" uninstall
+
+ install -m755 -d "${pkgdir}/usr/share/licenses/libgles"
+ install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libgles/"
+}
+
+package_libegl() {
+ # check also egl.pc
+ depends=('libx11' 'libxext' 'libxdamage' 'libxfixes' 'libxxf86vm' 'libxcb' 'libgbm' 'khrplatform-devel')
+ pkgdesc="Mesa EGL libraries and headers"
+
+ make -C ${srcdir}/?esa-*/src/gallium/targets/egl-static DESTDIR="${pkgdir}" install
+ install -m755 -d "${pkgdir}/usr/share/doc/libegl"
+ install -m644 ${srcdir}/?esa-*/docs/egl.html "${pkgdir}/usr/share/doc/libegl/"
+
+ # fix linking because of splitted package
+ make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" install
+ make -C ${srcdir}/?esa-*/src/gbm DESTDIR="${pkgdir}" install
+
+ make -C ${srcdir}/?esa-*/src/egl DESTDIR="${pkgdir}" install
+
+ # fix linking because of splitted package - cleanup
+ make -C ${srcdir}/?esa-*/src/gbm DESTDIR="${pkgdir}" uninstall
+ make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" uninstall
+
+ install -m755 -d "${pkgdir}/usr/share/licenses/libegl"
+ install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libegl/"
+
+ # fix file conflicts
+ rm -rf ${pkgdir}/usr/include/KHR
+}
+
+package_khrplatform-devel() {
+ pkgdesc="Khronos platform development package"
+
+ install -m755 -d "${pkgdir}/usr/include/KHR"
+ install -m644 ${srcdir}/?esa-*/include/KHR/khrplatform.h "${pkgdir}/usr/include/KHR/"
+
+ install -m755 -d "${pkgdir}/usr/share/licenses/khrplatform-devel"
+ install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/khrplatform-devel/"
+}
+
+package_ati-dri() {
+ depends=("libgl=${pkgver}")
+ pkgdesc="Mesa DRI radeon/r200 + Gallium3D r300,r600 drivers for AMD/ATI Radeon"
+ conflicts=('xf86-video-ati<6.9.0-6')
+
+ # fix linking because of splitted package
+ make -C ${srcdir}/?esa-*/src/mesa/libdricore DESTDIR="${pkgdir}" install
+
+ # classic mesa drivers for radeon,r200
+ make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/radeon DESTDIR="${pkgdir}" install
+ make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/r200 DESTDIR="${pkgdir}" install
+ # gallium3D driver for r300,r600,radeonsi
+ make -C ${srcdir}/?esa-*/src/gallium/targets/dri-r300 DESTDIR="${pkgdir}" install
+ make -C ${srcdir}/?esa-*/src/gallium/targets/dri-r600 DESTDIR="${pkgdir}" install
+ make -C ${srcdir}/?esa-*/src/gallium/targets/dri-radeonsi DESTDIR="${pkgdir}" install
+ # vdpau driver
+ make -C ${srcdir}/?esa-*/src/gallium/targets/vdpau-r300 DESTDIR="${pkgdir}" install
+ make -C ${srcdir}/?esa-*/src/gallium/targets/vdpau-r600 DESTDIR="${pkgdir}" install
+ make -C ${srcdir}/?esa-*/src/gallium/targets/vdpau-radeonsi DESTDIR="${pkgdir}" install
+
+ # fix linking because of splitted package - cleanup
+ make -C ${srcdir}/?esa-*/src/mesa/libdricore DESTDIR="${pkgdir}" uninstall
+
+ install -m755 -d "${pkgdir}/usr/share/licenses/ati-dri"
+ install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/ati-dri/"
+}
+
+package_intel-dri() {
+ depends=("libgl=${pkgver}")
+ pkgdesc="Mesa DRI drivers for Intel"
+
+ # fix linking because of splitted package
+ make -C ${srcdir}/?esa-*/src/mesa/libdricore DESTDIR="${pkgdir}" install
+
+ make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i915 DESTDIR="${pkgdir}" install
+ make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i965 DESTDIR="${pkgdir}" install
+
+ # fix linking because of splitted package - cleanup
+ make -C ${srcdir}/?esa-*/src/mesa/libdricore DESTDIR="${pkgdir}" uninstall
+
+ install -m755 -d "${pkgdir}/usr/share/licenses/intel-dri"
+ install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/intel-dri/"
+}
+
+package_nouveau-dri() {
+ depends=("libgl=${pkgver}")
+ pkgdesc="Mesa classic DRI + Gallium3D drivers for Nouveau"
+
+ # fix linking because of splitted package
+ make -C ${srcdir}/?esa-*/src/mesa/libdricore DESTDIR="${pkgdir}" install
+
+ # 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
+ # vdpau driver
+ make -C ${srcdir}/?esa-*/src/gallium/targets/vdpau-nouveau DESTDIR="${pkgdir}" install
+
+ # fix linking because of splitted package - cleanup
+ make -C ${srcdir}/?esa-*/src/mesa/libdricore DESTDIR="${pkgdir}" uninstall
+
+ install -m755 -d "${pkgdir}/usr/share/licenses/nouveau-dri"
+ install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/nouveau-dri/"
+}
+
+package_svga-dri() {
+ depends=('gcc-libs' 'libdrm' 'expat')
+ pkgdesc="Gallium3D VMware guest GL driver"
+
+ make -C ${srcdir}/?esa-*/src/gallium/targets/dri-vmwgfx DESTDIR="${pkgdir}" install
+
+ install -m755 -d "${pkgdir}/usr/share/licenses/svga-dri"
+ install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/svga-dri/"
+}
Deleted: pthread_fix.diff
===================================================================
--- pthread_fix.diff 2012-10-05 15:41:07 UTC (rev 168065)
+++ pthread_fix.diff 2012-10-05 15:41:36 UTC (rev 168066)
@@ -1,23 +0,0 @@
-From dd4fde8f674f5e3efa19e929f97de4ecfd82391b Mon Sep 17 00:00:00 2001
-From: Matt Turner <mattst88 at gmail.com>
-Date: Thu, 27 Sep 2012 22:49:52 +0000
-Subject: build: Set PTHREAD_LIBS for pkgconfig files if empty
-
----
-diff --git a/configure.ac b/configure.ac
-index 770df2f..dc2720d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -509,6 +509,10 @@ AC_CHECK_DECLS([signbit],[],
-
- dnl Check for pthreads
- AX_PTHREAD
-+dnl AX_PTHREADS leaves PTHREAD_LIBS empty for gcc and sets PTHREAD_CFLAGS
-+dnl to -pthread, which causes problems if we need -lpthread to appear in
-+dnl pkgconfig files.
-+test -z "$PTHREAD_LIBS" && PTHREAD_LIBS="-lpthread"
-
- dnl SELinux awareness.
- AC_ARG_ENABLE([selinux],
---
-cgit v0.9.0.2-2-gbebe
Copied: mesa/repos/staging-x86_64/pthread_fix.diff (from rev 168065, mesa/trunk/pthread_fix.diff)
===================================================================
--- pthread_fix.diff (rev 0)
+++ pthread_fix.diff 2012-10-05 15:41:36 UTC (rev 168066)
@@ -0,0 +1,23 @@
+From dd4fde8f674f5e3efa19e929f97de4ecfd82391b Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88 at gmail.com>
+Date: Thu, 27 Sep 2012 22:49:52 +0000
+Subject: build: Set PTHREAD_LIBS for pkgconfig files if empty
+
+---
+diff --git a/configure.ac b/configure.ac
+index 770df2f..dc2720d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -509,6 +509,10 @@ AC_CHECK_DECLS([signbit],[],
+
+ dnl Check for pthreads
+ AX_PTHREAD
++dnl AX_PTHREADS leaves PTHREAD_LIBS empty for gcc and sets PTHREAD_CFLAGS
++dnl to -pthread, which causes problems if we need -lpthread to appear in
++dnl pkgconfig files.
++test -z "$PTHREAD_LIBS" && PTHREAD_LIBS="-lpthread"
+
+ dnl SELinux awareness.
+ AC_ARG_ENABLE([selinux],
+--
+cgit v0.9.0.2-2-gbebe
More information about the arch-commits
mailing list