[arch-commits] Commit in mesa/trunk (LICENSE PKGBUILD)
Jan Steffens
heftig at archlinux.org
Thu Mar 29 08:29:52 UTC 2018
Date: Thursday, March 29, 2018 @ 08:29:51
Author: heftig
Revision: 320598
Cleanup
Modified:
mesa/trunk/LICENSE
mesa/trunk/PKGBUILD
----------+
LICENSE | 87 +++++++++++++++----------------
PKGBUILD | 168 ++++++++++++++++++++++---------------------------------------
2 files changed, 106 insertions(+), 149 deletions(-)
Modified: LICENSE
===================================================================
--- LICENSE 2018-03-29 08:14:47 UTC (rev 320597)
+++ LICENSE 2018-03-29 08:29:51 UTC (rev 320598)
@@ -1,33 +1,34 @@
+The Mesa 3D Graphics Library
+
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.
+ Mesa is a 3-D graphics library with an API which is very similar to
+ that of [1]OpenGL.* To the extent that Mesa utilizes the OpenGL command
+ syntax or state machine, it is being used with authorization from
+ [2]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
+ 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.
+ * OpenGL is a trademark of [3]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 Mesa distribution consists of several components. Different
+ copyrights and licenses apply to different components. For example, the
+ GLX client code uses the SGI Free Software License B, and 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 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:
+ The default Mesa license is as follows:
Copyright (C) 1999-2007 Brian Paul All Rights Reserved.
@@ -44,39 +45,39 @@
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.
+THE AUTHORS OR COPYRIGHT HOLDERS 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.
+ 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)
+Component Location License
+------------------------------------------------------------------
+Main Mesa code src/mesa/ MIT
-Device drivers src/mesa/drivers/* See drivers See drivers
+Device drivers src/mesa/drivers/* MIT, generally
-Ext headers include/GL/glext.h SGI SGI Free B
+Gallium code src/gallium/ MIT
+
+Ext headers include/GL/glext.h Khronos
include/GL/glxext.h
-GLUT src/glut/ Mark Kilgard Mark's copyright
+GLX client code src/glx/ SGI Free Software License B
-Mesa GLU library src/glu/mesa/ Brian Paul GNU-LGPL
+C11 thread include/c11/threads*.h Boost (permissive) emulation
-SGI GLU library src/glu/sgi/ SGI SGI Free B
+ In general, consult the source files for license terms.
-demo programs progs/demos/ various see source files
+References
-X demos progs/xdemos/ Brian Paul see source files
-
-SGI demos progs/samples/ SGI SGI copyright
-
-RedBook demos progs/redbook/ SGI SGI copyright
+ 1. https://www.opengl.org/
+ 2. https://www.sgi.com/
+ 3. https://www.sgi.com/
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2018-03-29 08:14:47 UTC (rev 320597)
+++ PKGBUILD 2018-03-29 08:29:51 UTC (rev 320598)
@@ -4,13 +4,14 @@
pkgbase=mesa
pkgname=('opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 'libva-mesa-driver' 'mesa-vdpau' 'mesa')
-pkgdesc="an open-source implementation of the OpenGL specification"
+pkgdesc="An open-source implementation of the OpenGL specification"
pkgver=18.0.0
pkgrel=2
arch=('x86_64')
makedepends=('python2-mako' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'dri3proto' 'presentproto'
'libxshmfence' 'libxxf86vm' 'libxdamage' 'libvdpau' 'libva' 'wayland' 'wayland-protocols'
- 'elfutils' 'llvm' 'libomxil-bellagio' 'libclc' 'clang' 'libglvnd' 'libunwind' 'lm_sensors' 'meson')
+ 'elfutils' 'llvm' 'libomxil-bellagio' 'libclc' 'clang' 'libglvnd' 'libunwind' 'lm_sensors'
+ 'meson')
url="https://www.mesa3d.org/"
license=('custom')
source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig}
@@ -20,16 +21,16 @@
fix-versions.diff)
sha512sums=('1494bb09357896a2505b3dcfec772268e28c765804f21e144948a314f1d79d99ff9f21062ef5860eb5a5a568b305a9c954585924a7ac8890fe1ebd8df3bcc396'
'SKIP'
- '25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2'
+ 'f9f0d0ccf166fe6cb684478b6f1e1ab1f2850431c06aa041738563eb1808a004e52cdec823c103c9e180f03ffc083e95974d291353f0220fe52ae6d4897fecc7'
'75849eca72ca9d01c648d5ea4f6371f1b8737ca35b14be179e14c73cc51dca0739c333343cdc228a6d464135f4791bcdc21734e2debecd29d57023c8c088b028'
'da32ac3b025282c584bfc962723151b6e11887e59e35086c616a987cb3a471051d60f2b303a91f37106ebb75621cbd9b3f560036f5beb88518cfe9d75c45ee03'
'7ab28153780c5fa0f443873a627201e7d434991e5ce18ef2a05f678aa4561e172b2ad9a56fb01b72a8482bba650e26a08df10b4d4d6bb696c523f73196a47e39')
-validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D') # Emil Velikov <emil.l.velikov at gmail.com>
-validpgpkeys+=('946D09B5E4C9845E63075FF1D961C596A7203456') # Andres Gomez <tanty at igalia.com>
-validpgpkeys+=('E3E8F480C52ADD73B278EE78E1ECBE07D7D70895') # Juan Antonio Suárez Romero (Igalia, S.L.) <jasuarez at igalia.com>"
+validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D' # Emil Velikov <emil.l.velikov at gmail.com>
+ '946D09B5E4C9845E63075FF1D961C596A7203456' # Andres Gomez <tanty at igalia.com>
+ 'E3E8F480C52ADD73B278EE78E1ECBE07D7D70895') # Juan Antonio Suárez Romero (Igalia, S.L.) <jasuarez at igalia.com>"
prepare() {
- cd ${srcdir}/mesa-${pkgver}
+ cd mesa-${pkgver}
# glvnd support patches - from Fedora
# non-upstreamed ones
@@ -42,46 +43,9 @@
# fix library versioning
# this is upstreamable
patch -Np1 -i ../fix-versions.diff
-
-# autoreconf -fiv
}
build() {
-# cd ${srcdir}/mesa-${pkgver}
-
- # ./configure --prefix=/usr \
- # --sysconfdir=/etc \
- # --with-gallium-drivers=r300,r600,radeonsi,nouveau,svga,swrast,virgl,swr \
- # --with-dri-drivers=i915,i965,r200,radeon,nouveau,swrast \
- # --with-platforms=x11,drm,wayland \
- # --with-vulkan-drivers=intel,radeon \
- # --disable-xvmc \
- # --enable-llvm \
- # --enable-llvm-shared-libs \
- # --enable-shared-glapi \
- # --enable-libglvnd \
- # --enable-libunwind \
- # --enable-lmsensors \
- # --enable-egl \
- # --enable-glx \
- # --enable-glx-tls \
- # --enable-gles1 \
- # --enable-gles2 \
- # --enable-gbm \
- # --enable-dri \
- # --enable-gallium-osmesa \
- # --enable-gallium-extra-hud \
- # --enable-texture-float \
- # --enable-xa \
- # --enable-vdpau \
- # --enable-omx-bellagio \
- # --enable-nine \
- # --enable-opencl \
- # --enable-opencl-icd \
- # --with-clang-libdir=/usr/lib
-
- # make
-
arch-meson mesa-$pkgver build \
-D b_lto=false \
-D platforms=x11,wayland,drm,surfaceless \
@@ -112,14 +76,26 @@
-D texture-float=true \
-D valgrind=false
+ # Print config
+ meson configure build
+
ninja -C build
- # fake installation
- mkdir $srcdir/fakeinstall
-# make DESTDIR=${srcdir}/fakeinstall install
- DESTDIR=${srcdir}/fakeinstall ninja -C build install
+ # fake installation to be seperated into packages
+ # outside of fakeroot but mesa doesn't need to chown/mod
+ DESTDIR="${srcdir}/fakeinstall" ninja -C build install
}
+_install() {
+ local src f dir
+ for src; do
+ f="${src#fakeinstall/}"
+ dir="${pkgdir}/${f%/*}"
+ install -m755 -d "${dir}"
+ mv -v "${src}" "${dir}/"
+ done
+}
+
package_opencl-mesa() {
pkgdesc="OpenCL support for AMD/ATI Radeon mesa drivers"
depends=('expat' 'libdrm' 'libelf' 'libclc' 'clang')
@@ -126,15 +102,11 @@
optdepends=('opencl-headers: headers necessary for OpenCL development')
provides=('opencl-driver')
- install -m755 -d ${pkgdir}/etc
- mv -v ${srcdir}/fakeinstall/etc/OpenCL ${pkgdir}/etc/
-
- install -m755 -d ${pkgdir}/usr/lib
- mv -v ${srcdir}/fakeinstall/usr/lib/lib*OpenCL* ${pkgdir}/usr/lib/
- mv -v ${srcdir}/fakeinstall/usr/lib/gallium-pipe ${pkgdir}/usr/lib/
+ _install fakeinstall/etc/OpenCL
+ _install fakeinstall/usr/lib/lib*OpenCL*
+ _install fakeinstall/usr/lib/gallium-pipe
- install -m755 -d "${pkgdir}/usr/share/licenses/opencl-mesa"
- install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/opencl-mesa/"
+ install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
}
package_vulkan-intel() {
@@ -142,15 +114,11 @@
depends=('wayland' 'libx11' 'libxshmfence' 'libdrm')
provides=('vulkan-driver')
- install -m755 -d ${pkgdir}/usr/share/vulkan/icd.d
- mv -v ${srcdir}/fakeinstall/usr/share/vulkan/icd.d/intel_icd*.json ${pkgdir}/usr/share/vulkan/icd.d/
+ _install fakeinstall/usr/share/vulkan/icd.d/intel_icd*.json
+ _install fakeinstall/usr/lib/libvulkan_intel.so
+ _install fakeinstall/usr/include/vulkan/vulkan_intel.h
- install -m755 -d ${pkgdir}/usr/{include/vulkan,lib}
- mv -v ${srcdir}/fakeinstall/usr/lib/libvulkan_intel.so ${pkgdir}/usr/lib/
- mv -v ${srcdir}/fakeinstall/usr/include/vulkan/vulkan_intel.h ${pkgdir}/usr/include/vulkan
-
- install -m755 -d "${pkgdir}/usr/share/licenses/vulkan-intel"
- install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/vulkan-intel/"
+ install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
}
package_vulkan-radeon() {
@@ -158,14 +126,10 @@
depends=('wayland' 'libx11' 'libxshmfence' 'libelf' 'libdrm' 'llvm-libs')
provides=('vulkan-driver')
- install -m755 -d ${pkgdir}/usr/share/vulkan/icd.d
- mv -v ${srcdir}/fakeinstall/usr/share/vulkan/icd.d/radeon_icd*.json ${pkgdir}/usr/share/vulkan/icd.d/
+ _install fakeinstall/usr/share/vulkan/icd.d/radeon_icd*.json
+ _install fakeinstall/usr/lib/libvulkan_radeon.so
- install -m755 -d ${pkgdir}/usr/lib
- mv -v ${srcdir}/fakeinstall/usr/lib/libvulkan_radeon.so ${pkgdir}/usr/lib/
-
- install -m755 -d "${pkgdir}/usr/share/licenses/vulkan-radeon"
- install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/vulkan-radeon/"
+ install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
}
package_libva-mesa-driver() {
@@ -172,11 +136,9 @@
pkgdesc="VA-API implementation for gallium"
depends=('libdrm' 'libx11' 'llvm-libs' 'expat' 'libelf' 'libxshmfence')
- install -m755 -d ${pkgdir}/usr/lib/dri
- mv -v ${srcdir}/fakeinstall/usr/lib/dri/*_drv_video.so ${pkgdir}/usr/lib/dri
+ _install fakeinstall/usr/lib/dri/*_drv_video.so
- install -m755 -d "${pkgdir}/usr/share/licenses/libva-mesa-driver"
- install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libva-mesa-driver/"
+ install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
}
package_mesa-vdpau() {
@@ -183,11 +145,9 @@
pkgdesc="Mesa VDPAU drivers"
depends=('libdrm' 'libx11' 'llvm-libs' 'expat' 'libelf' 'libxshmfence')
- install -m755 -d ${pkgdir}/usr/lib
- mv -v ${srcdir}/fakeinstall/usr/lib/vdpau ${pkgdir}/usr/lib
+ _install fakeinstall/usr/lib/vdpau
- install -m755 -d "${pkgdir}/usr/share/licenses/mesa-vdpau"
- install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-vdpau/"
+ install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
}
package_mesa() {
@@ -201,42 +161,38 @@
replaces=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa-dri' 'mesa-libgl')
backup=('etc/drirc')
- install -m755 -d ${pkgdir}/etc
- mv -v ${srcdir}/fakeinstall/etc/drirc ${pkgdir}/etc
-
- install -m755 -d ${pkgdir}/usr/share/glvnd/egl_vendor.d
- mv -v ${srcdir}/fakeinstall/usr/share/glvnd/egl_vendor.d/50_mesa.json ${pkgdir}/usr/share/glvnd/egl_vendor.d/
+ _install fakeinstall/etc/drirc
+ _install fakeinstall/usr/share/glvnd/egl_vendor.d/50_mesa.json
- install -m755 -d ${pkgdir}/usr/lib/dri
# ati-dri, nouveau-dri, intel-dri, svga-dri, swrast
- mv -v ${srcdir}/fakeinstall/usr/lib/dri/*_dri.so ${pkgdir}/usr/lib/dri
+ _install fakeinstall/usr/lib/dri/*_dri.so
- mv -v ${srcdir}/fakeinstall/usr/lib/bellagio ${pkgdir}/usr/lib
- mv -v ${srcdir}/fakeinstall/usr/lib/d3d ${pkgdir}/usr/lib
- mv -v ${srcdir}/fakeinstall/usr/lib/lib{gbm,glapi}.so* ${pkgdir}/usr/lib/
- mv -v ${srcdir}/fakeinstall/usr/lib/libOSMesa.so* ${pkgdir}/usr/lib/
- mv -v ${srcdir}/fakeinstall/usr/lib/libwayland*.so* ${pkgdir}/usr/lib/
- mv -v ${srcdir}/fakeinstall/usr/lib/libxatracker.so* ${pkgdir}/usr/lib/
- mv -v ${srcdir}/fakeinstall/usr/lib/libswrAVX*.so* ${pkgdir}/usr/lib/
+ _install fakeinstall/usr/lib/bellagio
+ _install fakeinstall/usr/lib/d3d
+ _install fakeinstall/usr/lib/lib{gbm,glapi}.so*
+ _install fakeinstall/usr/lib/libOSMesa.so*
+ _install fakeinstall/usr/lib/libwayland*.so*
+ _install fakeinstall/usr/lib/libxatracker.so*
+ _install fakeinstall/usr/lib/libswrAVX*.so*
# in libglvnd
- rm -v ${srcdir}/fakeinstall/usr/lib/libGLESv{1_CM,2}.so*
-
- mv -v ${srcdir}/fakeinstall/usr/include ${pkgdir}/usr
- mv -v ${srcdir}/fakeinstall/usr/lib/pkgconfig ${pkgdir}/usr/lib/
+ rm -v fakeinstall/usr/lib/libGLESv{1_CM,2}.so*
- # remove vulkan headers
- rm -r ${pkgdir}/usr/include/vulkan
+ # in vulkan-headers
+ rm -rv fakeinstall/usr/include/vulkan
+ _install fakeinstall/usr/include
+ _install fakeinstall/usr/lib/pkgconfig
+
# libglvnd support
- mv -v ${srcdir}/fakeinstall/usr/lib/libGLX_mesa.so* ${pkgdir}/usr/lib/
- mv -v ${srcdir}/fakeinstall/usr/lib/libEGL_mesa.so* ${pkgdir}/usr/lib/
+ _install fakeinstall/usr/lib/libGLX_mesa.so*
+ _install fakeinstall/usr/lib/libEGL_mesa.so*
+
# indirect rendering
- ln -s /usr/lib/libGLX_mesa.so.0 ${pkgdir}/usr/lib/libGLX_indirect.so.0
+ ln -s /usr/lib/libGLX_mesa.so.0 "${pkgdir}/usr/lib/libGLX_indirect.so.0"
- # no files should be left: safety check
- find "${srcdir}/fakeinstall" -depth -print0 | xargs -0 rmdir
+ # make sure there are no files left to install
+ find fakeinstall -depth -print0 | xargs -0 rmdir
- install -m755 -d "${pkgdir}/usr/share/licenses/mesa"
- install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa/"
+ install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
}
More information about the arch-commits
mailing list