pool/libglvnd
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 735975 from X11:XOrg

Browse Source 
- move gl, egl, glesv1_cm and glesv2 pkgconfig files to doc
  directory, so these can be picked up by Mesa build; no longer
  require Mesa devel subpackages ...

- reverting inclusion of GL, EGL, GLES, GLES2, GLES3 headers;
  no longer let libglvnd-devel package provide and obsolete 
  corresponding Mesa gl, egl, gles* devel subpackages; headers
  just aren't compatible; instead require them ...
- supersedes patches:
  * n_0001-eglplatform-fix-mesa-specific-defines.patch
  * u_add-gl3ext.h

- let libglvnd-devel also provide/obsolete Mesa-libGLESv3-devel

- let libglvnd-devel provide/obsolete some of previous Mesa devel
  packages:
  * Mesa-libGL-devel
  * Mesa-libEGL-devel
  * Mesa-libGLESv1_CM-devel
  * Mesa-libGLESv2-devel
  * Mesa-KHR-devel
- u_add-gl3ext.h
  * adds missing include/GLES/gl3ext.h 

- Update to version 1.2.0:
  * Changes:
    + Libglvnd now includes and installs the header files for OpenGL, GLES, EGL,
      and GLX.
    + Added pkg-config files for each library.
    + The X11 libraries are now an optional dependency if you're not building
      GLX.
- n_0001-GL-Bump-GL-version-to-9-2.patch  
  * with a version of 1.2 the XServer build fails; set the version accordingly to
    allow XServer builds again.
- n_0001-eglplatform-fix-mesa-specific-defines.patch
  * the XServer fails to build; add the mesa specific defines to eglplatform, to
    let it build again.

OBS-URL: https://build.opensuse.org/request/show/735975
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libglvnd?expand=0&rev=12
This commit is contained in:
Dominique Leuenberger 2019-10-24 21:00:07 +00:00 committed by Git OBS Bridge
commit 2eb2a366dd
5 changed files with 98 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libglvnd-1.1.1.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:baca5e1a78b96a112650cdc597be3f856d4754eb73a7bf3f6629e78a7e9f2b5a
size 828342

3
libglvnd-1.2.0.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:37981bd3320261f14140b8aef6e2e6c08c7e75b6a98dcea034670017f3f1312a
size 1000578

53
libglvnd.changes
View File

@ -1,3 +1,56 @@
-------------------------------------------------------------------
Mon Oct 7 21:32:25 UTC 2019 - Stefan Dirsch <sndirsch@suse.com>
- move gl, egl, glesv1_cm and glesv2 pkgconfig files to doc
directory, so these can be picked up by Mesa build; no longer
require Mesa devel subpackages ...
-------------------------------------------------------------------
Mon Oct 7 16:12:05 UTC 2019 - Stefan Dirsch <sndirsch@suse.com>
- reverting inclusion of GL, EGL, GLES, GLES2, GLES3 headers;
no longer let libglvnd-devel package provide and obsolete
corresponding Mesa gl, egl, gles* devel subpackages; headers
just aren't compatible; instead require them ...
- supersedes patches:
* n_0001-eglplatform-fix-mesa-specific-defines.patch
* u_add-gl3ext.h
-------------------------------------------------------------------
Sun Oct 6 10:51:27 UTC 2019 - Stefan Dirsch <sndirsch@suse.com>
- let libglvnd-devel also provide/obsolete Mesa-libGLESv3-devel
-------------------------------------------------------------------
Fri Sep 27 11:24:45 UTC 2019 - Stefan Dirsch <sndirsch@suse.com>
- let libglvnd-devel provide/obsolete some of previous Mesa devel
packages:
* Mesa-libGL-devel
* Mesa-libEGL-devel
* Mesa-libGLESv1_CM-devel
* Mesa-libGLESv2-devel
* Mesa-KHR-devel
- u_add-gl3ext.h
* adds missing include/GLES/gl3ext.h
-------------------------------------------------------------------
Thu Sep 26 07:01:41 UTC 2019 - Tobias Klausmann <tobias.klausmann@freenet.de>
- Update to version 1.2.0:
* Changes:
+ Libglvnd now includes and installs the header files for OpenGL, GLES, EGL,
and GLX.
+ Added pkg-config files for each library.
+ The X11 libraries are now an optional dependency if you're not building
GLX.
- n_0001-GL-Bump-GL-version-to-9-2.patch
* with a version of 1.2 the XServer build fails; set the version accordingly to
allow XServer builds again.
- n_0001-eglplatform-fix-mesa-specific-defines.patch
* the XServer fails to build; add the mesa specific defines to eglplatform, to
let it build again.
-------------------------------------------------------------------
Tue Mar 19 15:30:52 UTC 2019 - Stefan Dirsch <sndirsch@suse.com>

