gst.play is gone in 0.9...

Original commit message from CVS:
* configure.ac:
* Makefile.am:
* gst/Makefile.am:
* testsuite/common.py:
gst.play is gone in 0.9...

diff --git a/ChangeLog b/ChangeLog
index 679f25f..9051b51 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2005-07-01  Edward Hervey  <edward@fluendo.com>
 
+       * configure.ac:
+       * Makefile.am:
+       * gst/Makefile.am:
+       * testsuite/common.py:
+       gst.play is gone in 0.9...
+       
+2005-07-01  Edward Hervey  <edward@fluendo.com>
+
        * gst/gst.defs:
        * gst/gst.override:
        Probes are gone...

diff --git a/configure.ac b/configure.ac
index 269ea22..30efc54 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -86,22 +86,6 @@ AM_CONDITIONAL(BUILD_INTERFACES, test "x$HAVE_INTERFACES" = "xyes")
 AC_SUBST(GST_INTERFACES_CFLAGS)
 AC_SUBST(GST_INTERFACES_LIBS)
 
-dnl Play
-AC_MSG_CHECKING(for GStreamer play include dir)
-PKG_CHECK_MODULES(GST_PLAY, gstreamer-play-$GST_MAJORMINOR, 
-                         HAVE_PLAY=yes,HAVE_PLAY=no)
-AM_CONDITIONAL(BUILD_PLAY, test "x$HAVE_PLAY" = "xyes")
-AC_SUBST(GST_PLAY_CFLAGS)
-AC_SUBST(GST_PLAY_LIBS)
-
-dnl Editor
-dnl AC_MSG_CHECKING(for GStreamer editor include dir)
-dnl PKG_CHECK_MODULES(GST_EDITOR, gst-editor-libs >= 0.7.0,
-dnl                      HAVE_EDITOR=yes,HAVE_EDITOR=no)
-dnl AM_CONDITIONAL(BUILD_EDITOR, test "x$HAVE_EDITOR" = "xyes")
-dnl AC_SUBST(GST_EDITOR_CFLAGS)
-dnl AC_SUBST(GST_EDITOR_LIBS)
-
 BUILD_DOCS=yes
 AC_CHECK_PROG(XMLTO, xmlto, xmlto, no)
 if test "x$XMLTO" = xno ; then
@@ -182,7 +166,6 @@ AC_OUTPUT([
   Makefile
   examples/Makefile
   examples/gst/Makefile
-  examples/gstplay/Makefile
   gst/Makefile
   pkgconfig/Makefile
   pkgconfig/gst-python.pc

diff --git a/gst/Makefile.am b/gst/Makefile.am
index 229197d..71c6253 100644 (file)
--- a/gst/Makefile.am
+++ b/gst/Makefile.am
@@ -9,18 +9,13 @@ pygstdir = $(pkgpythondir)
 pygst_PYTHON = __init__.py
 
 pygstexecdir = $(pkgpyexecdir)
-pygstexec_LTLIBRARIES = _gst.la $(interface_lib) $(play_lib)
+pygstexec_LTLIBRARIES = _gst.la $(interface_lib)
 
 if BUILD_INTERFACES
 interface_lib = interfaces.la
 else
 interface_lib =
 endif
-if BUILD_PLAY
-play_lib = play.la
-else
-play_lib =
-endif
 
 defs_DATA = gst-types.defs \
        gst-extrafuncs.defs
@@ -54,18 +49,6 @@ CLEANFILES = gst.c
 EXTRA_DIST += $(GST_DEFS) $(GST_OVERRIDES)
 gst.c: $(GST_DEFS) $(GST_OVERRIDES) $(GEN_FILES)
 
-# gst-play bindings
-play_la_CFLAGS = $(common_cflags) $(GST_PLAY_CFLAGS) 
-play_la_LIBADD = $(common_libadd) $(GST_PLAY_LIBS)
-play_la_LDFLAGS = $(common_ldflags) -export-symbols-regex initplay
-play_la_SOURCES = playmodule.c
-nodist_play_la_SOURCES = play.c
-PLAY_OVERRIDES = play.override
-PLAY_DEFS = play.defs
-CLEANFILES += play.c
-EXTRA_DIST += $(PLAY_DEFS) $(PLAY_OVERRIDES) 
-play.c: $(PLAY_DEFS) $(PLAY_OVERRIDES) $(GEN_FILES)
-
 # GStreamer interfaces bindings
 interfaces_la_CFLAGS = $(common_cflags) $(GST_INTERFACES_CFLAGS) 
 interfaces_la_LIBADD = $(common_libadd) $(GST_INTERFACES_LIBS)

diff --git a/testsuite/common.py b/testsuite/common.py
index 145228a..97be509 100644 (file)
--- a/testsuite/common.py
+++ b/testsuite/common.py
@@ -50,17 +50,6 @@ except ImportError:
 file = gst.interfaces.__file__
 assert file.startswith(path), 'bad gst.interfaces path: %s' % file
 
-try:
-   import gst.play
-   assert os.path.basename(gst.play.__file__) != path, 'bad path'
-except ImportError:
-   # hack: we import it from our builddir/gst/.libs instead; ugly
-   import play
-   gst.play = play
-   pass
-file = gst.play.__file__
-assert file.startswith(path), 'bad gst.play path: %s' % file
-
 # testhelper needs ltihooks
 import ltihooks
 import testhelper