diff options
author | Nirbheek Chauhan <nirbheek@centricular.com> | 2020-09-18 03:35:21 +0530 |
---|---|---|
committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2020-09-18 04:38:08 +0530 |
commit | 604d68afb579e5022b67251dc69a77c2cb028555 (patch) | |
tree | 4e6317d7b7df4496387dfb7cb6e560946c123f55 | |
parent | 7c3721421330c6784a3c41bc5cc8fe44586f4b34 (diff) |
gst-plugins-bad: Get rid of external usrsctp recipe
We've started using the internal sctp, so get rid of the external one.
Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/604>
-rw-r--r-- | packages/gstreamer-1.0-net.package | 4 | ||||
-rw-r--r-- | recipes/gst-plugins-bad-1.0.recipe | 4 | ||||
-rw-r--r-- | recipes/libusrsctp.recipe | 57 |
3 files changed, 5 insertions, 60 deletions
diff --git a/packages/gstreamer-1.0-net.package b/packages/gstreamer-1.0-net.package index 8597d4c9..ead91c82 100644 --- a/packages/gstreamer-1.0-net.package +++ b/packages/gstreamer-1.0-net.package @@ -11,7 +11,7 @@ class Package(custom.GStreamer, package.Package): deps = ['gstreamer-1.0-core', 'base-crypto'] files = ['libsoup:libs', 'libpsl:libs', 'sqlite3:libs', 'libsrtp:libs', - 'libnice:libs:plugins_net', 'srt:libs', 'libusrsctp:libs', + 'libnice:libs:plugins_net', 'srt:libs', 'gst-plugins-base-1.0:plugins_net', 'gst-plugins-good-1.0:plugins_net', 'gst-plugins-ugly-1.0:plugins_net', 'gst-plugins-bad-1.0:plugins_net', 'gst-rtsp-server-1.0:libs:typelibs:plugins_net'] @@ -34,7 +34,7 @@ class Package(custom.GStreamer, package.Package): if self.config.variants.uwp: self.files = [ - 'glib-networking', 'libsrtp:libs', 'libusrsctp:libs', + 'glib-networking', 'libsrtp:libs', 'libnice:libs:plugins_net', 'gst-plugins-base-1.0:plugins_net', 'gst-plugins-good-1.0:plugins_net', 'gst-plugins-ugly-1.0:plugins_net', 'gst-plugins-bad-1.0:plugins_net', 'gst-rtsp-server-1.0:libs:plugins_net', diff --git a/recipes/gst-plugins-bad-1.0.recipe b/recipes/gst-plugins-bad-1.0.recipe index 74523713..42691651 100644 --- a/recipes/gst-plugins-bad-1.0.recipe +++ b/recipes/gst-plugins-bad-1.0.recipe @@ -4,6 +4,7 @@ from cerbero.tools.libtool import LibtoolLibrary class Recipe(custom.GStreamer): name = 'gst-plugins-bad-1.0' btype = BuildType.MESON + licenses = [{License.LGPLv2Plus: None, License.BSD_like: ['ext/sctp/usrsctp/LICENSE.md']}] tarball_checksum = 'f382ab1caddd64aaa7acb7c4787487f63fd39bd0fde9c757655cbaa457c1185f' # Explicitly enable plugins that we provide dependencies for to ensure that # we error out if they weren't found. @@ -28,6 +29,7 @@ class Recipe(custom.GStreamer): 'rtmp2': 'enabled', 'sbc': 'enabled', 'sctp': 'enabled', + 'sctp-internal-usrsctp': 'enabled', 'soundtouch': 'enabled', 'srt': 'enabled', 'spandsp': 'enabled', @@ -71,7 +73,7 @@ class Recipe(custom.GStreamer): 'libsrtp', 'libdca', 'libmms', 'libdvdnav', 'libnice', 'soundtouch', 'vo-aacenc', 'librsvg', 'openjpeg', 'pango', 'spandsp', 'webrtc-audio-processing', 'sbc', 'ladspa', - 'srt', 'libusrsctp', 'zbar'] + 'srt', 'zbar'] use_system_libs = True files_lang = ['gst-plugins-bad-1.0'] diff --git a/recipes/libusrsctp.recipe b/recipes/libusrsctp.recipe deleted file mode 100644 index 6241459d..00000000 --- a/recipes/libusrsctp.recipe +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright (c) 2014-2015, Centricular Ltd. All rights reserved. -# Copyright (c) 2015, Ericsson AB. All rights reserved. -# -# Redistribution and use in source and binary forms, with or without modification, -# are permitted provided that the following conditions are met: -# -# 1. Redistributions of source code must retain the above copyright notice, this -# list of conditions and the following disclaimer. -# -# 2. Redistributions in binary form must reproduce the above copyright notice, this -# list of conditions and the following disclaimer in the documentation and/or other -# materials provided with the distribution. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY -# OF SUCH DAMAGE. - -# -*- Mode: Python -*- vi:si:et:sw=4:sts=4:ts=4:syntax=python - -from cerbero.tools.libtool import LibtoolLibrary - -class Recipe(recipe.Recipe): - name = 'libusrsctp' - version = 'master' - remotes = {'origin': 'https://github.com/sctplab/usrsctp.git'} - commit = 'f668bb69123fdbd0dd027b590536d89118964dca' - stype = SourceType.GIT - btype = BuildType.MESON - licenses = [{License.BSD_like: ['LICENSE.md']}] - - # We do not need the socket API since we will wrap inside a DTLS packet - # anyway, because we use SCTP for WebRTC data channels. - meson_options = {'sctp_inet': 'false', 'sctp_inet6': 'false', 'sctp_build_programs': 'false'} - - files_libs = ['libusrsctp'] - files_devel = ['include/usrsctp.h'] - - def prepare(self): - if self.using_msvc(): - self.library_type = LibraryType.SHARED - - def post_install(self): - # XXX: Don't forget to keep this in sync with the library version! - dependency_libs=[] - - libtool_la = LibtoolLibrary('usrsctp', 0, None, None, self.config.libdir, - self.config.target_platform, - deps=dependency_libs) - libtool_la.save() - super().post_install() |