From 1a4080e6cdb074b7e2771bc062234ce10a173f2a Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Mon, 20 Sep 2021 20:59:43 +1000 Subject: [PATCH] tg_owt: bump version --- ....patchset => tg_owt-0.0.20210915.patchset} | 44 ++++++++++++++++++- ...0627.recipe => tg_owt-0.0.20210915.recipe} | 22 ++++------ 2 files changed, 51 insertions(+), 15 deletions(-) rename media-libs/tg_owt/patches/{tg_owt-0.0.20210627.patchset => tg_owt-0.0.20210915.patchset} (97%) rename media-libs/tg_owt/{tg_owt-0.0.20210627.recipe => tg_owt-0.0.20210915.recipe} (76%) diff --git a/media-libs/tg_owt/patches/tg_owt-0.0.20210627.patchset b/media-libs/tg_owt/patches/tg_owt-0.0.20210915.patchset similarity index 97% rename from media-libs/tg_owt/patches/tg_owt-0.0.20210627.patchset rename to media-libs/tg_owt/patches/tg_owt-0.0.20210915.patchset index 1f7195f6a..774c99f21 100644 --- a/media-libs/tg_owt/patches/tg_owt-0.0.20210627.patchset +++ b/media-libs/tg_owt/patches/tg_owt-0.0.20210915.patchset @@ -1,6 +1,6 @@ -From d0793b34c7d6c4e3fe2f3e6fb325143186bea54e Mon Sep 17 00:00:00 2001 +From 8b57254fd9ca87d5207278fc44e3ef637a3338d5 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Wed, 11 Aug 2021 21:09:47 +1000 +Date: Fri, 17 Sep 2021 17:09:05 +1000 Subject: Add Haiku support @@ -109,6 +109,46 @@ index f5696ed..819d371 100644 set(platform_export libevent ) +diff --git a/cmake/external.cmake b/cmake/external.cmake +index 781f0a1..28e0804 100644 +--- a/cmake/external.cmake ++++ b/cmake/external.cmake +@@ -1,7 +1,7 @@ + # OpenSSL + set(TG_OWT_OPENSSL_INCLUDE_PATH "" CACHE STRING "Include path for openssl.") + function(link_openssl target_name) +- if (TG_OWT_PACKAGED_BUILD) ++ if (TG_OWT_PACKAGED_BUILD OR HAIKU) + find_package(OpenSSL REQUIRED) + target_include_directories(${target_name} PRIVATE ${OPENSSL_INCLUDE_DIR}) + target_link_libraries(${target_name} PRIVATE ${OPENSSL_LIBRARIES}) +@@ -20,7 +20,7 @@ endfunction() + # Opus + set(TG_OWT_OPUS_INCLUDE_PATH "" CACHE STRING "Include path for opus.") + function(link_opus target_name) +- if (TG_OWT_PACKAGED_BUILD) ++ if (TG_OWT_PACKAGED_BUILD OR HAIKU) + find_package(PkgConfig REQUIRED) + pkg_check_modules(OPUS REQUIRED opus) + target_include_directories(${target_name} PRIVATE ${OPUS_INCLUDE_DIRS}) +@@ -41,7 +41,7 @@ endfunction() + set(TG_OWT_FFMPEG_INCLUDE_PATH "" CACHE STRING "Include path for ffmpeg.") + option(TG_OWT_PACKAGED_BUILD_FFMPEG_STATIC "Link ffmpeg statically in packaged mode." OFF) + function(link_ffmpeg target_name) +- if (TG_OWT_PACKAGED_BUILD) ++ if (TG_OWT_PACKAGED_BUILD OR HAIKU) + find_package(PkgConfig REQUIRED) + pkg_check_modules(AVCODEC REQUIRED libavcodec) + pkg_check_modules(AVFORMAT REQUIRED libavformat) +@@ -89,7 +89,7 @@ endfunction() + # libjpeg + set(TG_OWT_LIBJPEG_INCLUDE_PATH "" CACHE STRING "Include path for libjpeg.") + function(link_libjpeg target_name) +- if (TG_OWT_PACKAGED_BUILD) ++ if (TG_OWT_PACKAGED_BUILD OR HAIKU) + find_package(JPEG REQUIRED) + target_include_directories(${target_name} PRIVATE ${JPEG_INCLUDE_DIRS}) + target_link_libraries(${target_name} PRIVATE ${JPEG_LIBRARIES}) diff --git a/cmake/libusrsctp.cmake b/cmake/libusrsctp.cmake index 1dc5e5e..e88531c 100644 --- a/cmake/libusrsctp.cmake diff --git a/media-libs/tg_owt/tg_owt-0.0.20210627.recipe b/media-libs/tg_owt/tg_owt-0.0.20210915.recipe similarity index 76% rename from media-libs/tg_owt/tg_owt-0.0.20210627.recipe rename to media-libs/tg_owt/tg_owt-0.0.20210915.recipe index 5cba8a9f7..b1d8596e8 100644 --- a/media-libs/tg_owt/tg_owt-0.0.20210627.recipe +++ b/media-libs/tg_owt/tg_owt-0.0.20210915.recipe @@ -3,19 +3,19 @@ DESCRIPTION="Telegram Desktop's fork of Google's WebRTC." HOMEPAGE="https://github.com/desktop-app/tg_owt" COPYRIGHT="2013-2021 Telegram" LICENSE="BSD (3-clause)" -REVISION="2" -srcGitRev="91d836dc84a16584c6ac52b36c04c0de504d9c34" +REVISION="1" +srcGitRev="575fb17d2853c43329e45f6693370f5e41668055" SOURCE_URI="https://github.com/desktop-app/tg_owt/archive/$srcGitRev.tar.gz" SOURCE_DIR="tg_owt-$srcGitRev" -CHECKSUM_SHA256="94f00a591d207f9b2e064475e922ef4fe4383e011816cb45e61be7c5b93732b0" +CHECKSUM_SHA256="b7176605b66d1d3ab8180bf2569fbe1f646ee6bca1610e96b2bf4978c14f4241" SOURCE_FILENAME="tg_owt-$srcGitRev.tar.gz" -srcGitRev_2="bd53f0cc9faefbca2dcb6b21b6849d5e24141c9c" +srcGitRev_2="5b63f0f821e94f8072eb483014cfc33b05978bb9" SOURCE_URI_2="https://github.com/webmproject/libvpx/archive/$srcGitRev_2.tar.gz" -CHECKSUM_SHA256_2="6d0bb99a05ee906ff90fd6de9d5663773ad33f3d778992037abf220be04dd974" +CHECKSUM_SHA256_2="9c48507861a65e9d248da69881e1c66c01d2d533cd3b1f7c4ccb30ddb9e6c416" SOURCE_FILENAME_2="libvpx-$srcGitRev_2.tar.gz" -srcGitRev_3="5b3351bd07e83f9f9a4cb6629561331ecdb7c546" +srcGitRev_3="ad890067f661dc747a975bc55ba3767fe30d4452" SOURCE_URI_3="https://github.com/lemenkov/libyuv/archive/$srcGitRev_3.tar.gz" -CHECKSUM_SHA256_3="242e3c42d2c6ff7770d62d78cfb45642541e92dea6afe2ebe07a9a04db3a98cb" +CHECKSUM_SHA256_3="3bd4b9e5cc75cdb1360cae868f7de39d4547448c30e1074d8e94f25bc6931e30" SOURCE_FILENAME_3="libyuv-$srcGitRev_3.tar.gz" PATCHES="tg_owt-$portVersion.patchset" @@ -80,14 +80,10 @@ BUILD() -DCMAKE_INSTALL_LIBDIR=$developLibDir \ -DCMAKE_INSTALL_INCLUDEDIR=$includeDir \ -DBUILD_SHARED_LIBS=FALSE \ - -DTG_OWT_PACKAGED_BUILD=TRUE \ + -DTG_OWT_PACKAGED_BUILD=FALSE \ -DTG_OWT_SPECIAL_TARGET=haiku \ -DTG_OWT_USE_PROTOBUF=FALSE \ - -DTG_OWT_USE_PIPEWIRE=FALSE \ - -DTG_OWT_LIBJPEG_INCLUDE_PATH=/system/$relativeIncludeDir \ - -DTG_OWT_OPENSSL_INCLUDE_PATH=/system/$relativeIncludeDir \ - -DTG_OWT_OPUS_INCLUDE_PATH=/system/$relativeIncludeDir/opus \ - -DTG_OWT_FFMPEG_INCLUDE_PATH=/system/$relativeIncludeDir + -DTG_OWT_USE_PIPEWIRE=FALSE make $jobArgs }