diff mbox series

[08/17] libglu: update 9.0.2 -> 9.0.3

Message ID 20230906165633.2382629-8-alex@linutronix.de
State Accepted, archived
Commit 3f8627d8367720ec3160b337f46b4d383ebf431d
Headers show
Series [01/17] openssl: build and install manpages only if they are enabled | expand

Commit Message

Alexander Kanavin Sept. 6, 2023, 4:56 p.m. UTC 
Drop backport.

Set gl_provider explicitly, as upstream changed the default to glvnd.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...1-Remove-deprecated-register-in-C-17.patch | 32 -------------------
 .../mesa/{libglu_9.0.2.bb => libglu_9.0.3.bb} |  9 +++---
 2 files changed, 5 insertions(+), 36 deletions(-)
 delete mode 100644 meta/recipes-graphics/mesa/libglu/0001-Remove-deprecated-register-in-C-17.patch
 rename meta/recipes-graphics/mesa/{libglu_9.0.2.bb => libglu_9.0.3.bb} (79%)
diff mbox series

Patch

diff --git a/meta/recipes-graphics/mesa/libglu/0001-Remove-deprecated-register-in-C-17.patch b/meta/recipes-graphics/mesa/libglu/0001-Remove-deprecated-register-in-C-17.patch
deleted file mode 100644
index 95d56e95739..00000000000
--- a/meta/recipes-graphics/mesa/libglu/0001-Remove-deprecated-register-in-C-17.patch
+++ /dev/null
@@ -1,32 +0,0 @@ 
-From 1910b3a83a7e5aa1a31c4325829c94134fafce76 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 13 Jan 2023 20:58:07 -0800
-Subject: [PATCH] Remove deprecated register in C++17
-
-Fixes errors like
-
-src/libnurbs/internals/varray.cc:76:5: error: ISO C++17 does not allow 'register' storage class specifier [-Wregister]
-    register long ds = sgn(arc->tail()[0] - arc->prev->tail()[0]);
-    ^~~~~~~~~
-
-Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/glu/-/merge_requests/10]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- src/libnurbs/internals/varray.cc | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/libnurbs/internals/varray.cc b/src/libnurbs/internals/varray.cc
-index 1cb2354..41b3b18 100644
---- a/src/libnurbs/internals/varray.cc
-+++ b/src/libnurbs/internals/varray.cc
-@@ -73,8 +73,8 @@ Varray::~Varray( void )
- inline void
- Varray::update( Arc_ptr arc, long dir[2], REAL val )
- {
--    register long ds = sgn(arc->tail()[0] - arc->prev->tail()[0]);
--    register long dt = sgn(arc->tail()[1] - arc->prev->tail()[1]);
-+    long ds = sgn(arc->tail()[0] - arc->prev->tail()[0]);
-+    long dt = sgn(arc->tail()[1] - arc->prev->tail()[1]);
- 
-     if( dir[0] != ds || dir[1] != dt ) {
- 	dir[0] = ds;
diff --git a/meta/recipes-graphics/mesa/libglu_9.0.2.bb b/meta/recipes-graphics/mesa/libglu_9.0.3.bb
similarity index 79%
rename from meta/recipes-graphics/mesa/libglu_9.0.2.bb
rename to meta/recipes-graphics/mesa/libglu_9.0.3.bb
index 525d6316111..8151727c52a 100644
--- a/meta/recipes-graphics/mesa/libglu_9.0.2.bb
+++ b/meta/recipes-graphics/mesa/libglu_9.0.3.bb
@@ -11,17 +11,18 @@  LIC_FILES_CHKSUM = "file://include/GL/glu.h;endline=29;md5=6b79c570f644363b35645
 # Epoch as this used to be part of mesa
 PE = "2"
 
-SRC_URI = "https://mesa.freedesktop.org/archive/glu/glu-${PV}.tar.gz \
-           file://0001-Remove-deprecated-register-in-C-17.patch \
+SRC_URI = "https://mesa.freedesktop.org/archive/glu/glu-${PV}.tar.xz \
            "
 
-SRC_URI[sha256sum] = "24effdfb952453cc00e275e1c82ca9787506aba0282145fff054498e60e19a65"
+SRC_URI[sha256sum] = "bd43fe12f374b1192eb15fe20e45ff456b9bc26ab57f0eee919f96ca0f8a330f"
 
 S = "${WORKDIR}/glu-${PV}"
 
 DEPENDS = "virtual/libgl"
 
-inherit autotools pkgconfig features_check
+inherit meson pkgconfig features_check
+
+EXTRA_OEMESON = "-Dgl_provider=gl"
 
 # Requires libGL.so which is provided by mesa when x11 in DISTRO_FEATURES
 REQUIRED_DISTRO_FEATURES = "x11 opengl"