[arch-commits] Commit in lib32-mesa-demos/repos/multilib-x86_64 (6 files)

Antonio Rojas arojas at gemini.archlinux.org
Sat Jun 11 09:27:04 UTC 2022


    Date: Saturday, June 11, 2022 @ 09:27:04
  Author: arojas
Revision: 1232201

archrelease: copy trunk to multilib-x86_64

Added:
  lib32-mesa-demos/repos/multilib-x86_64/LICENSE
    (from rev 1232200, lib32-mesa-demos/trunk/LICENSE)
  lib32-mesa-demos/repos/multilib-x86_64/PKGBUILD
    (from rev 1232200, lib32-mesa-demos/trunk/PKGBUILD)
  lib32-mesa-demos/repos/multilib-x86_64/mesa-demos.install
    (from rev 1232200, lib32-mesa-demos/trunk/mesa-demos.install)
Deleted:
  lib32-mesa-demos/repos/multilib-x86_64/LICENSE
  lib32-mesa-demos/repos/multilib-x86_64/PKGBUILD
  lib32-mesa-demos/repos/multilib-x86_64/mesa-demos.install

--------------------+
 LICENSE            |  164 +++++++++++++++++++++++++--------------------------
 PKGBUILD           |  142 ++++++++++++++++++++++----------------------
 mesa-demos.install |   12 +--
 3 files changed, 160 insertions(+), 158 deletions(-)

Deleted: LICENSE
===================================================================
--- LICENSE	2022-06-11 09:26:49 UTC (rev 1232200)
+++ LICENSE	2022-06-11 09:27:04 UTC (rev 1232201)
@@ -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: lib32-mesa-demos/repos/multilib-x86_64/LICENSE (from rev 1232200, lib32-mesa-demos/trunk/LICENSE)
===================================================================
--- LICENSE	                        (rev 0)
+++ LICENSE	2022-06-11 09:27:04 UTC (rev 1232201)
@@ -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: PKGBUILD
===================================================================
--- PKGBUILD	2022-06-11 09:26:49 UTC (rev 1232200)
+++ PKGBUILD	2022-06-11 09:27:04 UTC (rev 1232201)
@@ -1,70 +0,0 @@
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Jan de Groot <jgc at archlinux.org>
-# Contributor: Andreas Radke <andyrtr at archlinux.org>
-
-pkgbase=lib32-mesa-demos
-pkgname=('lib32-mesa-demos' 'lib32-mesa-utils')
-pkgver=8.4.0
-pkgrel=8
-arch=(x86_64)
-url="http://mesa3d.sourceforge.net"
-license=('custom')
-makedepends=('lib32-mesa' 'lib32-freetype2' 'lib32-glew' 'lib32-freeglut')
-options=('debug')
-source=(https://mesa.freedesktop.org/archive/demos/mesa-demos-${pkgver}.tar.bz2{,.sig}
-        'LICENSE')
-sha512sums=('b72d03cad36e0535ff18dcfb222ec4200064b9264f6da51a6e5f03b0dd912abe188bc1d600b6698de3ce6f63b28d2ce01565886ca8e7079edc4967fbf2fb0957'
-            'SKIP'
-            '25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2')
-validpgpkeys=('E390B9700582FAEA959ACAD41EEF53D38A3A9C67') # "Andreas Boll <andreas.boll.dev at gmail.com>"
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG="i686-pc-linux-gnu-pkg-config"
-
-  cd mesa-demos-${pkgver}
-  ./configure --prefix=/usr \
-    --disable-gles1 \
-    --with-system-data-files=/usr/share/mesa-demos
-
-  make
-}
-
-package_lib32-mesa-demos() {
-  pkgdesc="Mesa demos (32-bit)"
-  depends=('lib32-libgl' 'lib32-glew' 'lib32-freeglut' 'mesa-demos')
-  install=mesa-demos.install
-
-  cd mesa-demos-${pkgver}
-  make DESTDIR="${pkgdir}" install
-
-  # remove utils
-  rm "${pkgdir}"/usr/bin/{glxinfo,glxgears,eglinfo}
-
-  local i
-  for i in "$pkgdir/usr/bin/"*; do
-    mv "$i" "$i"32
-  done
-
-  rm -r "$pkgdir/usr/share/mesa-demos"
-
-  install -Dm 0644 ../LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
-
-package_lib32-mesa-utils() {
-  pkgdesc="Essential Mesa utilities (32-bit)"
-  depends=('lib32-libgl')
-  provides=('glxinfo32' 'glxgears32' 'eglinfo32')
-
-  cd 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/"
-
-  local i
-  for i in "$pkgdir/usr/bin/"*; do
-    mv "$i" "$i"32
-  done
-
-  install -Dm 0644 ../LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}/"
-}

