BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix building Python bindings with pygobject >= 3.7.91.

This commit is contained in:
Martin Ling 2014-07-19 15:10:25 +01:00 committed by Bert Vermeulen
parent 762aee1e91
commit abc7146d03
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
bindings/python/sigrok/core/classes.i
View File

@ -26,6 +26,14 @@ PyObject *GLib;
PyTypeObject *IOChannel; PyTypeObject *IOChannel;
PyTypeObject *PollFD; PyTypeObject *PollFD;
#include "../../../../config.h"
#if PYGOBJECT_FLAGS_SIGNED
typedef gint pyg_flags_type;
#else
typedef guint pyg_flags_type;
#endif
%} %}
%init %{ %init %{
@ -64,7 +72,7 @@ PyTypeObject *PollFD;
/* Map from Glib::IOCondition to GLib.IOCondition. */ /* Map from Glib::IOCondition to GLib.IOCondition. */
%typecheck(SWIG_TYPECHECK_POINTER) Glib::IOCondition { %typecheck(SWIG_TYPECHECK_POINTER) Glib::IOCondition {
gint flags; pyg_flags_type flags;
$1 = pygobject_check($input, &PyGFlags_Type) && $1 = pygobject_check($input, &PyGFlags_Type) &&
(pyg_flags_get_value(G_TYPE_IO_CONDITION, $input, &flags) != -1); (pyg_flags_get_value(G_TYPE_IO_CONDITION, $input, &flags) != -1);
} }
@ -72,7 +80,7 @@ PyTypeObject *PollFD;
%typemap(in) Glib::IOCondition { %typemap(in) Glib::IOCondition {
if (!pygobject_check($input, &PyGFlags_Type)) if (!pygobject_check($input, &PyGFlags_Type))
SWIG_exception(SWIG_TypeError, "Expected GLib.IOCondition value"); SWIG_exception(SWIG_TypeError, "Expected GLib.IOCondition value");
gint flags; pyg_flags_type flags;
if (pyg_flags_get_value(G_TYPE_IO_CONDITION, $input, &flags) == -1) if (pyg_flags_get_value(G_TYPE_IO_CONDITION, $input, &flags) == -1)
SWIG_exception(SWIG_TypeError, "Not a valid Glib.IOCondition value"); SWIG_exception(SWIG_TypeError, "Not a valid Glib.IOCondition value");
$1 = (Glib::IOCondition) flags; $1 = (Glib::IOCondition) flags;
@ -97,7 +105,7 @@ PyTypeObject *PollFD;
SWIG_exception(SWIG_TypeError, "Expected GLib.PollFD"); SWIG_exception(SWIG_TypeError, "Expected GLib.PollFD");
PyObject *fd_obj = PyObject_GetAttrString($input, "fd"); PyObject *fd_obj = PyObject_GetAttrString($input, "fd");
PyObject *events_obj = PyObject_GetAttrString($input, "events"); PyObject *events_obj = PyObject_GetAttrString($input, "events");
gint flags; pyg_flags_type flags;
pyg_flags_get_value(G_TYPE_IO_CONDITION, events_obj, &flags); pyg_flags_get_value(G_TYPE_IO_CONDITION, events_obj, &flags);
int fd = PyInt_AsLong(fd_obj); int fd = PyInt_AsLong(fd_obj);
Glib::IOCondition events = (Glib::IOCondition) flags; Glib::IOCondition events = (Glib::IOCondition) flags;

7
configure.ac
View File

@ -367,7 +367,12 @@ PKG_CHECK_MODULES([glibmm], [glibmm-2.4 >= 2.32.0],
# PyGObject is needed for the Python bindings. # PyGObject is needed for the Python bindings.
PKG_CHECK_MODULES([pygobject], [pygobject-3.0], PKG_CHECK_MODULES([pygobject], [pygobject-3.0],
[CXXFLAGS="$CXXFLAGS $pygobject_CFLAGS"; [CXXFLAGS="$CXXFLAGS $pygobject_CFLAGS";
CXXLIBS="$CXXLIBS $pygobject_LIBS"], [BINDINGS_PYTHON="no"]) CXXLIBS="$CXXLIBS $pygobject_LIBS";
PKG_CHECK_MODULES([pygobject_3_7_91], [pygobject-3.0 >= 3.7.91],
[pyg_flags_signed=0], [pyg_flags_signed=1]);
AC_DEFINE_UNQUOTED(PYGOBJECT_FLAGS_SIGNED, [$pyg_flags_signed],
[Whether last argument to pyg_flags_get_value() is signed])],
[BINDINGS_PYTHON="no"])
# The Check unit testing framework is optional. Disable if not found. # The Check unit testing framework is optional. Disable if not found.
PKG_CHECK_MODULES([check], [check >= 0.9.4], PKG_CHECK_MODULES([check], [check >= 0.9.4],