From: David Woodhouse <dwmw2@infradead.org>
Date: Sun, 29 Apr 2018 22:38:09 +0000 (+0100)
Subject: Explicitly require gstreamer-video-1.0 and split deps
X-Git-Tag: v0.91~18
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=2de9f8d8ac80d39f45fab9083038df404ff7c104;p=pidgin-chime.git

Explicitly require gstreamer-video-1.0 and split deps
---

diff --git a/Makefile.am b/Makefile.am
index bd91b64..ae329b6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -37,8 +37,8 @@ CHIME_SRCS =	chime/chime-connection.c chime/chime-connection.h \
 noinst_LTLIBRARIES = libchime.la
 
 libchime_la_SOURCES = $(CHIME_SRCS) $(WEBSOCKET_SRCS) $(PROTOBUF_SRCS)
-libchime_la_CFLAGS = $(SOUP_CFLAGS) $(JSON_CFLAGS) $(LIBXML_CFLAGS) $(PROTOBUF_CFLAGS) $(GSTREAMER_CFLAGS) $(GNUTLS_CFLAGS) -Ichime
-libchime_la_LIBADD = $(SOUP_LIBS) $(JSON_LIBS) $(LIBXML_LIBS) $(PROTOBUF_LIBS) $(GSTREAMER_LIBS) $(GNUTLS_LIBS)
+libchime_la_CFLAGS = $(SOUP_CFLAGS) $(JSON_CFLAGS) $(LIBXML_CFLAGS) $(PROTOBUF_CFLAGS) $(GSTREAMER_CFLAGS) $(GSTRTP_CFLAGS) $(GSTAPP_CFLAGS) $(GSTVIDEO_CFLAGS) $(GNUTLS_CFLAGS) -Ichime
+libchime_la_LIBADD = $(SOUP_LIBS) $(JSON_LIBS) $(LIBXML_LIBS) $(PROTOBUF_LIBS) $(GSTREAMER_LIBS) $(GSTRTP_LIBS) $(GSTAPP_LIBS) $(GSTVIDEO_LIBS) $(GNUTLS_LIBS)
 libchime_la_LDFLAGS = -module -avoid-version -no-undefined
 
 libchimeprpl_la_SOURCES = $(PRPL_SRCS) $(LOGIN_SRCS)
diff --git a/configure.ac b/configure.ac
index d4c761d..d30db90 100644
--- a/configure.ac
+++ b/configure.ac
@@ -53,7 +53,10 @@ AC_SUBST(pidgin_plugindir, $pidgin_plugindir)
 
 PKG_CHECK_MODULES(GNUTLS, [gnutls >= 3.2.0])
 PKG_CHECK_MODULES(FARSTREAM, [farstream-0.2])
-PKG_CHECK_MODULES(GSTREAMER, [gstreamer-1.0 gstreamer-app-1.0 gstreamer-rtp-1.0])
+PKG_CHECK_MODULES(GSTREAMER, [gstreamer-1.0])
+PKG_CHECK_MODULES(GSTAPP, [gstreamer-app-1.0])
+PKG_CHECK_MODULES(GSTRTP, [gstreamer-rtp-1.0])
+PKG_CHECK_MODULES(GSTVIDEO, [gstreamer-video-1.0])
 PKG_CHECK_MODULES(OPUS, [opus])
 PKG_CHECK_MODULES(PROTOBUF, [libprotobuf-c])
 PKG_CHECK_MODULES(JSON, [json-glib-1.0])
diff --git a/gst-chime/Makefile.am b/gst-chime/Makefile.am
index 936c763..e2f93ea 100644
--- a/gst-chime/Makefile.am
+++ b/gst-chime/Makefile.am
@@ -1,7 +1,7 @@
 gstplugin_LTLIBRARIES = libgstchime.la
 
-libgstchime_la_CFLAGS = $(GSTREAMER_CFLAGS)
-libgstchime_la_LIBADD = $(GSTREAMER_LIBS)
+libgstchime_la_CFLAGS = $(GSTREAMER_CFLAGS) $(GSTRTP_CLAGS)
+libgstchime_la_LIBADD = $(GSTREAMER_LIBS) $(GSTRTP_LIBS)
 libgstchime_la_LDFLAGS = -module -avoid-version -no-undefined
 
 libgstchime_la_SOURCES =	\
diff --git a/pidgin-chime.spec.in b/pidgin-chime.spec.in
index ff3f5a0..f22ecbe 100644
--- a/pidgin-chime.spec.in
+++ b/pidgin-chime.spec.in
@@ -31,6 +31,7 @@ BuildRequires:  pkgconfig(farstream-0.2)
 BuildRequires:  pkgconfig(gstreamer-1.0)
 BuildRequires:  pkgconfig(gstreamer-app-1.0)
 BuildRequires:  pkgconfig(gstreamer-rtp-1.0)
+BuildRequires:  pkgconfig(gstreamer-video-1.0)
 BuildRequires:  pkgconfig(opus)
 BuildRequires:  pkgconfig(libprotobuf-c)
 BuildRequires:  pkgconfig(json-glib-1.0)