From d453ced394dfb95ecccbeb4d0e17234fe7c03aa1 Mon Sep 17 00:00:00 2001 From: Rmys Date: Wed, 3 Feb 2021 23:45:10 +0300 Subject: [PATCH] libtg_owt rebuild --- multimedia/misc/libtg_owt/actions.py | 29 ++++++++++++++++------------ multimedia/misc/libtg_owt/pspec.xml | 8 ++++---- 2 files changed, 21 insertions(+), 16 deletions(-) diff --git a/multimedia/misc/libtg_owt/actions.py b/multimedia/misc/libtg_owt/actions.py index c8af8421b9..fc392f1526 100644 --- a/multimedia/misc/libtg_owt/actions.py +++ b/multimedia/misc/libtg_owt/actions.py @@ -13,25 +13,30 @@ from pisi.actionsapi import get def setup(): shelltools.cd("%s" % get.workDIR()) shelltools.move("tg_owt-*", "tg-owt-%s" % get.srcVERSION()) + #shelltools.system("git clone https://chromium.googlesource.com/webm/libvpx") + #shelltools.system("git clone https://chromium.googlesource.com/libyuv/libyuv") shelltools.cd("tg-owt-%s" % get.srcVERSION()) shelltools.move("../libvpx/*", "src/third_party/libvpx/source/libvpx") shelltools.move("../libyuv/*", "src/third_party/libyuv") - shelltools.system("mkdir build") - shelltools.cd("build") - cmaketools.configure("-DBUILD_SHARED_LIBS=TRUE \ - -DTG_OWT_PACKAGED_BUILD=TRUE \ - -DTG_OWT_USE_PROTOBUF=TRUE", sourceDir="..") + pisitools.flags.add("-fPIC") + cmaketools.configure("-G Ninja -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DTG_OWT_SPECIAL_TARGET=linux \ + -DTG_OWT_LIBJPEG_INCLUDE_PATH=/usr/include \ + -DTG_OWT_OPENSSL_INCLUDE_PATH=/usr/include \ + -DTG_OWT_OPUS_INCLUDE_PATH=/usr/include/opus \ + -DTG_OWT_FFMPEG_INCLUDE_PATH=/usr/include") def build(): - shelltools.cd("%s" % get.workDIR()) - shelltools.cd("tg-owt-%s/build" % get.srcVERSION()) - cmaketools.make() + #shelltools.cd("%s" % get.workDIR()) + #shelltools.cd("tg-owt-%s/build" % get.srcVERSION()) + shelltools.system("ninja") def install(): - shelltools.cd("%s" % get.workDIR()) - shelltools.cd("tg-owt-%s/build" % get.srcVERSION()) - cmaketools.rawInstall("DESTDIR=%s" % get.installDIR()) + #shelltools.cd("%s" % get.workDIR()) + #shelltools.cd("tg-owt-%s/build" % get.srcVERSION()) + shelltools.system("DESTDIR=%s ninja install" % get.installDIR()) - pisitools.dodoc("../LICENSE") + pisitools.dodoc("LICENSE") diff --git a/multimedia/misc/libtg_owt/pspec.xml b/multimedia/misc/libtg_owt/pspec.xml index 6391720021..e56655edaa 100644 --- a/multimedia/misc/libtg_owt/pspec.xml +++ b/multimedia/misc/libtg_owt/pspec.xml @@ -16,6 +16,7 @@ https://sourceforge.net/projects/pisilinux/files/source/libvpx.tar.gz https://sourceforge.net/projects/pisilinux/files/source/libyuv.tar.gz + ninja cmake yasm-devel unzip @@ -29,7 +30,6 @@ protobuf-devel pulseaudio-libs-devel alsa-lib-devel - libvpx-devel python3-setuptools /usr/include