From 3ca7f292245213a7bf5976fa2c7d304ebbbc9253 Mon Sep 17 00:00:00 2001 From: Christian Fredrik Kalager Schaller Date: Mon, 12 Mar 2012 09:03:42 +0000 Subject: [PATCH 1/4] update license link to point to 2.1 license, instead of just generic lgpl file, which is always the latest and thus not correct for gstreamer --- docs/faq/general.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/faq/general.xml b/docs/faq/general.xml index c6ccb6ac70..e85bec0c9d 100644 --- a/docs/faq/general.xml +++ b/docs/faq/general.xml @@ -99,7 +99,7 @@ What are the exact licensing terms for GStreamer and its plugins ? All of GStreamer, including our own plugin code, is licensed under the -GNU LGPL license. +GNU LGPL 2.1 license. Some of the libraries we use for some of the plugins are however under the GPL, which means that those plugins can not be used by a non-GPL-compatible application. From cc445664c82f576647b89c591545d495d875f33e Mon Sep 17 00:00:00 2001 From: Stefan Sauer Date: Mon, 12 Mar 2012 23:08:00 +0100 Subject: [PATCH 2/4] docs: fix function name and typo --- libs/gst/base/gstcollectpads2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/gst/base/gstcollectpads2.c b/libs/gst/base/gstcollectpads2.c index 8a6f5da83b..466e47d7dc 100644 --- a/libs/gst/base/gstcollectpads2.c +++ b/libs/gst/base/gstcollectpads2.c @@ -450,9 +450,9 @@ gst_collect_pads2_set_event_function (GstCollectPads2 * pads, } /** -* gst_collect_pads2_clip_running: +* gst_collect_pads2_clip_running_time: * @pads: the collectspads to use -* @cdata: collect data of corrsponding pad +* @cdata: collect data of corresponding pad * @buf: buffer being clipped * @outbuf: output buffer with running time, or NULL if clipped * @user_data: user data (unused) From 2c08b81db1c85cf65e30ba65c1c0adc5bd439ad7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Mon, 12 Mar 2012 23:02:48 +0000 Subject: [PATCH 3/4] configure: backport AS_LIBTOOL version from 0.10.36 release Might fix issues with missing symbols for people who install GStreamer from source and at some point jumped back and forth between git master and the 0.10.36 release (or 0.10. branch). --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 4fab0c9f18..c1b4f58465 100644 --- a/configure.ac +++ b/configure.ac @@ -48,7 +48,7 @@ dnl - interfaces added/removed/changed -> increment CURRENT, REVISION = 0 dnl - interfaces added -> increment AGE dnl - interfaces removed -> AGE = 0 dnl sets GST_LT_LDFLAGS -AS_LIBTOOL(GST, 29, 0, 29) +AS_LIBTOOL(GST, 30, 0, 30) dnl FIXME: this macro doesn't actually work; dnl the generated libtool script has no support for the listed tags. From bb78f15e42c9fd52ed33b17656e347ca7fb307d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Mon, 12 Mar 2012 23:05:01 +0000 Subject: [PATCH 4/4] configure: bump AS_LIBTOOL version API was added to collectpads2 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index c1b4f58465..8a67c36d8b 100644 --- a/configure.ac +++ b/configure.ac @@ -48,7 +48,7 @@ dnl - interfaces added/removed/changed -> increment CURRENT, REVISION = 0 dnl - interfaces added -> increment AGE dnl - interfaces removed -> AGE = 0 dnl sets GST_LT_LDFLAGS -AS_LIBTOOL(GST, 30, 0, 30) +AS_LIBTOOL(GST, 31, 0, 31) dnl FIXME: this macro doesn't actually work; dnl the generated libtool script has no support for the listed tags.