forked from pool/telegram-desktop
c0869ffb29
- Refresh 0002-use-bundled-rnnoise-expected-gsl-ranges-webrtc.patch OBS-URL: https://build.opensuse.org/request/show/1067966 OBS-URL: https://build.opensuse.org/package/show/server:messaging/telegram-desktop?expand=0&rev=246
77 lines
2.7 KiB
Diff
77 lines
2.7 KiB
Diff
--- a/cmake/external/rnnoise/CMakeLists.txt
|
|
+++ b/cmake/external/rnnoise/CMakeLists.txt
|
|
@@ -4,7 +4,7 @@
|
|
# For license and copyright information please follow this link:
|
|
# https://github.com/desktop-app/legal/blob/master/LEGAL
|
|
|
|
-if (DESKTOP_APP_USE_PACKAGED)
|
|
+if (NOT DESKTOP_APP_USE_PACKAGED)
|
|
add_library(external_rnnoise INTERFACE IMPORTED GLOBAL)
|
|
add_library(desktop-app::external_rnnoise ALIAS external_rnnoise)
|
|
|
|
@@ -18,7 +18,7 @@ endif()
|
|
add_library(external_rnnoise STATIC IMPORTED GLOBAL)
|
|
add_library(desktop-app::external_rnnoise ALIAS external_rnnoise)
|
|
|
|
-set(rnnoise_lib_loc ${libs_loc}/rnnoise/out)
|
|
+set(rnnoise_lib_loc ${libs_loc}/rnnoise/.libs)
|
|
if (WIN32)
|
|
target_include_directories(external_rnnoise SYSTEM
|
|
INTERFACE
|
|
@@ -40,9 +40,9 @@ elseif (APPLE)
|
|
else()
|
|
target_include_directories(external_rnnoise SYSTEM
|
|
INTERFACE
|
|
- /usr/local/include
|
|
+ ${libs_loc}/rnnoise/include
|
|
)
|
|
- find_library(DESKTOP_APP_RNNOISE_LIBRARIES librnnoise.a REQUIRED)
|
|
+ find_library(DESKTOP_APP_RNNOISE_LIBRARIES librnnoise.a HINTS "${rnnoise_lib_loc}" REQUIRED)
|
|
set_target_properties(external_rnnoise PROPERTIES
|
|
IMPORTED_LOCATION "${DESKTOP_APP_RNNOISE_LIBRARIES}"
|
|
)
|
|
--- a/cmake/external/expected/CMakeLists.txt
|
|
+++ b/cmake/external/expected/CMakeLists.txt
|
|
@@ -7,7 +7,7 @@
|
|
add_library(external_expected INTERFACE IMPORTED GLOBAL)
|
|
add_library(desktop-app::external_expected ALIAS external_expected)
|
|
|
|
-if (DESKTOP_APP_USE_PACKAGED)
|
|
+if (NOT DESKTOP_APP_USE_PACKAGED)
|
|
if (DESKTOP_APP_USE_PACKAGED_LAZY)
|
|
find_package(tl-expected QUIET)
|
|
else()
|
|
--- a/cmake/external/gsl/CMakeLists.txt
|
|
+++ b/cmake/external/gsl/CMakeLists.txt
|
|
@@ -7,7 +7,7 @@
|
|
add_library(external_gsl INTERFACE IMPORTED GLOBAL)
|
|
add_library(desktop-app::external_gsl ALIAS external_gsl)
|
|
|
|
-if (DESKTOP_APP_USE_PACKAGED)
|
|
+if (NOT DESKTOP_APP_USE_PACKAGED)
|
|
if (DESKTOP_APP_USE_PACKAGED_LAZY)
|
|
find_package(Microsoft.GSL 4.0.0 QUIET)
|
|
else()
|
|
--- a/cmake/external/ranges/CMakeLists.txt
|
|
+++ b/cmake/external/ranges/CMakeLists.txt
|
|
@@ -7,7 +7,7 @@
|
|
add_library(external_ranges INTERFACE IMPORTED GLOBAL)
|
|
add_library(desktop-app::external_ranges ALIAS external_ranges)
|
|
|
|
-if (DESKTOP_APP_USE_PACKAGED)
|
|
+if (NOT DESKTOP_APP_USE_PACKAGED)
|
|
if (DESKTOP_APP_USE_PACKAGED_LAZY)
|
|
find_package(range-v3 QUIET)
|
|
else()
|
|
--- a/cmake/external/webrtc/CMakeLists.txt
|
|
+++ b/cmake/external/webrtc/CMakeLists.txt
|
|
@@ -7,7 +7,7 @@
|
|
add_library(external_webrtc INTERFACE IMPORTED GLOBAL)
|
|
add_library(desktop-app::external_webrtc ALIAS external_webrtc)
|
|
|
|
-if (DESKTOP_APP_USE_PACKAGED)
|
|
+if (NOT DESKTOP_APP_USE_PACKAGED)
|
|
find_package(tg_owt REQUIRED)
|
|
target_link_libraries(external_webrtc INTERFACE tg_owt::tg_owt)
|
|
return()
|