From fdb5c79b8b505ee6c681f52f44cbb477d861b48a Mon Sep 17 00:00:00 2001 From: Vincent Penquerc'h Date: Fri, 27 Jan 2012 14:49:58 +0000 Subject: [PATCH 1/2] plenty: fixup glib deprecations --- ext/opus/Makefile.am | 1 + ext/opus/gstopusenc.c | 1 + 2 files changed, 2 insertions(+) diff --git a/ext/opus/Makefile.am b/ext/opus/Makefile.am index cdf3c30ac1..1aaed79247 100644 --- a/ext/opus/Makefile.am +++ b/ext/opus/Makefile.am @@ -4,6 +4,7 @@ libgstopus_la_SOURCES = gstopus.c gstopusdec.c gstopusenc.c gstopusparse.c gstop libgstopus_la_CFLAGS = \ -DGST_USE_UNSTABLE_API \ $(GST_PLUGINS_BASE_CFLAGS) \ + $(GST_PLUGINS_BAD_CFLAGS) \ $(GST_CFLAGS) \ $(OPUS_CFLAGS) libgstopus_la_LIBADD = \ diff --git a/ext/opus/gstopusenc.c b/ext/opus/gstopusenc.c index 9b475cf8c7..29b254ee23 100644 --- a/ext/opus/gstopusenc.c +++ b/ext/opus/gstopusenc.c @@ -48,6 +48,7 @@ #include #include +#include #include "gstopusheader.h" #include "gstopuscommon.h" #include "gstopusenc.h" From 3ecfd258082554def80227ae01038d2ecbc3797b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Fri, 3 Feb 2012 00:50:33 +0000 Subject: [PATCH 2/2] build: fix CFLAGS order and LIBS order _BAD_CFLAGS should always come first, then GST_PLUGINS_BASE_CFLAGS, then GST_BASE_CFLAGS then GST_CFLAGS. Same for libs: first plugins base libs, then GST_BASE_LIB then GST_LIBS. --- ext/opus/Makefile.am | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/ext/opus/Makefile.am b/ext/opus/Makefile.am index 1aaed79247..48a7eade40 100644 --- a/ext/opus/Makefile.am +++ b/ext/opus/Makefile.am @@ -3,14 +3,13 @@ plugin_LTLIBRARIES = libgstopus.la libgstopus_la_SOURCES = gstopus.c gstopusdec.c gstopusenc.c gstopusparse.c gstopusheader.c gstopuscommon.c gstrtpopuspay.c gstrtpopusdepay.c libgstopus_la_CFLAGS = \ -DGST_USE_UNSTABLE_API \ - $(GST_PLUGINS_BASE_CFLAGS) \ $(GST_PLUGINS_BAD_CFLAGS) \ + $(GST_PLUGINS_BASE_CFLAGS) \ $(GST_CFLAGS) \ $(OPUS_CFLAGS) libgstopus_la_LIBADD = \ - -lgstaudio-$(GST_MAJORMINOR) \ - $(GST_PLUGINS_BASE_LIBS) -lgsttag-$(GST_MAJORMINOR) \ - -lgstrtp-@GST_MAJORMINOR@ \ + $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) \ + -lgsttag-$(GST_MAJORMINOR) -lgstrtp-$(GST_MAJORMINOR) \ $(GST_BASE_LIBS) \ $(GST_LIBS) \ $(OPUS_LIBS)