mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-05-18 08:22:51 +00:00
Code Issues Projects Releases Wiki Activity

fix for parallel installability

Browse source 
Original commit message from CVS:
fix for parallel installability
This commit is contained in:
Thomas Vander Stichele 2002-12-08 14:39:38 +00:00
parent 9a796e2cb5
commit 7eea6a04b7
45 changed files with 3928 additions and 395 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Makefile.am
View file

@ -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 \

2
common

@ -1 +1 @@
Subproject commit 9d5642850b94f5bc21d565f8c900a0606fbb518f
Subproject commit 92ff5101d55c0f853620bf13f8dd528992824137

41
configure.ac
View file

@ -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")

14
docs/devhelp/Makefile.am
View file

@ -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

3
docs/gst/Makefile.am
View file

@ -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) \

6
docs/gst/tmpl/cothreads.sgml
View file

@ -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 ##### -->

1
docs/gst/tmpl/gst.sgml
View file

@ -97,6 +97,7 @@ pipeline</ulink> and Microsoft's DirectShow for some background.
@argc:
@argv:
@popt_options:
@Returns:
<!-- ##### FUNCTION gst_version ##### -->

16
docs/gst/tmpl/gstaggregator.sgml
View file

@ -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:

8
docs/gst/tmpl/gstcaps.sgml
View file

@ -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.

91
docs/gst/tmpl/gstclock.sgml
View file

@ -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>

1
docs/gst/tmpl/gstelementfactory.sgml
View file

@ -62,6 +62,7 @@ describes the element, mostly for the benefit of editors.
@longname:
@klass:
@license:
@description:
@version:
@author:

11
docs/gst/tmpl/gstevent.sgml
View file

@ -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>

8
docs/gst/tmpl/gstextratypes.sgml
View file

@ -21,3 +21,11 @@ A type that can be used to indicate a filename.
<!-- ##### FUNCTION gst_extra_get_filename_type ##### -->
<para>
</para>
@Returns:

9
docs/gst/tmpl/gstfakesink.sgml
View file

@ -16,3 +16,12 @@ with the buffer. (fakesink)
</para>
<!-- ##### FUNCTION gst_fakesink_factory_init ##### -->
<para>
</para>
@factory:
@Returns:

52
docs/gst/tmpl/gstfakesrc.sgml
View file

@ -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:

8
docs/gst/tmpl/gstfilesrc.sgml
View file

@ -15,3 +15,11 @@ and subbuffers.
</para>
<!-- ##### ENUM GstFileSrcFlags ##### -->
<para>
</para>
@GST_FILESRC_OPEN:
@GST_FILESRC_FLAG_LAST:

16
docs/gst/tmpl/gstinfo.sgml
View file

@ -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

9
docs/gst/tmpl/gstobject.sgml
View file

@ -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

1
docs/gst/tmpl/gstpad.sgml
View file

@ -922,6 +922,7 @@ Destroy the pad.
@querytypefunc:
@intconnfunc:
@bufferpoolfunc:
@probedisp:
<!-- ##### MACRO GST_RPAD_DIRECTION ##### -->
<para>

4
docs/gst/tmpl/gstpadtemplate.sgml
View file

@ -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()

8
docs/gst/tmpl/gstpipefilter.sgml
View file

@ -15,3 +15,11 @@ buffers from its output.
</para>
<!-- ##### ENUM GstPipeFilterFlags ##### -->
<para>
</para>
@GST_PIPEFILTER_OPEN:
@GST_PIPEFILTER_FLAG_LAST:

5
docs/gst/tmpl/gstprops.sgml
View file

@ -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

6
docs/gst/tmpl/gstqueue.sgml
View file

@ -25,3 +25,9 @@ The queue blocks by default.
</para>
<!-- ##### VARIABLE gst_queue_details ##### -->
<para>
</para>

3565
docs/gst/tmpl/gstreamer-unused.sgml
View file

File diff suppressed because it is too large Load diff

11
docs/gst/tmpl/gstscheduler.sgml
View file

@ -64,17 +64,6 @@ Destroy the scheduler
@sched:
<!-- ##### FUNCTION gst_scheduler_get_preferred_stack ##### -->
<para>
</para>
@sched:
@stack:
@size:
@Returns:
<!-- ##### FUNCTION gst_scheduler_reset ##### -->
<para>

9
docs/gst/tmpl/gststatistics.sgml
View file

