From 9a7284be3f39bf2dd876664072a9a1f5af035419 Mon Sep 17 00:00:00 2001 From: Mark Nauwelaerts Date: Tue, 10 Feb 2009 12:07:52 +0100 Subject: [PATCH 1/5] Provide wrapper for gst_tag_get_type. Fixes #571156. --- gst/gst.defs | 4 ++-- gst/gst.override | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/gst/gst.defs b/gst/gst.defs index 2cd5283b84..9c323d6c06 100644 --- a/gst/gst.defs +++ b/gst/gst.defs @@ -6257,8 +6257,8 @@ ) ) -(define-function tag_get_type - (c-name "gst_tag_get_type") +(define-function tag_get_tag_type + (c-name "gst_tag_get_tag_type") (return-type "GType") (parameters '("const-gchar*" "tag") diff --git a/gst/gst.override b/gst/gst.override index 0da60a2c34..70b3fa27c3 100644 --- a/gst/gst.override +++ b/gst/gst.override @@ -241,6 +241,12 @@ pygst_debug_log (PyObject *pyobject, PyObject *string, GstDebugLevel level, return Py_None; } +GType +gst_tag_get_tag_type (const gchar * tag) +{ + return gst_tag_get_type (tag); +} + %% include gstbin.override From 0d55256c9f4c82ebe806494d97c51a73f5f162c1 Mon Sep 17 00:00:00 2001 From: Edward Hervey Date: Sat, 4 Apr 2009 10:05:50 +0200 Subject: [PATCH 2/5] pygst.py.in: Fix license (LGPL). --- pygst.py.in | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/pygst.py.in b/pygst.py.in index 36a93ee49a..a55a552230 100644 --- a/pygst.py.in +++ b/pygst.py.in @@ -5,21 +5,22 @@ # # pygst.py: pygst version selection code. # -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. # -# This program is distributed in the hope that it will be useful, +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Library General Public +# License as published by the Free Software Foundation; either +# version 2 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Library General Public License for more details. +# +# You should have received a copy of the GNU Library General Public +# License along with this library; if not, write to the +# Free Software Foundation, Inc., 59 Temple Place - Suite 330, +# Boston, MA 02111-1307, USA. # -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 -# USA - # This allows parallel installation of gst-python # # In order to have backward compatibility From f4865eb42703a5e825636422a91ce63389f54c56 Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Sat, 4 Apr 2009 12:55:47 +0200 Subject: [PATCH 3/5] handle actual GObject having been set to NULL in repr (For example, when doing weak ref tracking) --- gst/gstobject.override | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gst/gstobject.override b/gst/gstobject.override index 0af2288bda..ec8e78c26f 100644 --- a/gst/gstobject.override +++ b/gst/gstobject.override @@ -47,7 +47,9 @@ _wrap_gst_object_tp_repr (PyObject * self) repr = g_strdup_printf ("<%s object (%s) at 0x%lx>", self->ob_type->tp_name, - GST_OBJECT_NAME (object) ? GST_OBJECT_NAME (object) : "unnamed", + object ? ( + GST_OBJECT_NAME (object) ? GST_OBJECT_NAME (object) : "unnamed" + ) : "(null)", (long) self); ret = PyString_FromString (repr); g_free (repr); From 2383964753d12360a65264fd9ff0e980713f3969 Mon Sep 17 00:00:00 2001 From: Edward Hervey Date: Sat, 4 Apr 2009 14:55:08 +0200 Subject: [PATCH 4/5] Automatic update of common submodule From f8b3d91 to d0ea89e --- common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common b/common index f8b3d9167a..d0ea89e0ec 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit f8b3d9167a75c5acb514d43173d8d29d413a6e9c +Subproject commit d0ea89e0ec3d8742c3247098ab550578c3fe2b9c From b25600a8f7de3e256f7cd07bfe26a6074bcdc58a Mon Sep 17 00:00:00 2001 From: Felipe Contreras Date: Sat, 4 Apr 2009 21:19:46 +0300 Subject: [PATCH 5/5] Automatic update of common submodule From d0ea89e to b3941ea --- common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common b/common index d0ea89e0ec..b3941ea131 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit d0ea89e0ec3d8742c3247098ab550578c3fe2b9c +Subproject commit b3941ea131db2d85d339a6bcf500a58bd63df0d5