[arch-commits] Commit in lib32-mesa/trunk (LICENSE PKGBUILD)
Laurent Carlier
lcarlier at archlinux.org
Sat Sep 20 21:35:17 UTC 2014
Date: Saturday, September 20, 2014 @ 23:35:17
Author: lcarlier
Revision: 119338
upgpkg: lib32-mesa 10.3.0-2
update dependencies
Added:
lib32-mesa/trunk/LICENSE
Modified:
lib32-mesa/trunk/PKGBUILD
----------+
LICENSE | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
PKGBUILD | 43 +++++++++++++++----------------
2 files changed, 103 insertions(+), 22 deletions(-)
Added: LICENSE
===================================================================
--- LICENSE (rev 0)
+++ LICENSE 2014-09-20 21:35:17 UTC (rev 119338)
@@ -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
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2014-09-20 19:00:53 UTC (rev 119337)
+++ PKGBUILD 2014-09-20 21:35:17 UTC (rev 119338)
@@ -5,7 +5,7 @@
pkgbase=lib32-mesa
pkgname=('lib32-mesa-dri' 'lib32-mesa-vdpau' 'lib32-mesa' 'lib32-mesa-libgl')
pkgver=10.3.0
-pkgrel=1
+pkgrel=2
arch=('x86_64')
makedepends=('python2' 'lib32-libxml2' 'lib32-expat' 'lib32-libx11' 'glproto' 'lib32-libdrm' 'dri2proto' 'dri3proto' 'presentproto'
'lib32-libxshmfence' 'lib32-libxxf86vm' 'lib32-libxdamage' 'gcc-multilib' 'lib32-elfutils' 'lib32-llvm' 'lib32-systemd'
@@ -13,15 +13,17 @@
url="http://mesa3d.sourceforge.net"
license=('custom')
#source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2{,.sig}
-source=(ftp://ftp.freedesktop.org/pub/mesa/10.3/MesaLib-${pkgver}.tar.bz2{,.sig})
+source=(ftp://ftp.freedesktop.org/pub/mesa/10.3/MesaLib-${pkgver}.tar.bz2{,.sig}
+ LICENSE)
sha256sums=('0283bfe710fa449ed82e465cfa09612a269e19abb7e0382082608062ce7960b5'
- 'SKIP')
+ 'SKIP'
+ '7fdc119cf53c8ca65396ea73f6d10af641ba41ea1dd2bd44a824726e01c8b3f2')
build() {
export CC="gcc -m32"
export CXX="g++ -m32"
export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
- export LLVM_CONFIG=/usr/bin/llvm-config32
+ export LLVM_CONFIG="/usr/bin/llvm-config32"
cd ${srcdir}/?esa-*
@@ -61,7 +63,7 @@
package_lib32-mesa-dri() {
pkgdesc="Mesa DRI drivers (32-bit)"
- depends=('lib32-mesa-libgl' "lib32-mesa=${pkgver}" 'mesa-dri' 'lib32-libtxc_dxtn')
+ depends=('lib32-expat' 'lib32-libdrm' 'lib32-libtxc_dxtn')
conflicts=('lib32-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri')
provides=('lib32-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri')
replaces=('lib32-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri')
@@ -73,27 +75,28 @@
mv -v ${srcdir}/fakeinstall/usr/lib32/xorg/modules/dri/nouveau{,_vieux}_dri.so ${pkgdir}/usr/lib32/xorg/modules/dri
# intel-dri
mv -v ${srcdir}/fakeinstall/usr/lib32/xorg/modules/dri/{i915,i965}_dri.so ${pkgdir}/usr/lib32/xorg/modules/dri
+ # swrast
+ mv -v ${srcdir}/fakeinstall/usr/lib32/xorg/modules/dri/{kms_,}swrast_dri.so ${pkgdir}/usr/lib32/xorg/modules/dri
- install -m755 -d "${pkgdir}/usr/share/licenses"
- ln -s mesa-dri "$pkgdir/usr/share/licenses/lib32-mesa-dri"
+ install -m755 -d "${pkgdir}/usr/share/licenses/lib32-mesa-dri"
+ install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/lib32-mesa-dri/"
}
package_lib32-mesa-vdpau() {
pkgdesc="Mesa VDPAU drivers (32-bit)"
- depends=("lib32-mesa=${pkgver}")
+ depends=('lib32-libdrm' 'lib32-libx11' 'lib32-expat' 'lib32-elfutils')
install -m755 -d ${pkgdir}/usr/lib32
mv -v ${srcdir}/fakeinstall/usr/lib32/vdpau ${pkgdir}/usr/lib32
- install -m755 -d "${pkgdir}/usr/share/licenses"
- ln -s mesa "$pkgdir/usr/share/licenses/lib32-mesa-vdpau"
+ install -m755 -d "${pkgdir}/usr/share/licenses/lib32-mesa-vdpau"
+ install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/lib32-mesa-vdpau/"
}
-
package_lib32-mesa() {
pkgdesc="an open-source implementation of the OpenGL specification (32-bit)"
depends=('lib32-libdrm' 'lib32-libxxf86vm' 'lib32-libxdamage' 'lib32-libxshmfence' 'lib32-systemd'
- 'lib32-elfutils' 'lib32-llvm-libs' 'lib32-wayland' 'lib32-libgl' 'mesa')
+ 'lib32-elfutils' 'lib32-llvm-libs' 'lib32-wayland' 'lib32-mesa-dri' 'mesa')
optdepends=('opengl-man-pages: for the OpenGL API man pages')
provides=('lib32-libglapi' 'lib32-osmesa' 'lib32-libgbm' 'lib32-libgles' 'lib32-libegl')
conflicts=('lib32-libglapi' 'lib32-osmesa' 'lib32-libgbm' 'lib32-libgles' 'lib32-libegl')
@@ -106,10 +109,6 @@
#mv -v ${srcdir}/fakeinstall/usr/lib32/gbm/gbm_gallium_drm* ${pkgdir}/usr/lib32/gbm/
mv -v ${srcdir}/fakeinstall/usr/lib32/pkgconfig ${pkgdir}/usr/lib32/
-
- # swrast
- install -m755 -d ${pkgdir}/usr/lib32/xorg/modules/dri
- mv -v ${srcdir}/fakeinstall/usr/lib32/xorg/modules/dri/{kms_,}swrast_dri.so ${pkgdir}/usr/lib32/xorg/modules/dri
install -m755 -d ${pkgdir}/usr/lib32/mesa
# move libgl/EGL/glesv*.so to not conflict with blobs - may break .pc files ?
@@ -117,14 +116,14 @@
mv -v ${srcdir}/fakeinstall/usr/lib32/libEGL.so* ${pkgdir}/usr/lib32/mesa/
mv -v ${srcdir}/fakeinstall/usr/lib32/libGLES*.so* ${pkgdir}/usr/lib32/mesa/
- install -m755 -d "${pkgdir}/usr/share/licenses"
- ln -s mesa "$pkgdir/usr/share/licenses/lib32-mesa"
+ install -m755 -d "${pkgdir}/usr/share/licenses/lib32-mesa"
+ install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/lib32-mesa/"
}
package_lib32-mesa-libgl() {
pkgdesc="Mesa 3-D graphics library (32-bit)"
- depends=("lib32-mesa=${pkgver}")
- provides=("lib32-libgl=${pkgver}")
+ depends=('lib32-mesa')
+ provides=('lib32-libgl')
replaces=('lib32-libgl')
install -m755 -d ${pkgdir}/usr/lib32
@@ -145,6 +144,6 @@
ln -s libGLESv2.so.2.0.0 ${pkgdir}/usr/lib32/libGLESv2.so.2
ln -s libGLESv2.so.2.0.0 ${pkgdir}/usr/lib32/libGLESv2.so
- install -m755 -d "${pkgdir}/usr/share/licenses"
- ln -s lib32-mesa "${pkgdir}/usr/share/licenses/lib32-mesa-libgl"
+ install -m755 -d "${pkgdir}/usr/share/licenses/lib32-mesa-libgl"
+ install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/lib32-mesa-libgl/"
}
More information about the arch-commits
mailing list