@ -15,3 +15,12 @@ the data stream, such as buffers/bytes/events etc.
</para>
<!-- ##### STRUCT stats ##### -->
<para>
</para>
@buffers:
@bytes:
@events:

119
docs/gst/tmpl/gsttimecache.sgml
View file

@ -15,122 +15,3 @@ used for efficient seeking.
</para>
<!-- ##### STRUCT GstTimeCacheEntry ##### -->
<para>
</para>
@location:
@timestamp:
<!-- ##### STRUCT GstTimeCacheGroup ##### -->
<para>
</para>
@groupnum:
@entries:
@certainty:
@peergroup:
@mintimestamp:
@maxtimestamp:
@minlocation:
@maxlocation:
<!-- ##### ENUM GstTimeCacheCertainty ##### -->
<para>
</para>
@GST_TIME_CACHE_UNKNOWN:
@GST_TIME_CACHE_CERTAIN:
@GST_TIME_CACHE_FUZZY_LOCATION:
@GST_TIME_CACHE_FUZZY_TIMESTAMP:
@GST_TIME_CACHE_FUZZY:
<!-- ##### FUNCTION gst_time_cache_new ##### -->
<para>
</para>
@Returns:
<!-- ##### FUNCTION gst_time_cache_get_group ##### -->
<para>
</para>
@tc:
@Returns:
<!-- ##### FUNCTION gst_time_cache_new_group ##### -->
<para>
</para>
@tc:
@Returns:
<!-- ##### FUNCTION gst_time_cache_set_group ##### -->
<para>
</para>
@tc:
@groupnum:
@Returns:
<!-- ##### FUNCTION gst_time_cache_set_certainty ##### -->
<para>
</para>
@tc:
@certainty:
<!-- ##### FUNCTION gst_time_cache_get_certainty ##### -->
<para>
</para>
@tc:
@Returns:
<!-- ##### FUNCTION gst_time_cache_add_entry ##### -->
<para>
</para>
@tc:
@location:
@timestamp:
<!-- ##### FUNCTION gst_time_cache_find_location ##### -->
<para>
</para>
@tc:
@location:
@timestamp:
@Returns:
<!-- ##### FUNCTION gst_time_cache_find_timestamp ##### -->
<para>
</para>
@tc:
@timestamp:
@location:
@Returns:

6
docs/gst/tmpl/gsttypefind.sgml
View file

@ -15,3 +15,9 @@ the detected mime type of the stream. It is used in autoplugging.
</para>
<!-- ##### VARIABLE gst_type_find_details ##### -->
<para>
</para>

3
docs/libs/Makefile.am
View file

@ -12,7 +12,8 @@ DOC_SOURCE_DIR=$(top_srcdir)/libs
EXTRA_DIST = $(DOC_MODULE)-docs.sgml $(DOC_MODULE)-sections.txt
HTML_DIR=@HTML_DIR@
TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
# add major minor here for parallel installs
TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)-@GST_MAJORMINOR@
if HAVE_GTK_DOC
html: html/book1.html

37
gst/Makefile.am
View file

