make gstreamer python work uninstalled again

Original commit message from CVS:
make gstreamer python work uninstalled again
This commit is contained in:
Thomas Vander Stichele 2004-03-04 11:32:46 +00:00
parent 212df27212
commit b86c702816
10 changed files with 17 additions and 12 deletions

View file

@ -1,3 +1,13 @@
2004-03-04 Thomas Vander Stichele <thomas at apestaart dot org>
* Makefile.am:
* autogen.sh:
* configure.ac:
* gst/__init__.py:
* gst/gstmodule.c: (init_gst):
move gstreamer/ to gst/ by cvs surgery so we can work uninstalled
more changes to be able to run uninstalled
2004-02-27 Johan Dahlin <johan@gnome.org> 2004-02-27 Johan Dahlin <johan@gnome.org>
* gstreamer/: All over the place, more rename work (gstreamer -> gst) * gstreamer/: All over the place, more rename work (gstreamer -> gst)

View file

@ -7,7 +7,7 @@ endif
INTERFACESDIR = gstinterfaces INTERFACESDIR = gstinterfaces
PLAYDIR = gstplay PLAYDIR = gstplay
UNCONDDIRS = gstreamer pkgconfig examples testsuite UNCONDDIRS = gst pkgconfig examples testsuite
SUBDIRS = \ SUBDIRS = \
$(UNCONDDIRS) \ $(UNCONDDIRS) \
$(INTERFACESDIR) \ $(INTERFACESDIR) \

View file

@ -3,7 +3,7 @@
DIE=0 DIE=0
package=gst-python package=gst-python
srcfile=gstreamer/gstmodule.c srcfile=gst/gstmodule.c
# a quick cvs co if necessary to alleviate the pain - may remove this # a quick cvs co if necessary to alleviate the pain - may remove this
# when developers get a clue ;) # when developers get a clue ;)

View file

@ -6,7 +6,7 @@ AC_CANONICAL_TARGET
AS_VERSION(gst-python, GST_PYTHON_VERSION, 0, 1, 0, 1) AS_VERSION(gst-python, GST_PYTHON_VERSION, 0, 1, 0, 1)
AM_INIT_AUTOMAKE($PACKAGE,$VERSION) AM_INIT_AUTOMAKE($PACKAGE,$VERSION)
AC_CONFIG_SRCDIR([gstreamer/gstmodule.c]) AC_CONFIG_SRCDIR([gst/gstmodule.c])
AM_CONFIG_HEADER(config.h) AM_CONFIG_HEADER(config.h)
dnl Add parameters for aclocal dnl Add parameters for aclocal
@ -45,9 +45,9 @@ GST_MAJORMINOR=0.7
PKG_CHECK_MODULES(GST, gstreamer-$GST_MAJORMINOR >= $GST_REQ, PKG_CHECK_MODULES(GST, gstreamer-$GST_MAJORMINOR >= $GST_REQ,
HAVE_GSTREAMER=yes,HAVE_GSTREAMER=no) HAVE_GSTREAMER=yes,HAVE_GSTREAMER=no)
dnl Give error and exit if we don't have gstreamer dnl Give error and exit if we don't have GStreamer
if test "x$HAVE_GSTREAMER" = "xno"; then if test "x$HAVE_GSTREAMER" = "xno"; then
AC_MSG_ERROR(you need gstreamer development packages installed !) AC_MSG_ERROR(you need GStreamer development packages installed !)
fi fi
AC_SUBST(GST_MAJORMINOR) AC_SUBST(GST_MAJORMINOR)
@ -144,7 +144,7 @@ changequote([,])dnl
AC_OUTPUT([ AC_OUTPUT([
Makefile Makefile
gstreamer/Makefile gst/Makefile
gstinterfaces/Makefile gstinterfaces/Makefile
gstplay/Makefile gstplay/Makefile
pkgconfig/Makefile pkgconfig/Makefile

View file

@ -144,7 +144,6 @@ tests = {
def main(): def main():
"A GStreamer latency tester" "A GStreamer latency tester"
#gst_debug_set_categories(-1)
global iterations, print_del global iterations, print_del
if len(sys.argv) < 3: if len(sys.argv) < 3:

View file

@ -99,7 +99,6 @@ def decoder_notified(sender, pspec):
def main(): def main():
"Basic example to play an Ogg Vorbis stream through OSS" "Basic example to play an Ogg Vorbis stream through OSS"
#gst_debug_set_categories(-1)
if len(sys.argv) != 2: if len(sys.argv) != 2:
print 'usage: %s <Ogg Vorbis file>' % (sys.argv[0]) print 'usage: %s <Ogg Vorbis file>' % (sys.argv[0])

View file

@ -144,7 +144,6 @@ tests = {
def main(): def main():
"A GStreamer latency tester" "A GStreamer latency tester"
#gst_debug_set_categories(-1)
global iterations, print_del global iterations, print_del
if len(sys.argv) < 3: if len(sys.argv) < 3:

View file

@ -99,7 +99,6 @@ def decoder_notified(sender, pspec):
def main(): def main():
"Basic example to play an Ogg Vorbis stream through OSS" "Basic example to play an Ogg Vorbis stream through OSS"
#gst_debug_set_categories(-1)
if len(sys.argv) != 2: if len(sys.argv) != 2:
print 'usage: %s <Ogg Vorbis file>' % (sys.argv[0]) print 'usage: %s <Ogg Vorbis file>' % (sys.argv[0])

View file

@ -36,7 +36,6 @@ sys.setdlopenflags(dl.RTLD_LAZY | dl.RTLD_GLOBAL)
del devloc, sys, os del devloc, sys, os
from _gst import * from _gst import *
del _gst
def threads_init(): def threads_init():
import gtk import gtk

View file

@ -70,7 +70,7 @@ init_gst (void)
g_free (argv); g_free (argv);
} }
m = Py_InitModule ("gst._gst", pygst_functions); m = Py_InitModule ("_gst", pygst_functions);
d = PyModule_GetDict (m); d = PyModule_GetDict (m);
pygst_register_classes (d); pygst_register_classes (d);