diff mbox series

[meta-oe,40/40] waylandpp: upgrade 1.0.0 -> 1.0.1

Message ID 20250730232923.522-14-wangmy@fujitsu.com
State New
Headers show
Series None | expand

Commit Message

Wang Mingyu July 30, 2025, 11:29 p.m. UTC 
From: Wang Mingyu <wangmy@fujitsu.com>

0001-include-missing-cstdint.patch
refreshed for 1.0.1

4576426020932ebc481ae35c15f644af2f17e88a.patch
removed since it's included in 1.0.1

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
 .../0001-include-missing-cstdint.patch        | 40 ++-----------------
 ...426020932ebc481ae35c15f644af2f17e88a.patch | 23 -----------
 ...{waylandpp_1.0.0.bb => waylandpp_1.0.1.bb} | 10 ++---
 3 files changed, 8 insertions(+), 65 deletions(-)
 delete mode 100644 meta-oe/recipes-graphics/wayland/waylandpp/4576426020932ebc481ae35c15f644af2f17e88a.patch
 rename meta-oe/recipes-graphics/wayland/{waylandpp_1.0.0.bb => waylandpp_1.0.1.bb} (83%)
diff mbox series

Patch

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
index f2169c43c9..d4f95e16b4 100644
--- a/meta-oe/recipes-graphics/wayland/waylandpp/0001-include-missing-cstdint.patch
+++ b/meta-oe/recipes-graphics/wayland/waylandpp/0001-include-missing-cstdint.patch
@@ -1,4 +1,4 @@ 
-From 5e3243b163aa5d50083b4036c21f84c1204f2023 Mon Sep 17 00:00:00 2001
+From 2ef1bca4c35377c00ff6dc7e37d8ad75727d5607 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Thu, 26 Jan 2023 23:25:05 -0800
 Subject: [PATCH] include missing <cstdint>
@@ -10,24 +10,11 @@  gcc 13 moved some includes around and as a result <cstdint> is no longer transit
 Upstream-Status: Submitted [https://github.com/NilsBrause/waylandpp/pull/75]
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 ---
- include/wayland-client.hpp | 1 +
- scanner/scanner.cpp        | 3 +++
- 2 files changed, 4 insertions(+)
+ scanner/scanner.cpp | 1 +
+ 1 file changed, 1 insertion(+)
 
-diff --git a/include/wayland-client.hpp b/include/wayland-client.hpp
-index a3f782b..4598a0e 100644
---- a/include/wayland-client.hpp
-+++ b/include/wayland-client.hpp
-@@ -29,6 +29,7 @@
- /** \file */
- 
- #include <atomic>
-+#include <cstdint>
- #include <functional>
- #include <memory>
- #include <string>
 diff --git a/scanner/scanner.cpp b/scanner/scanner.cpp
-index bebd71e..c25746a 100644
+index 37cf7ff..85f9e92 100644
 --- a/scanner/scanner.cpp
 +++ b/scanner/scanner.cpp
 @@ -15,6 +15,7 @@
@@ -38,22 +25,3 @@  index bebd71e..c25746a 100644
  #include <fstream>
  #include <iostream>
  #include <list>
-@@ -1106,6 +1107,7 @@ int main(int argc, char *argv[])
-   wayland_hpp << "#pragma once" << std::endl
-               << std::endl
-               << "#include <array>" << std::endl
-+              << "#include <cstdint>" << std::endl
-               << "#include <functional>" << std::endl
-               << "#include <memory>" << std::endl
-               << "#include <string>" << std::endl
-@@ -1125,6 +1127,7 @@ int main(int argc, char *argv[])
-     wayland_server_hpp << "#pragma once" << std::endl
-                        << std::endl
-                        << "#include <array>" << std::endl
-+                       << "#include <cstdint>" << std::endl
-                        << "#include <functional>" << std::endl
-                        << "#include <memory>" << std::endl
-                        << "#include <string>" << std::endl
--- 
-2.39.1
-
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 @@ 
-From 4576426020932ebc481ae35c15f644af2f17e88a Mon Sep 17 00:00:00 2001
-From: Alexey Sokolov <alexey@asokolov.org>
-Date: Sun, 4 May 2025 14:38:52 +0100
-Subject: [PATCH] Fix build with cmake 4
-
-Upstream-Status: Backport
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 866477b..8e9d2ad 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -21,7 +21,7 @@
- # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- 
--cmake_minimum_required(VERSION 3.4)
-+cmake_minimum_required(VERSION 3.4...4.0)
- project(waylandpp VERSION 1.0.0 LANGUAGES CXX)
- 
- # 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
similarity index 83%
rename from meta-oe/recipes-graphics/wayland/waylandpp_1.0.0.bb
rename to meta-oe/recipes-graphics/wayland/waylandpp_1.0.1.bb
index 0e53807cc7..576b416975 100644
--- a/meta-oe/recipes-graphics/wayland/waylandpp_1.0.0.bb
+++ b/meta-oe/recipes-graphics/wayland/waylandpp_1.0.1.bb
@@ -2,16 +2,14 @@  SUMMARY = " C++ binding for Wayland using the most modern C++ technology"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3aae28cc66d61975114c2b14df215407"
 
-SRC_URI = " \
-	git://github.com/NilsBrause/waylandpp.git;protocol=https;branch=master \
-	file://0001-include-missing-cstdint.patch \
-	file://4576426020932ebc481ae35c15f644af2f17e88a.patch \
-"
+SRC_URI = "git://github.com/NilsBrause/waylandpp.git;protocol=https;branch=1.0.x \
+           file://0001-include-missing-cstdint.patch \
+           "
 
 DEPENDS = "pugixml"
 DEPENDS:append:class-target = " waylandpp-native wayland virtual/egl virtual/libgles2"
 
-SRCREV = "4321ed5c7b4bffa41b8a2a13dc7f3ece1191f4f3"
+SRCREV = "4f208c416f37ea093e4a70a1407abd7d93c889f9"
 
 inherit cmake pkgconfig features_check