@ -1,4 +1,4 @@
lib_LTLIBRARIES = libgstreamer.la
lib_LTLIBRARIES = libgstreamer-@GST_MAJORMINOR@.la
noinst_LTLIBRARIES = libcothreads.la
if HAVE_CPU_I386
@ -41,13 +41,12 @@ else
GST_TRACE_SRC = gsttrace.c
endif
EXTRA_libgstreamer_la_SOURCES = gstcpuid_i386.s gstmarshal.list gstxml.c gsttypefind.c gstparse.c gstautoplug.c gsttrace.c
EXTRA_libgstreamer_@GST_MAJORMINOR@_la_SOURCES = gstcpuid_i386.s gstmarshal.list gstxml.c gsttypefind.c gstparse.c gstautoplug.c gsttrace.c
SUBDIRS = parse registries . $(GST_AUTOPLUG_DIRS) elements schedulers types caches
DIST_SUBDIRS = autoplug elements parse registries schedulers types caches
libcothreads_la_SOURCES = cothreads.c
libgstreamer_la_SOURCES = \
libgstreamer_@GST_MAJORMINOR@_la_SOURCES = \
gst.c \
gstmarshal.c \
gstenumtypes.c \
@ -91,7 +90,17 @@ libgstreamer_la_SOURCES = \
BUILT_SOURCES = gstmarshal.h gstmarshal.c gstenumtypes.h gstenumtypes.c
libgstreamerincludedir = $(includedir)/gstreamer-@VERSION@/gst
libgstreamer_@GST_MAJORMINOR@_la_CFLAGS = -D_GNU_SOURCE \
$(LIBGST_CFLAGS) \
-DG_LOG_DOMAIN=g_log_domain_gstreamer \
-DGST_CONFIG_DIR=\""$(GST_CONFIG_DIR)"\" \
-DGST_CACHE_DIR=\""$(GST_CACHE_DIR)"\"
libgstreamer_@GST_MAJORMINOR@_la_LIBADD = $(LIBGST_LIBS) parse/libgstparse.la registries/libgstxmlregistry.la
libgstreamer_@GST_MAJORMINOR@_la_LDFLAGS = @GST_LT_LDFLAGS@ -version-info @GST_LIBVERSION@
libgstreamer_@GST_MAJORMINOR@includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst
gst_headers = \
gst.h \
@ -139,7 +148,7 @@ built_headers = \
gstmarshal.h \
gstenumtypes.h
libgstreamerinclude_HEADERS = $(gst_headers) $(built_headers)
libgstreamer_@GST_MAJORMINOR@include_HEADERS = $(gst_headers) $(built_headers)
noinst_HEADERS = \
gst_private.h \
@ -147,6 +156,10 @@ noinst_HEADERS = \
gstarch.h \
cothreads.h
# the compiler shoots cothreads.c in the head at -O6
libcothreads_la_SOURCES = cothreads.c
libcothreads_la_CFLAGS = $(libgstreamer_@GST_MAJORMINOR@_la_CFLAGS)
gstmarshal.h: gstmarshal.list
glib-genmarshal --header --prefix=gst_marshal $^ > gstmarshal.h.tmp
@ -184,16 +197,4 @@ dist-hook:
distclean-local:
rm -f $(top_builddir)/gst/gstmarshal.c $(top_builddir)/gst/gstmarshal.h
libgstreamer_la_CFLAGS = -D_GNU_SOURCE \
$(LIBGST_CFLAGS) \
-DG_LOG_DOMAIN=g_log_domain_gstreamer \
-DGST_CONFIG_DIR=\""$(GST_CONFIG_DIR)"\" \
-DGST_CACHE_DIR=\""$(GST_CACHE_DIR)"\"
# the compiler shoots cothreads.c in the head at -O6
libcothreads_la_CFLAGS = $(libgstreamer_la_CFLAGS) -O2
libgstreamer_la_LIBADD = $(LIBGST_LIBS) parse/libgstparse.la registries/libgstxmlregistry.la
libgstreamer_la_LDFLAGS = @GST_LT_LDFLAGS@ -version-info @GST_LIBVERSION@
EXTRA_DIST = ROADMAP

2
gst/autoplug/Makefile.am
View file

@ -1,4 +1,4 @@
plugindir = $(libdir)/gst
plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
plugin_LTLIBRARIES = \
libgststaticautoplug.la \

2
gst/caches/Makefile.am
View file

@ -1,4 +1,4 @@
plugindir = $(libdir)/gst
plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
plugin_LTLIBRARIES = libgstcaches.la

4
gst/elements/Makefile.am
View file

@ -1,8 +1,8 @@
plugindir = $(libdir)/gst
plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
plugin_LTLIBRARIES = libgstelements.la
libgstelements_la_DEPENDENCIES = ../libgstreamer.la
libgstelements_la_DEPENDENCIES = ../libgstreamer-@GST_MAJORMINOR@.la
libgstelements_la_SOURCES = \
gstelements.c \
gstfakesrc.c \

10
gst/gstinfo.h
View file

@ -455,9 +455,7 @@ extern GstErrorHandler _gst_error_handler;
extern GHashTable *__gst_function_pointers;
#if GST_DEBUG_ENABLED
#define GST_DEBUG_FUNCPTR(ptr) _gst_debug_register_funcptr((void *)(ptr), #ptr)
#define GST_DEBUG_FUNCPTR_NAME(ptr) _gst_debug_nameof_funcptr((void *)ptr)
#ifdef GST_DEBUG_ENABLED
static inline void *
_gst_debug_register_funcptr (void *ptr, gchar *ptrname)
{
@ -466,8 +464,10 @@ _gst_debug_register_funcptr (void *ptr, gchar *ptrname)
g_hash_table_insert(__gst_function_pointers,ptr,ptrname);
return ptr;
}
#define GST_DEBUG_FUNCPTR(ptr) _gst_debug_register_funcptr((void *)(ptr), #ptr)
#define GST_DEBUG_FUNCPTR_NAME(ptr) _gst_debug_nameof_funcptr((void *)ptr)
gchar *_gst_debug_nameof_funcptr (void *ptr);
gchar * _gst_debug_nameof_funcptr (void *ptr);
#else
#define GST_DEBUG_FUNCPTR(ptr) (ptr)
#define GST_DEBUG_FUNCPTR_NAME(ptr) ""
@ -475,6 +475,4 @@ gchar *_gst_debug_nameof_funcptr (void *ptr);
void gst_debug_print_stack_trace (void);
#endif /* __GSTINFO_H__ */

