diff --git a/ChangeLog b/ChangeLog index 16dbefad12..f186a2c3a3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2005-11-30 Edward Hervey + + * configure.ac: + * gst/Makefile.am: + gst-interfaces-0.9.pc is no more, update to new use + * testsuite/test_element.py: + Fix for queue modification + 2005-11-30 Edward Hervey * gst/gst-types.defs: diff --git a/common b/common index 8db4c613eb..f9f5f06372 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 8db4c613eb1aa57dc21d25a4b83b36e3cdedc5ca +Subproject commit f9f5f063728688cf455a1512d492b632c43963d7 diff --git a/configure.ac b/configure.ac index 973e8ce99d..3d6252796d 100644 --- a/configure.ac +++ b/configure.ac @@ -113,14 +113,6 @@ dnl PYGTK_CODEGEN="$PYTHON \$(top_srcdir)/codegen/codegen.py" AC_SUBST(PYGTK_CODEGEN) AC_MSG_RESULT($PYGTK_CODEGEN) -dnl Interfaces -AC_MSG_CHECKING(for GStreamer interfaces include dir) -PKG_CHECK_MODULES(GST_INTERFACES, gstreamer-plugins-base-$GST_MAJORMINOR, - HAVE_INTERFACES=yes,HAVE_INTERFACES=no) -AM_CONDITIONAL(BUILD_INTERFACES, test "x$HAVE_INTERFACES" = "xyes") -AC_SUBST(GST_INTERFACES_CFLAGS) -AC_SUBST(GST_INTERFACES_LIBS) - dnl decide on error flags dnl if we support -Wall, set it unconditionally AS_COMPILER_FLAG(-Wall, diff --git a/gst/Makefile.am b/gst/Makefile.am index b58f02a9b6..42247e9ff7 100644 --- a/gst/Makefile.am +++ b/gst/Makefile.am @@ -11,11 +11,7 @@ pygst_PYTHON = __init__.py pygstexecdir = $(pkgpyexecdir) pygstexec_LTLIBRARIES = _gst.la $(interface_lib) -if BUILD_INTERFACES interface_lib = interfaces.la -else -interface_lib = -endif defs_DATA = gst-types.defs \ gst-extrafuncs.defs \ @@ -67,9 +63,9 @@ EXTRA_DIST += $(GST_DEFS) $(GST_OVERRIDES) gst.c: $(GST_DEFS) $(GST_OVERRIDES) $(GEN_FILES) # GStreamer interfaces bindings -interfaces_la_CFLAGS = $(common_cflags) $(GST_INTERFACES_CFLAGS) -interfaces_la_LIBADD = $(common_libadd) $(GST_INTERFACES_LIBS) -lgstinterfaces-0.9 -interfaces_la_LDFLAGS = $(common_ldflags) -export-symbols-regex initinterface +interfaces_la_CFLAGS = $(common_cflags) $(GST_BASE_CFLAGS) +interfaces_la_LIBADD = $(common_libadd) -lgstinterfaces-0.9 +interfaces_la_LDFLAGS = $(common_ldflags) -export-symbols-regex initinterface $(GST_BASE_LIBS) interfaces_la_SOURCES = interfacesmodule.c nodist_interfaces_la_SOURCES = interfaces.c INTERFACES_OVERRIDES = interfaces.override xoverlay.override diff --git a/testsuite/test_element.py b/testsuite/test_element.py index a1b882644b..a33fa525d8 100644 --- a/testsuite/test_element.py +++ b/testsuite/test_element.py @@ -204,7 +204,6 @@ class QueryTest(TestCase): class QueueTest(TestCase): def testConstruct(self): queue = gst.element_factory_make('queue') - assert isinstance(queue, gst.Queue) assert queue.get_name() == 'queue0' self.assertEquals(queue.__gstrefcount__, 1)