mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-02 04:22:27 +00:00
Code Issues 1 Projects Releases Wiki Activity

Link against Gst Data protocol libraries.

Browse source 
Original commit message from CVS:
* configure.ac:
* gst/Makefile.am:
Link against Gst Data protocol libraries.
* gst/__init__.py:
Restore dlopenflags after importing gst.
Closes #329110
This commit is contained in:
Edward Hervey 2006-01-30 12:57:02 +00:00
parent d27adc910e
commit b06a9be61e
4 changed files with 29 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2006-01-30 Edward Hervey <edward@fluendo.com>
* configure.ac:
* gst/Makefile.am:
Link against Gst Data protocol libraries.
* gst/__init__.py:
Restore dlopenflags after importing gst.
Closes #329110
=== release 0.10.2 === === release 0.10.2 ===
2006-01-16 Thomas Vander Stichele <thomas at apestaart dot org> 2006-01-16 Thomas Vander Stichele <thomas at apestaart dot org>

12
configure.ac
View file

@ -93,6 +93,18 @@ fi
AC_SUBST(GST_NET_LIBS) AC_SUBST(GST_NET_LIBS)
AC_SUBST(GST_NET_CFLAGS) AC_SUBST(GST_NET_CFLAGS)
dnl check for gstreamer-dataprotocol
PKG_CHECK_MODULES(GST_DP, gstreamer-dataprotocol-$GST_MAJORMINOR >= $GST_REQ,
HAVE_GST_DP="yes", HAVE_GST_DP="no")
if test "x$HAVE_GST_DP" = "xno"; then
AC_MSG_ERROR(no GStreamer Data Protocol Libs found)
fi
AC_SUBST(GST_DP_LIBS)
AC_SUBST(GST_DP_CFLAGS)
dnl check for gst-plugins-base dnl check for gst-plugins-base
PKG_CHECK_MODULES(GST_PLUGINS_BASE, gstreamer-plugins-base-$GST_MAJORMINOR >= $GSTPB_REQ, PKG_CHECK_MODULES(GST_PLUGINS_BASE, gstreamer-plugins-base-$GST_MAJORMINOR >= $GSTPB_REQ,
HAVE_GST_PLUGINS_BASE="yes", HAVE_GST_PLUGINS_BASE="no") HAVE_GST_PLUGINS_BASE="yes", HAVE_GST_PLUGINS_BASE="no")

2
gst/Makefile.am
View file

@ -31,7 +31,7 @@ GEN_FILES = arg-types.py gst-types.defs libs.defs base.defs
_gst_la_CFLAGS = $(common_cflags) _gst_la_CFLAGS = $(common_cflags)
_gst_la_LIBADD = $(common_libadd) $(GST_BASE_LIBS) _gst_la_LIBADD = $(common_libadd) $(GST_BASE_LIBS)
_gst_la_LDFLAGS = $(common_ldflags) -export-symbols-regex init_gst \ _gst_la_LDFLAGS = $(common_ldflags) -export-symbols-regex init_gst \
$(GST_BASE_LIBS) $(GST_CONTROLLER_LIBS) $(GST_NET_LIBS) $(GST_BASE_LIBS) $(GST_CONTROLLER_LIBS) $(GST_NET_LIBS) $(GST_DP_LIBS)
_gst_la_SOURCES = \ _gst_la_SOURCES = \
gst-argtypes.c \ gst-argtypes.c \
gstmodule.c \ gstmodule.c \

14
gst/__init__.py
View file

@ -36,13 +36,6 @@ if 'gobject' not in sys.modules:
import pygtk import pygtk
pygtk.require('2.0') pygtk.require('2.0')
try:
import DLFCN
sys.setdlopenflags(DLFCN.RTLD_LAZY | DLFCN.RTLD_GLOBAL)
del sys, DLFCN
except ImportError:
pass
class Value: class Value:
def __init__(self, type): def __init__(self, type):
assert type in ('fourcc', 'intrange', 'doublerange', 'fractionrange', 'fraction') assert type in ('fourcc', 'intrange', 'doublerange', 'fractionrange', 'fraction')
@ -90,9 +83,16 @@ class Fraction(Value):
def __repr__(self): def __repr__(self):
return '<gst.Fraction %d/%d>' % (self.num, self.denom) return '<gst.Fraction %d/%d>' % (self.num, self.denom)
import DLFCN, sys
dlsave = sys.getdlopenflags()
sys.setdlopenflags(DLFCN.RTLD_LAZY | DLFCN.RTLD_GLOBAL)
from _gst import * from _gst import *
import interfaces import interfaces
sys.setdlopenflags(dlsave)
del DLFCN, sys
# this restores previously installed importhooks, so we don't interfere # this restores previously installed importhooks, so we don't interfere
# with other people's module importers # with other people's module importers
# it also clears out the module completely as if it were never loaded, # it also clears out the module completely as if it were never loaded,