owr: Conditionally build a static binary or not

Make the default no, so that a normal configure will work as expected
and builds a version that works out of the box with the system dependencies.

EricssonResearch#6

Author: sdroege

bridge/owr_bridge.c

@@ -30,7 +30,6 @@
 #endif
 #include "owr_bridge.h"
 
-#include "Owr-0.1.gir.h"
 #include "client/domutils.js.h"
 #include "client/sdp.js.h"
 #include "client/webrtc.js.h"
@@ -42,13 +41,17 @@
 #include "worker/bridgeserver.js.h"
 #include "worker/peerhandler.js.h"
 
+#ifdef OWR_STATIC
+#include "Owr-0.1.gir.h"
 #include <gir/GIRepository-2.0.gir.h>
 #include <gir/GLib-2.0.gir.h>
 #include <gir/GObject-2.0.gir.h>
 #include <gir/Gio-2.0.gir.h>
 
 #include <girepository.h>
 #include <girparser.h>
+#endif
+
 #include <glib/gstdio.h>
 #include <seed.h>
 
@@ -58,6 +61,7 @@
 #include <TargetConditionals.h>
 #endif
 
+#ifdef OWR_STATIC
 GLogLevelFlags logged_levels;
 static void no_log_handler() { }
 
@@ -274,6 +278,7 @@ static void load_typelibs()
     for (i = 0; gir_checksums[i]; i++)
         g_free(gir_checksums[i]);
 }
+#endif
 
 static SeedException evaluate_script(SeedContext context, gchar *script, guint script_len,
     gchar *script_name)
@@ -376,7 +381,10 @@ static gpointer run(GAsyncQueue *msg_queue)
     client_script_lengths[3] = webrtc_js__len;
     client_script_lengths[4] = 0;
 
+#ifdef OWR_STATIC
     load_typelibs();
+#endif
+
     owr_init_with_main_context(g_main_context_default());
     engine = seed_init(&argc, &argv);
     seed_engine_set_search_path(engine, "");

build.sh

