forked from pool/libglvnd
- 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
This commit is contained in:
Git OBS Bridge
parent
106d5ff587
commit
dc51a184c8
@ -1,3 +1,15 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Oct 7 16:12:05 UTC 2019 - Stefan Dirsch <sndirsch@suse.com>
|
||||
|
||||
- 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 <sndirsch@suse.com>
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
@ -1,33 +0,0 @@
|
||||
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
|
||||
|
||||
@ -1,59 +0,0 @@
|
||||
From ee52ba51114ad353a1427ad5487ad989c09e6bd0 Mon Sep 17 00:00:00 2001
|
||||
From: Tobias Klausmann <tobias.johannes.klausmann@mni.thm.de>
|
||||
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 <tobias.klausmann@freenet.de>
|
||||
|
||||
---
|
||||
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 <X11/Xlib.h>
|
||||
#include <X11/Xutil.h>
|
||||
@@ -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
|
||||
|
||||
@ -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 = \
|
||||
Loading…
Reference in New Issue
Block a user