tg_owt: build against static libvpx-1.10

This commit is contained in:
John 2021-04-02 11:46:51 +02:00
parent dfb72f7fac
commit c79eb58e63
2 changed files with 6 additions and 89 deletions

View File

@ -1,87 +0,0 @@
diff --git CMakeLists.txt CMakeLists.txt
index d970719..c14226e 100644
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -45,7 +45,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)
@@ -77,13 +76,6 @@ 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
)
else()
@@ -97,7 +89,6 @@ else()
tg_owt::librnnoise
tg_owt::libsrtp
tg_owt::libusrsctp
- tg_owt::libvpx
tg_owt::libyuv
)
endif()
@@ -122,6 +113,7 @@ if (APPLE)
target_link_libraries(tg_owt PUBLIC tg_owt::libsdkmacos)
endif()
+link_vpx(tg_owt)
link_openssl(tg_owt)
link_ffmpeg(tg_owt)
link_opus(tg_owt)
@@ -1868,16 +1860,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(export_targets
tg_owt
@@ -1887,7 +1869,6 @@ set(export_targets
librnnoise
libsrtp
libusrsctp
- libvpx
${vpx_export}
libwebrtcbuild
libyuv
diff --git cmake/external.cmake cmake/external.cmake
index 964e260..82d68d0 100644
--- cmake/external.cmake
+++ cmake/external.cmake
@@ -129,3 +129,15 @@ function(link_dl target_name)
target_link_libraries(${target_name} PRIVATE ${CMAKE_DL_LIBS})
endif()
endfunction()
+
+# libvpx
+function(link_vpx target_name)
+ if (TG_OWT_PACKAGED_BUILD)
+ find_package(PkgConfig REQUIRED)
+ pkg_check_modules(VPX vpx)
+ endif()
+ if (VPX_FOUND)
+ target_include_directories(${target_name} PRIVATE ${VPX_INCLUDE_DIRS})
+ target_link_libraries(${target_name} PRIVATE ${VPX_LINK_LIBRARIES})
+ endif()
+endfunction()

View File

@ -1,23 +1,26 @@
# Template file for 'tg_owt'
pkgname=tg_owt
version=0.0.0.20210321
revision=1
revision=2
_commit=2d804d2c9c5d05324c8ab22f2e6ff8306521b3c3
_libyuv_commit=ad890067f661dc747a975bc55ba3767fe30d4452
_libvpx_commit=5b63f0f821e94f8072eb483014cfc33b05978bb9
wrksrc="tg_owt-$_commit"
build_style=cmake
configure_args="-DBUILD_SHARED_LIBS=OFF"
hostmakedepends="pkg-config yasm protobuf"
makedepends="alsa-lib-devel pulseaudio-devel openssl-devel opus-devel
libvpx-devel ffmpeg-devel libjpeg-turbo-devel protobuf-devel"
ffmpeg-devel libjpeg-turbo-devel protobuf-devel"
depends="$makedepends"
short_desc="WebRTC library for Telegram-desktop"
maintainer="John <me@johnnynator.dev>"
license="GPL-3.0-or-later"
homepage="https://github.com/desktop-app/tg_owt"
distfiles="https://github.com/desktop-app/tg_owt/archive/${_commit}.tar.gz
https://chromium.googlesource.com/webm/libvpx/+archive/${_libvpx_commit}.tar.gz
https://chromium.googlesource.com/libyuv/libyuv/+archive/${_libyuv_commit}.tar.gz"
checksum="@2873f3c9a6e5a93976623d4502af59bf6c8a3536aa9928acf45cea0a20e23ec0
@ea967f58e720be3a8f8105d48fedb983570679c8ced8ffbad48fb673089c7ed9
@1dd51820852df840c339bf3f18e6cf1166de33d5631a69cd1eae5b2b34c113e3"
skip_extraction="${_libvpx_commit}.tar.gz ${_libyuv_commit}.tar.gz"
@ -31,4 +34,5 @@ fi
post_extract() {
bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_libyuv_commit}.tar.gz -C ${wrksrc}/src/third_party/libyuv
bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_libvpx_commit}.tar.gz -C ${wrksrc}/src/third_party/libvpx/source/libvpx
}