Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
2fd5ff7
aui: add new port
luadebug Aug 20, 2026
f573e64
vdb
luadebug Aug 20, 2026
364551a
aui-toolbox: add helper for aui package
luadebug Aug 20, 2026
d59ed7f
vdb
luadebug Aug 20, 2026
3ffca80
aui: add test port
luadebug Aug 23, 2026
5287e39
soxr: install .pc file
luadebug Aug 23, 2026
9c8814a
aui: clean patch files, cmake.in, try resolve NDK build
luadebug Aug 23, 2026
e72300b
vdb
luadebug Aug 23, 2026
de498d7
Merge branch 'master' into aui2
luadebug Aug 23, 2026
4e91cdb
aui: try fix NDK build to find oboe
luadebug Aug 23, 2026
57fb721
aui: improve test port for NDK
luadebug Aug 23, 2026
4ca4561
aui: remove supports to validate arm64 linux os is unsupported due ca…
luadebug Aug 23, 2026
844a5f3
simplify fix-arm64.patch
luadebug Aug 23, 2026
ad9f19d
aui: improve component dependency handling and error messaging
luadebug Aug 23, 2026
3af1775
aui: use only imported target dbus-1 and gtk+-3.0
luadebug Aug 23, 2026
b7556b6
aui: drop VCPKG_POLICY_EMPTY_INCLUDE_FOLDER policy
luadebug Aug 23, 2026
481b5c6
aui: rework fix-fmt12 patch to follow upstream
luadebug Aug 23, 2026
e5c1ca3
aui: improve fix-fmt12 patch
luadebug Aug 23, 2026
f0498d4
aui-toolbox: refactor to do mirroring from aui to aui-toolbox patches
luadebug Aug 23, 2026
8d57ee8
aui: finish rework fix-fmt12 patch to follow upstream
luadebug Aug 23, 2026
5d17bea
aui-toolbox: remove_recurse 3rdparty
luadebug Aug 27, 2026
7c6b21b
Merge branch 'master' into aui2
luadebug Aug 27, 2026
6b3a8b1
Resolve review
luadebug Aug 30, 2026
780ca5f
Merge branch 'master' into aui2
luadebug Aug 30, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
193 changes: 193 additions & 0 deletions ports/aui-toolbox/debundle.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,193 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6902d56..d1d37e1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -64,9 +64,7 @@ function(define_aui_component AUI_COMPONENT_NAME)
add_subdirectory("aui.${AUI_COMPONENT_NAME}")
endfunction()

-auib_import(ZLIB https://github.com/aui-framework/zlib
- VERSION 448a9c76a97202a21f68bd82e453dd743e944a3a
- CMAKE_ARGS -DZLIB_BUILD_EXAMPLES=OFF)
+find_package(ZLIB REQUIRED)

# define all components
define_aui_component(core)
@@ -86,7 +84,7 @@ define_aui_component(json)
define_aui_component(audio)
define_aui_component(updater)

-if (NOT ANDROID AND NOT IOS)
+if (0)
define_aui_component(uitests)
endif()

@@ -195,7 +193,6 @@ auib_precompiled_binary()
# [auib_precompiled_binary]

# test aui.boot on ci/cd
-add_subdirectory(test/)

# [configure file example]
configure_file(cmake/aui-config.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/aui-config.cmake @ONLY)
diff --git a/aui.core/CMakeLists.txt b/aui.core/CMakeLists.txt
index 6aa1b07..0eaa67f 100644
--- a/aui.core/CMakeLists.txt
+++ b/aui.core/CMakeLists.txt
@@ -11,9 +11,8 @@ aui_enable_benchmarks(aui.core)


