mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 12:11:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

configure.ac: fix use of PKG_CHECK_MODULES check for a pygobject of at least 2.11 for a value_from_pyobject fix

Browse source 
Original commit message from CVS:
* configure.ac:
fix use of PKG_CHECK_MODULES
check for a pygobject of at least 2.11 for a value_from_pyobject fix
* gst/gstobject.override:
use it
This commit is contained in:
Thomas Vander Stichele 2007-01-17 06:15:33 +00:00
parent 39b3a029bb
commit bd220304ef
3 changed files with 29 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2007-01-17 Thomas Vander Stichele <thomas at apestaart dot org>
* configure.ac:
fix use of PKG_CHECK_MODULES
check for a pygobject of at least 2.11 for a value_from_pyobject fix
* gst/gstobject.override:
use it
2007-01-17 Thomas Vander Stichele <thomas at apestaart dot org>
* gst/extend/discoverer.py:

14
configure.ac
View file

@ -227,7 +227,10 @@ AC_SUBST(GST_PLUGINS_BASE_CFLAGS)
dnl check for pygobject
PKG_CHECK_MODULES(PYGOBJECT, pygobject-2.0 >= $PYGOBJECT_REQ,
HAVE_PYGOBJECT="yes", HAVE_PYGOBJECT="no")
[
HAVE_PYGOBJECT="yes"
AC_MSG_RESULT([yes])
], HAVE_PYGOBJECT="no")
if test "x$HAVE_PYGOBJECT" = "xno"; then
dnl If we don't have pygobject, then check for pygtk
@ -238,6 +241,15 @@ if test "x$HAVE_PYGOBJECT" = "xno"; then
fi
AC_SUBST(PYGOBJECT_CFLAGS)
dnl FIXME: check for a pygobject with a correct pyg_param_gvalue_from_pyobject
PKG_CHECK_MODULES(PYGOBJECT_2_12, pygobject-2.0 >= 2.11.1,
[
HAVE_PYGOBJECT_2_12="yes"
AC_MSG_RESULT([yes])
AC_DEFINE_UNQUOTED(HAVE_PYGOBJECT_2_12, 1,
[Defined if we have a 2.12 series pygobject])
], HAVE_PYGOBJECT_2_12="no")
dnl define an ERROR_CFLAGS Makefile variable
GST_SET_ERROR_CFLAGS($GST_CVS)

8
gst/gstobject.override
View file

@ -102,6 +102,14 @@ set_property_from_pspec(GObject *obj,
}
g_value_init(&value, G_PARAM_SPEC_VALUE_TYPE(pspec));
/* FIXME: bug in pygtk 2.8 series; see
http://svn.gnome.org/viewcvs/pygobject/trunk/gobject/pygobject.h?rev=566&r1=564&r2=566 */
#ifndef PYGOBJECT_2_12
#undef pyg_param_gvalue_from_pyobject
#define pyg_param_gvalue_from_pyobject (_PyGObject_API->gvalue_from_param_pyobject)
#endif
if (pyg_param_gvalue_from_pyobject(&value, pvalue, pspec) < 0) {
PyErr_SetString(PyExc_TypeError,
"could not convert argument to correct param type");