Copied: lib32-mesa-demos/repos/multilib-x86_64/PKGBUILD (from rev 1232200, lib32-mesa-demos/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2022-06-11 09:27:04 UTC (rev 1232201)
@@ -0,0 +1,72 @@
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Jan de Groot <jgc at archlinux.org>
+# Contributor: Andreas Radke <andyrtr at archlinux.org>
+
+pkgbase=lib32-mesa-demos
+pkgname=('lib32-mesa-demos' 'lib32-mesa-utils')
+pkgver=8.5.0
+pkgrel=1
+arch=(x86_64)
+url="http://mesa3d.sourceforge.net"
+license=('custom')
+makedepends=('lib32-mesa' 'lib32-freetype2' 'lib32-glew' 'lib32-freeglut' 'meson' 'wayland-protocols')
+options=('debug')
+source=(https://archive.mesa3d.org/demos/${pkgver}/mesa-demos-${pkgver}.tar.bz2{,.sig}
+        'LICENSE')
+sha512sums=('df6a7f09638ca389d6e8bc569e599dcc59c9aa280bcfb95976d83e5cd3edfe74bb3a31f0953956dc16faa540ee5b09990e3377e1341d836fc527e50ace6e60b8'
+            'SKIP'
+            '25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2')
+validpgpkeys=('E390B9700582FAEA959ACAD41EEF53D38A3A9C67') # "Andreas Boll <andreas.boll.dev at gmail.com>"
+validpgpkeys+=('FF4CF638C624C3CF21ED2CF227EF763A2AA39F96') # Erik Faye-Lund <erik.faye-lund at collabora.com>
+
+build() {
+  export CC="gcc -m32"
+  export CXX="g++ -m32"
+  export PKG_CONFIG="i686-pc-linux-gnu-pkg-config"
+
+  arch-meson mesa-demos-$pkgver build \
+    -D gles1=disabled \
+    -D with-system-data-files=true
+
+  # Print config
+  meson configure build
+
+  meson compile -C build
+}
+
+package_lib32-mesa-demos() {
+  pkgdesc="Mesa demos (32-bit)"
+  depends=('lib32-libgl' 'lib32-glew' 'lib32-freeglut' 'mesa-demos')
+  install=mesa-demos.install
+
+  DESTDIR="$pkgdir" meson install -C build
+
+  # remove utils
+  rm "${pkgdir}"/usr/bin/{glxinfo,glxgears,eglinfo}
+
+  local i
+  for i in "$pkgdir/usr/bin/"*; do
+    mv "$i" "$i"32
+  done
+
+  rm -r "$pkgdir/usr/share/mesa-demos"
+
+  install -Dm 0644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}/"
+}
+
+package_lib32-mesa-utils() {
+  pkgdesc="Essential Mesa utilities (32-bit)"
+  depends=('lib32-libgl')
+  provides=('glxinfo32' 'glxgears32' 'eglinfo32')
+
+  cd build
+  install -Dm 0755 src/egl/opengl/eglinfo -t "${pkgdir}/usr/bin/"
+  install -Dm 0755 src/xdemos/{glxinfo,glxgears} -t "${pkgdir}/usr/bin/"
+
+  local i
+  for i in "$pkgdir/usr/bin/"*; do
+    mv "$i" "$i"32
+  done
+
+  install -Dm 0644 ../LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}/"
+}

Deleted: mesa-demos.install
===================================================================
--- mesa-demos.install	2022-06-11 09:26:49 UTC (rev 1232200)
+++ mesa-demos.install	2022-06-11 09:27:04 UTC (rev 1232201)
@@ -1,6 +0,0 @@
-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
-}

Copied: lib32-mesa-demos/repos/multilib-x86_64/mesa-demos.install (from rev 1232200, lib32-mesa-demos/trunk/mesa-demos.install)
===================================================================
--- mesa-demos.install	                        (rev 0)
+++ mesa-demos.install	2022-06-11 09:27:04 UTC (rev 1232201)
@@ -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