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:49:08 +0000 |
commit | cfe1272230b91cc35b80c71f9f5aff48a2f7585e (patch) | |
tree | c2d02fb8e773da1d909c900b3b58d07b73c5f02d /meta/recipes-graphics/mesa | |
parent | 8790d0bdbd93bfe05a462d5a8461d8707803190f (diff) | |
download | poky-cfe1272230b91cc35b80c71f9f5aff48a2f7585e.tar.gz |
libglu: Remove deprecated register in C++17
(From OE-Core rev: 93287c629e889d8026f76a42646bbe4529a7523f)
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 @@ | |||
1 | From 1910b3a83a7e5aa1a31c4325829c94134fafce76 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 13 Jan 2023 20:58:07 -0800 | ||
4 | Subject: [PATCH] Remove deprecated register in C++17 | ||
5 | |||
6 | Fixes errors like | ||
7 | |||
8 | src/libnurbs/internals/varray.cc:76:5: error: ISO C++17 does not allow 'register' storage class specifier [-Wregister] | ||
9 | register long ds = sgn(arc->tail()[0] - arc->prev->tail()[0]); | ||
10 | ^~~~~~~~~ | ||
11 | |||
12 | Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/glu/-/merge_requests/10] | ||
13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
14 | --- | ||
15 | src/libnurbs/internals/varray.cc | 4 ++-- | ||
16 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
17 | |||
18 | diff --git a/src/libnurbs/internals/varray.cc b/src/libnurbs/internals/varray.cc | ||
19 | index 1cb2354..41b3b18 100644 | ||
20 | --- a/src/libnurbs/internals/varray.cc | ||
21 | +++ b/src/libnurbs/internals/varray.cc | ||
22 | @@ -73,8 +73,8 @@ Varray::~Varray( void ) | ||
23 | inline void | ||
24 | Varray::update( Arc_ptr arc, long dir[2], REAL val ) | ||
25 | { | ||
26 | - register long ds = sgn(arc->tail()[0] - arc->prev->tail()[0]); | ||
27 | - register long dt = sgn(arc->tail()[1] - arc->prev->tail()[1]); | ||
28 | + long ds = sgn(arc->tail()[0] - arc->prev->tail()[0]); | ||
29 | + long dt = sgn(arc->tail()[1] - arc->prev->tail()[1]); | ||
30 | |||
31 | if( dir[0] != ds || dir[1] != dt ) { | ||
32 | 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 | |||
11 | # Epoch as this used to be part of mesa | 11 | # Epoch as this used to be part of mesa |
12 | PE = "2" | 12 | PE = "2" |
13 | 13 | ||
14 | SRC_URI = "https://mesa.freedesktop.org/archive/glu/glu-${PV}.tar.gz" | 14 | SRC_URI = "https://mesa.freedesktop.org/archive/glu/glu-${PV}.tar.gz \ |
15 | file://0001-Remove-deprecated-register-in-C-17.patch \ | ||
16 | " | ||
15 | 17 | ||
16 | SRC_URI[sha256sum] = "24effdfb952453cc00e275e1c82ca9787506aba0282145fff054498e60e19a65" | 18 | SRC_URI[sha256sum] = "24effdfb952453cc00e275e1c82ca9787506aba0282145fff054498e60e19a65" |
17 | 19 | ||