diff options
author | Khem Raj <raj.khem@gmail.com> | 2023-01-13 21:10:10 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-01-15 08:46:07 +0000 |
commit | 93287c629e889d8026f76a42646bbe4529a7523f (patch) | |
tree | bb7c0f425207ee1dfc21912a0fb0884ca4de15c3 /meta/recipes-graphics/mesa | |
parent | b122f4ab5d8750dd64814da0ae7c9035b7620e4c (diff) | |
download | openembedded-core-contrib-93287c629e889d8026f76a42646bbe4529a7523f.tar.gz |
libglu: Remove deprecated register in C++17
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/mesa')
-rw-r--r-- | meta/recipes-graphics/mesa/libglu/0001-Remove-deprecated-register-in-C-17.patch | 32 | ||||
-rw-r--r-- | meta/recipes-graphics/mesa/libglu_9.0.2.bb | 4 |
2 files changed, 35 insertions, 1 deletions
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 new file mode 100644 index 0000000000..95d56e9573 --- /dev/null +++ b/meta/recipes-graphics/mesa/libglu/0001-Remove-deprecated-register-in-C-17.patch @@ -0,0 +1,32 @@ +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.2.bb index 0d27dd116b..525d631611 100644 --- a/meta/recipes-graphics/mesa/libglu_9.0.2.bb +++ b/meta/recipes-graphics/mesa/libglu_9.0.2.bb @@ -11,7 +11,9 @@ 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" +SRC_URI = "https://mesa.freedesktop.org/archive/glu/glu-${PV}.tar.gz \ + file://0001-Remove-deprecated-register-in-C-17.patch \ + " SRC_URI[sha256sum] = "24effdfb952453cc00e275e1c82ca9787506aba0282145fff054498e60e19a65" |