From b7c25d46b5cebc2af92fa19b127e2565d91097e2 Mon Sep 17 00:00:00 2001 From: Aaron Covrig Date: Tue, 17 Jun 2025 21:46:17 -0400 Subject: [PATCH 1/3] Update bullseye submodule and cloning to https Notes: * This is because GitLab has removed support for the insecure 'git://' protocol --- .gitmodules | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 8043504..44100d5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "cmake"] path = cmake - url = git://github.com/dlech/vala-cmake-modules + url = https://github.com/dlech/vala-cmake-modules [submodule "doc/sphinx/_html_extra"] path = doc/sphinx/_html_extra url = https://github.com/ev3dev/ev3devKit.git diff --git a/README.md b/README.md index 866f189..a507f33 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ This is currently in the development stages and is unstable. This project uses git and git submodules. - git clone --recursive git://github.com/ev3dev/ev3devKit + git clone --recursive https://github.com/ev3dev/ev3devKit ## Cross-compiling for the EV3 From e05a1dec9127b4d29f53c65dfb5548eabc18bf4c Mon Sep 17 00:00:00 2001 From: Aaron Covrig Date: Tue, 17 Jun 2025 21:46:18 -0400 Subject: [PATCH 2/3] Fix CMakeLists.txt path to bindings/*.vapi source Notes: 1. It seems like something changed in CMakes build behavior here --- CMakeLists.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2ce28db..3e321c5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -144,7 +144,7 @@ LIBRARY PACKAGES ${COMMON_PACKAGES} CUSTOM_VAPIS - bindings/*.vapi + "${CMAKE_CURRENT_SOURCE_DIR}/bindings/*.vapi" OPTIONS --target-glib=${TARGET_GLIB} ${GRX3_VAPIDIR_OPTION} @@ -236,8 +236,8 @@ if (EV3DEVKIT_BUILD_DEMO) ${DEVICES_DEMO_SOURCE_FILES} PACKAGES ${EXEC_PACKAGES} - CUSTOM_VAPIS - bindings/*.vapi + CUSTOM_VAPIS + "${CMAKE_CURRENT_SOURCE_DIR}/bindings/*.vapi" OPTIONS --target-glib=${TARGET_GLIB} --vapidir=${CMAKE_CURRENT_BINARY_DIR} @@ -271,7 +271,7 @@ if (EV3DEVKIT_BUILD_DEMO) PACKAGES ${EXEC_PACKAGES} CUSTOM_VAPIS - bindings/*.vapi + "${CMAKE_CURRENT_SOURCE_DIR}/bindings/*.vapi" OPTIONS --target-glib=${TARGET_GLIB} --vapidir=${CMAKE_CURRENT_BINARY_DIR} @@ -306,7 +306,7 @@ if (VALADOC_FOUND) include (ValadocGenerate) generate_valadoc ( ${LIBRARY_SOURCE_FILES} - bindings/*.vapi + "${CMAKE_CURRENT_SOURCE_DIR}/bindings/*.vapi" PACKAGE_NAME ${PROJECT_NAME} PACKAGE_VERSION From 31020dbaaf409c03d1f5a4a8b0b630204afd6c32 Mon Sep 17 00:00:00 2001 From: Aaron Covrig Date: Tue, 17 Jun 2025 21:46:19 -0400 Subject: [PATCH 3/3] Update dereference pointer before calling new_full Notes: 1. This is likely from the change here: https://github.com/ev3dev/grx/commit/28b0686b1a47794fab83683c6c494c9299c7c9ae#diff-02a99699ea96689f62c694983532fedec8e3b84b46ccc23d10f1ced786c82473L329 where grx is updated to take a uint8[] instead of a uint8*[] for Context? new(); the commit mentions that this is a breaking change that removes support for the unused planar memory objects. --- src/ui/Screen.vala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ui/Screen.vala b/src/ui/Screen.vala index 790f255..7f9ac531 100644 --- a/src/ui/Screen.vala +++ b/src/ui/Screen.vala @@ -174,8 +174,8 @@ namespace Ev3devKit.Ui { if (context_mem_addr == null) context = Context.new_full (mode, width, height); else { - uint8* addr[4]; - addr[0] = context_mem_addr; + uint8 addr[4]; + addr[0] = *context_mem_addr; context = Context.new_full (mode, width, height, addr); } }