Skip to content

Commit 48802ac

Browse files
committed
fix: link against libpipewire
1 parent d7a6264 commit 48802ac

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

.github/workflows/build.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
name: "Install mpv"
2424
run: |
2525
sudo apt-get update -y
26-
sudo apt-get install -y libmpv-dev libavformat-dev libavcodec-dev libavutil-dev libswscale-dev libavdevice-dev libavfilter-dev libswresample-dev libpostproc-dev
26+
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
2727
- uses: silenium-dev/actions/jni-natives/ubuntu@main
2828
with:
2929
gradle-cache-encryption-key: ${{ secrets.GRADLE_CACHE_ENCRYPTION_KEY }}

native/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD COMMAND objcopy --localize-
7171
if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
7272
target_compile_definitions(${PROJECT_NAME} PRIVATE -D_LINUX)
7373
find_package(PkgConfig REQUIRED)
74-
pkg_check_modules(GL REQUIRED IMPORTED_TARGET egl libva libva-drm libdrm glx libva-glx)
74+
pkg_check_modules(GL REQUIRED IMPORTED_TARGET egl glx)
7575
target_link_libraries(${PROJECT_NAME} PUBLIC PkgConfig::GL)
7676
target_include_directories(${PROJECT_NAME} PUBLIC "${JAVA_HOME}/include/linux")
7777
add_compile_options(-static -static-libstdc++ -static-libgcc)

native/thirdparty/mpv.cmake

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,7 @@ set_target_properties(mpv PROPERTIES IMPORTED_LOCATION "${CMAKE_CURRENT_BINARY_D
4040

4141
target_include_directories(mpv INTERFACE "${MPV_INCLUDE_DIR}")
4242
target_link_options(mpv INTERFACE "-Wl,-Bsymbolic")
43+
44+
find_package(PkgConfig REQUIRED)
45+
pkg_check_modules(MPV_deps REQUIRED IMPORTED_TARGET libva libva-drm libdrm libva-glx libva-x11 libpipewire-0.3)
46+
target_link_libraries(mpv INTERFACE PkgConfig::MPV_deps)

0 commit comments

Comments
 (0)