@@ -74,36 +74,36 @@ build(){
 
         export CFLAGS="$PLATFORM_CFLAGS -I${src_dir}/openwebrtc-deps-${target}/include -I${src_dir}/framework"
         if [[ $target_triple == "arm-apple-darwin10" ]]; then
-            local configure_flags="--enable-static --disable-shared --disable-introspection"
+            local configure_flags="--enable-static --enable-owr-static --disable-shared --disable-introspection"
             local platform_ldflags="${home}/openwebrtc-deps-armv7-ios/lib/my_environ.o ${home}/openwebrtc-deps-${target}/lib/my_stat.o "
             local seed_platform_libs="-framework JavaScriptCore"
             export PLATFORM_GLIB_LIBS="-lffi -lresolv -liconv -lintl "
             export PLATFORM_GSTREAMER_LIBS="-lgstosxaudio -lgstapplemedia -framework AssetsLibrary -framework CoreMedia -framework CoreVideo -framework AVFoundation -framework Foundation -framework OpenGLES -framework CoreAudio -framework AudioToolbox"
             export PLATFORM_OWR_GST_PLUGINS_LIBS="-lgstercolorspace"
             export PLATFORM_CXX_LIBS="-lc++"
         elif [[ $target_triple == "i386-apple-darwin10" ]]; then
-            local configure_flags="--enable-static --disable-shared --disable-introspection"
+            local configure_flags="--enable-static --enable-owr-static --disable-shared --disable-introspection"
             local seed_platform_libs="-framework JavaScriptCore"
             export PLATFORM_GLIB_LIBS="-lffi -lresolv -liconv -lintl "
             export PLATFORM_GSTREAMER_LIBS="-framework CoreMedia -framework CoreVideo -framework AVFoundation -framework Foundation -framework OpenGLES -lgstosxaudio -lgstapplemedia -framework AssetsLibrary -framework CoreAudio -framework AudioToolbox"
             export PLATFORM_CXX_LIBS="-lc++"
         elif [[ $target_triple == "arm-linux-androideabi" ]]; then
             local platform_ldflags="-llog -Wl,--allow-multiple-definition "
-            local configure_flags="--disable-static --enable-shared --disable-introspection"
+            local configure_flags="--disable-static --enable-owr-static --enable-shared --disable-introspection"
             local seed_platform_libs="-ljavascriptcoregtk-3.0 -licui18n -licuuc -licudata"
             export PLATFORM_GLIB_LIBS="-lffi -liconv -lintl "
             export PLATFORM_GSTREAMER_LIBS="-lgstopensles -lOpenSLES -lGLESv2 -lEGL"
             export PLATFORM_OWR_GST_PLUGINS_LIBS="-lgstandroidvideosrc -lgstercolorspace"
             export PLATFORM_CXX_LIBS="-L$ANDROID_NDK/sources/cxx-stl/gnu-libstdc++/4.8/libs/armeabi-v7a -lgnustl_static -lstdc++"
         elif [[ $target_triple == "x86_64-apple-darwin" ]]; then
-            local configure_flags="--enable-static --enable-shared --enable-gtk-doc"
+            local configure_flags="--enable-static --enable-owr-static --enable-shared --enable-gtk-doc"
             local seed_platform_libs="-framework JavaScriptCore"
             export PLATFORM_GLIB_LIBS="-lffi -lresolv -liconv -lintl -framework Carbon"
             export PLATFORM_GSTREAMER_LIBS="-lgstvideoconvert -lgstapplemedia -lgstosxaudio"
             export PLATFORM_GSTREAMER_LIBS="$PLATFORM_GSTREAMER_LIBS -framework AudioUnit -framework AudioToolbox -framework CoreAudio -framework CoreMedia -framework CoreVideo -framework QTKit -framework AVFoundation -framework Foundation -framework VideoToolbox -framework AppKit -framework OpenGL"
             export PLATFORM_CXX_LIBS="-lc++"
         elif [[ $target_triple == "x86_64-unknown-linux" ]] ; then
-            local configure_flags="--enable-static --enable-shared --enable-gtk-doc"
+            local configure_flags="--enable-static --enable-owr-static --enable-shared --enable-gtk-doc"
             local seed_platform_libs="-ljavascriptcoregtk-3.0 -licui18n -licuuc -licudata"
             export PLATFORM_GLIB_LIBS="-lpthread -lffi -lrt -ldl -lresolv"
             export PLATFORM_GSTREAMER_LIBS="-lgstvideoconvert -lgstpulse -lpulse-mainloop-glib -lpulse -lgstvideo4linux2 -lv4l2 -lX11 -lXv -lgstallocators-1.0 -lGLU -lGL"

configure.ac

@@ -57,6 +57,24 @@ if test "x$enable_debug" = xyes; then
 fi
 AM_CONDITIONAL(OWR_DEBUG, test x$enable_debug = xyes)
 
+dnl build static or not
+AC_MSG_CHECKING([whether to build static owr or not])
+AC_ARG_ENABLE(owr-static,
+AC_HELP_STRING(
+  [--enable-owr-static],
+  [Enable static owr @<:@default=no@:>@]),
+[case "${enableval}" in
+  yes) enable_owr_static=yes ;;
+  no)  enable_owr_static=no ;;
+  *) AC_MSG_ERROR(bad value ${enableval} for --enable-owr-static) ;;
+esac],[enable_owr_static=no])
+AC_MSG_RESULT([$enable_owr_static])
+if test "x$enable_owr_static" = xyes; then
+  AC_DEFINE(OWR_STATIC, 1,
+  [Define if building static])
+fi
+AM_CONDITIONAL(OWR_STATIC, test x$enable_owr_static = xyes)
+
 AC_OUTPUT([
 Makefile
 bridge/Makefile

owr/Makefile.am

@@ -17,7 +17,6 @@ lib_LTLIBRARIES = libopenwebrtc.la
 
 libopenwebrtc_la_SOURCES = \
     owr.c \
-    owr_require_symbols.c \
     owr_types.c \
     owr_media_source.c \
     owr_utils.c
@@ -35,10 +34,15 @@ libopenwebrtc_la_DEPENDENCIES = \
     $(top_builddir)/local/libopenwebrtc_local.la \
     $(top_builddir)/transport/libopenwebrtc_transport.la
 
-libopenwebrtc_la_LDFLAGS = -export-dynamic -export-symbols $(top_srcdir)/libopenwebrtc.exp -version-info 3601
+libopenwebrtc_la_LDFLAGS = -export-dynamic -version-info 3601
 
+if OWR_STATIC
+libopenwebrtc_la_LDFLAGS += -export-symbols $(top_srcdir)/libopenwebrtc.exp
+libopenwebrtc_la_SOURCES += \
+    owr_require_symbols.c
 owr_require_symbols.c:
 	python ${srcdir}/symbols_to_source.py $(top_srcdir)/libopenwebrtc.exp $@
+endif
 
 includedir = $(prefix)/include/owr
 include_HEADERS = \
@@ -61,7 +65,11 @@ EXTRA_DIST = \
 -include $(INTROSPECTION_MAKEFILE)
 INTROSPECTION_GIRS =
 INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) --warn-all
-INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) --shared-library=""
+
+INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
+if OWR_STATIC
+INTROSPECTION_COMPILER_ARGS += --shared-library=""
+endif
 
 if HAVE_INTROSPECTION
 introspection_sources = $(libopenwebrtc_la_SOURCES)
