[arch-commits] Commit in lib32-mesa-demos/trunk (LICENSE PKGBUILD mesa-demos.install)
Laurent Carlier
lcarlier at gemini.archlinux.org
Tue Nov 30 09:49:20 UTC 2021
Date: Tuesday, November 30, 2021 @ 09:49:19
Author: lcarlier
Revision: 1057687
upgpkg: lib32-mesa-demos 8.4.0-3: split build and move glxinfo32/glxgears32/eglinfo32 into new lib32-mesa-utils
Added:
lib32-mesa-demos/trunk/LICENSE
lib32-mesa-demos/trunk/mesa-demos.install
Modified:
lib32-mesa-demos/trunk/PKGBUILD
--------------------+
LICENSE | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++
PKGBUILD | 49 ++++++++++++++++++++++--------
mesa-demos.install | 6 +++
3 files changed, 124 insertions(+), 13 deletions(-)
Added: LICENSE
===================================================================
--- LICENSE (rev 0)
+++ LICENSE 2021-11-30 09:49:19 UTC (rev 1057687)
@@ -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 2021-11-30 09:31:31 UTC (rev 1057686)
+++ PKGBUILD 2021-11-30 09:49:19 UTC (rev 1057687)
@@ -2,19 +2,19 @@
# Contributor: Jan de Groot <jgc at archlinux.org>
# Contributor: Andreas Radke <andyrtr at archlinux.org>
-_pkgbasename=mesa-demos
-pkgname=lib32-$_pkgbasename
+pkgbase=lib32-mesa-demos
+pkgname=('lib32-mesa-demos' 'lib32-mesa-utils')
pkgver=8.4.0
-pkgrel=2
+pkgrel=3
arch=(x86_64)
-pkgdesc="Mesa demos and tools (32-bit)"
url="http://mesa3d.sourceforge.net"
license=('custom')
-depends=('lib32-libgl' 'lib32-glew' 'mesa-demos')
-makedepends=(gcc-multilib 'lib32-mesa')
-source=(https://mesa.freedesktop.org/archive/demos/mesa-demos-$pkgver.tar.bz2{,.sig})
+makedepends=(gcc-multilib 'lib32-mesa' 'lib32-freetype2' 'lib32-freeglut' 'lib32-glew')
+source=(https://mesa.freedesktop.org/archive/demos/mesa-demos-$pkgver.tar.bz2{,.sig}
+ 'LICENSE')
sha512sums=('b72d03cad36e0535ff18dcfb222ec4200064b9264f6da51a6e5f03b0dd912abe188bc1d600b6698de3ce6f63b28d2ce01565886ca8e7079edc4967fbf2fb0957'
- 'SKIP')
+ 'SKIP'
+ '25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2')
validpgpkeys=('E390B9700582FAEA959ACAD41EEF53D38A3A9C67') # "Andreas Boll <andreas.boll.dev at gmail.com>"
build() {
@@ -24,17 +24,23 @@
cd "${srcdir}/mesa-demos-${pkgver}"
./configure --prefix=/usr \
- --without-glut
+ --disable-gles1 \
+ --with-system-data-files=/usr/share/mesa-demos
make
}
-package() {
- depends=('lib32-glew' mesa-demos)
+package_lib32-mesa-demos() {
+ pkgdesc="Mesa demos (32-bit)"
+ depends=('lib32-glew' 'lib32-freeglut' mesa-demos)
+ install=mesa-demos.install
cd "${srcdir}/mesa-demos-${pkgver}"
make DESTDIR="${pkgdir}" install
+ # remove utils
+ rm ${pkgdir}/usr/bin/{glxinfo,glxgears,eglinfo}
+
for i in "$pkgdir/usr/bin/"*; do
mv "$i" "$i"32
done
@@ -41,6 +47,23 @@
rm -r "$pkgdir/usr/share/mesa-demos"
- mkdir -p "$pkgdir/usr/share/licenses"
- ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
+ install -m755 -d "${pkgdir}/usr/share/licenses/$pkgname"
+ install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/$pkgname/"
}
+
+package_lib32-mesa-utils() {
+ pkgdesc="essential Mesa utilities (32-bit)"
+ depends=('lib32-libgl')
+ provides=('glxinfo32' 'glxgears32' 'eglinfo32')
+
+ cd "${srcdir}/mesa-demos-${pkgver}"
+ install -Dm 0755 src/egl/opengl/eglinfo -t "${pkgdir}/usr/bin/"
+ install -Dm 0755 src/xdemos/{glxinfo,glxgears} -t "${pkgdir}/usr/bin/"
+
+ for i in "$pkgdir/usr/bin/"*; do
+ mv "$i" "$i"32
+ done
+
+ install -m755 -d "${pkgdir}/usr/share/licenses/$pkgname"
+ install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/$pkgname/"
+}
Added: mesa-demos.install
===================================================================
--- mesa-demos.install (rev 0)
+++ mesa-demos.install 2021-11-30 09:49:19 UTC (rev 1057687)
@@ -0,0 +1,6 @@
+post_upgrade() {
+ if [ "`vercmp $2 8.4.0-3`" -lt 0 ]; then
+ echo ">>> glxinfo32, eglinfo32 and glxgears32 are now part of"
+ echo ">>> the new \"lib32-mesa-utils\" package."
+ fi
+}
More information about the arch-commits
mailing list