mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-23 14:36:24 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst.play is gone in 0.9...

Browse source 
Original commit message from CVS:
* configure.ac:
* Makefile.am:
* gst/Makefile.am:
* testsuite/common.py:
gst.play is gone in 0.9...
This commit is contained in:
Edward Hervey 2005-07-05 13:50:21 +00:00
parent 95344205ec
commit 8bc75a8b27
4 changed files with 9 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
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> 2005-07-01 Edward Hervey <edward@fluendo.com>
* gst/gst.defs: * gst/gst.defs:

17
configure.ac
View file

@ -86,22 +86,6 @@ AM_CONDITIONAL(BUILD_INTERFACES, test "x$HAVE_INTERFACES" = "xyes")
AC_SUBST(GST_INTERFACES_CFLAGS) AC_SUBST(GST_INTERFACES_CFLAGS)
AC_SUBST(GST_INTERFACES_LIBS) 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 BUILD_DOCS=yes
AC_CHECK_PROG(XMLTO, xmlto, xmlto, no) AC_CHECK_PROG(XMLTO, xmlto, xmlto, no)
if test "x$XMLTO" = xno ; then if test "x$XMLTO" = xno ; then
@ -182,7 +166,6 @@ AC_OUTPUT([
Makefile Makefile
examples/Makefile examples/Makefile
examples/gst/Makefile examples/gst/Makefile
examples/gstplay/Makefile
gst/Makefile gst/Makefile
pkgconfig/Makefile pkgconfig/Makefile
pkgconfig/gst-python.pc pkgconfig/gst-python.pc

19
gst/Makefile.am
View file

@ -9,18 +9,13 @@ pygstdir = $(pkgpythondir)
pygst_PYTHON = __init__.py pygst_PYTHON = __init__.py
pygstexecdir = $(pkgpyexecdir) pygstexecdir = $(pkgpyexecdir)
pygstexec_LTLIBRARIES = _gst.la $(interface_lib) $(play_lib) pygstexec_LTLIBRARIES = _gst.la $(interface_lib)
if BUILD_INTERFACES if BUILD_INTERFACES
interface_lib = interfaces.la interface_lib = interfaces.la
else else
interface_lib = interface_lib =
endif endif
if BUILD_PLAY
play_lib = play.la
else
play_lib =
endif
defs_DATA = gst-types.defs \ defs_DATA = gst-types.defs \
gst-extrafuncs.defs gst-extrafuncs.defs
@ -54,18 +49,6 @@ CLEANFILES = gst.c
EXTRA_DIST += $(GST_DEFS) $(GST_OVERRIDES) EXTRA_DIST += $(GST_DEFS) $(GST_OVERRIDES)
gst.c: $(GST_DEFS) $(GST_OVERRIDES) $(GEN_FILES) 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 # GStreamer interfaces bindings
interfaces_la_CFLAGS = $(common_cflags) $(GST_INTERFACES_CFLAGS) interfaces_la_CFLAGS = $(common_cflags) $(GST_INTERFACES_CFLAGS)
interfaces_la_LIBADD = $(common_libadd) $(GST_INTERFACES_LIBS) interfaces_la_LIBADD = $(common_libadd) $(GST_INTERFACES_LIBS)

11
testsuite/common.py
View file

@ -50,17 +50,6 @@ except ImportError:
file = gst.interfaces.__file__ file = gst.interfaces.__file__
assert file.startswith(path), 'bad gst.interfaces path: %s' % 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 # testhelper needs ltihooks
import ltihooks import ltihooks
import testhelper import testhelper