- Update snapshot to 20170607

- Default to asm and tls when available
- Use the fixed tsd for armhfp and aarch64
  fixed in https://github.com/NVIDIA/libglvnd/issues/116
This commit is contained in:
Nicolas Chauvet 2017-06-13 14:54:09 +02:00
parent e389ff61d3
commit 72107e05eb
3 changed files with 14 additions and 41 deletions

View File

@ -1,27 +0,0 @@
From 55f564b77773e6bfcbe1fa6b1d613ea194b408ed Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Mon, 17 Oct 2016 16:58:56 -0400
Subject: [PATCH] OpenGL: Statically export a few more things
I'm... unsure if I like this.
Signed-off-by: Adam Jackson <ajax@redhat.com>
---
src/generate/genCommon.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/generate/genCommon.py b/src/generate/genCommon.py
index 5781275..bb4e491 100644
--- a/src/generate/genCommon.py
+++ b/src/generate/genCommon.py
@@ -41,6 +41,7 @@ _LIBRARY_FEATURE_NAMES = {
"GL_VERSION_2_0", "GL_VERSION_2_1", "GL_VERSION_3_0", "GL_VERSION_3_1",
"GL_VERSION_3_2", "GL_VERSION_3_3", "GL_VERSION_4_0", "GL_VERSION_4_1",
"GL_VERSION_4_2", "GL_VERSION_4_3", "GL_VERSION_4_4", "GL_VERSION_4_5",
+ "GL_ARB_imaging", "GL_ARB_multitexture",
)),
"glesv1" : frozenset(("GL_VERSION_ES_CM_1_0", "GL_OES_point_size_array")),
"glesv2" : frozenset(("GL_ES_VERSION_2_0", "GL_ES_VERSION_3_0",
--
2.9.3

View File

@ -1,5 +1,5 @@
%global commit0 8e6e1028208fda96deb6e1aa282ca17b405ccd26 %global commit0 80d9a87b5084073ee860927673b705285d6dc2e0
%global date 20170308 %global date 20170607
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
%if (0%{?fedora} && 0%{?fedora} <= 24) || (0%{?rhel} && 0%{?rhel} <= 7) %if (0%{?fedora} && 0%{?fedora} <= 24) || (0%{?rhel} && 0%{?rhel} <= 7)
@ -11,16 +11,14 @@
Name: libglvnd Name: libglvnd
Version: 0.2.999 Version: 0.2.999
Release: 17%{?commit0:.%{date}git%{shortcommit0}}%{?dist} Release: 18%{?commit0:.%{date}git%{shortcommit0}}%{?dist}
# Provide an upgrade path from the negativo17.org pkgs which have Epoch 1 # Provide an upgrade path from the negativo17.org pkgs which have Epoch 1
Epoch: 1 Epoch: 1
Summary: The GL Vendor-Neutral Dispatch library Summary: The GL Vendor-Neutral Dispatch library
License: MIT License: MIT
URL: https://github.com/NVIDIA/libglvnd URL: https://github.com/NVIDIA/libglvnd
Source0: https://github.com/NVIDIA/%{name}/archive/%{commit0}.tar.gz#/%{name}-%{shortcommit0}.tar.gz Source0: %{url}/archive/%{commit0}.tar.gz#/%{name}-%{shortcommit0}.tar.gz
# https://github.com/NVIDIA/libglvnd/pull/100
Patch1: 0001-OpenGL-Statically-export-a-few-more-things.patch
BuildRequires: libtool BuildRequires: libtool
BuildRequires: gcc BuildRequires: gcc
@ -140,7 +138,6 @@ libGL and libGLX are the common dispatch interface for the GLX API.
%prep %prep
%setup -n %{name}-%{?commit0}%{?!commit0:%{version}} %setup -n %{name}-%{?commit0}%{?!commit0:%{version}}
%patch1 -p1
%if 0%{?rhel} == 6 %if 0%{?rhel} == 6
autoreconf268 -vif autoreconf268 -vif
%else %else
@ -149,15 +146,12 @@ autoreconf -vif
%build %build
#Only enable asm on x86 arches for now #Prefer asm and tls for x86* and ppc64*
#https://github.com/NVIDIA/libglvnd/issues/116 #armhfp and aarch64 fallback to asm and tsd
#Others arches fallback to pure-c and tls.
%configure \ %configure \
--disable-static \ --disable-static \
%ifarch %{ix86} x86_64
--enable-asm \ --enable-asm \
%else
--disable-asm \
%endif
--enable-tls --enable-tls
%make_build V=1 %make_build V=1
@ -251,6 +245,12 @@ xvfb-run -a make check V=1 || cat `find . -name test-suite.log`
%changelog %changelog
* Tue Jun 13 2017 Nicolas Chauvet <kwizart@gmail.com> - 1:0.2.999-18.20170607git80d9a87
- Update snapshot to 20170607
- Default to asm and tls when available
- Use the fixed tsd for armhfp and aarch64
fixed in https://github.com/NVIDIA/libglvnd/issues/116
* Tue Apr 04 2017 Björn Esser <besser82@fedoraproject.org> - 1:0.2.999-17.20170308git8e6e102 * Tue Apr 04 2017 Björn Esser <besser82@fedoraproject.org> - 1:0.2.999-17.20170308git8e6e102
- Add conditional to disable testsuite, when needed - Add conditional to disable testsuite, when needed

View File

@ -1 +1 @@
SHA512 (libglvnd-8e6e102.tar.gz) = f5811ba2f82b688af4bd93516df46b5a84ba86607181420b30bf754f2ef4517a547cf7cccd4344a01f6520c5d6e30c2f3acd74c97f43bbabb88b6ed9a13d5c4b SHA512 (libglvnd-80d9a87.tar.gz) = 08c9fe30c0602728a0b40d0235d0daf31946460c745ed1d1d1ebc31329af45891d622bb9af2f0bcc71fbbccf7fb7f40fb6e0ba6b82a9927361ec0cbbd26f1031