mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-07-23 03:05:48 +03:00
81 lines
2 KiB
Diff
81 lines
2 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index c591825..98f102f 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -59,7 +59,6 @@ include(cmake/libpffft.cmake)
|
|
include(cmake/librnnoise.cmake)
|
|
include(cmake/libsrtp.cmake)
|
|
include(cmake/libusrsctp.cmake)
|
|
-include(cmake/libvpx.cmake)
|
|
include(cmake/libwebrtcbuild.cmake)
|
|
include(cmake/libyuv.cmake)
|
|
if (NOT WIN32 AND NOT APPLE)
|
|
@@ -93,14 +92,9 @@ if (is_x86 OR is_x64)
|
|
tg_owt::librnnoise
|
|
tg_owt::libsrtp
|
|
tg_owt::libusrsctp
|
|
- tg_owt::libvpx
|
|
- tg_owt::libvpx_mmx
|
|
- tg_owt::libvpx_sse2
|
|
- tg_owt::libvpx_ssse3
|
|
- tg_owt::libvpx_sse4
|
|
- tg_owt::libvpx_avx
|
|
- tg_owt::libvpx_avx2
|
|
tg_owt::libyuv
|
|
+ /usr/lib/libvpx.so
|
|
+ /usr/lib/libXtst.so
|
|
)
|
|
else()
|
|
target_link_libraries(tg_owt
|
|
@@ -113,8 +107,9 @@ else()
|
|
tg_owt::librnnoise
|
|
tg_owt::libsrtp
|
|
tg_owt::libusrsctp
|
|
- tg_owt::libvpx
|
|
tg_owt::libyuv
|
|
+ /usr/lib/libvpx.so
|
|
+ /usr/lib/libXtst.so
|
|
)
|
|
endif()
|
|
|
|
@@ -1868,9 +1863,11 @@ PRIVATE
|
|
#screen drawer
|
|
modules/desktop_capture/screen_drawer.cc
|
|
modules/desktop_capture/screen_drawer.h
|
|
- modules/desktop_capture/screen_drawer_mac.cc
|
|
+ modules/desktop_capture/screen_drawer_linux.cc
|
|
modules/desktop_capture/screen_drawer_lock_posix.cc
|
|
modules/desktop_capture/screen_drawer_lock_posix.h
|
|
+ modules/desktop_capture/linux/shared_x_display.h
|
|
+ modules/desktop_capture/linux/shared_x_display.cc
|
|
|
|
|
|
#primitives
|
|
@@ -2124,18 +2121,6 @@ elseif (APPLE)
|
|
)
|
|
endif()
|
|
|
|
-set(vpx_export)
|
|
-if (is_x86 OR is_x64)
|
|
- set(vpx_export
|
|
- libvpx_mmx
|
|
- libvpx_sse2
|
|
- libvpx_ssse3
|
|
- libvpx_sse4
|
|
- libvpx_avx
|
|
- libvpx_avx2
|
|
- )
|
|
-endif()
|
|
-
|
|
set(tg_owt_export tg_owt)
|
|
if (is_x86 OR is_x64)
|
|
set(tg_owt_export
|
|
@@ -2153,8 +2138,6 @@ set(export_targets
|
|
librnnoise
|
|
libsrtp
|
|
libusrsctp
|
|
- libvpx
|
|
- ${vpx_export}
|
|
libwebrtcbuild
|
|
libyuv
|
|
${platform_export}
|