mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-09 04:11:16 +00:00
waylandpp: update 1.0.0 -> 1.0.1
This maintenance release fixes missing cstdint includes, wrong quoting in CMakeLists.txt, and adds cmake 4 support. Signed-off-by: Markus Volk <f_l_k@t-online.de> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
@@ -1,59 +0,0 @@
|
|||||||
From 5e3243b163aa5d50083b4036c21f84c1204f2023 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>
|
|
||||||
|
|
||||||
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.
|
|
||||||
|
|
||||||
[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes
|
|
||||||
|
|
||||||
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(+)
|
|
||||||
|
|
||||||
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
|
|
||||||
--- a/scanner/scanner.cpp
|
|
||||||
+++ b/scanner/scanner.cpp
|
|
||||||
@@ -15,6 +15,7 @@
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
+#include <cstdint>
|
|
||||||
#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
|
|
||||||
|
|
||||||
-23
@@ -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
|
|
||||||
+2
-4
@@ -3,15 +3,13 @@ LICENSE = "MIT"
|
|||||||
LIC_FILES_CHKSUM = "file://LICENSE;md5=3aae28cc66d61975114c2b14df215407"
|
LIC_FILES_CHKSUM = "file://LICENSE;md5=3aae28cc66d61975114c2b14df215407"
|
||||||
|
|
||||||
SRC_URI = " \
|
SRC_URI = " \
|
||||||
git://github.com/NilsBrause/waylandpp.git;protocol=https;branch=master \
|
git://github.com/NilsBrause/waylandpp.git;protocol=https;branch=1.0.x \
|
||||||
file://0001-include-missing-cstdint.patch \
|
|
||||||
file://4576426020932ebc481ae35c15f644af2f17e88a.patch \
|
|
||||||
"
|
"
|
||||||
|
|
||||||
DEPENDS = "pugixml"
|
DEPENDS = "pugixml"
|
||||||
DEPENDS:append:class-target = " waylandpp-native wayland virtual/egl virtual/libgles2"
|
DEPENDS:append:class-target = " waylandpp-native wayland virtual/egl virtual/libgles2"
|
||||||
|
|
||||||
SRCREV = "4321ed5c7b4bffa41b8a2a13dc7f3ece1191f4f3"
|
SRCREV = "4f208c416f37ea093e4a70a1407abd7d93c889f9"
|
||||||
|
|
||||||
inherit cmake pkgconfig features_check
|
inherit cmake pkgconfig features_check
|
||||||
|
|
||||||
Reference in New Issue
Block a user