diff --git a/libglvnd.changes b/libglvnd.changes index 9cc4834..347e47a 100644 --- a/libglvnd.changes +++ b/libglvnd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Nov 24 12:50:20 UTC 2019 - Stefan Dirsch + +- removed n_0001-GL-Bump-GL-version-to-9-2.patch, which is no + longer needed with xorg-server 1.20.6 + ------------------------------------------------------------------- Thu Nov 7 11:45:05 UTC 2019 - Stefan Dirsch diff --git a/libglvnd.spec b/libglvnd.spec index 95e80b4..3e32d4e 100644 --- a/libglvnd.spec +++ b/libglvnd.spec @@ -29,7 +29,6 @@ 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 Patch1: 0001-include-install-GL-headers-when-GL-is-enabled.patch Patch2: 0002-Add-a-configure-option-to-disable-glesv1-or-glesv2.patch Patch3: 0003-egl-Sync-with-Khronos.patch @@ -64,7 +63,6 @@ development. %prep %setup -q -%patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 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 -