Cerbero has moved from gnutls+openssl to only openssl

This commit is contained in:
Nirbheek Chauhan 2020-03-02 16:38:17 +05:30
parent 254ce57b07
commit af9e42d130
7 changed files with 22 additions and 22 deletions

View file

@ -29,6 +29,6 @@ endif
GSTREAMER_NDK_BUILD_PATH := $(GSTREAMER_ROOT)/share/gst-android/ndk-build/
include $(GSTREAMER_NDK_BUILD_PATH)/plugins.mk
GSTREAMER_PLUGINS := $(GSTREAMER_PLUGINS_CORE) $(GSTREAMER_PLUGINS_PLAYBACK) $(GSTREAMER_PLUGINS_CODECS) $(GSTREAMER_PLUGINS_NET) $(GSTREAMER_PLUGINS_SYS)
G_IO_MODULES := gnutls
G_IO_MODULES := openssl
GSTREAMER_EXTRA_DEPS := gstreamer-video-1.0
include $(GSTREAMER_NDK_BUILD_PATH)/gstreamer-1.0.mk

View file

@ -29,6 +29,6 @@ endif
GSTREAMER_NDK_BUILD_PATH := $(GSTREAMER_ROOT)/share/gst-android/ndk-build/
include $(GSTREAMER_NDK_BUILD_PATH)/plugins.mk
GSTREAMER_PLUGINS := $(GSTREAMER_PLUGINS_CORE) $(GSTREAMER_PLUGINS_PLAYBACK) $(GSTREAMER_PLUGINS_CODECS) $(GSTREAMER_PLUGINS_NET) $(GSTREAMER_PLUGINS_SYS)
G_IO_MODULES := gnutls
G_IO_MODULES := openssl
GSTREAMER_EXTRA_DEPS := gstreamer-video-1.0
include $(GSTREAMER_NDK_BUILD_PATH)/gstreamer-1.0.mk

View file

@ -528,8 +528,8 @@ GST_PLUGIN_STATIC_DECLARE(rtmp);
GST_PLUGIN_STATIC_DECLARE(nle);
#endif
#if defined(GST_IOS_GIO_MODULE_GNUTLS)
GST_G_IO_MODULE_DECLARE(gnutls);
#if defined(GST_IOS_GIO_MODULE_OPENSSL)
GST_G_IO_MODULE_DECLARE(openssl);
#endif
void
@ -564,8 +564,8 @@ gst_ios_init (void)
ca_certificates = g_build_filename (resources_dir, "ssl", "certs", "ca-certificates.crt", NULL);
g_setenv ("CA_CERTIFICATES", ca_certificates, TRUE);
#if defined(GST_IOS_GIO_MODULE_GNUTLS)
GST_G_IO_MODULE_LOAD(gnutls);
#if defined(GST_IOS_GIO_MODULE_OPENSSL)
GST_G_IO_MODULE_LOAD(openssl);
#endif
if (ca_certificates) {

View file

@ -528,8 +528,8 @@ GST_PLUGIN_STATIC_DECLARE(rtmp);
GST_PLUGIN_STATIC_DECLARE(nle);
#endif
#if defined(GST_IOS_GIO_MODULE_GNUTLS)
GST_G_IO_MODULE_DECLARE(gnutls);
#if defined(GST_IOS_GIO_MODULE_OPENSSL)
GST_G_IO_MODULE_DECLARE(openssl);
#endif
void
@ -564,8 +564,8 @@ gst_ios_init (void)
ca_certificates = g_build_filename (resources_dir, "ssl", "certs", "ca-certificates.crt", NULL);
g_setenv ("CA_CERTIFICATES", ca_certificates, TRUE);
#if defined(GST_IOS_GIO_MODULE_GNUTLS)
GST_G_IO_MODULE_LOAD(gnutls);
#if defined(GST_IOS_GIO_MODULE_OPENSSL)
GST_G_IO_MODULE_LOAD(openssl);
#endif
if (ca_certificates) {

View file

@ -528,8 +528,8 @@ GST_PLUGIN_STATIC_DECLARE(rtmp);
GST_PLUGIN_STATIC_DECLARE(nle);
#endif
#if defined(GST_IOS_GIO_MODULE_GNUTLS)
GST_G_IO_MODULE_DECLARE(gnutls);
#if defined(GST_IOS_GIO_MODULE_OPENSSL)
GST_G_IO_MODULE_DECLARE(openssl);
#endif
void
@ -564,8 +564,8 @@ gst_ios_init (void)
ca_certificates = g_build_filename (resources_dir, "ssl", "certs", "ca-certificates.crt", NULL);
g_setenv ("CA_CERTIFICATES", ca_certificates, TRUE);
#if defined(GST_IOS_GIO_MODULE_GNUTLS)
GST_G_IO_MODULE_LOAD(gnutls);
#if defined(GST_IOS_GIO_MODULE_OPENSSL)
GST_G_IO_MODULE_LOAD(openssl);
#endif
if (ca_certificates) {

View file

@ -528,8 +528,8 @@ GST_PLUGIN_STATIC_DECLARE(rtmp);
GST_PLUGIN_STATIC_DECLARE(nle);
#endif
#if defined(GST_IOS_GIO_MODULE_GNUTLS)
GST_G_IO_MODULE_DECLARE(gnutls);
#if defined(GST_IOS_GIO_MODULE_OPENSSL)
GST_G_IO_MODULE_DECLARE(openssl);
#endif
void
@ -564,8 +564,8 @@ gst_ios_init (void)
ca_certificates = g_build_filename (resources_dir, "ssl", "certs", "ca-certificates.crt", NULL);
g_setenv ("CA_CERTIFICATES", ca_certificates, TRUE);
#if defined(GST_IOS_GIO_MODULE_GNUTLS)
GST_G_IO_MODULE_LOAD(gnutls);
#if defined(GST_IOS_GIO_MODULE_OPENSSL)
GST_G_IO_MODULE_LOAD(openssl);
#endif
if (ca_certificates) {

View file

@ -528,8 +528,8 @@ GST_PLUGIN_STATIC_DECLARE(rtmp);
GST_PLUGIN_STATIC_DECLARE(nle);
#endif
#if defined(GST_IOS_GIO_MODULE_GNUTLS)
GST_G_IO_MODULE_DECLARE(gnutls);
#if defined(GST_IOS_GIO_MODULE_OPENSSL)
GST_G_IO_MODULE_DECLARE(openssl);
#endif
void
@ -564,8 +564,8 @@ gst_ios_init (void)
ca_certificates = g_build_filename (resources_dir, "ssl", "certs", "ca-certificates.crt", NULL);
g_setenv ("CA_CERTIFICATES", ca_certificates, TRUE);
#if defined(GST_IOS_GIO_MODULE_GNUTLS)
GST_G_IO_MODULE_LOAD(gnutls);
#if defined(GST_IOS_GIO_MODULE_OPENSSL)
GST_G_IO_MODULE_LOAD(openssl);
#endif
if (ca_certificates) {