12
libglvnd.spec
View File

@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@ -20,7 +20,7 @@
#
Name: libglvnd
Version: 1.1.1
Version: 1.2.0
Release: 0
Summary: The GL Vendor-Neutral Dispatch library
License: MIT
@ -29,6 +29,7 @@ Url: https://github.com/NVIDIA/libglvnd
# Source is _service generated
Source: %name-%version.tar.gz
Source1: baselibs.conf
Patch0: n_0001-GL-Bump-GL-version-to-9-2.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libtool
@ -51,7 +52,6 @@ OpenGL ABI proposal.
Summary: Development files for libglvnd
Group: Development/Libraries/C and C++
Requires: %name = %version
Recommends: Mesa-libGL-devel >= 12.0.0
%description devel
Vendor-neutral dispatch layer for arbitrating OpenGL API calls between
@ -61,6 +61,7 @@ development.
%prep
%setup -q
%patch0 -p1
# fix env shebang to call py3 directly
sed -i -e "1s|#!.*|#!/usr/bin/python3|" src/generate/*.py
@ -71,6 +72,7 @@ sed -i -e "1s|#!.*|#!/usr/bin/python3|" src/generate/*.py
--libdir=/usr/X11R6/%_lib \
%endif
--disable-static \
--disable-headers \
--disable-silent-rules
make %{?_smp_mflags}
@ -90,6 +92,9 @@ EOF
echo "%config %_sysconfdir/ld.so.conf.d/%name.conf" >%_builddir/%name-%version/filelist.rpm
fi
%endif
mkdir -p %buildroot/usr/share/doc/packages/%name/pkgconfig
mv %buildroot/%_libdir/pkgconfig/{gl,egl,glesv1_cm,glesv2}.pc \
%buildroot/usr/share/doc/packages/%name/pkgconfig
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
@ -97,6 +102,7 @@ fi
%files -f filelist.rpm
%defattr(-,root,root)
%doc README.md
/usr/share/doc/packages/%name/pkgconfig
%if 0%{?suse_version} < 1330
%dir /usr/X11R6
%dir /usr/X11R6/%_lib

33
n_0001-GL-Bump-GL-version-to-9-2.patch Normal file
View File

@ -0,0 +1,33 @@
From d498a96f97c7d41f773b326f643a6ae1d46a090d Mon Sep 17 00:00:00 2001
From: Tobias Klausmann <tobias.johannes.klausmann@mni.thm.de>
Date: Fri, 20 Sep 2019 20:30:52 +0200
Subject: [PATCH] GL: Bump GL Version to 9.2
With a version of 1.2 the XServer build fails with:
configure: error: Package requirements (glproto >= 1.4.17 gl >= 9.2.0) were not met:
Package dependency requirement 'gl >= 9.2.0' could not be satisfied.
Package 'gl' has version '1.2', required version is '>= 9.2.0'
Set the version accordingly to allow XServer builds again.
Signed-off-by: Tobias Klausmann <tobias.klausmann@freenet.de>
---
src/GL/gl.pc.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/GL/gl.pc.in b/src/GL/gl.pc.in
index 0eaa149..d643756 100644
--- a/src/GL/gl.pc.in
+++ b/src/GL/gl.pc.in
@@ -5,6 +5,6 @@ includedir=@includedir@
Name: gl
Description: Legacy OpenGL and GLX library and headers
-Version: 1.2
+Version: 9.2.0
Libs: -L${libdir} -lGL
Cflags: -I${includedir}
--
2.23.0