[gstreamermm] Discoverer: Use pkg-config to get the -lgstpbutils-0.10.
- From: Josà Alburquerque <jaalburqu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gstreamermm] Discoverer: Use pkg-config to get the -lgstpbutils-0.10.
- Date: Thu, 14 Jul 2011 02:38:37 +0000 (UTC)
commit 69686597f2d555da7e5606e36f21dcbff90bc808
Author: Josà Alburquerque <jaalburqu svn gnome org>
Date: Wed Jul 13 22:37:21 2011 -0400
Discoverer: Use pkg-config to get the -lgstpbutils-0.10.
* configure.ac (GSTREAMERMM_MODULES): Require the
gstreamer-pbutils-0.10 package so that GSTREAMERMM_LIBS variable
includes the -lgstpbutils-0.10 automatically.
* examples/Makefile.am (LDDADD): Remove the extra (now unneeded)
-lgstpbutils-0.10.
* gstreamer/gstreamermm.pc.in (Libs): Remove it from here also because
it is included automatically from the "Requires:" section.
ChangeLog | 12 ++++++++++++
configure.ac | 3 ++-
examples/Makefile.am | 2 +-
gstreamer/gstreamermm.pc.in | 2 +-
4 files changed, 16 insertions(+), 3 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 85173c7..9a3b418 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
2011-07-13 Josà Alburquerque <jaalburqu svn gnome org>
+ Discoverer: Use pkg-config to get the -lgstpbutils-0.10.
+
+ * configure.ac (GSTREAMERMM_MODULES): Require the
+ gstreamer-pbutils-0.10 package so that GSTREAMERMM_LIBS variable
+ includes the -lgstpbutils-0.10 automatically.
+ * examples/Makefile.am (LDDADD): Remove the extra (now unneeded)
+ -lgstpbutils-0.10.
+ * gstreamer/gstreamermm.pc.in (Libs): Remove it from here also because
+ it is included automatically from the "Requires:" section.
+
+2011-07-13 Josà Alburquerque <jaalburqu svn gnome org>
+
gstreamermm.h: Add forgotten includes from newly added API.
* gstreamer/gstreamermm.h:
diff --git a/configure.ac b/configure.ac
index 157af5f..edcb3dc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -53,7 +53,8 @@ AC_PROG_SED
AC_SUBST([GSTREAMERMM_MODULES],
['giomm-2.4 >= 2.28.0 libxml++-2.6 >= 2.14[]m4_foreach([gstmm_mod],
[[], [-base], [-controller], [-dataprotocol], [-net], [-plugins-base],
- [-audio], [-cdda], [-interfaces], [-netbuffer], [-rtp], [-video]],
+ [-audio], [-cdda], [-interfaces], [-netbuffer], [-rtp], [-video],
+ [-pbutils]],
[ gstreamer[]m4_defn([gstmm_mod])[]-0.10 >= 0.10.32])'])
PKG_CHECK_MODULES([GSTREAMERMM], [$GSTREAMERMM_MODULES])
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 45e841c..70daff6 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -35,7 +35,7 @@ local_libgstreamermm = $(top_builddir)/gstreamer/gstreamermm/libgstreamermm-$(GS
AM_CPPFLAGS = -I$(top_builddir) $(gstreamermm_includes) $(examples_cppflags)
AM_CXXFLAGS = $(GSTREAMERMM_WXXFLAGS)
-LDADD = $(GSTREAMERMM_LIBS) $(local_libgstreamermm) -lgstpbutils-0.10
+LDADD = $(GSTREAMERMM_LIBS) $(local_libgstreamermm)
element_link_example_SOURCES = element_link/element_link.cc
media_player_gtkmm_example_SOURCES = media_player_gtkmm/main.cc \
diff --git a/gstreamer/gstreamermm.pc.in b/gstreamer/gstreamermm.pc.in
index 9574410..0549098 100644
--- a/gstreamer/gstreamermm.pc.in
+++ b/gstreamer/gstreamermm.pc.in
@@ -15,5 +15,5 @@ Description: C++ binding for gstreamer
Version: @GSTREAMERMM_VERSION@
URL: http://www.gtkmm.org/
Requires: @GSTREAMERMM_MODULES@
-Libs: -L${libdir} -lgstreamermm- GSTREAMERMM_API_VERSION@ -lgstpbutils-0.10
+Libs: -L${libdir} -lgstreamermm- GSTREAMERMM_API_VERSION@
Cflags: -I${includedir}/@GSTREAMERMM_MODULE_NAME@ -I${libdir}/@GSTREAMERMM_MODULE_NAME@/include
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]