Page MenuHomeSolus
Differential D10460 Diff 25251 files/tg_owt-Link-against-shared-libvpx.patch

Changeset View

Standalone View

View Options

files/tg_owt-Link-against-shared-libvpx.patch

From bce87f403147cb1efae8bb917557efb090a15742 Mon Sep 17 00:00:00 2001 From bce87f403147cb1efae8bb917557efb090a15742 Mon Sep 17 00:00:00 2001
From: Fabio Forni <livingsilver94.solus@redaril.me> From: Fabio Forni <livingsilver94.solus@redaril.me>
Date: Thu, 24 Dec 2020 21:28:34 +0100 Date: Thu, 24 Dec 2020 21:28:34 +0100
Subject: [PATCH] Link against shared libvpx Subject: [PATCH] Link against shared libvpx
--- ---
CMakeLists.txt | 24 +----------------------- CMakeLists.txt | 24 +-----------------------
cmake/external.cmake | 9 +++++++++ cmake/external.cmake | 9 +++++++++
2 files changed, 10 insertions(+), 23 deletions(-) 2 files changed, 10 insertions(+), 23 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt
index d970719..e4e5b4f 100644 index d970719..e4e5b4f 100644
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -45,7 +45,6 @@ include(cmake/libpffft.cmake) @@ -55,7 +55,6 @@ include(cmake/libpffft.cmake)
include(cmake/librnnoise.cmake) include(cmake/librnnoise.cmake)
include(cmake/libsrtp.cmake) include(cmake/libsrtp.cmake)
include(cmake/libusrsctp.cmake) include(cmake/libusrsctp.cmake)
-include(cmake/libvpx.cmake) -include(cmake/libvpx.cmake)
include(cmake/libwebrtcbuild.cmake) include(cmake/libwebrtcbuild.cmake)
include(cmake/libyuv.cmake) include(cmake/libyuv.cmake)
if (NOT WIN32 AND NOT APPLE) if (NOT WIN32 AND NOT APPLE)
@@ -77,13 +76,6 @@ if (is_x86 OR is_x64) @@ -89,13 +88,6 @@ if (is_x86 OR is_x64)
tg_owt::librnnoise tg_owt::librnnoise
tg_owt::libsrtp tg_owt::libsrtp
tg_owt::libusrsctp tg_owt::libusrsctp
- tg_owt::libvpx - tg_owt::libvpx
- tg_owt::libvpx_mmx - tg_owt::libvpx_mmx
- tg_owt::libvpx_sse2 - tg_owt::libvpx_sse2
- tg_owt::libvpx_ssse3 - tg_owt::libvpx_ssse3
- tg_owt::libvpx_sse4 - tg_owt::libvpx_sse4
- tg_owt::libvpx_avx - tg_owt::libvpx_avx
- tg_owt::libvpx_avx2 - tg_owt::libvpx_avx2
tg_owt::libyuv tg_owt::libyuv
) )
else() else()
@@ -97,7 +89,6 @@ else() @@ -109,7 +101,6 @@ else()
tg_owt::librnnoise tg_owt::librnnoise
tg_owt::libsrtp tg_owt::libsrtp
tg_owt::libusrsctp tg_owt::libusrsctp
- tg_owt::libvpx - tg_owt::libvpx
tg_owt::libyuv tg_owt::libyuv
) )
endif() endif()
@@ -125,6 +116,7 @@ endif() @@ -137,6 +128,7 @@ endif()
link_openssl(tg_owt) link_openssl(tg_owt)
link_ffmpeg(tg_owt) link_ffmpeg(tg_owt)
link_opus(tg_owt) link_opus(tg_owt)
+link_libvpx(tg_owt) +link_libvpx(tg_owt)
if (UNIX AND NOT APPLE) if (UNIX AND NOT APPLE)
link_libalsa(tg_owt) link_libalsa(tg_owt)
@@ -1867,18 +1859,6 @@ elseif (APPLE) @@ -2131,18 +2123,6 @@ elseif (APPLE)
) )
endif() endif()
-set(vpx_export) -set(vpx_export)
-if (is_x86 OR is_x64) -if (is_x86 OR is_x64)
- set(vpx_export - set(vpx_export
- libvpx_mmx - libvpx_mmx
- libvpx_sse2 - libvpx_sse2
- libvpx_ssse3 - libvpx_ssse3
- libvpx_sse4 - libvpx_sse4
- libvpx_avx - libvpx_avx
- libvpx_avx2 - libvpx_avx2
- ) - )
-endif() -endif()
- -
set(export_targets set(tg_owt_export tg_owt)
tg_owt if (is_x86 OR is_x64)
libabsl set(tg_owt_export
@@ -1887,8 +1867,6 @@ set(export_targets @@ -2160,8 +2140,6 @@ set(export_targets
librnnoise librnnoise
libsrtp libsrtp
libusrsctp libusrsctp
- libvpx - libvpx
- ${vpx_export} - ${vpx_export}
libwebrtcbuild libwebrtcbuild
libyuv libyuv
${platform_export} ${platform_export}
Show All 20 Lines
Copyright © 2015-2021 Solus Project. The Solus logo is Copyright © 2016-2021 Solus Project. All Rights Reserved.