gst/: fix headers

Original commit message from CVS:
2004-09-13  Thomas Vander Stichele  <thomas at apestaart dot org>

* gst/__init__.py:
* gst/gstreamer.py:
* gst/arg-types.py:
fix headers
* gst/gst.override:
change GstPad repr
* gst/ltihooks.py:
fix distcheck for uninstalled by only adding .libs when needed
This commit is contained in:
Thomas Vander Stichele 2004-09-13 07:31:31 +00:00
parent 02f72cd028
commit 828449319c
7 changed files with 58 additions and 32 deletions

View file

@ -1,3 +1,14 @@
2004-09-13 Thomas Vander Stichele <thomas at apestaart dot org>
* gst/__init__.py:
* gst/gstreamer.py:
* gst/arg-types.py:
fix headers
* gst/gst.override:
change GstPad repr
* gst/ltihooks.py:
fix distcheck for uninstalled by only adding .libs when needed
2004-08-30 Johan Dahlin <johan@gnome.org>
* gst/gst.override (_wrap_gst_structure_ass_subscript): Some more

2
common

@ -1 +1 @@
Subproject commit 14f44a56213628dcfdf8ca77159ba0f9622f6102
Subproject commit 5ec931d243c53ddda5b2cbb9a2c21ce89747bcb4

View file

@ -1,3 +1,5 @@
# -*- Mode: Python -*-
# vi:si:et:sw=4:sts=4:ts=4
#
# gst-python
# Copyright (C) 2002 David I. Lehn
@ -18,7 +20,6 @@
# Boston, MA 02111-1307, USA.
#
# Author: David I. Lehn <dlehn@users.sourceforge.net>
#
try:
import ltihooks

View file

@ -1,3 +1,5 @@
# -*- Mode: Python -*-
# vi:si:et:sw=4:sts=4:ts=4
#
# gst-python
# Copyright (C) 2002 David I. Lehn
@ -19,7 +21,6 @@
# Boston, MA 02111-1307, USA.
#
# Author: David I. Lehn <dlehn@users.sourceforge.net>
#
from argtypes import UInt64Arg, Int64Arg, PointerArg, ArgMatcher, ArgType, matcher

View file

@ -186,15 +186,18 @@ _wrap_gst_pad_tp_repr (PyGObject *self)
{
char *buf;
PyObject *retval;
GstPad *pad;
GstElement *parent;
buf = g_strdup_printf("<GstPad (%s) at %lx>",
gst_pad_get_name(GST_PAD(self->obj)),
(long)self->obj);
buf = g_strdup_printf ("<GstPad (%s:%s) at %lx>",
gst_element_get_name (parent),
gst_pad_get_name (pad), (long) self->obj);
retval = PyString_FromString(buf);
g_free(buf);
return retval;
}
%%
override gst_pad_query kwargs
static PyObject *

View file

@ -1,3 +1,5 @@
# -*- Mode: Python -*-
# vi:si:et:sw=4:sts=4:ts=4
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Library General Public
@ -15,6 +17,5 @@
# Boston, MA 02111-1307, USA.
#
# Author: David I. Lehn <dlehn@users.sourceforge.net>
#
from gst import *

View file

@ -1,4 +1,6 @@
# -*- Mode: Python; py-indent-offset: 4 -*-
# -*- Mode: Python -*-
# vi:si:et:sw=4:sts=4:ts=4
# ltihooks.py: python import hooks that understand libtool libraries.
# Copyright (C) 2000 James Henstridge.
#
@ -34,8 +36,10 @@ class LibtoolHooks(ihooks.Hooks):
installed = 1
line = fp.readline()
while line:
# dlname: the name that we can dlopen
if len(line) > 7 and line[:7] == 'dlname=':
dlname = line[8:-2]
# installed: whether it's already installed
elif len(line) > 10 and line[:10] == 'installed=':
installed = line[10:-1] == 'yes'
line = fp.readline()
@ -44,6 +48,11 @@ class LibtoolHooks(ihooks.Hooks):
if installed:
filename = os.path.join(os.path.dirname(filename),
dlname)
else:
# if .libs already there, don't need to add it again
if os.path.dirname(filename).endswith('.libs'):
filename = os.path.join(os.path.dirname(filename),
dlname)
else:
filename = os.path.join(os.path.dirname(filename),
'.libs', dlname)