2
gst/schedulers/Makefile.am
View file

@ -1,4 +1,4 @@
plugindir = $(libdir)/gst
plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
plugin_LTLIBRARIES = \
libgstbasicomegascheduler.la \

2
gst/types/Makefile.am
View file

@ -1,4 +1,4 @@
plugindir = $(libdir)/gst
plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
plugin_LTLIBRARIES = libgsttypes.la

5
gstreamer.pc.in
View file

@ -1,12 +1,13 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@/gstreamer-@VERSION@
includedir=@includedir@/gstreamer-@GST_MAJORMINOR@
toolsdir=${exec_prefix}/bin
gstcontrol_libs=-lgstcontrol-@GST_MAJORMINOR@
Name: GStreamer
Description: Streaming-media framework
Requires: @GST_PKG_DEPS@@LIBXML_PKG@
Version: @VERSION@
Libs: -L${libdir} -lgstreamer
Libs: -L${libdir} -lgstreamer-@GST_MAJORMINOR@
Cflags: -I${includedir} @GST_PKG_CFLAGS@

174
gstreamer.spec.in
View file

@ -10,12 +10,14 @@ Vendor: GStreamer Backpackers Team <package@gstreamer.net>
Source: http://gstreamer.net/releases/%{version}/src/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-root
%define majorminor @GST_MAJORMINOR@
%define _glib2 @GLIB2_REQ@
%define _libxml2 @LIBXML2_REQ@
Requires: glib2 >= %_glib2
Requires: libxml2 >= %_libxml2
Requires: popt > 1.6
Requires: %{name}-tools >= %{version}
BuildRequires: glib2-devel >= %_glib2
BuildRequires: libxml2-devel >= %_libxml2
BuildRequires: bison
@ -59,6 +61,22 @@ plugins.
This package contains the libraries and includes files necessary to develop
applications and plugins for GStreamer.
%package tools
Summary: tools for GStreamer streaming media framework.
Group: Libraries/Multimedia
%description tools
GStreamer is a streaming-media framework, based on graphs of filters which
operate on media data. Applications using this library can do anything
from real-time sound processing to playing videos, and just about anything
else media-related. Its plugin-based architecture means that new data
types or processing capabilities can be added simply by installing new
plugins.
This package contains the basic command-line tools used for GStreamer, like
gst-register and gst-launch. It is split off to allow parallel-installability
in the future.
%prep
%setup
@ -82,7 +100,7 @@ FFLAGS="${FFLAGS:-%optflags}" ; export FFLAGS ; \
--mandir=%{_mandir} \
--infodir=%{_infodir} \
--enable-debug \
--with-configdir=/etc/gstreamer \
--with-cachedir=%{_localstatedir}/cache/gstreamer \
--disable-tests --disable-examples \
--enable-docs-build --with-html-dir=$RPM_BUILD_ROOT%{_datadir}/gtk-doc/html
@ -102,8 +120,8 @@ cp $RPM_BUILD_DIR/%{name}-%{version}/docs/devhelp/*.devhelp $RPM_BUILD_ROOT/usr/
%makeinstall
# Clean out files that should not be part of the rpm.
# This is the recommended way of dealing with it for RH8
rm -f $RPM_BUILD_ROOT%{_libdir}/gst/*.la
rm -f $RPM_BUILD_ROOT%{_libdir}/gst/*.a
rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}-%{majorminor}/*.la
rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}-%{majorminor}/*.a
rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
@ -126,6 +144,27 @@ ln -sf %{_datadir}/gtk-doc/html/gstreamer-libs %{_datadir}/devhelp/books
%files
%defattr(-, root, root)
%doc AUTHORS COPYING README TODO COPYING.LIB ABOUT-NLS REQUIREMENTS DOCBUILDING RELEASE
%{_libdir}/libgstreamer-%{majorminor}.so.*
%{_libdir}/libgstcontrol-%{majorminor}.so.*
%dir %{_libdir}/gstreamer-%{majorminor}
%{_libdir}/gstreamer-%{majorminor}/libgstautoplugcache*.so*
%{_libdir}/gstreamer-%{majorminor}/libgstautoplugger*.so*
%{_libdir}/gstreamer-%{majorminor}/libgstbasicomega*.so*
%{_libdir}/gstreamer-%{majorminor}/libgstfastomega*.so*
%{_libdir}/gstreamer-%{majorminor}/libgstoptomega*.so*
%{_libdir}/gstreamer-%{majorminor}/libgstbasicwingo*.so*
%{_libdir}/gstreamer-%{majorminor}/libgstfastwingo*.so*
%{_libdir}/gstreamer-%{majorminor}/libgstoptwingoscheduler*.so
%{_libdir}/gstreamer-%{majorminor}/libgstelements*.so*
%{_libdir}/gstreamer-%{majorminor}/libgsttypes*.so*
%{_libdir}/gstreamer-%{majorminor}/libgststaticautoplug*.so*
%{_libdir}/gstreamer-%{majorminor}/libgstbytestream*.so*
%{_libdir}/gstreamer-%{majorminor}/libgstgetbits*.so*
%{_libdir}/gstreamer-%{majorminor}/libgstputbits*.so*
%{_libdir}/gstreamer-%{majorminor}/libgstspider*.so*
%{_libdir}/gstreamer-%{majorminor}/libgstcaches.so
%files tools
%{_bindir}/gst-complete
%{_bindir}/gst-compprep
%{_bindir}/gst-inspect
@ -134,23 +173,6 @@ ln -sf %{_datadir}/gtk-doc/html/gstreamer-libs %{_datadir}/devhelp/books
%{_bindir}/gst-register
%{_bindir}/gst-feedback
%{_bindir}/gst-xmllaunch
%{_libdir}/libgstreamer-%{version}.so.*
%{_libdir}/gst/libgstautoplugcache*.so*
%{_libdir}/gst/libgstautoplugger*.so*
%{_libdir}/gst/libgstbasicomega*.so*
%{_libdir}/gst/libgstfastomega*.so*
%{_libdir}/gst/libgstoptomega*.so*
%{_libdir}/gst/libgstbasicwingo*.so*
%{_libdir}/gst/libgstfastwingo*.so*
%{_libdir}/gst/libgstoptwingoscheduler.so
%{_libdir}/gst/libgstelements*.so*
%{_libdir}/gst/libgsttypes*.so*
%{_libdir}/gst/libgststaticautoplug*.so*
%{_libdir}/gst/libgstbytestream*.so*
%{_libdir}/gst/libgstgetbits*.so*
%{_libdir}/gst/libgstputbits*.so*
%{_libdir}/gst/libgstspider*.so*
%{_libdir}/gst/libgstcaches.so
%{_mandir}/man1/gst-feedback.*
%{_mandir}/man1/gst-xmllaunch.*
%{_mandir}/man1/gst-complete.*
@ -160,69 +182,85 @@ ln -sf %{_datadir}/gtk-doc/html/gstreamer-libs %{_datadir}/devhelp/books
%{_mandir}/man1/gst-md5sum.*
%{_mandir}/man1/gst-register.*
%{_libdir}/libgstcontrol*.so*
%files devel
%defattr(-, root, root)
%{_includedir}/%{name}-%{version}/gst
%dir %{_includedir}/%{name}-%{majorminor}
%dir %{_includedir}/%{name}-%{majorminor}/gst
%{_includedir}/%{name}-%{majorminor}/gst/*.h
%dir %{_includedir}/%{name}-%{majorminor}/gst/control
%{_includedir}/%{name}-%{majorminor}/gst/control/*.h
%dir %{_includedir}/%{name}-%{majorminor}/gst/bytestream
%{_includedir}/%{name}-%{majorminor}/gst/bytestream/bytestream.h
%dir %{_includedir}/%{name}-%{majorminor}/gst/getbits
%{_includedir}/%{name}-%{majorminor}/gst/getbits/getbits.h
%dir %{_includedir}/%{name}-%{majorminor}/gst/putbits
%{_includedir}/%{name}-%{majorminor}/gst/putbits/putbits.h
# %{_libdir}/libgstreamer.a
%{_libdir}/libgstreamer.so
%{_libdir}/pkgconfig/gstreamer*.pc
%{_libdir}/libgstreamer-%{majorminor}.so
%{_libdir}/libgstcontrol-%{majorminor}.so
%{_libdir}/pkgconfig/gstreamer-%{majorminor}.pc
## we specify the API docs as regular files since %docs doesn't fail when
# files aren't found anymore for RPM >= 4
# we list all of the files we really need to trap incomplete doc builds
# then we catch the rest with *, you can safely ignore the errors from this
## gstreamer API
%{_datadir}/gtk-doc/html/gstreamer/autopluggers.html
%{_datadir}/gtk-doc/html/gstreamer/book1.html
%{_datadir}/gtk-doc/html/gstreamer/element-types.html
%{_datadir}/gtk-doc/html/gstreamer/gstautoplugfactory.html
%{_datadir}/gtk-doc/html/gstreamer/gstautoplug.html
%{_datadir}/gtk-doc/html/gstreamer/gstbin.html
%{_datadir}/gtk-doc/html/gstreamer/gstclock.html
%{_datadir}/gtk-doc/html/gstreamer/gstelement.html
%{_datadir}/gtk-doc/html/gstreamer/gst-index.html
%{_datadir}/gtk-doc/html/gstreamer/gstobject.html
%{_datadir}/gtk-doc/html/gstreamer/gstpad.html
%{_datadir}/gtk-doc/html/gstreamer/gstpipeline.html
%{_datadir}/gtk-doc/html/gstreamer/gstpluginfeature.html
# %{_datadir}/gtk-doc/html/gstreamer/gstreamer-cothreads.html
%{_datadir}/gtk-doc/html/gstreamer/gstreamer-gstbuffer.html
%{_datadir}/gtk-doc/html/gstreamer/gstreamer-gstbufferpool.html
%{_datadir}/gtk-doc/html/gstreamer/gstreamer-gstcaps.html
%{_datadir}/gtk-doc/html/gstreamer/gstreamer-gstcpu.html
%{_datadir}/gtk-doc/html/gstreamer/gstreamer-gstdata.html
%{_datadir}/gtk-doc/html/gstreamer/gstreamer-gstevent.html
%{_datadir}/gtk-doc/html/gstreamer/gstreamer-gst.html
%{_datadir}/gtk-doc/html/gstreamer/gstreamer-gstinfo.html
%{_datadir}/gtk-doc/html/gstreamer/gstreamer-gstparse.html
%{_datadir}/gtk-doc/html/gstreamer/gstreamer-gstplugin.html
%{_datadir}/gtk-doc/html/gstreamer/gstreamer-gstprops.html
%{_datadir}/gtk-doc/html/gstreamer/gstreamer-gststaticautoplug.html
%{_datadir}/gtk-doc/html/gstreamer/gstreamer-gststaticautoplugrender.html
%{_datadir}/gtk-doc/html/gstreamer/gstreamer-gsttee.html
%{_datadir}/gtk-doc/html/gstreamer/gstreamer-gsttype.html
%{_datadir}/gtk-doc/html/gstreamer/gstreamer-gstutils.html
%{_datadir}/gtk-doc/html/gstreamer/gstreamer.html
%{_datadir}/gtk-doc/html/gstreamer/gstschedulerfactory.html
%{_datadir}/gtk-doc/html/gstreamer/gstscheduler.html
%{_datadir}/gtk-doc/html/gstreamer/gstthread.html
%{_datadir}/gtk-doc/html/gstreamer/gsttypefactory.html
%{_datadir}/gtk-doc/html/gstreamer/gstxml.html
%{_datadir}/gtk-doc/html/gstreamer/index.sgml
%dir %{_datadir}/gtk-doc/html/%{name}-%{majorminor}
%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/autopluggers.html
%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/book1.html
%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/element-types.html
%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstautoplugfactory.html
%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstautoplug.html
%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstbin.html
%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstclock.html
%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstelement.html
%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gst-index.html
%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstobject.html
%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstpad.html
%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstpipeline.html
%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstpluginfeature.html
# %{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer-cothreads.html
%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer-gstbuffer.html
%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer-gstbufferpool.html
%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer-gstcaps.html
%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer-gstcpu.html
%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer-gstdata.html
%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer-gstevent.html
%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer-gst.html
%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer-gstinfo.html
%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer-gstparse.html
%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer-gstplugin.html
%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer-gstprops.html
%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer-gststaticautoplug.html
%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer-gststaticautoplugrender.html
%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer-gsttee.html
%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer-gsttype.html
%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer-gstutils.html
%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstreamer.html
%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstschedulerfactory.html
%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstscheduler.html
%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstthread.html
%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gsttypefactory.html
%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/gstxml.html
%{_datadir}/gtk-doc/html/%{name}-%{majorminor}/index.sgml
## gstreamer-libs API
%{_datadir}/gtk-doc/html/gstreamer-libs/book1.html
%{_datadir}/gtk-doc/html/gstreamer-libs/gstreamer-libs-gstcolorspace.html
%{_datadir}/gtk-doc/html/gstreamer-libs/gstreamer-libs-gstgetbits.html
%{_datadir}/gtk-doc/html/gstreamer-libs/gstreamer-libs.html
%{_datadir}/gtk-doc/html/gstreamer-libs/index.sgml
%dir %{_datadir}/gtk-doc/html/%{name}-libs-%{majorminor}
%{_datadir}/gtk-doc/html/%{name}-libs-%{majorminor}/book1.html
%{_datadir}/gtk-doc/html/%{name}-libs-%{majorminor}/%{name}-libs-gstcolorspace.html
%{_datadir}/gtk-doc/html/%{name}-libs-%{majorminor}/%{name}-libs-gstgetbits.html
%{_datadir}/gtk-doc/html/%{name}-libs-%{majorminor}/%{name}-libs.html
%{_datadir}/gtk-doc/html/%{name}-libs-%{majorminor}/index.sgml
## this catches all of the rest of the docs we might have forgotten
%{_datadir}/gtk-doc/html/*
%{_datadir}/devhelp/specs/gstreamer.devhelp
%{_datadir}/devhelp/specs/gstreamer-libs.devhelp
%{_datadir}/devhelp/specs/%{name}-%{majorminor}.devhelp
%{_datadir}/devhelp/specs/%{name}-libs-%{majorminor}.devhelp
%changelog
* Sat Dec 07 2002 Thomas Vander Stichele <thomas at apestaart dot org>
- define majorminor and use it everywhere
- full parallel installability
* Tue Nov 05 2002 Christian Schaller <Uraeus@linuxrising.org>
- Add optwingo scheduler
* Sat Oct 12 2002 Christian Schaller <Uraeus@linuxrising.org>

4
libs/gst/bytestream/Makefile.am
View file

@ -1,9 +1,9 @@
librarydir = $(libdir)/gst
librarydir = $(libdir)/gstreamer-@GST_MAJORMINOR@
library_LTLIBRARIES = libgstbytestream.la
noinst_LTLIBRARIES = libgstbstest.la
libgstbytestreamincludedir = $(includedir)/gstreamer-@VERSION@/gst/bytestream
libgstbytestreamincludedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/bytestream
libgstbytestreaminclude_HEADERS = bytestream.h
libgstbytestream_la_SOURCES = bytestream.c

13
libs/gst/control/Makefile.am
View file

@ -1,9 +1,9 @@
librarydir = $(libdir)
library_LTLIBRARIES = libgstcontrol.la
library_LTLIBRARIES = libgstcontrol-@GST_MAJORMINOR@.la
libgstcontrolincludedir = $(includedir)/gstreamer-@VERSION@/gst/control
libgstcontrolinclude_HEADERS = \
libgstcontrol_@GST_MAJORMINOR@_includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/control
libgstcontrol_@GST_MAJORMINOR@_include_HEADERS = \
control.h \
dparammanager.h \
dparam.h \
@ -12,7 +12,7 @@ libgstcontrolinclude_HEADERS = \
dparamcommon.h \
dplinearinterp.h
libgstcontrol_la_SOURCES = \
libgstcontrol_@GST_MAJORMINOR@_la_SOURCES = \
control.c \
dparammanager.c \
dparam.c \
@ -20,5 +20,6 @@ libgstcontrol_la_SOURCES = \
unitconvert.c \
dplinearinterp.c
libgstcontrol_la_CFLAGS = $(GST_CFLAGS) -finline-functions -ffast-math
libgstcontrol_la_LDFLAGS = @GST_LT_LDFLAGS@ -version-info @GST_LIBVERSION@
libgstcontrol_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS) -finline-functions -ffast-math
libgstcontrol_@GST_MAJORMINOR@_la_LDFLAGS = @GST_LT_LDFLAGS@ -version-info @GST_LIBVERSION@

7
libs/gst/getbits/Makefile.am
View file

@ -1,4 +1,4 @@
librarydir = $(libdir)/gst
librarydir = $(libdir)/gstreamer-@GST_MAJORMINOR@
library_LTLIBRARIES = libgstgetbits.la
@ -8,8 +8,9 @@ else
GSTARCH_SRCS =
endif
libgstgetbitsincludedir = $(includedir)/gstreamer-@VERSION@/gst/getbits
libgstgetbitsincludedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/getbits
libgstgetbitsinclude_HEADERS = getbits.h
noinst_HEADERS = gstgetbits_inl.h
libgstgetbits_la_SOURCES = getbits.c gstgetbits_inl.h gstgetbits_generic.c $(GSTARCH_SRCS)
EXTRA_libgstgetbits_la_SOURCES = gstgetbits_i386.s
@ -17,6 +18,4 @@ EXTRA_libgstgetbits_la_SOURCES = gstgetbits_i386.s
libgstgetbits_la_CFLAGS = $(GST_CFLAGS) -funroll-all-loops -finline-functions -ffast-math
libgstgetbits_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
noinst_HEADERS = getbits.h gstgetbits_inl.h
# check_PROGRAMS = gbtest

6
libs/gst/putbits/Makefile.am
View file

@ -1,12 +1,10 @@
librarydir = $(libdir)/gst
librarydir = $(libdir)/gstreamer-@GST_MAJORMINOR@
library_LTLIBRARIES = libgstputbits.la
libgstputbitsincludedir = $(includedir)/gstreamer-@VERSION@/gst/putbits
libgstputbitsincludedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/putbits
libgstputbitsinclude_HEADERS = putbits.h
libgstputbits_la_SOURCES = putbits.c
libgstputbits_la_CFLAGS = $(GST_CFLAGS) -funroll-all-loops -finline-functions -ffast-math
libgstputbits_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
noinst_HEADERS = putbits.h

4
plugins/elements/Makefile.am
View file

@ -1,8 +1,8 @@
plugindir = $(libdir)/gst
plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
plugin_LTLIBRARIES = libgstelements.la
libgstelements_la_DEPENDENCIES = ../libgstreamer.la
libgstelements_la_DEPENDENCIES = ../libgstreamer-@GST_MAJORMINOR@.la
libgstelements_la_SOURCES = \
gstelements.c \
gstfakesrc.c \

2
tools/Makefile.am
View file

@ -36,7 +36,7 @@ gst_register_CFLAGS = $(GST_CFLAGS) -DGST_CONFIG_DIR=\"$(GST_CONFIG_DIR)\" \
-DGST_CACHE_DIR=\""$(GST_CACHE_DIR)"\"
endif
gst_inspect_LDADD = $(GST_LIBS) ../libs/gst/control/libgstcontrol.la
gst_inspect_LDADD = $(GST_LIBS) ../libs/gst/control/libgstcontrol-@GST_MAJORMINOR@.la
gst_inspect_CFLAGS = $(GST_CFLAGS) -DGST_CONFIG_DIR=\"$(GST_CONFIG_DIR)\" \
-DGST_CACHE_DIR=\""$(GST_CACHE_DIR)"\"

11
tools/gst-register.c
View file

@ -39,14 +39,14 @@ static gint num_plugins = 0;
static void
plugin_added_func (GstRegistry *registry, GstPlugin *plugin, gpointer user_data)
{
g_print ("added plugin %s with %d feature(s)\n", plugin->name,
g_print ("added plugin %s with %d feature(s)\n", plugin->name,
plugin->numfeatures);
num_features += plugin->numfeatures;
num_plugins++;
}
int main (int argc,char *argv[])
int main (int argc,char *argv[])
{
GList *registries;
GList *path_spill = NULL; /* used for path spill from failing registries */
@ -77,8 +77,8 @@ int main (int argc,char *argv[])
path_spill = NULL;
}
g_signal_connect (G_OBJECT (registry), "plugin_added",
G_CALLBACK (plugin_added_func), NULL);
g_signal_connect (G_OBJECT (registry), "plugin_added",
G_CALLBACK (plugin_added_func), NULL);
if (registry->flags & GST_REGISTRY_WRITABLE) {
g_print ("rebuilding %s\n", registry->name);
@ -91,12 +91,11 @@ int main (int argc,char *argv[])
{
g_print ("error loading %s\n", registry->name);
/* move over paths from this registry to the next one */
path_spill = g_list_concat (path_spill,
path_spill = g_list_concat (path_spill,
gst_registry_get_path_list (registry));
g_assert (path_spill != NULL);
}
}
registries = g_list_next (registries);
}