Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Various build fixes #7

Closed
wants to merge 8 commits into from
Closed

Various build fixes #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c465256
configure.ac: The OpenWebRTC GStreamer plugins install no pkg-config …
sdroege Oct 2, 2014
7191253
build: Don't use -pedantic and -ansi
sdroege Oct 2, 2014
4d9416c
nice: Version 0.1.7.1 or newer is required to build
sdroege Oct 2, 2014
0c3a546
owr_local_media_source: Work around wrong compiler warning
sdroege Oct 2, 2014
3c15961
build: Requires gstreamer-app-1.0 and gstreamer-video-1.0 too
sdroege Oct 2, 2014
b2fb39e
transport/owr_candidate: Use - instead of _ to prevent assertions wit…
sdroege Oct 2, 2014
f45e763
build: Fix linking of the bridge daemon
sdroege Oct 2, 2014
404af77
Require GStreamer >= 1.4 and write the version only once
sdroege Oct 2, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions bridge/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ AM_CFLAGS = \
-Wall \
-Wextra \
-Werror \
-pedantic \
$(DEBUG_CFLAGS)

lib_LTLIBRARIES = libopenwebrtc_bridge.la
Expand All @@ -37,7 +36,8 @@ libopenwebrtc_bridge_la_LDFLAGS = -export-dynamic

bin_PROGRAMS = daemon
daemon_SOURCES = daemon.c
daemon_LDFLAGS = -static -export-dynamic $(SEED_LIBS) libopenwebrtc_bridge.la
daemon_LDFLAGS = -static -export-dynamic $(SEED_LIBS)
daemon_LDADD = libopenwebrtc_bridge.la

includedir = $(prefix)/include/owr
include_HEADERS = \
Expand Down
7 changes: 4 additions & 3 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,19 @@ AM_INIT_AUTOMAKE([1.11 -Wno-portability])
AM_SILENT_RULES([yes])

AC_PROG_CC
AC_PROG_CC_STDC

LT_INIT

LIBOPENWEBRTC_CFLAGS="-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_32 -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_32 -DGLIB_DISABLE_DEPRECATION_WARNINGS"
AC_SUBST(LIBOPENWEBRTC_CFLAGS)

GST_REQUIRED=1.4
PKG_CHECK_MODULES(GLIB, [glib-2.0, gobject-2.0, gmodule-2.0, gthread-2.0])
PKG_CHECK_MODULES(GSTREAMER, [gstreamer-1.0 >= 1.0.10 gstreamer-rtp-1.0 >= 1.0.10])
PKG_CHECK_MODULES(NICE, [nice >= 0.1.4])
PKG_CHECK_MODULES(GSTREAMER, [gstreamer-1.0 >= $GST_REQUIRED gstreamer-rtp-1.0 >= $GST_REQUIRED gstreamer-video-1.0 >= $GST_REQUIRED gstreamer-app-1.0 >= $GST_REQUIRED])
PKG_CHECK_MODULES(NICE, [nice >= 0.1.7.1])
PKG_CHECK_MODULES(ORC, [orc-0.4])
PKG_CHECK_MODULES(SEED, [seed])
PKG_CHECK_MODULES(OPENWEBRTC_GST_PLUGINS, [openwebrtc-gst-plugins])

# check for gobject-introspection
m4_ifdef([GOBJECT_INTROSPECTION_CHECK], [
Expand Down
4 changes: 1 addition & 3 deletions local/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,9 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/owr

AM_CFLAGS = \
-ansi \
-Wall \
-Wextra \
-Werror \
-pedantic
-Werror
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This may be a contentious change. :)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Without this the build fails for me with the libnice headers because of some pedantic warnings :)


noinst_LTLIBRARIES = libopenwebrtc_local.la

Expand Down
2 changes: 1 addition & 1 deletion local/owr_local_media_source.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ static GstPad *owr_local_media_source_get_pad(OwrMediaSource *media_source, GstC
OwrLocalMediaSource *local_source;
OwrLocalMediaSourcePrivate *priv;
GstElement *source_bin, *post_tee_bin;
GstElement *source, *capsfilter = NULL, *tee;
GstElement *source = NULL, *capsfilter = NULL, *tee;
GstPad *ghostpad = NULL;
gchar *pad_name;
OwrMediaType media_type = OWR_MEDIA_TYPE_UNKNOWN;
Expand Down
2 changes: 0 additions & 2 deletions owr/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,9 @@ AM_CPPFLAGS = \
$(GSTREAMER_CFLAGS)

AM_CFLAGS = \
-ansi \
-Wall \
-Wextra \
-Werror \
-pedantic \
$(DEBUG_CFLAGS)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same with these two, maybe contentious. We'll have to discuss why we use those and whether we still want them.

lib_LTLIBRARIES = libopenwebrtc.la
Expand Down
2 changes: 0 additions & 2 deletions transport/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,9 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/owr

AM_CFLAGS = \
-ansi \
-Wall \
-Wextra \
-Werror \
-pedantic \
$(DEBUG_CFLAGS)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And these.

noinst_LTLIBRARIES = libopenwebrtc_transport.la
Expand Down
4 changes: 2 additions & 2 deletions transport/owr_candidate.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,12 +230,12 @@ static void owr_candidate_class_init(OwrCandidateClass *klass)
OWR_CANDIDATE_TYPE_HOST, OWR_CANDIDATE_TYPE_RELAY, OWR_CANDIDATE_TYPE_HOST,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS);

obj_properties[PROP_COMPONENT_TYPE] = g_param_spec_uint("component_type", "Component type",
obj_properties[PROP_COMPONENT_TYPE] = g_param_spec_uint("component-type", "Component type",
"The stream component type (RTP/RTCP)",
OWR_COMPONENT_TYPE_RTP, OWR_COMPONENT_TYPE_RTCP, OWR_COMPONENT_TYPE_RTP,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS);

obj_properties[PROP_TRANSPORT_TYPE] = g_param_spec_uint("transport_type", "Transport type",
obj_properties[PROP_TRANSPORT_TYPE] = g_param_spec_uint("transport-type", "Transport type",
"The transport type (UDP or TCP (active/passive/simultaneous open))",
OWR_TRANSPORT_TYPE_UDP, OWR_TRANSPORT_TYPE_TCP_SO, OWR_TRANSPORT_TYPE_UDP,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
Expand Down