Commit af9e42d1 authored by Nirbheek Chauhan's avatar Nirbheek Chauhan 🐜
Browse files

Cerbero has moved from gnutls+openssl to only openssl

parent 254ce57b
......@@ -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
......@@ -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
......@@ -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) {
......
......@@ -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) {
......
......@@ -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) {
......
......@@ -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) {
......
......@@ -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) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment