Skip to content

Commit 1d7cec5

Browse files
Gemini AgentAlexis Rosovsky
authored andcommitted
build: Fix Linux X11 ABI mismatch by defining WEBRTC_USE_X11
1 parent 4f20314 commit 1d7cec5

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

webrtc-jni/src/main/cpp/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ elseif(LINUX)
110110
set(CXX_LIBS "-static-libgcc")
111111
endif()
112112

113-
target_link_libraries(${PROJECT_NAME} ${CXX_LIBS} pulse udev)
113+
target_link_libraries(${PROJECT_NAME} ${CXX_LIBS} pulse udev X11 Xfixes Xrandr Xcomposite Xdamage Xtst Xext Xrender)
114114
elseif(WIN32)
115115
target_link_libraries(${PROJECT_NAME} dwmapi.lib mf.lib mfreadwrite.lib mfplat.lib mfuuid.lib shcore.lib)
116116
endif()

webrtc-jni/src/main/cpp/dependencies/webrtc/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ elseif(LINUX)
172172
pkg_check_modules(DBUS REQUIRED dbus-1)
173173

174174
target_include_directories(${PROJECT_NAME} PUBLIC ${DBUS_INCLUDE_DIRS})
175-
target_compile_definitions(${PROJECT_NAME} PUBLIC WEBRTC_LINUX WEBRTC_POSIX WEBRTC_USE_H264)
175+
target_compile_definitions(${PROJECT_NAME} PUBLIC WEBRTC_LINUX WEBRTC_POSIX WEBRTC_USE_H264 WEBRTC_USE_X11)
176176
target_link_libraries(${PROJECT_NAME} X11 Xfixes Xrandr Xcomposite dbus-1)
177177
elseif(WIN32)
178178
target_compile_definitions(${PROJECT_NAME} PUBLIC WEBRTC_WIN WEBRTC_USE_H264 NOMINMAX WIN32_LEAN_AND_MEAN NDEBUG)

0 commit comments

Comments
 (0)