@@ -74,6 +82,9 @@ Owr_0_1_gir_CFLAGS = \
     -I$(top_srcdir)/transport \
     -I$(top_srcdir)/local
 Owr_0_1_gir_LIBS = libopenwebrtc.la
+if !OWR_STATIC
+Owr_0_1_gir_LIBS += gstreamer-1.0 gstvideo-1.0 gstapp-1.0
+endif
 Owr_0_1_gir_FILES = \
     owr.h \
     owr.c \

owr/owr.c

@@ -43,7 +43,10 @@
 #include "owr_utils.h"
 
 #include <gst/gst.h>
+
+#ifdef OWR_STATIC
 #include <gstnice.h>
+#endif
 
 #ifdef __APPLE__
 #include <TargetConditionals.h>
@@ -64,6 +67,7 @@ static guint bus_watch_id = -1;
 static gpointer owr_run(gpointer data);
 static gboolean bus_call(GstBus *bus, GstMessage *msg, gpointer user_data);
 
+#ifdef OWR_STATIC
 GST_PLUGIN_STATIC_DECLARE(alaw);
 GST_PLUGIN_STATIC_DECLARE(app);
 GST_PLUGIN_STATIC_DECLARE(audioconvert);
@@ -105,6 +109,7 @@ GST_PLUGIN_STATIC_DECLARE(video4linux2);
 #if defined(__ANDROID__) || (defined(__APPLE__) && TARGET_OS_IPHONE && !TARGET_IPHONE_SIMULATOR)
 GST_PLUGIN_STATIC_DECLARE(ercolorspace);
 #endif
+#endif
 
 #ifdef __ANDROID__
 static void g_print_android_handler(const gchar *message)
@@ -176,12 +181,15 @@ void owr_init()
     gst_debug_add_log_function((GstLogFunction)gst_log_android_handler, NULL, NULL);
 #endif
 
+#ifdef OWR_STATIC
     /* Hack to make sure that all symbols that we need are included in the resulting library/binary */
     _owr_require_symbols();
+#endif
 
     gst_init(NULL, NULL);
     owr_initialized = TRUE;
 
+#ifdef OWR_STATIC
     GST_PLUGIN_STATIC_REGISTER(alaw);
     GST_PLUGIN_STATIC_REGISTER(app);
     GST_PLUGIN_STATIC_REGISTER(audioconvert);
@@ -225,6 +233,7 @@ void owr_init()
 
     gst_element_register(NULL, "nicesrc", GST_RANK_NONE, GST_TYPE_NICE_SRC);
     gst_element_register(NULL, "nicesink", GST_RANK_NONE, GST_TYPE_NICE_SINK);
+#endif
 
     owr_main_context_is_external = !!owr_main_context;