From feaf42641a9b875e046f583458594994b703b6f695c15d302770614df6583840 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Thu, 26 Sep 2019 10:46:23 +0000 Subject: [PATCH 01/14] Accepting request 733371 from home:tobijk:X11:XOrg OBS-URL: https://build.opensuse.org/request/show/733371 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/libglvnd?expand=0&rev=27 --- libglvnd-1.1.1.tar.gz | 3 - libglvnd-1.2.0.tar.gz | 3 + libglvnd.changes | 11 ++++ libglvnd.spec | 21 ++++++- n_0001-GL-Bump-GL-version-to-9-2.patch | 33 +++++++++++ ...glplatform-fix-mesa-specific-defines.patch | 59 +++++++++++++++++++ 6 files changed, 125 insertions(+), 5 deletions(-) delete mode 100644 libglvnd-1.1.1.tar.gz create mode 100644 libglvnd-1.2.0.tar.gz create mode 100644 n_0001-GL-Bump-GL-version-to-9-2.patch create mode 100644 n_0001-eglplatform-fix-mesa-specific-defines.patch diff --git a/libglvnd-1.1.1.tar.gz b/libglvnd-1.1.1.tar.gz deleted file mode 100644 index baeed56..0000000 --- a/libglvnd-1.1.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:baca5e1a78b96a112650cdc597be3f856d4754eb73a7bf3f6629e78a7e9f2b5a -size 828342 diff --git a/libglvnd-1.2.0.tar.gz b/libglvnd-1.2.0.tar.gz new file mode 100644 index 0000000..0d15da9 --- /dev/null +++ b/libglvnd-1.2.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:37981bd3320261f14140b8aef6e2e6c08c7e75b6a98dcea034670017f3f1312a +size 1000578 diff --git a/libglvnd.changes b/libglvnd.changes index bafe127..9fc84eb 100644 --- a/libglvnd.changes +++ b/libglvnd.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Thu Sep 26 07:01:41 UTC 2019 - Tobias Klausmann + +- 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. + ------------------------------------------------------------------- Tue Mar 19 15:30:52 UTC 2019 - Stefan Dirsch diff --git a/libglvnd.spec b/libglvnd.spec index c50776e..8a73abe 100644 --- a/libglvnd.spec +++ b/libglvnd.spec @@ -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 @@ -41,6 +41,8 @@ BuildRequires: pkgconfig(xext) BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: libglvnd0 = %version-%release Obsoletes: libglvnd0 <= %version-%release +Patch1: n_0001-GL-Bump-GL-version-to-9-2.patch +Patch2: n_0001-eglplatform-fix-mesa-specific-defines.patch %description Vendor-neutral dispatch layer for arbitrating OpenGL API calls between @@ -61,6 +63,8 @@ development. %prep %setup -q +%patch1 -p1 +%patch2 -p1 # fix env shebang to call py3 directly sed -i -e "1s|#!.*|#!/usr/bin/python3|" src/generate/*.py @@ -117,4 +121,17 @@ fi %_libdir/pkgconfig/*.pc %_includedir/glvnd/ +%dir %{_includedir}/EGL +%{_includedir}/EGL/*.h +%dir %{_includedir}/GL +%{_includedir}/GL/*.h +%dir %{_includedir}/GLES +%{_includedir}/GLES/*.h +%dir %{_includedir}/GLES2 +%{_includedir}/GLES2/*.h +%dir %{_includedir}/GLES3 +%{_includedir}/GLES3/*.h +%dir %{_includedir}/KHR +%{_includedir}/KHR/*.h + %changelog diff --git a/n_0001-GL-Bump-GL-version-to-9-2.patch b/n_0001-GL-Bump-GL-version-to-9-2.patch new file mode 100644 index 0000000..0febcb3 --- /dev/null +++ b/n_0001-GL-Bump-GL-version-to-9-2.patch @@ -0,0 +1,33 @@ +From d498a96f97c7d41f773b326f643a6ae1d46a090d Mon Sep 17 00:00:00 2001 +From: Tobias Klausmann +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 +--- + 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 + diff --git a/n_0001-eglplatform-fix-mesa-specific-defines.patch b/n_0001-eglplatform-fix-mesa-specific-defines.patch new file mode 100644 index 0000000..c72857a --- /dev/null +++ b/n_0001-eglplatform-fix-mesa-specific-defines.patch @@ -0,0 +1,59 @@ +From ee52ba51114ad353a1427ad5487ad989c09e6bd0 Mon Sep 17 00:00:00 2001 +From: Tobias Klausmann +Date: Sun, 22 Sep 2019 13:28:26 +0200 +Subject: [PATCH] eglplatform: fix mesa specific defines + +The XServer fails to build with +In file included from /usr/include/EGL/eglplatform.h:122, + from /usr/include/epoxy/egl_generated.h:11, + from /usr/include/epoxy/egl.h:46, + from glamor_priv.h:43, + from glamor_copy.c:23: +/usr/include/X11/Xlib.h:222:2: error: conflicting types for 'GC' + 222 | *GC; + | ^~ +In file included from glamor.h:34, + from glamor_priv.h:32, + from glamor_copy.c:23: +../include/gcstruct.h:282:3: note: previous declaration of 'GC' was here + 282 | } GC; + +Add the mesa specific defines to eglplatform, to let it build again. + +Signed-off-by: Tobias Klausmann + +--- + include/EGL/eglplatform.h | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/include/EGL/eglplatform.h b/include/EGL/eglplatform.h +index 29ab288..dd38452 100644 +--- a/include/EGL/eglplatform.h ++++ b/include/EGL/eglplatform.h +@@ -118,6 +118,14 @@ typedef intptr_t EGLNativeWindowType; + + #elif defined(__unix__) || defined(USE_X11) + ++#if defined(MESA_EGL_NO_X11_HEADERS) ++ ++typedef void *EGLNativeDisplayType; ++typedef khronos_uintptr_t EGLNativePixmapType; ++typedef khronos_uintptr_t EGLNativeWindowType; ++ ++#else ++ + /* X11 (tentative) */ + #include + #include +@@ -126,6 +134,8 @@ typedef Display *EGLNativeDisplayType; + typedef Pixmap EGLNativePixmapType; + typedef Window EGLNativeWindowType; + ++#endif /* MESA_EGL_NO_X11_HEADERS */ ++ + #elif defined(__APPLE__) + + typedef int EGLNativeDisplayType; +-- +2.23.0 + From 466580af23dcd66ad7d940e0b68327bc5b14a1272f470c7962aa48fb9c6181e8 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Thu, 26 Sep 2019 12:30:39 +0000 Subject: [PATCH 02/14] - 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/package/show/X11:XOrg/libglvnd?expand=0&rev=28 --- libglvnd.changes | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/libglvnd.changes b/libglvnd.changes index 9fc84eb..9e3848c 100644 --- a/libglvnd.changes +++ b/libglvnd.changes @@ -4,10 +4,16 @@ Thu Sep 26 07:01:41 UTC 2019 - Tobias Klausmann - Update to version 1.2.0: * Changes: + Libglvnd now includes and installs the header files for OpenGL, GLES, EGL, - and GLX. + and GLX. + Added pkg-config files for each library. + The X11 libraries are now an optional dependency if you're not building - GLX. + 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 From 3c8618b27c6da0c64157d28ab0e2b09193ede6dbcdfd0207cd1418ce39252ac7 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Thu, 26 Sep 2019 15:28:04 +0000 Subject: [PATCH 03/14] - let libglvnd-devel provide/obsolete some of previous Mesa devel packages: * Mesa-libGL-devel * Mesa-libEGL-devel * Mesa-libGLESv1_CM-devel * Mesa-libGLESv2-devel OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/libglvnd?expand=0&rev=29 --- libglvnd.changes | 10 ++++++++++ libglvnd.spec | 9 ++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/libglvnd.changes b/libglvnd.changes index 9e3848c..b0dfd32 100644 --- a/libglvnd.changes +++ b/libglvnd.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Sep 26 15:24:58 UTC 2019 - Stefan Dirsch + +- let libglvnd-devel provide/obsolete some of previous Mesa devel + packages: + * Mesa-libGL-devel + * Mesa-libEGL-devel + * Mesa-libGLESv1_CM-devel + * Mesa-libGLESv2-devel + ------------------------------------------------------------------- Thu Sep 26 07:01:41 UTC 2019 - Tobias Klausmann diff --git a/libglvnd.spec b/libglvnd.spec index 8a73abe..b08b05e 100644 --- a/libglvnd.spec +++ b/libglvnd.spec @@ -53,7 +53,14 @@ OpenGL ABI proposal. Summary: Development files for libglvnd Group: Development/Libraries/C and C++ Requires: %name = %version -Recommends: Mesa-libGL-devel >= 12.0.0 +Provides: Mesa-libEGL-devel = 19.1.7 +Provides: Mesa-libGL-devel = 19.1.7 +Provides: Mesa-libGLESv1_CM-devel = 19.1.7 +Provides: Mesa-libGLESv2-devel = 19.1.7 +Obsoletes: Mesa-libEGL-devel < 19.1.7 +Obsoletes: Mesa-libGL-devel < 19.1.7 +Obsoletes: Mesa-libGLESv1_CM-devel < 19.1.7 +Obsoletes: Mesa-libGLESv2-devel < 19.1.7 %description devel Vendor-neutral dispatch layer for arbitrating OpenGL API calls between From 1c430aed97abc5a795c94cae1b4179fe3153116023393ec41c200788dcb334fe Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Thu, 26 Sep 2019 20:15:48 +0000 Subject: [PATCH 04/14] * Mesa-KHR-devel OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/libglvnd?expand=0&rev=30 --- libglvnd.changes | 1 + libglvnd.spec | 2 ++ 2 files changed, 3 insertions(+) diff --git a/libglvnd.changes b/libglvnd.changes index b0dfd32..35deead 100644 --- a/libglvnd.changes +++ b/libglvnd.changes @@ -7,6 +7,7 @@ Thu Sep 26 15:24:58 UTC 2019 - Stefan Dirsch * Mesa-libEGL-devel * Mesa-libGLESv1_CM-devel * Mesa-libGLESv2-devel + * Mesa-KHR-devel ------------------------------------------------------------------- Thu Sep 26 07:01:41 UTC 2019 - Tobias Klausmann diff --git a/libglvnd.spec b/libglvnd.spec index b08b05e..084e384 100644 --- a/libglvnd.spec +++ b/libglvnd.spec @@ -53,10 +53,12 @@ OpenGL ABI proposal. Summary: Development files for libglvnd Group: Development/Libraries/C and C++ Requires: %name = %version +Provides: Mesa-KHR-devel = 19.1.7 Provides: Mesa-libEGL-devel = 19.1.7 Provides: Mesa-libGL-devel = 19.1.7 Provides: Mesa-libGLESv1_CM-devel = 19.1.7 Provides: Mesa-libGLESv2-devel = 19.1.7 +Obsoletes: Mesa-KHR-devel < 19.1.7 Obsoletes: Mesa-libEGL-devel < 19.1.7 Obsoletes: Mesa-libGL-devel < 19.1.7 Obsoletes: Mesa-libGLESv1_CM-devel < 19.1.7 From d4628d2b3478100bce15d91c0a28ee0aaf30f81637ed894b379ca8e97b8eea36 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Fri, 27 Sep 2019 11:35:12 +0000 Subject: [PATCH 05/14] - u_add-gl3ext.h * adds missing include/GLES/gl3ext.h OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/libglvnd?expand=0&rev=31 --- libglvnd.changes | 6 ++++++ libglvnd.spec | 2 ++ u_add-gl3ext.h | 39 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 47 insertions(+) create mode 100644 u_add-gl3ext.h diff --git a/libglvnd.changes b/libglvnd.changes index 35deead..e380bad 100644 --- a/libglvnd.changes +++ b/libglvnd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Sep 27 11:24:45 UTC 2019 - Stefan Dirsch + +- u_add-gl3ext.h + * adds missing include/GLES/gl3ext.h + ------------------------------------------------------------------- Thu Sep 26 15:24:58 UTC 2019 - Stefan Dirsch diff --git a/libglvnd.spec b/libglvnd.spec index 084e384..24f25f7 100644 --- a/libglvnd.spec +++ b/libglvnd.spec @@ -43,6 +43,7 @@ Provides: libglvnd0 = %version-%release Obsoletes: libglvnd0 <= %version-%release Patch1: n_0001-GL-Bump-GL-version-to-9-2.patch Patch2: n_0001-eglplatform-fix-mesa-specific-defines.patch +Patch3: u_add-gl3ext.h %description Vendor-neutral dispatch layer for arbitrating OpenGL API calls between @@ -74,6 +75,7 @@ development. %setup -q %patch1 -p1 %patch2 -p1 +%patch3 -p1 # fix env shebang to call py3 directly sed -i -e "1s|#!.*|#!/usr/bin/python3|" src/generate/*.py diff --git a/u_add-gl3ext.h b/u_add-gl3ext.h new file mode 100644 index 0000000..6443d96 --- /dev/null +++ b/u_add-gl3ext.h @@ -0,0 +1,39 @@ +diff -r -u -p --new-file libglvnd-1.2.0.orig/include/GLES3/gl3ext.h libglvnd-1.2.0/include/GLES3/gl3ext.h +--- libglvnd-1.2.0.orig/include/GLES3/gl3ext.h 1970-01-01 01:00:00.000000000 +0100 ++++ libglvnd-1.2.0/include/GLES3/gl3ext.h 2019-09-27 13:21:14.705844000 +0200 +@@ -0,0 +1,24 @@ ++#ifndef __gl3ext_h_ ++#define __gl3ext_h_ ++ ++/* $Revision: 17809 $ on $Date:: 2012-05-14 08:03:36 -0700 #$ */ ++ ++/* ++ * This document is licensed under the SGI Free Software B License Version ++ * 2.0. For details, see http://oss.sgi.com/projects/FreeB/ . ++ */ ++ ++/* OpenGL ES 3 Extensions ++ * ++ * After an OES extension's interactions with OpenGl ES 3.0 have been documented, ++ * its tokens and function definitions should be added to this file in a manner ++ * that does not conflict with gl2ext.h or gl3.h. ++ * ++ * Tokens and function definitions for extensions that have become standard ++ * features in OpenGL ES 3.0 will not be added to this file. ++ * ++ * Applications using OpenGL-ES-2-only extensions should include gl2ext.h ++ */ ++ ++#endif /* __gl3ext_h_ */ ++ +diff -r -u -p --new-file libglvnd-1.2.0.orig/include/Makefile.am libglvnd-1.2.0/include/Makefile.am +--- libglvnd-1.2.0.orig/include/Makefile.am 2019-09-27 13:31:59.442286000 +0200 ++++ libglvnd-1.2.0/include/Makefile.am 2019-09-27 13:32:55.495331000 +0200 +@@ -28,6 +28,7 @@ GLES_HEADER_FILES = \ + GLES3/gl31.h \ + GLES3/gl32.h \ + GLES3/gl3.h \ ++ GLES3/gl3ext.h \ + GLES3/gl3platform.h + + GLX_HEADER_FILES = \ From b346f6e5a696cc9daa13cf37eab8338cbd64772443374ccefa91f8a8b4318668 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Sat, 28 Sep 2019 13:49:24 +0000 Subject: [PATCH 06/14] - cleanup in .changes file OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/libglvnd?expand=0&rev=32 --- libglvnd.changes | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/libglvnd.changes b/libglvnd.changes index e380bad..014a151 100644 --- a/libglvnd.changes +++ b/libglvnd.changes @@ -1,12 +1,6 @@ ------------------------------------------------------------------- Fri Sep 27 11:24:45 UTC 2019 - Stefan Dirsch -- u_add-gl3ext.h - * adds missing include/GLES/gl3ext.h - -------------------------------------------------------------------- -Thu Sep 26 15:24:58 UTC 2019 - Stefan Dirsch - - let libglvnd-devel provide/obsolete some of previous Mesa devel packages: * Mesa-libGL-devel @@ -14,6 +8,8 @@ Thu Sep 26 15:24:58 UTC 2019 - Stefan Dirsch * 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 From 1e6c98c1ac6f803d2461249cc1980a781b2a46b8a695708b751ba5c748039b13 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Thu, 3 Oct 2019 16:40:01 +0000 Subject: [PATCH 07/14] -devel package should obsolete <= 19.1.7 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/libglvnd?expand=0&rev=33 --- libglvnd.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libglvnd.spec b/libglvnd.spec index 24f25f7..eb8e842 100644 --- a/libglvnd.spec +++ b/libglvnd.spec @@ -59,11 +59,11 @@ Provides: Mesa-libEGL-devel = 19.1.7 Provides: Mesa-libGL-devel = 19.1.7 Provides: Mesa-libGLESv1_CM-devel = 19.1.7 Provides: Mesa-libGLESv2-devel = 19.1.7 -Obsoletes: Mesa-KHR-devel < 19.1.7 -Obsoletes: Mesa-libEGL-devel < 19.1.7 -Obsoletes: Mesa-libGL-devel < 19.1.7 -Obsoletes: Mesa-libGLESv1_CM-devel < 19.1.7 -Obsoletes: Mesa-libGLESv2-devel < 19.1.7 +Obsoletes: Mesa-KHR-devel <= 19.1.7 +Obsoletes: Mesa-libEGL-devel <= 19.1.7 +Obsoletes: Mesa-libGL-devel <= 19.1.7 +Obsoletes: Mesa-libGLESv1_CM-devel <= 19.1.7 +Obsoletes: Mesa-libGLESv2-devel <= 19.1.7 %description devel Vendor-neutral dispatch layer for arbitrating OpenGL API calls between From 106d5ff58797434a08eca34f5f38d4d816ca546d1cc74af00192a13c6289e7d8 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Sun, 6 Oct 2019 10:52:42 +0000 Subject: [PATCH 08/14] - let libglvnd-devel also provide/obsolete Mesa-libGLESv3-devel OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/libglvnd?expand=0&rev=34 --- libglvnd.changes | 5 +++++ libglvnd.spec | 2 ++ 2 files changed, 7 insertions(+) diff --git a/libglvnd.changes b/libglvnd.changes index 014a151..7f8021c 100644 --- a/libglvnd.changes +++ b/libglvnd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Oct 6 10:51:27 UTC 2019 - Stefan Dirsch + +- let libglvnd-devel also provide/obsolete Mesa-libGLESv3-devel + ------------------------------------------------------------------- Fri Sep 27 11:24:45 UTC 2019 - Stefan Dirsch diff --git a/libglvnd.spec b/libglvnd.spec index eb8e842..a338260 100644 --- a/libglvnd.spec +++ b/libglvnd.spec @@ -59,11 +59,13 @@ Provides: Mesa-libEGL-devel = 19.1.7 Provides: Mesa-libGL-devel = 19.1.7 Provides: Mesa-libGLESv1_CM-devel = 19.1.7 Provides: Mesa-libGLESv2-devel = 19.1.7 +Provides: Mesa-libGLESv3-devel = 19.1.7 Obsoletes: Mesa-KHR-devel <= 19.1.7 Obsoletes: Mesa-libEGL-devel <= 19.1.7 Obsoletes: Mesa-libGL-devel <= 19.1.7 Obsoletes: Mesa-libGLESv1_CM-devel <= 19.1.7 Obsoletes: Mesa-libGLESv2-devel <= 19.1.7 +Obsoletes: Mesa-libGLESv3-devel <= 19.1.7 %description devel Vendor-neutral dispatch layer for arbitrating OpenGL API calls between From dc51a184c8b8e54f543da3099ffc2c44630bc6a17a388a9340652e4525f0b0dc Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Mon, 7 Oct 2019 16:20:09 +0000 Subject: [PATCH 09/14] - reverting inclusion of GL, EGL, GLES, GLES2, GLES3 header and pkgconfig files; no longer let libglvnd-devel package provide and obsolete corresponding Mesa gl, egl, gles* devel subpackages; files just aren't compatible ... - supersedes patches: * n_0001-GL-Bump-GL-version-to-9-2.patch * n_0001-eglplatform-fix-mesa-specific-defines.patch * u_add-gl3ext.h OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/libglvnd?expand=0&rev=35 --- libglvnd.changes | 12 ++++ libglvnd.spec | 37 ++---------- n_0001-GL-Bump-GL-version-to-9-2.patch | 33 ----------- ...glplatform-fix-mesa-specific-defines.patch | 59 ------------------- u_add-gl3ext.h | 39 ------------ 5 files changed, 17 insertions(+), 163 deletions(-) delete mode 100644 n_0001-GL-Bump-GL-version-to-9-2.patch delete mode 100644 n_0001-eglplatform-fix-mesa-specific-defines.patch delete mode 100644 u_add-gl3ext.h diff --git a/libglvnd.changes b/libglvnd.changes index 7f8021c..1447d2d 100644 --- a/libglvnd.changes +++ b/libglvnd.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Mon Oct 7 16:12:05 UTC 2019 - Stefan Dirsch + +- reverting inclusion of GL, EGL, GLES, GLES2, GLES3 header and + pkgconfig files; no longer let libglvnd-devel package provide and + obsolete corresponding Mesa gl, egl, gles* devel subpackages; files + just aren't compatible ... +- supersedes patches: + * n_0001-GL-Bump-GL-version-to-9-2.patch + * n_0001-eglplatform-fix-mesa-specific-defines.patch + * u_add-gl3ext.h + ------------------------------------------------------------------- Sun Oct 6 10:51:27 UTC 2019 - Stefan Dirsch diff --git a/libglvnd.spec b/libglvnd.spec index a338260..bc33ac3 100644 --- a/libglvnd.spec +++ b/libglvnd.spec @@ -41,9 +41,6 @@ BuildRequires: pkgconfig(xext) BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: libglvnd0 = %version-%release Obsoletes: libglvnd0 <= %version-%release -Patch1: n_0001-GL-Bump-GL-version-to-9-2.patch -Patch2: n_0001-eglplatform-fix-mesa-specific-defines.patch -Patch3: u_add-gl3ext.h %description Vendor-neutral dispatch layer for arbitrating OpenGL API calls between @@ -54,18 +51,6 @@ OpenGL ABI proposal. Summary: Development files for libglvnd Group: Development/Libraries/C and C++ Requires: %name = %version -Provides: Mesa-KHR-devel = 19.1.7 -Provides: Mesa-libEGL-devel = 19.1.7 -Provides: Mesa-libGL-devel = 19.1.7 -Provides: Mesa-libGLESv1_CM-devel = 19.1.7 -Provides: Mesa-libGLESv2-devel = 19.1.7 -Provides: Mesa-libGLESv3-devel = 19.1.7 -Obsoletes: Mesa-KHR-devel <= 19.1.7 -Obsoletes: Mesa-libEGL-devel <= 19.1.7 -Obsoletes: Mesa-libGL-devel <= 19.1.7 -Obsoletes: Mesa-libGLESv1_CM-devel <= 19.1.7 -Obsoletes: Mesa-libGLESv2-devel <= 19.1.7 -Obsoletes: Mesa-libGLESv3-devel <= 19.1.7 %description devel Vendor-neutral dispatch layer for arbitrating OpenGL API calls between @@ -75,9 +60,6 @@ development. %prep %setup -q -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 # fix env shebang to call py3 directly sed -i -e "1s|#!.*|#!/usr/bin/python3|" src/generate/*.py @@ -88,6 +70,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} @@ -107,6 +90,7 @@ EOF echo "%config %_sysconfdir/ld.so.conf.d/%name.conf" >%_builddir/%name-%version/filelist.rpm fi %endif +rm %buildroot/%_libdir/pkgconfig/{egl,gl,glesv1_cm,glesv2}.pc %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -131,20 +115,9 @@ fi %else %_libdir/lib*.so %endif -%_libdir/pkgconfig/*.pc +%_libdir/pkgconfig/libglvnd.pc +%_libdir/pkgconfig/glx.pc +%_libdir/pkgconfig/opengl.pc %_includedir/glvnd/ -%dir %{_includedir}/EGL -%{_includedir}/EGL/*.h -%dir %{_includedir}/GL -%{_includedir}/GL/*.h -%dir %{_includedir}/GLES -%{_includedir}/GLES/*.h -%dir %{_includedir}/GLES2 -%{_includedir}/GLES2/*.h -%dir %{_includedir}/GLES3 -%{_includedir}/GLES3/*.h -%dir %{_includedir}/KHR -%{_includedir}/KHR/*.h - %changelog diff --git a/n_0001-GL-Bump-GL-version-to-9-2.patch b/n_0001-GL-Bump-GL-version-to-9-2.patch deleted file mode 100644 index 0febcb3..0000000 --- a/n_0001-GL-Bump-GL-version-to-9-2.patch +++ /dev/null @@ -1,33 +0,0 @@ -From d498a96f97c7d41f773b326f643a6ae1d46a090d Mon Sep 17 00:00:00 2001 -From: Tobias Klausmann -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 ---- - 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 - diff --git a/n_0001-eglplatform-fix-mesa-specific-defines.patch b/n_0001-eglplatform-fix-mesa-specific-defines.patch deleted file mode 100644 index c72857a..0000000 --- a/n_0001-eglplatform-fix-mesa-specific-defines.patch +++ /dev/null @@ -1,59 +0,0 @@ -From ee52ba51114ad353a1427ad5487ad989c09e6bd0 Mon Sep 17 00:00:00 2001 -From: Tobias Klausmann -Date: Sun, 22 Sep 2019 13:28:26 +0200 -Subject: [PATCH] eglplatform: fix mesa specific defines - -The XServer fails to build with -In file included from /usr/include/EGL/eglplatform.h:122, - from /usr/include/epoxy/egl_generated.h:11, - from /usr/include/epoxy/egl.h:46, - from glamor_priv.h:43, - from glamor_copy.c:23: -/usr/include/X11/Xlib.h:222:2: error: conflicting types for 'GC' - 222 | *GC; - | ^~ -In file included from glamor.h:34, - from glamor_priv.h:32, - from glamor_copy.c:23: -../include/gcstruct.h:282:3: note: previous declaration of 'GC' was here - 282 | } GC; - -Add the mesa specific defines to eglplatform, to let it build again. - -Signed-off-by: Tobias Klausmann - ---- - include/EGL/eglplatform.h | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/include/EGL/eglplatform.h b/include/EGL/eglplatform.h -index 29ab288..dd38452 100644 ---- a/include/EGL/eglplatform.h -+++ b/include/EGL/eglplatform.h -@@ -118,6 +118,14 @@ typedef intptr_t EGLNativeWindowType; - - #elif defined(__unix__) || defined(USE_X11) - -+#if defined(MESA_EGL_NO_X11_HEADERS) -+ -+typedef void *EGLNativeDisplayType; -+typedef khronos_uintptr_t EGLNativePixmapType; -+typedef khronos_uintptr_t EGLNativeWindowType; -+ -+#else -+ - /* X11 (tentative) */ - #include - #include -@@ -126,6 +134,8 @@ typedef Display *EGLNativeDisplayType; - typedef Pixmap EGLNativePixmapType; - typedef Window EGLNativeWindowType; - -+#endif /* MESA_EGL_NO_X11_HEADERS */ -+ - #elif defined(__APPLE__) - - typedef int EGLNativeDisplayType; --- -2.23.0 - diff --git a/u_add-gl3ext.h b/u_add-gl3ext.h deleted file mode 100644 index 6443d96..0000000 --- a/u_add-gl3ext.h +++ /dev/null @@ -1,39 +0,0 @@ -diff -r -u -p --new-file libglvnd-1.2.0.orig/include/GLES3/gl3ext.h libglvnd-1.2.0/include/GLES3/gl3ext.h ---- libglvnd-1.2.0.orig/include/GLES3/gl3ext.h 1970-01-01 01:00:00.000000000 +0100 -+++ libglvnd-1.2.0/include/GLES3/gl3ext.h 2019-09-27 13:21:14.705844000 +0200 -@@ -0,0 +1,24 @@ -+#ifndef __gl3ext_h_ -+#define __gl3ext_h_ -+ -+/* $Revision: 17809 $ on $Date:: 2012-05-14 08:03:36 -0700 #$ */ -+ -+/* -+ * This document is licensed under the SGI Free Software B License Version -+ * 2.0. For details, see http://oss.sgi.com/projects/FreeB/ . -+ */ -+ -+/* OpenGL ES 3 Extensions -+ * -+ * After an OES extension's interactions with OpenGl ES 3.0 have been documented, -+ * its tokens and function definitions should be added to this file in a manner -+ * that does not conflict with gl2ext.h or gl3.h. -+ * -+ * Tokens and function definitions for extensions that have become standard -+ * features in OpenGL ES 3.0 will not be added to this file. -+ * -+ * Applications using OpenGL-ES-2-only extensions should include gl2ext.h -+ */ -+ -+#endif /* __gl3ext_h_ */ -+ -diff -r -u -p --new-file libglvnd-1.2.0.orig/include/Makefile.am libglvnd-1.2.0/include/Makefile.am ---- libglvnd-1.2.0.orig/include/Makefile.am 2019-09-27 13:31:59.442286000 +0200 -+++ libglvnd-1.2.0/include/Makefile.am 2019-09-27 13:32:55.495331000 +0200 -@@ -28,6 +28,7 @@ GLES_HEADER_FILES = \ - GLES3/gl31.h \ - GLES3/gl32.h \ - GLES3/gl3.h \ -+ GLES3/gl3ext.h \ - GLES3/gl3platform.h - - GLX_HEADER_FILES = \ From 7551e6ba3183bcbf0220afb6aaac9dee9f0c97adc76261563d900e3941256ed8 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Mon, 7 Oct 2019 16:40:47 +0000 Subject: [PATCH 10/14] egl, gl pkgconfig files; no longer let libglvnd-devel package provide and OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/libglvnd?expand=0&rev=36 --- libglvnd.changes | 2 +- libglvnd.spec | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libglvnd.changes b/libglvnd.changes index 1447d2d..568168e 100644 --- a/libglvnd.changes +++ b/libglvnd.changes @@ -2,7 +2,7 @@ Mon Oct 7 16:12:05 UTC 2019 - Stefan Dirsch - reverting inclusion of GL, EGL, GLES, GLES2, GLES3 header and - pkgconfig files; no longer let libglvnd-devel package provide and + egl, gl pkgconfig files; no longer let libglvnd-devel package provide and obsolete corresponding Mesa gl, egl, gles* devel subpackages; files just aren't compatible ... - supersedes patches: diff --git a/libglvnd.spec b/libglvnd.spec index bc33ac3..99493a5 100644 --- a/libglvnd.spec +++ b/libglvnd.spec @@ -90,7 +90,7 @@ EOF echo "%config %_sysconfdir/ld.so.conf.d/%name.conf" >%_builddir/%name-%version/filelist.rpm fi %endif -rm %buildroot/%_libdir/pkgconfig/{egl,gl,glesv1_cm,glesv2}.pc +rm %buildroot/%_libdir/pkgconfig/{egl,gl}.pc %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -118,6 +118,8 @@ rm %buildroot/%_libdir/pkgconfig/{egl,gl,glesv1_cm,glesv2}.pc %_libdir/pkgconfig/libglvnd.pc %_libdir/pkgconfig/glx.pc %_libdir/pkgconfig/opengl.pc +%_libdir/pkgconfig/glesv1_cm.pc +%_libdir/pkgconfig/glesv2.pc %_includedir/glvnd/ %changelog From e045d9779cea840cec69a076ba973109e6cec538c8272cfece3bdbc07c420cc5 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Mon, 7 Oct 2019 18:59:50 +0000 Subject: [PATCH 11/14] readded egl.pc and gl.pc files OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/libglvnd?expand=0&rev=37 --- libglvnd.changes | 6 +++--- libglvnd.spec | 7 +------ 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/libglvnd.changes b/libglvnd.changes index 568168e..7391387 100644 --- a/libglvnd.changes +++ b/libglvnd.changes @@ -1,9 +1,9 @@ ------------------------------------------------------------------- Mon Oct 7 16:12:05 UTC 2019 - Stefan Dirsch -- reverting inclusion of GL, EGL, GLES, GLES2, GLES3 header and - egl, gl pkgconfig files; no longer let libglvnd-devel package provide and - obsolete corresponding Mesa gl, egl, gles* devel subpackages; files +- 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 ... - supersedes patches: * n_0001-GL-Bump-GL-version-to-9-2.patch diff --git a/libglvnd.spec b/libglvnd.spec index 99493a5..fa6b31e 100644 --- a/libglvnd.spec +++ b/libglvnd.spec @@ -90,7 +90,6 @@ EOF echo "%config %_sysconfdir/ld.so.conf.d/%name.conf" >%_builddir/%name-%version/filelist.rpm fi %endif -rm %buildroot/%_libdir/pkgconfig/{egl,gl}.pc %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -115,11 +114,7 @@ rm %buildroot/%_libdir/pkgconfig/{egl,gl}.pc %else %_libdir/lib*.so %endif -%_libdir/pkgconfig/libglvnd.pc -%_libdir/pkgconfig/glx.pc -%_libdir/pkgconfig/opengl.pc -%_libdir/pkgconfig/glesv1_cm.pc -%_libdir/pkgconfig/glesv2.pc +%_libdir/pkgconfig/*.pc %_includedir/glvnd/ %changelog From 2947fc516cdc3ed888287a8f61c15e2c4a39be34ce708df55499adb844530bca Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Mon, 7 Oct 2019 19:28:54 +0000 Subject: [PATCH 12/14] require Mesa -devel subpackages OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/libglvnd?expand=0&rev=38 --- libglvnd.changes | 2 +- libglvnd.spec | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/libglvnd.changes b/libglvnd.changes index 7391387..2dfe210 100644 --- a/libglvnd.changes +++ b/libglvnd.changes @@ -4,7 +4,7 @@ Mon Oct 7 16:12:05 UTC 2019 - Stefan Dirsch - 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 ... + just aren't compatible; instead require them ... - supersedes patches: * n_0001-GL-Bump-GL-version-to-9-2.patch * n_0001-eglplatform-fix-mesa-specific-defines.patch diff --git a/libglvnd.spec b/libglvnd.spec index fa6b31e..c6eb832 100644 --- a/libglvnd.spec +++ b/libglvnd.spec @@ -51,6 +51,13 @@ OpenGL ABI proposal. Summary: Development files for libglvnd Group: Development/Libraries/C and C++ Requires: %name = %version +# we need headers from Mesa :-( +Requires: Mesa-KHR-devel +Requires: Mesa-libEGL-devel +Requires: Mesa-libGL-devel +Requires: Mesa-libGLESv1_CM-devel +Requires: Mesa-libGLESv2-devel +Requires: Mesa-libGLESv3-devel %description devel Vendor-neutral dispatch layer for arbitrating OpenGL API calls between From 4b6d974a7932bb20d3114f0935c1db60ba6bb865316b3046a2683909432e85f5 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Mon, 7 Oct 2019 20:05:14 +0000 Subject: [PATCH 13/14] reintroduce n_0001-GL-Bump-GL-version-to-9-2.patch OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/libglvnd?expand=0&rev=39 --- libglvnd.changes | 1 - libglvnd.spec | 2 ++ n_0001-GL-Bump-GL-version-to-9-2.patch | 33 ++++++++++++++++++++++++++ 3 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 n_0001-GL-Bump-GL-version-to-9-2.patch diff --git a/libglvnd.changes b/libglvnd.changes index 2dfe210..9cd6303 100644 --- a/libglvnd.changes +++ b/libglvnd.changes @@ -6,7 +6,6 @@ Mon Oct 7 16:12:05 UTC 2019 - Stefan Dirsch corresponding Mesa gl, egl, gles* devel subpackages; headers just aren't compatible; instead require them ... - supersedes patches: - * n_0001-GL-Bump-GL-version-to-9-2.patch * n_0001-eglplatform-fix-mesa-specific-defines.patch * u_add-gl3ext.h diff --git a/libglvnd.spec b/libglvnd.spec index c6eb832..179cf61 100644 --- a/libglvnd.spec +++ b/libglvnd.spec @@ -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 @@ -67,6 +68,7 @@ development. %prep %setup -q +%patch0 -p1 # fix env shebang to call py3 directly sed -i -e "1s|#!.*|#!/usr/bin/python3|" src/generate/*.py diff --git a/n_0001-GL-Bump-GL-version-to-9-2.patch b/n_0001-GL-Bump-GL-version-to-9-2.patch new file mode 100644 index 0000000..0febcb3 --- /dev/null +++ b/n_0001-GL-Bump-GL-version-to-9-2.patch @@ -0,0 +1,33 @@ +From d498a96f97c7d41f773b326f643a6ae1d46a090d Mon Sep 17 00:00:00 2001 +From: Tobias Klausmann +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 +--- + 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 + From 06a1d5b2d710b24719f178cba59920bc468d9b2b89b705162bba6d181cf13a7d Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Mon, 7 Oct 2019 21:49:11 +0000 Subject: [PATCH 14/14] - 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 ... OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/libglvnd?expand=0&rev=40 --- libglvnd.changes | 7 +++++++ libglvnd.spec | 11 ++++------- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/libglvnd.changes b/libglvnd.changes index 9cd6303..51d31a6 100644 --- a/libglvnd.changes +++ b/libglvnd.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Oct 7 21:32:25 UTC 2019 - Stefan Dirsch + +- 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 diff --git a/libglvnd.spec b/libglvnd.spec index 179cf61..2850d3a 100644 --- a/libglvnd.spec +++ b/libglvnd.spec @@ -52,13 +52,6 @@ OpenGL ABI proposal. Summary: Development files for libglvnd Group: Development/Libraries/C and C++ Requires: %name = %version -# we need headers from Mesa :-( -Requires: Mesa-KHR-devel -Requires: Mesa-libEGL-devel -Requires: Mesa-libGL-devel -Requires: Mesa-libGLESv1_CM-devel -Requires: Mesa-libGLESv2-devel -Requires: Mesa-libGLESv3-devel %description devel Vendor-neutral dispatch layer for arbitrating OpenGL API calls between @@ -99,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 @@ -106,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