[arch-commits] Commit in lib32-libglvnd/repos/multilib-x86_64 (5 files)
Laurent Carlier
lcarlier at archlinux.org
Sat Oct 19 08:24:28 UTC 2019
Date: Saturday, October 19, 2019 @ 08:24:28
Author: lcarlier
Revision: 517433
archrelease: copy trunk to multilib-x86_64
Added:
lib32-libglvnd/repos/multilib-x86_64/0001-Add-a-configure-option-to-disable-glesv1-or-glesv2.patch
(from rev 517432, lib32-libglvnd/trunk/0001-Add-a-configure-option-to-disable-glesv1-or-glesv2.patch)
lib32-libglvnd/repos/multilib-x86_64/LICENSE
(from rev 517432, lib32-libglvnd/trunk/LICENSE)
lib32-libglvnd/repos/multilib-x86_64/PKGBUILD
(from rev 517432, lib32-libglvnd/trunk/PKGBUILD)
Deleted:
lib32-libglvnd/repos/multilib-x86_64/LICENSE
lib32-libglvnd/repos/multilib-x86_64/PKGBUILD
---------------------------------------------------------------+
0001-Add-a-configure-option-to-disable-glesv1-or-glesv2.patch | 122 ++++++++++
LICENSE | 52 ++--
PKGBUILD | 94 ++++---
3 files changed, 198 insertions(+), 70 deletions(-)
Copied: lib32-libglvnd/repos/multilib-x86_64/0001-Add-a-configure-option-to-disable-glesv1-or-glesv2.patch (from rev 517432, lib32-libglvnd/trunk/0001-Add-a-configure-option-to-disable-glesv1-or-glesv2.patch)
===================================================================
--- 0001-Add-a-configure-option-to-disable-glesv1-or-glesv2.patch (rev 0)
+++ 0001-Add-a-configure-option-to-disable-glesv1-or-glesv2.patch 2019-10-19 08:24:28 UTC (rev 517433)
@@ -0,0 +1,122 @@
+From 3a1fb32c3b2ba0bc28952759c33dc98bb5260125 Mon Sep 17 00:00:00 2001
+From: Laurent Carlier <lordheavym at gmail.com>
+Date: Tue, 8 Oct 2019 16:34:16 +0000
+Subject: [PATCH] Add a configure option to disable glesv1 or glesv2
+
+Because mesa can be built without glesv1 so it breaks autodetection.
+
+Fixes: https://bugs.archlinux.org/task/64032 ('mesa-demos doesn't build, unable to find GLES/gl.h')
+---
+ configure.ac | 23 +++++++++++++++--------
+ include/Makefile.am | 24 ++++++++++++++++++------
+ src/Makefile.am | 4 +++-
+ 3 files changed, 36 insertions(+), 15 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index faa0379..eb68d3b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -70,13 +70,19 @@ if test "x$enable_x11" != "xyes" -a "x$enable_glx" = "xyes" ; then
+ AC_MSG_ERROR([Can't build GLX without X11.])
+ fi
+
+-AC_ARG_ENABLE([gles],
+- [AS_HELP_STRING([--disable-gles],
+- [Do not build the libGLES*.so libraries @<:@default=enabled@:>@])],
+- [enable_gles="$enableval"],
+- [enable_gles=yes]
+-)
+-AM_CONDITIONAL([ENABLE_GLES], [test "x$enable_gles" = "xyes"])
++AC_ARG_ENABLE([gles1],
++ [AS_HELP_STRING([--disable-gles1],
++ [disable support for OpenGL ES 1.x API @<:@default=enabled@:>@])],
++ [enable_gles1="$enableval"],
++ [enable_gles1=yes])
++AM_CONDITIONAL([ENABLE_GLES1], [test "x$enable_gles1" = "xyes"])
++
++AC_ARG_ENABLE([gles2],
++ [AS_HELP_STRING([--disable-gles2],
++ [disable support for OpenGL ES 2.x and 3.x API @<:@default=enabled@:>@])],
++ [enable_gles2="$enableval"],
++ [enable_gles2=yes])
++AM_CONDITIONAL([ENABLE_GLES2], [test "x$enable_gles2" = "xyes"])
+
+ AC_ARG_ENABLE([headers],
+ [AS_HELP_STRING([--disable-headers],
+@@ -87,7 +93,8 @@ AC_ARG_ENABLE([headers],
+ AM_CONDITIONAL([ENABLE_GL_HEADERS], [test "x$enable_headers" = "xyes"])
+ AM_CONDITIONAL([ENABLE_EGL_HEADERS], [test "x$enable_headers" = "xyes" -a "x$enable_egl" = "xyes"])
+ AM_CONDITIONAL([ENABLE_GLX_HEADERS], [test "x$enable_headers" = "xyes" -a "x$enable_glx" = "xyes"])
+-AM_CONDITIONAL([ENABLE_GLES_HEADERS], [test "x$enable_headers" = "xyes" -a "x$enable_gles" = "xyes"])
++AM_CONDITIONAL([ENABLE_GLES1_HEADERS], [test "x$enable_headers" = "xyes" -a "x$enable_gles1" = "xyes"])
++AM_CONDITIONAL([ENABLE_GLES2_HEADERS], [test "x$enable_headers" = "xyes" -a "x$enable_gles2" = "xyes"])
+
+ dnl
+ dnl Arch/platform-specific settings. Copied from mesa
+diff --git a/include/Makefile.am b/include/Makefile.am
+index 3d81d17..0c41dc7 100644
+--- a/include/Makefile.am
++++ b/include/Makefile.am
+@@ -17,14 +17,18 @@ GL_HEADER_FILES = \
+ GL/glext.h \
+ KHR/khrplatform.h
+
+-GLES_HEADER_FILES = \
++GLES1_HEADER_FILES = \
+ GLES/egl.h \
+ GLES/gl.h \
+ GLES/glext.h \
+- GLES/glplatform.h \
++ GLES/glplatform.h
++
++GLES2_HEADER_FILES = \
+ GLES2/gl2ext.h \
+ GLES2/gl2.h \
+- GLES2/gl2platform.h \
++ GLES2/gl2platform.h
++
++GLES3_HEADER_FILES = \
+ GLES3/gl31.h \
+ GLES3/gl32.h \
+ GLES3/gl3.h \
+@@ -45,10 +49,18 @@ else
+ noinst_HEADERS += $(GL_HEADER_FILES)
+ endif
+
+-if ENABLE_GLES_HEADERS
+-nobase_include_HEADERS += $(GLES_HEADER_FILES)
++if ENABLE_GLES1_HEADERS
++nobase_include_HEADERS += $(GLES1_HEADER_FILES)
++else
++noinst_HEADERS += $(GLES1_HEADER_FILES)
++endif
++
++if ENABLE_GLES2_HEADERS
++nobase_include_HEADERS += $(GLES2_HEADER_FILES)
++nobase_include_HEADERS += $(GLES3_HEADER_FILES)
+ else
+-noinst_HEADERS += $(GLES_HEADER_FILES)
++noinst_HEADERS += $(GLES2_HEADER_FILES)
++noinst_HEADERS += $(GLES3_HEADER_FILES)
+ endif
+
+ if ENABLE_GLX_HEADERS
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 5f7ce79..821346f 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -12,8 +12,10 @@ SUBDIRS += GLX
+ SUBDIRS += GL
+ endif
+
+-if ENABLE_GLES
++if ENABLE_GLES1
+ SUBDIRS += GLESv1
++endif
++if ENABLE_GLES2
+ SUBDIRS += GLESv2
+ endif
+
+--
+2.23.0
+
Deleted: LICENSE
===================================================================
--- LICENSE 2019-10-19 08:24:22 UTC (rev 517432)
+++ LICENSE 2019-10-19 08:24:28 UTC (rev 517433)
@@ -1,26 +0,0 @@
-Copyright (c) 2013, NVIDIA CORPORATION.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and/or associated documentation files (the
-"Materials"), to deal in the Materials without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Materials, and to
-permit persons to whom the Materials are furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be included
-unaltered in all copies or substantial portions of the Materials.
-Any additions, deletions, or changes to the original source files
-must be clearly indicated in accompanying documentation.
-
-If only executable code is distributed, then the accompanying
-documentation must state that "this software is based in part on the
-work of the Khronos Group."
-
-THE MATERIALS ARE 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 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
-MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
\ No newline at end of file
Copied: lib32-libglvnd/repos/multilib-x86_64/LICENSE (from rev 517432, lib32-libglvnd/trunk/LICENSE)
===================================================================
--- LICENSE (rev 0)
+++ LICENSE 2019-10-19 08:24:28 UTC (rev 517433)
@@ -0,0 +1,26 @@
+Copyright (c) 2013, NVIDIA CORPORATION.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and/or associated documentation files (the
+"Materials"), to deal in the Materials without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Materials, and to
+permit persons to whom the Materials are furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be included
+unaltered in all copies or substantial portions of the Materials.
+Any additions, deletions, or changes to the original source files
+must be clearly indicated in accompanying documentation.
+
+If only executable code is distributed, then the accompanying
+documentation must state that "this software is based in part on the
+work of the Khronos Group."
+
+THE MATERIALS ARE 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 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
+MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
\ No newline at end of file
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2019-10-19 08:24:22 UTC (rev 517432)
+++ PKGBUILD 2019-10-19 08:24:28 UTC (rev 517433)
@@ -1,44 +0,0 @@
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-
-pkgname=lib32-libglvnd
-pkgver=1.2.0
-pkgrel=2
-pkgdesc="The GL Vendor-Neutral Dispatch library"
-arch=('x86_64')
-url="https://github.com/NVIDIA/libglvnd"
-license=('custom:BSD-like')
-makedepends=('lib32-libx11' 'lib32-libxext' 'glproto' 'python')
-provides=('lib32-libgl' 'lib32-libegl' 'lib32-libgles')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/NVIDIA/libglvnd/archive/v$pkgver.tar.gz")
-sha512sums=('0e0e9c3f303739c73f5bee4c2aaef9eff56440345f2f1ce285ee98eb94c1e5e740774dd501aeeed1299aa25a449d813a850e95282999a3ca4648d2381d6c8fa6')
-
-build() {
- export CC='gcc -m32'
- export CXX='g++ -m32'
- export PKG_CONFIG_PATH='/usr/lib32/pkgconfig'
-
- cd libglvnd-$pkgver
- ./autogen.sh
- ./configure --prefix=/usr \
- --libdir=/usr/lib32/ \
- --build=i686-unknown-linux-gnu \
- --disable-headers
- make
-}
-
-package() {
- # lib32-libglvnd needs lib32-mesa for indirect rendering
- depends=('lib32-libxext' 'libglvnd' 'lib32-mesa' 'lib32-opengl-driver')
-
- cd libglvnd-$pkgver
- make DESTDIR="$pkgdir" install
-
- rm -r "$pkgdir"/usr/include
-
- mkdir -p "$pkgdir"/usr/share/licenses
- ln -s libglvnd "$pkgdir"/usr/share/licenses/$pkgname
-
- # FS#64044
- rm "$pkgdir"/usr/lib32/pkgconfig/glesv1*
- rm "$pkgdir"/usr/lib32/libGLESv1*
-}
Copied: lib32-libglvnd/repos/multilib-x86_64/PKGBUILD (from rev 517432, lib32-libglvnd/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2019-10-19 08:24:28 UTC (rev 517433)
@@ -0,0 +1,50 @@
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+
+pkgname=lib32-libglvnd
+pkgver=1.2.0
+pkgrel=3
+pkgdesc="The GL Vendor-Neutral Dispatch library"
+arch=('x86_64')
+url="https://github.com/NVIDIA/libglvnd"
+license=('custom:BSD-like')
+makedepends=('lib32-libx11' 'lib32-libxext' 'glproto' 'python')
+provides=('lib32-libgl' 'lib32-libegl' 'lib32-libgles')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/NVIDIA/libglvnd/archive/v$pkgver.tar.gz"
+ 0001-Add-a-configure-option-to-disable-glesv1-or-glesv2.patch)
+sha512sums=('0e0e9c3f303739c73f5bee4c2aaef9eff56440345f2f1ce285ee98eb94c1e5e740774dd501aeeed1299aa25a449d813a850e95282999a3ca4648d2381d6c8fa6'
+ 'b2d2e8fd7ea92bfc913d0b808d15c801e7c3ceb484bdd60700fd1c9ce27b4fbd4b68e568e967599f2e5132cc1ed382ec87a07c16bd3bfa5c4d920f2d9600e689')
+
+prepare() {
+ cd libglvnd-$pkgver
+
+ # merged upstream
+ patch -Np1 -i ../0001-Add-a-configure-option-to-disable-glesv1-or-glesv2.patch
+
+ ./autogen.sh
+}
+
+build() {
+ export CC='gcc -m32'
+ export CXX='g++ -m32'
+ export PKG_CONFIG_PATH='/usr/lib32/pkgconfig'
+
+ cd libglvnd-$pkgver
+ ./configure --prefix=/usr \
+ --libdir=/usr/lib32/ \
+ --build=i686-unknown-linux-gnu \
+ --disable-gles1
+ make
+}
+
+package() {
+ # lib32-libglvnd needs lib32-mesa for indirect rendering
+ depends=('lib32-libxext' 'libglvnd' 'lib32-mesa' 'lib32-opengl-driver')
+
+ cd libglvnd-$pkgver
+ make DESTDIR="$pkgdir" install
+
+ rm -r "$pkgdir"/usr/include
+
+ mkdir -p "$pkgdir"/usr/share/licenses
+ ln -s libglvnd "$pkgdir"/usr/share/licenses/$pkgname
+}
More information about the arch-commits
mailing list