From 48802ac2039f9e65018f6a011b66c442fbd92ff2 Mon Sep 17 00:00:00 2001 From: Silas Della Contrada Date: Fri, 10 Jan 2025 14:00:57 +0100 Subject: [PATCH] fix: link against libpipewire --- .github/workflows/build.yaml | 2 +- native/CMakeLists.txt | 2 +- native/thirdparty/mpv.cmake | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index d5bfee8..3ce3379 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -23,7 +23,7 @@ jobs: name: "Install mpv" run: | sudo apt-get update -y - sudo apt-get install -y libmpv-dev libavformat-dev libavcodec-dev libavutil-dev libswscale-dev libavdevice-dev libavfilter-dev libswresample-dev libpostproc-dev + sudo apt-get install -y libmpv-dev libavformat-dev libavcodec-dev libavutil-dev libswscale-dev libavdevice-dev libavfilter-dev libswresample-dev libpostproc-dev libpipewire-0.3-dev - uses: silenium-dev/actions/jni-natives/ubuntu@main with: gradle-cache-encryption-key: ${{ secrets.GRADLE_CACHE_ENCRYPTION_KEY }} diff --git a/native/CMakeLists.txt b/native/CMakeLists.txt index 80c4e4e..4c82b27 100644 --- a/native/CMakeLists.txt +++ b/native/CMakeLists.txt @@ -71,7 +71,7 @@ add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD COMMAND objcopy --localize- if (CMAKE_SYSTEM_NAME STREQUAL "Linux") target_compile_definitions(${PROJECT_NAME} PRIVATE -D_LINUX) find_package(PkgConfig REQUIRED) - pkg_check_modules(GL REQUIRED IMPORTED_TARGET egl libva libva-drm libdrm glx libva-glx) + pkg_check_modules(GL REQUIRED IMPORTED_TARGET egl glx) target_link_libraries(${PROJECT_NAME} PUBLIC PkgConfig::GL) target_include_directories(${PROJECT_NAME} PUBLIC "${JAVA_HOME}/include/linux") add_compile_options(-static -static-libstdc++ -static-libgcc) diff --git a/native/thirdparty/mpv.cmake b/native/thirdparty/mpv.cmake index 6f25b71..53612b2 100644 --- a/native/thirdparty/mpv.cmake +++ b/native/thirdparty/mpv.cmake @@ -40,3 +40,7 @@ set_target_properties(mpv PROPERTIES IMPORTED_LOCATION "${CMAKE_CURRENT_BINARY_D target_include_directories(mpv INTERFACE "${MPV_INCLUDE_DIR}") target_link_options(mpv INTERFACE "-Wl,-Bsymbolic") + +find_package(PkgConfig REQUIRED) +pkg_check_modules(MPV_deps REQUIRED IMPORTED_TARGET libva libva-drm libdrm libva-glx libva-x11 libpipewire-0.3) +target_link_libraries(mpv INTERFACE PkgConfig::MPV_deps)