Skip to content

Commit d9e2e03

Browse files
committed
linux: fix pulse
1 parent d4ff764 commit d9e2e03

File tree

2 files changed

+14
-5
lines changed

2 files changed

+14
-5
lines changed

packages/a/aui/patches/v7.1.2/debundle.diff

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ index 6902d56a..98ebd001 100644
3131
# [configure file example]
3232
configure_file(cmake/aui-config.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/aui-config.cmake @ONLY)
3333
diff --git a/aui.audio/CMakeLists.txt b/aui.audio/CMakeLists.txt
34-
index 21e44153..afbc367b 100644
34+
index 21e44153..f6732e73 100644
3535
--- a/aui.audio/CMakeLists.txt
3636
+++ b/aui.audio/CMakeLists.txt
37-
@@ -5,26 +5,36 @@ add_subdirectory(3rdparty/ogg)
37+
@@ -5,26 +5,44 @@ add_subdirectory(3rdparty/ogg)
3838
aui_link(aui.audio PUBLIC aui::core)
3939

4040
if (AUI_PLATFORM_ANDROID)
@@ -67,7 +67,16 @@ index 21e44153..afbc367b 100644
6767
+ )
6868
+ endif ()
6969
elseif (AUI_PLATFORM_LINUX)
70-
aui_link(aui.audio PUBLIC pulse)
70+
- aui_link(aui.audio PUBLIC pulse)
71+
+ if (AUIB_DISABLE)
72+
+ auib_use_system_libs_begin()
73+
+ find_package(PkgConfig)
74+
+ pkg_check_modules(PULSEAUDIO REQUIRED IMPORTED_TARGET libpulse)
75+
+ aui_link(aui.audio PUBLIC PkgConfig::PULSEAUDIO)
76+
+ auib_use_system_libs_end()
77+
+ else ()
78+
+ aui_link(aui.audio PUBLIC pulse)
79+
+ endif ()
7180
elseif (AUI_PLATFORM_WIN)
7281
aui_link(aui.audio PUBLIC Winmm dsound.lib dxguid.lib)
7382
endif()
@@ -84,7 +93,7 @@ index 21e44153..afbc367b 100644
8493

8594
if (AUI_PLATFORM_IOS OR AUI_PLATFORM_MACOS)
8695
auib_use_system_libs_begin()
87-
@@ -42,9 +52,15 @@ if (AUI_PLATFORM_MACOS)
96+
@@ -42,9 +60,15 @@ if (AUI_PLATFORM_MACOS)
8897
"-framework QuartzCore")
8998
endif()
9099

packages/a/aui/xmake.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ package("aui")
77
"https://github.com/aui-framework/aui.git")
88

99
add_versions("v7.1.2", "a4cf965c50d75e20a319c9c8b231ad9c13c25a06ad303e1eb65d1ff141b1f85c")
10-
add_patches("v7.1.2", "patches/v7.1.2/debundle.diff", "ce03744c15417dee1192940e77fe95da96689f39e26a2bf34cb38bdf15640b79")
10+
add_patches("v7.1.2", "patches/v7.1.2/debundle.diff", "1eb3da88e82503e6a9a893c112b4dd97909341905fe0e28d3fb5a4d2a50075ea")
1111

1212
add_deps("cmake")
1313
if is_subhost("windows") then

0 commit comments

Comments
 (0)