fix for parallel installability

Original commit message from CVS:
fix for parallel installability
parent 9a796e2c
......@@ -25,8 +25,11 @@ SUBDIRS = include gst libs tools \
# These are all the possible subdirs
DIST_SUBDIRS = include libs gst tools tests testsuite examples docs
gstreamer-@GST_MAJORMINOR@.pc: gstreamer.pc
cp gstreamer.pc gstreamer-@GST_MAJORMINOR@.pc
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = gstreamer.pc
pkgconfig_DATA = gstreamer-@GST_MAJORMINOR@.pc
EXTRA_DIST = gstreamer.spec.in \
gstreamer.pc.in gstreamer-uninstalled.pc.in \
......
common @ 92ff5101
Subproject commit 9d5642850b94f5bc21d565f8c900a0606fbb518f
Subproject commit 92ff5101d55c0f853620bf13f8dd528992824137
......@@ -7,7 +7,17 @@ AS_VERSION(gstreamer, GST_VERSION, 0, 4, 2, 1, GST_ERROR="-Wall", GST_ERROR="-Wa
dnl AM_MAINTAINER_MODE only provides the option to configure to enable it
AM_MAINTAINER_MODE
AM_INIT_AUTOMAKE($PACKAGE,$VERSION)
AS_LIBTOOL(GST, 0, 0, 0, yes)
dnl our libraries and install dirs use major.minor as a version
GST_MAJORMINOR=$GST_VERSION_MAJOR.$GST_VERSION_MINOR
AC_SUBST(GST_MAJORMINOR)
dnl CURRENT, REVISION, AGE
dnl - library source changed -> increment REVISION
dnl - interfaces added/removed/changed -> increment CURRENT, REVISION = 0
dnl - interfaces added -> increment AGE
dnl - interfaces removed -> AGE = 0
AS_LIBTOOL(GST, 1, 0, 0)
AC_CONFIG_SRCDIR([gst/gst.c])
AM_CONFIG_HEADER(config.h)
......@@ -121,7 +131,7 @@ AC_SUBST(GST_PKG_DEPS)
dnl === libxml 2 ===
dnl Minimum required version of libxml2
LIBXML2_REQ="2.4.0"
LIBXML2_REQ="2.4.9"
AC_SUBST(LIBXML2_REQ)
dnl check for libxml2
......@@ -218,28 +228,13 @@ AC_HELP_STRING([--enable-profiling],[adds -pg to compiler commandline, for profi
esac],
[USE_PROFILING=no]) dnl Default value
dnl set up a configuration dir
GST_CONFIG_DIR=${sysconfdir}/gstreamer
AC_ARG_WITH(configdir,
AC_HELP_STRING([--with-configdir],[specify path to use for configuration files]),
[case "${withval}" in
yes) AC_MSG_ERROR(bad value ${withval} for --with-configdir) ;;
no) AC_MSG_ERROR(bad value ${withval} for --with-configdir) ;;
*) GST_CONFIG_DIR="${withval}" ;;
esac],
[:]) dnl Default value
AS_AC_EXPAND(GST_CONFIG_DIR, $GST_CONFIG_DIR)
AC_MSG_NOTICE(Using $GST_CONFIG_DIR as configuration dir)
dnl use a cache dir for storing element registry info.
dnl default to building registry in the source tree if we are enabling plugin build dir
if test "x$PLUGINS_USE_BUILDDIR" = "xyes"; then
GST_CACHE_DIR=`pwd`
else
dnl ${localstatedir} points to PREFIX/var
GST_CACHE_DIR=${localstatedir}/cache/gstreamer
GST_CACHE_DIR=${localstatedir}/cache/gstreamer-$GST_MAJORMINOR
fi
AC_ARG_WITH(cachedir,
AC_HELP_STRING([--with-cachedir],[specify path to use for plugin and command completion registries]),
......@@ -371,19 +366,15 @@ dnl ############################
dnl # Set up some more defines #
dnl ############################
dnl Set location of configuration dir.
AC_DEFINE_UNQUOTED(GST_CONFIG_DIR, "$GST_CONFIG_DIR", [Define the configuration directory])
AC_SUBST(GST_CONFIG_DIR)
dnl Set location of registry dir.
AC_DEFINE_UNQUOTED(GST_CACHE_DIR, "$GST_CACHE_DIR", [Define the registry directory])
AC_SUBST(GST_CACHE_DIR)
dnl Set location of plugin directory
if test "x${prefix}" = "xNONE"; then
PLUGINS_DIR=${ac_default_prefix}/lib/gst
PLUGINS_DIR=${ac_default_prefix}/lib/gstreamer-$GST_MAJORMINOR
else
PLUGINS_DIR=${prefix}/lib/gst
PLUGINS_DIR=${prefix}/lib/gstreamer-$GST_MAJORMINOR
fi
AC_DEFINE_UNQUOTED(PLUGINS_DIR, "$PLUGINS_DIR", [Define the plugin directory])
AC_SUBST(PLUGINS_DIR)
......@@ -414,7 +405,7 @@ AC_SUBST(LIBGST_LIBS)
AC_SUBST(LIBGST_CFLAGS)
dnl Vars for everyone else
GST_INT_LIBS="\$(top_builddir)/gst/libgstreamer.la"
GST_INT_LIBS="\$(top_builddir)/gst/libgstreamer-$GST_MAJORMINOR.la"
GST_INT_CFLAGS="$GST_INT_CFLAGS -I\$(top_srcdir)/libs -I\$(top_srcdir)/include"
AC_SUBST(GST_CFLAGS, "$LIBGST_CFLAGS $GST_INT_CFLAGS")
......
......@@ -2,18 +2,18 @@ EXTRA_DIST = html2xml.py
all-am: devhelp
devhelp: gstreamer.devhelp gstreamer-libs.devhelp
devhelp: gstreamer-@GST_MAJORMINOR@.devhelp gstreamer-libs-@GST_MAJORMINOR@.devhelp
gstreamer.devhelp:
gstreamer-@GST_MAJORMINOR@.devhelp:
cd ../gst && make
$(PYTHON) ./html2xml.py ../gst/html
sed 's@base=""@base="@HTML_DIR@/gstreamer"@g' html.devhelp > gstreamer.devhelp
perl -i -p -e 's/name="html"/name="gstreamer"/' gstreamer.devhelp
sed 's@base=""@base="@HTML_DIR@/gstreamer-@GST_MAJORMINOR@"@g' html.devhelp > gstreamer-@GST_MAJORMINOR@.devhelp
perl -i -p -e 's/name="html"/name="gstreamer-@GST_MAJORMINOR@"/' gstreamer-@GST_MAJORMINOR@.devhelp
rm html.devhelp
gstreamer-libs.devhelp:
gstreamer-libs-@GST_MAJORMINOR@.devhelp:
cd ../libs && make
$(PYTHON) ./html2xml.py ../libs/html
sed 's@base=""@base="@HTML_DIR@/gstreamer-libs"@g' html.devhelp > gstreamer-libs.devhelp
perl -i -p -e 's/name="html"/name="gstreamer-libs"/' gstreamer-libs.devhelp
sed 's@base=""@base="@HTML_DIR@/gstreamer-libs-@GST_MAJORMINOR@"@g' html.devhelp > gstreamer-libs-@GST_MAJORMINOR@.devhelp
perl -i -p -e 's/name="html"/name="gstreamer-libs-@GST_MAJORMINOR@"/' gstreamer-libs-@GST_MAJORMINOR@.devhelp
rm html.devhelp
......@@ -66,7 +66,8 @@ GTKDOC_LD=$(LIBTOOL) --mode=link $(CC)
# Everything below here is generic and you shouldn't need to change it.
###########################################################################
TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
# added majorminor here because we want parallel installs
TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)-@GST_MAJORMINOR@
EXTRA_DIST = \
$(content_files) \
......
......@@ -34,7 +34,7 @@ Get the current stack frame.
</para>
@ctx:
@threadnum:
@cothreadnum:
@priv:
@func:
@argc:
......@@ -42,8 +42,8 @@ Get the current stack frame.
@flags:
@sp:
@jmp:
@top_sp:
@pc:
@stack_base:
@stack_size:
@magic_number:
<!-- ##### STRUCT cothread_context ##### -->
......
......@@ -97,6 +97,7 @@ pipeline</ulink> and Microsoft's DirectShow for some background.
@argc:
@argv:
@popt_options:
@Returns:
<!-- ##### FUNCTION gst_version ##### -->
......
......@@ -15,13 +15,27 @@ methods to request buffers from its pads.
</para>
<!-- ##### VARIABLE gst_aggregator_details ##### -->
<para>
</para>
<!-- ##### ENUM GstAggregatorSchedType ##### -->
<para>
</para>
@AGGREGATOR_LOOP:
@AGGREGATOR_LOOP_PEEK:
@AGGREGATOR_LOOP_SELECT:
@AGGREGATOR_CHAIN:
<!-- ##### FUNCTION gst_aggregator_factory_init ##### -->
<para>
</para>
@factory:
@Returns:
......@@ -125,6 +125,8 @@ A convenience macro to create a new GstCaps structure.
@name: the name of the caps structure
@type: the mime type of the caps structure
@...:
<!-- # Unused Parameters # -->
@a...: the properties of this caps stucture.
......@@ -134,6 +136,8 @@ A convenience macro to create a GstCaps factory.
</para>
@factoryname: the name of the factory
@...:
<!-- # Unused Parameters # -->
@a...: the caps to create with this factory, usualy specified
with GST_CAPS_NEW()
......@@ -405,6 +409,8 @@ Set a property of a caps structure.
</para>
@caps: the caps structure to modify
@...:
<!-- # Unused Parameters # -->
@name: the name of the property to change
@args...: the new value of the property
......@@ -415,6 +421,8 @@ Get key/value pairs from the given GstCaps.
</para>
@caps: the caps to get the values from
@...:
<!-- # Unused Parameters # -->
@name: the name of the first key
@args...: a pointer to the variable that can hold the result followed by more key/value pairs.
......
......@@ -42,6 +42,7 @@ The function prototype of the callback.
@time: The time it was triggered
@id: The id that expired
@user_data: user data passed in the async_wait call
@Returns:
<!-- ##### TYPEDEF GstClockID ##### -->
......@@ -59,6 +60,7 @@ The return value of a clock operation.
@GST_CLOCK_TIMEOUT: The operation timed out.
@GST_CLOCK_EARLY: The operation was scheduled too late.
@GST_CLOCK_ERROR: An error occured
@GST_CLOCK_UNSUPPORTED:
<!-- ##### MACRO GST_CLOCK_TIME_NONE ##### -->
<para>
......@@ -134,6 +136,7 @@ The opaque data structure of the clock.
@clock:
@speed:
@Returns:
<!-- ##### FUNCTION gst_clock_get_speed ##### -->
......@@ -183,79 +186,6 @@ The opaque data structure of the clock.
@Returns:
<!-- ##### FUNCTION gst_clock_async_supported ##### -->
<para>
</para>
@clock:
@Returns:
<!-- ##### FUNCTION gst_clock_wait ##### -->
<para>
</para>
@clock:
@time:
@jitter:
@Returns:
<!-- ##### FUNCTION gst_clock_wait_async ##### -->
<para>
</para>
@clock:
@time:
@func:
@user_data:
@Returns:
<!-- ##### FUNCTION gst_clock_cancel_wait_async ##### -->
<para>
</para>
@clock:
@id:
<!-- ##### FUNCTION gst_clock_notify_async ##### -->
<para>
</para>
@clock:
@interval:
@func:
@user_data:
@Returns:
<!-- ##### FUNCTION gst_clock_remove_notify_async ##### -->
<para>
</para>
@clock:
@id:
<!-- ##### FUNCTION gst_clock_wait_id ##### -->
<para>
</para>
@clock:
@id:
@jitter:
@Returns:
<!-- ##### FUNCTION gst_clock_get_next_id ##### -->
<para>
......@@ -265,15 +195,6 @@ The opaque data structure of the clock.
@Returns:
<!-- ##### FUNCTION gst_clock_unlock_id ##### -->
<para>
</para>
@clock:
@id:
<!-- ##### FUNCTION gst_clock_get_time ##### -->
<para>
......@@ -308,5 +229,11 @@ The opaque data structure of the clock.
@clock:
@resolution:
@Returns:
<!-- ##### ARG GstClock:stats ##### -->
<para>
</para>
......@@ -62,6 +62,7 @@ describes the element, mostly for the benefit of editors.
@longname:
@klass:
@license:
@description:
@version:
@author:
......
......@@ -45,6 +45,7 @@ The different major types of events.
@GST_EVENT_SIZE: a size suggestion for a peer element
@GST_EVENT_RATE: adjust the output rate of an element
@GST_EVENT_FILLER: a dummy element that should be ignored by plugins
@GST_EVENT_TS_OFFSET:
<!-- ##### MACRO GST_EVENT_TYPE ##### -->
<para>
......@@ -243,13 +244,13 @@ The value of the size event
<!-- ##### STRUCT GstEvent ##### -->
<para>
The event data structure.
</para>
@data: The parent data type.
@type: The event type.
@timestamp: The event timestamp.
@src: The object that generated the event
@data:
@type:
@timestamp:
@src:
<!-- ##### FUNCTION gst_event_new ##### -->
<para>
......
......@@ -21,3 +21,11 @@ A type that can be used to indicate a filename.
<!-- ##### FUNCTION gst_extra_get_filename_type ##### -->
<para>
</para>
@Returns:
......@@ -16,3 +16,12 @@ with the buffer. (fakesink)
</para>
<!-- ##### FUNCTION gst_fakesink_factory_init ##### -->
<para>
</para>
@factory:
@Returns:
......@@ -14,3 +14,55 @@ The <classname>GstFakeSrc</classname> generates empty buffers. (fakesrc)
</para>
<!-- ##### ENUM GstFakeSrcOutputType ##### -->
<para>
</para>
@FAKESRC_FIRST_LAST_LOOP:
@FAKESRC_LAST_FIRST_LOOP:
@FAKESRC_PING_PONG:
@FAKESRC_ORDERED_RANDOM:
@FAKESRC_RANDOM:
@FAKESRC_PATTERN_LOOP:
@FAKESRC_PING_PONG_PATTERN:
@FAKESRC_GET_ALWAYS_SUCEEDS:
<!-- ##### ENUM GstFakeSrcDataType ##### -->
<para>
</para>
@FAKESRC_DATA_ALLOCATE:
@FAKESRC_DATA_SUBBUFFER:
@FAKESRC_DATA_BUFFERPOOL:
<!-- ##### ENUM GstFakeSrcSizeType ##### -->
<para>
</para>
@FAKESRC_SIZETYPE_NULL:
@FAKESRC_SIZETYPE_FIXED:
@FAKESRC_SIZETYPE_RANDOM:
<!-- ##### ENUM GstFakeSrcFillType ##### -->
<para>
</para>
@FAKESRC_FILLTYPE_NOTHING:
@FAKESRC_FILLTYPE_NULL:
@FAKESRC_FILLTYPE_RANDOM:
@FAKESRC_FILLTYPE_PATTERN:
@FAKESRC_FILLTYPE_PATTERN_CONT:
<!-- ##### FUNCTION gst_fakesrc_factory_init ##### -->
<para>
</para>
@factory:
@Returns:
......@@ -15,3 +15,11 @@ and subbuffers.
</para>
<!-- ##### ENUM GstFileSrcFlags ##### -->
<para>
</para>
@GST_FILESRC_OPEN:
@GST_FILESRC_FLAG_LAST:
......@@ -100,6 +100,8 @@ Print out any information usable at run-time by application developers.
</para>
@cat: the GST_CAT_... category for the information
@...:
<!-- # Unused Parameters # -->
@format: printf-style format string
@args...: printf arguments
......@@ -111,6 +113,8 @@ Print out information like #GST_INFO, but with an element pointer to clarify thi
@cat: the GST_CAT_... category for the information
@element: pointer to the #GstElement in question
@...:
<!-- # Unused Parameters # -->
@format: printf-style format string
@args...: printf arguments
......@@ -153,6 +157,8 @@ Called at the beginning of a function, it simply prints out a DEBUG string of "e
in addition to the given string.
</para>
@...:
<!-- # Unused Parameters # -->
@format: printf-style format string
@args...: printf arguments
......@@ -163,6 +169,8 @@ Called at the end of a function, it simply prints out a DEBUG string of "leaving
in addition to the given string.
</para>
@...:
<!-- # Unused Parameters # -->
@format: printf-stype format string
@args...: printf arguments
......@@ -173,6 +181,8 @@ Print out debugging information.
</para>
@cat: the GST_CAT_... the debug falls within
@...:
<!-- # Unused Parameters # -->
@format: printf-style format string
@args...: printf arguments
......@@ -224,6 +234,8 @@ Print out usefull debugging info of an element.
@cat: The category of this debugging statement.
@element: The element to debug.
@...:
<!-- # Unused Parameters # -->
@format: A printf-like string.
@args...: The argument for the printf-like string.
......@@ -234,6 +246,8 @@ Print out an error condition and abort the application.
</para>
@element: the #GstElement in question
@...:
<!-- # Unused Parameters # -->
@format: printf-style format string
@args...: printf arguments
......@@ -245,6 +259,8 @@ Print out an error condition and abort the application.
@element: the #GstElement in question
@object: pointer to a 'contributing' object
@...:
<!-- # Unused Parameters # -->
@format: printf-style format string
@args...: printf arguments
......
......@@ -280,6 +280,15 @@ Check if the object has been destroyed.
@Returns:
<!-- ##### SIGNAL GstObject::deep-notify ##### -->
<para>
</para>
@gstobject: the object which received the signal.
@arg1:
@arg2:
<!-- ##### SIGNAL GstObject::object-saved ##### -->
<para>
Is trigered whenever a new object is saved to XML. You can connect to
......
......@@ -922,6 +922,7 @@ Destroy the pad.
@querytypefunc:
@intconnfunc:
@bufferpoolfunc:
@probedisp:
<!-- ##### MACRO GST_RPAD_DIRECTION ##### -->
<para>
......
......@@ -127,6 +127,8 @@ Create a new padtemplate.
@padname: the nametemplate for the pads that will be created with this template
@dir: the direction of the pads.
@pres: the presence of the pads.
@...:
<!-- # Unused Parameters # -->
@a...: the capabilities of this padtemplate usually created with GST_CAPS_NEW()
......@@ -140,6 +142,8 @@ of the padtemplate. Use GST_PAD_TEMPLATE_GET() to get the unique padtemplate.
@padname: the nametemplate of the pads
@dir: the direction of the pads.
@pres: the presence of the pads.
@...:
<!-- # Unused Parameters # -->
@a...: the capabilities of this padtemplate, usually created with GST_CAPS_NEW()
......
......@@ -15,3 +15,11 @@ buffers from its output.
</para>
<!-- ##### ENUM GstPipeFilterFlags ##### -->
<para>
</para>
@GST_PIPEFILTER_OPEN:
@GST_PIPEFILTER_FLAG_LAST:
......@@ -34,10 +34,11 @@ are usually used in conjunction with GstCaps.
@GST_PROPS_INT_TYPE:
@GST_PROPS_FLOAT_TYPE:
@GST_PROPS_FOURCC_TYPE:
@GST_PROPS_BOOL_TYPE:
@GST_PROPS_BOOLEAN_TYPE:
@GST_PROPS_STRING_TYPE:
@GST_PROPS_VAR_TYPE:
@GST_PROPS_LIST_TYPE:
@GST_PROPS_GLIST_TYPE:
@GST_PROPS_FLOAT_RANGE_TYPE:
@GST_PROPS_INT_RANGE_TYPE:
@GST_PROPS_LAST_TYPE:
......@@ -84,6 +85,8 @@ Create a FOURCC value from a string. example:
Create a list of properties.
</para>
@...:
<!-- # Unused Parameters # -->
@a...: the list of GstProps
......
......@@ -25,3 +25,9 @@ The queue blocks by default.
</para>
<!-- ##### VARIABLE gst_queue_details ##### -->
<para>
</para>
This diff is collapsed.
......@@ -64,17 +64,6 @@ Destroy the scheduler
@sched:
<!-- ##### FUNCTION gst_scheduler_get_preferred_stack ##### -->
<para>
</para>
@sched:
@stack:
@size: