diff options
-rw-r--r-- | meta-oe/recipes-graphics/wayland/waylandpp/0001-include-missing-cstdint.patch | 59 | ||||
-rw-r--r-- | meta-oe/recipes-graphics/wayland/waylandpp/4576426020932ebc481ae35c15f644af2f17e88a.patch | 23 | ||||
-rw-r--r-- | meta-oe/recipes-graphics/wayland/waylandpp_1.0.1.bb (renamed from meta-oe/recipes-graphics/wayland/waylandpp_1.0.0.bb) | 6 |
3 files changed, 2 insertions, 86 deletions
diff --git a/meta-oe/recipes-graphics/wayland/waylandpp/0001-include-missing-cstdint.patch b/meta-oe/recipes-graphics/wayland/waylandpp/0001-include-missing-cstdint.patch deleted file mode 100644 index f2169c43c9..0000000000 --- a/meta-oe/recipes-graphics/wayland/waylandpp/0001-include-missing-cstdint.patch +++ /dev/null | |||
@@ -1,59 +0,0 @@ | |||
1 | From 5e3243b163aa5d50083b4036c21f84c1204f2023 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Thu, 26 Jan 2023 23:25:05 -0800 | ||
4 | Subject: [PATCH] include missing <cstdint> | ||
5 | |||
6 | gcc 13 moved some includes around and as a result <cstdint> is no longer transitively included [1]. Explicitly include it for uint{32,64}_t. | ||
7 | |||
8 | [1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes | ||
9 | |||
10 | Upstream-Status: Submitted [https://github.com/NilsBrause/waylandpp/pull/75] | ||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
12 | --- | ||
13 | include/wayland-client.hpp | 1 + | ||
14 | scanner/scanner.cpp | 3 +++ | ||
15 | 2 files changed, 4 insertions(+) | ||
16 | |||
17 | diff --git a/include/wayland-client.hpp b/include/wayland-client.hpp | ||
18 | index a3f782b..4598a0e 100644 | ||
19 | --- a/include/wayland-client.hpp | ||
20 | +++ b/include/wayland-client.hpp | ||
21 | @@ -29,6 +29,7 @@ | ||
22 | /** \file */ | ||
23 | |||
24 | #include <atomic> | ||
25 | +#include <cstdint> | ||
26 | #include <functional> | ||
27 | #include <memory> | ||
28 | #include <string> | ||
29 | diff --git a/scanner/scanner.cpp b/scanner/scanner.cpp | ||
30 | index bebd71e..c25746a 100644 | ||
31 | --- a/scanner/scanner.cpp | ||
32 | +++ b/scanner/scanner.cpp | ||
33 | @@ -15,6 +15,7 @@ | ||
34 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
35 | */ | ||
36 | |||
37 | +#include <cstdint> | ||
38 | #include <fstream> | ||
39 | #include <iostream> | ||
40 | #include <list> | ||
41 | @@ -1106,6 +1107,7 @@ int main(int argc, char *argv[]) | ||
42 | wayland_hpp << "#pragma once" << std::endl | ||
43 | << std::endl | ||
44 | << "#include <array>" << std::endl | ||
45 | + << "#include <cstdint>" << std::endl | ||
46 | << "#include <functional>" << std::endl | ||
47 | << "#include <memory>" << std::endl | ||
48 | << "#include <string>" << std::endl | ||
49 | @@ -1125,6 +1127,7 @@ int main(int argc, char *argv[]) | ||
50 | wayland_server_hpp << "#pragma once" << std::endl | ||
51 | << std::endl | ||
52 | << "#include <array>" << std::endl | ||
53 | + << "#include <cstdint>" << std::endl | ||
54 | << "#include <functional>" << std::endl | ||
55 | << "#include <memory>" << std::endl | ||
56 | << "#include <string>" << std::endl | ||
57 | -- | ||
58 | 2.39.1 | ||
59 | |||
diff --git a/meta-oe/recipes-graphics/wayland/waylandpp/4576426020932ebc481ae35c15f644af2f17e88a.patch b/meta-oe/recipes-graphics/wayland/waylandpp/4576426020932ebc481ae35c15f644af2f17e88a.patch deleted file mode 100644 index 5011f05f3d..0000000000 --- a/meta-oe/recipes-graphics/wayland/waylandpp/4576426020932ebc481ae35c15f644af2f17e88a.patch +++ /dev/null | |||
@@ -1,23 +0,0 @@ | |||
1 | From 4576426020932ebc481ae35c15f644af2f17e88a Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexey Sokolov <alexey@asokolov.org> | ||
3 | Date: Sun, 4 May 2025 14:38:52 +0100 | ||
4 | Subject: [PATCH] Fix build with cmake 4 | ||
5 | |||
6 | Upstream-Status: Backport | ||
7 | --- | ||
8 | CMakeLists.txt | 2 +- | ||
9 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
10 | |||
11 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
12 | index 866477b..8e9d2ad 100644 | ||
13 | --- a/CMakeLists.txt | ||
14 | +++ b/CMakeLists.txt | ||
15 | @@ -21,7 +21,7 @@ | ||
16 | # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
17 | # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
18 | |||
19 | -cmake_minimum_required(VERSION 3.4) | ||
20 | +cmake_minimum_required(VERSION 3.4...4.0) | ||
21 | project(waylandpp VERSION 1.0.0 LANGUAGES CXX) | ||
22 | |||
23 | # packages | ||
diff --git a/meta-oe/recipes-graphics/wayland/waylandpp_1.0.0.bb b/meta-oe/recipes-graphics/wayland/waylandpp_1.0.1.bb index 0e53807cc7..7ea9f3ffec 100644 --- a/meta-oe/recipes-graphics/wayland/waylandpp_1.0.0.bb +++ b/meta-oe/recipes-graphics/wayland/waylandpp_1.0.1.bb | |||
@@ -3,15 +3,13 @@ LICENSE = "MIT" | |||
3 | LIC_FILES_CHKSUM = "file://LICENSE;md5=3aae28cc66d61975114c2b14df215407" | 3 | LIC_FILES_CHKSUM = "file://LICENSE;md5=3aae28cc66d61975114c2b14df215407" |
4 | 4 | ||
5 | SRC_URI = " \ | 5 | SRC_URI = " \ |
6 | git://github.com/NilsBrause/waylandpp.git;protocol=https;branch=master \ | 6 | git://github.com/NilsBrause/waylandpp.git;protocol=https;branch=1.0.x \ |
7 | file://0001-include-missing-cstdint.patch \ | ||
8 | file://4576426020932ebc481ae35c15f644af2f17e88a.patch \ | ||
9 | " | 7 | " |
10 | 8 | ||
11 | DEPENDS = "pugixml" | 9 | DEPENDS = "pugixml" |
12 | DEPENDS:append:class-target = " waylandpp-native wayland virtual/egl virtual/libgles2" | 10 | DEPENDS:append:class-target = " waylandpp-native wayland virtual/egl virtual/libgles2" |
13 | 11 | ||
14 | SRCREV = "4321ed5c7b4bffa41b8a2a13dc7f3ece1191f4f3" | 12 | SRCREV = "4f208c416f37ea093e4a70a1407abd7d93c889f9" |
15 | 13 | ||
16 | inherit cmake pkgconfig features_check | 14 | inherit cmake pkgconfig features_check |
17 | 15 | ||