get_filename_component(SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
-if (GLM_INCLUDE_DIR)
- message(STATUS "Using custom GLM_INCLUDE_DIR: ${GLM_INCLUDE_DIR}")
-else()
+find_package(glm REQUIRED)
+if (0) # vendored glm replaced by vcpkg's glm
set(GLM_INCLUDE_DIR "${SELF_DIR}/3rdparty/glm")

install(
@@ -21,7 +20,8 @@ else()
DESTINATION "aui.core/include/"
)
endif()
-target_include_directories(aui.core PUBLIC $<BUILD_INTERFACE:${GLM_INCLUDE_DIR}>)
+target_link_libraries(aui.core PUBLIC glm::glm-header-only)
+target_compile_definitions(aui.core PUBLIC GLM_ENABLE_EXPERIMENTAL=1)

target_compile_definitions(aui.core PRIVATE UNICODE=1)
target_compile_definitions(aui.core PUBLIC NOMINMAX=1)
@@ -49,8 +49,7 @@ if (NOT WIN32)
endif()

if (AUI_PLATFORM_LINUX)
- auib_import(backtrace https://github.com/aui-framework/libbacktrace
- VERSION a5a32e3cc8e22a9fc40689a884b032c52ee3f88e)
+ find_package(unofficial-libbacktrace CONFIG REQUIRED)
set(_use_backtrace TRUE)
else()

@@ -84,7 +83,7 @@ endif()

if(_use_backtrace)
message(STATUS "Stacktrace backend: backtrace")
- aui_link(aui.core PRIVATE backtrace)
+ aui_link(aui.core PRIVATE unofficial::libbacktrace::libbacktrace)
target_compile_definitions(aui.core PRIVATE AUI_USE_BACKTRACE=1)
elseif(_use_unwind)
message(STATUS "Stacktrace backend: unwind")
@@ -111,7 +110,12 @@ if (ANDROID)
endif()

aui_link(aui.core PRIVATE ZLIB::ZLIB)
-add_subdirectory(3rdparty/minizip)
+find_package(minizip CONFIG REQUIRED)
+if(TARGET MINIZIP::minizip)
+ aui_link(aui.core PRIVATE MINIZIP::minizip)
+else()
+ aui_link(aui.core PRIVATE MINIZIP::minizipstatic)
+endif()

# forward platform info
foreach(_var AUI_PLATFORM_WIN
@@ -147,13 +151,9 @@ endif()


# [auib_import examples]
-auib_import(fmt https://github.com/fmtlib/fmt
- VERSION 9.1.0
- CMAKE_ARGS -DFMT_TEST=FALSE -DFMT_DOC=FALSE)
+find_package(fmt CONFIG REQUIRED)

-auib_import(range-v3 https://github.com/ericniebler/range-v3
- VERSION 0.12.0
- CMAKE_ARGS -DRANGE_V3_DOCS=OFF -DRANGE_V3_TESTS=OFF -DRANGE_V3_EXAMPLES=OFF -DRANGE_V3_PERF=OFF -DRANGE_V3_HEADER_CHECKS=OFF)
+find_package(range-v3 CONFIG REQUIRED)
# [auib_import examples]

aui_link(aui.core PUBLIC fmt::fmt-header-only range-v3::range-v3)
diff --git a/aui.crypt/CMakeLists.txt b/aui.crypt/CMakeLists.txt
index c5354f2..778d45e 100644
--- a/aui.crypt/CMakeLists.txt
+++ b/aui.crypt/CMakeLists.txt
@@ -1,9 +1,7 @@
cmake_minimum_required(VERSION 3.10)


-unset(OPENSSL_CRYPTO_LIBRARY CACHE)
-unset(OPENSSL_SSL_LIBRARY CACHE)
-auib_import(OpenSSL https://github.com/aui-framework/openssl-cmake/archive/56ee19b7e11b418e0f29825414abdca96ff6b83e.zip ARCHIVE)
+find_package(OpenSSL REQUIRED)

aui_module(aui.crypt EXPORT aui)
aui_enable_tests(aui.crypt)
diff --git a/aui.image/CMakeLists.txt b/aui.image/CMakeLists.txt
index 033e7ad..a6f292c 100644
--- a/aui.image/CMakeLists.txt
+++ b/aui.image/CMakeLists.txt
@@ -1,18 +1,13 @@
cmake_minimum_required(VERSION 3.10)

-auib_import(lunasvg https://github.com/aui-framework/lunasvg
- VERSION 272ceee)
+find_package(lunasvg CONFIG REQUIRED)


-set(WEBP_COMPONENTS_TO_DISABLE ANIM_UTILS CWEBP DWEBP GIF2WEBP IMG2WEBP VWEBP WEBPINFO LIBWEBPMUX WEBPMUX EXTRAS)
-
-foreach(_component ${WEBP_COMPONENTS_TO_DISABLE})
- list(APPEND WEBP_CMAKE_ARGS "-DWEBP_BUILD_${_component}=OFF")
-endforeach()
-
-auib_import(WebP https://github.com/webmproject/libwebp VERSION 1.3.1 CMAKE_ARGS ${WEBP_CMAKE_ARGS})
+find_package(WebP CONFIG REQUIRED)

aui_module(aui.image WHOLEARCHIVE EXPORT aui)
-add_subdirectory(3rdparty)
-aui_link(aui.image PRIVATE aui::core lunasvg::lunasvg WebP::webp WebP::webpdemux)
+find_package(unofficial-libnsgif CONFIG REQUIRED)
+find_package(Stb REQUIRED)
+aui_link(aui.image PRIVATE aui::core lunasvg::lunasvg WebP::webp WebP::webpdemux unofficial::libnsgif::nsgif)
+target_include_directories(aui.image PRIVATE ${Stb_INCLUDE_DIR})
aui_enable_tests(aui.image)
diff --git a/aui.image/src/AUI/Image/gif/GifImageFactory.cpp b/aui.image/src/AUI/Image/gif/GifImageFactory.cpp
index e9ca38f..4597d68 100644
--- a/aui.image/src/AUI/Image/gif/GifImageFactory.cpp
+++ b/aui.image/src/AUI/Image/gif/GifImageFactory.cpp
@@ -17,7 +17,9 @@
#include "AUI/Image/AImage.h"
#include "AUI/Util/ARaiiHelper.h"
#include "AUI/Logging/ALogger.h"
-#include "nsgif.h"
+extern "C" {
+#include <nsgif.h>
+}

static nsgif_bitmap_t* create_callback(int width, int height) {
return new char[4 * width * height];
diff --git a/cmake/aui.build.cmake b/cmake/aui.build.cmake
index 90c53d4..7a8e8e8 100644
--- a/cmake/aui.build.cmake
+++ b/cmake/aui.build.cmake
@@ -1072,18 +1072,18 @@ function(aui_module AUI_MODULE_NAME)
ARCHIVE DESTINATION "lib"
LIBRARY DESTINATION "lib"
RUNTIME DESTINATION "bin"
- PUBLIC_HEADER DESTINATION "${AUI_MODULE_NAME}/include"
- INCLUDES DESTINATION "${AUI_MODULE_NAME}/include"
+ PUBLIC_HEADER DESTINATION "include"
+ INCLUDES DESTINATION "include"
)

install(
DIRECTORY src/
- DESTINATION "${AUI_MODULE_NAME}/include/"
+ DESTINATION "include/"
FILES_MATCHING PATTERN "*.h"
PATTERN "*.hpp"

)
- target_include_directories(${AUI_MODULE_NAME} INTERFACE $<INSTALL_INTERFACE:${AUI_MODULE_NAME}/include/>)
+ target_include_directories(${AUI_MODULE_NAME} INTERFACE $<INSTALL_INTERFACE:include>)
endif()
if (NOT BUILD_AS_IMPORTED_NAME STREQUAL ${AUI_MODULE_NAME})
add_library(${BUILD_AS_IMPORTED_NAME} ALIAS ${AUI_MODULE_NAME})
21 changes: 21 additions & 0 deletions ports/aui-toolbox/disable-auib.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
diff --git a/aui.boot.cmake b/aui.boot.cmake
index 6baab15..72a838b 100644
--- a/aui.boot.cmake
+++ b/aui.boot.cmake
@@ -204,13 +204,13 @@ endif()


# create all required dirs
-if (NOT EXISTS ${AUIB_CACHE_DIR})
+if (0)
file(MAKE_DIRECTORY ${AUIB_CACHE_DIR})
endif()
-if (NOT EXISTS ${AUIB_CACHE_DIR}/prefix)
+if (0)
file(MAKE_DIRECTORY ${AUIB_CACHE_DIR}/prefix)
endif()
-if (NOT EXISTS ${AUIB_CACHE_DIR}/repo)
+if (0)
file(MAKE_DIRECTORY ${AUIB_CACHE_DIR}/repo)
endif()

22 changes: 22 additions & 0 deletions ports/aui-toolbox/disable-tests.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
diff --git a/cmake/aui.build.cmake b/cmake/aui.build.cmake
index 90c53d45..c741359d 100644
--- a/cmake/aui.build.cmake
+++ b/cmake/aui.build.cmake
@@ -230,7 +230,7 @@ macro(_aui_import_gtest)
endmacro()

macro(aui_enable_tests AUI_MODULE_NAME)
- if (NOT CMAKE_CROSSCOMPILING)
+ if (0)
_aui_import_gtest()
if (NOT TARGET GTest::gtest)
message(FATAL_ERROR "GTest::gtest not found!")
@@ -328,7 +328,7 @@ macro(_aui_import_google_benchmark)
endmacro()

macro(aui_enable_benchmarks AUI_MODULE_NAME)
- if (NOT CMAKE_CROSSCOMPILING)
+ if (0)
_aui_import_gtest()
_aui_import_google_benchmark()
if (NOT TARGET benchmark::benchmark)
13 changes: 13 additions & 0 deletions ports/aui-toolbox/fix-arm64.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/cmake/aui.build.cmake b/cmake/aui.build.cmake
index 90c53d4..780c872 100644
--- a/cmake/aui.build.cmake
+++ b/cmake/aui.build.cmake
@@ -140,7 +140,7 @@ else()
set(AUI_COMPILER_MSVC 0 CACHE INTERNAL "Compiler")
endif()

-if (CMAKE_GENERATOR_PLATFORM MATCHES "(arm64)|(ARM64)" OR CMAKE_SYSTEM_PROCESSOR MATCHES "(aarch64|arm64)")
+if (CMAKE_GENERATOR_PLATFORM MATCHES "(aarch64|arm64|AARCH64|ARM64)" OR CMAKE_SYSTEM_PROCESSOR MATCHES "(aarch64|arm64|AARCH64|ARM64)")
set(AUI_ARCH_X86_64 0 CACHE INTERNAL "Arch")
set(AUI_ARCH_X86 0 CACHE INTERNAL "Arch")
set(AUI_ARCH_ARM_64 1 CACHE INTERNAL "Arch")
Loading
Loading