From feaf42641a9b875e046f583458594994b703b6f695c15d302770614df6583840 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Thu, 26 Sep 2019 10:46:23 +0000 Subject: [PATCH] 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 +