mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-19 23:06:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst: Change versioning

Browse source 
Remove GST_MAJORMINOR and replace it by GST_API_VERSION
Also set GST_VERSION_{MAJOR,MINOR,MICRO,NANO} explicitely
now.

All versions are at 1.0.0 now for the release soon but
API/ABI can still change until the 1.0.0 release.

Next release versions until 1.0.0 will be 0.10.9X and
these will be release candidates. GST_VERSION_* will
nonetheless stay at 1.0.0.0.
This commit is contained in:
Sebastian Dröge 2012-04-04 13:13:52 +02:00
parent 6a0e594ebc
commit b0d89da6b6
47 changed files with 299 additions and 285 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Makefile.am
View file

@ -4,7 +4,7 @@ DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc --enable-docbook
ACLOCAL_AMFLAGS = -I m4 -I common/m4 ACLOCAL_AMFLAGS = -I m4 -I common/m4
aclocaldir = $(datadir)/aclocal aclocaldir = $(datadir)/aclocal
aclocal_DATA = gst-element-check-@GST_MAJORMINOR@.m4 aclocal_DATA = gst-element-check-@GST_API_VERSION@.m4
SUBDIRS = pkgconfig \ SUBDIRS = pkgconfig \
gst libs plugins tools tests \ gst libs plugins tools tests \
@ -32,7 +32,7 @@ EXTRA_DIST = \
scripts/gst-uninstalled \ scripts/gst-uninstalled \
$(win32) $(win32)
CLEANFILES = gst-element-check-@GST_MAJORMINOR@.m4 CLEANFILES = gst-element-check-@GST_API_VERSION@.m4
DISTCLEANFILES = _stdint.h DISTCLEANFILES = _stdint.h
@ -148,8 +148,8 @@ endif
check: $(CHECK_EXPORTS) check-enum-gettypes check: $(CHECK_EXPORTS) check-enum-gettypes
gst-element-check-@GST_MAJORMINOR@.m4: gst-element-check.m4 gst-element-check-@GST_API_VERSION@.m4: gst-element-check.m4
$(AM_V_GEN)cp gst-element-check.m4 gst-element-check-@GST_MAJORMINOR@.m4 $(AM_V_GEN)cp gst-element-check.m4 gst-element-check-@GST_API_VERSION@.m4
# cruft: plugins that have been merged or moved or renamed # cruft: plugins that have been merged or moved or renamed
@ -198,4 +198,4 @@ CRUFT_DIRS = \
include $(top_srcdir)/common/cruft.mak include $(top_srcdir)/common/cruft.mak
all-local: gst-element-check-@GST_MAJORMINOR@.m4 check-cruft all-local: gst-element-check-@GST_API_VERSION@.m4 check-cruft

40
configure.ac
View file

@ -34,13 +34,27 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])],
[AM_DEFAULT_VERBOSITY=1 [AM_DEFAULT_VERBOSITY=1
AC_SUBST(AM_DEFAULT_VERBOSITY)]) AC_SUBST(AM_DEFAULT_VERBOSITY)])
dnl our libraries and install dirs use major.minor as a version dnl GStreamer versioning, this is mostly informational
GST_MAJORMINOR=$PACKAGE_VERSION_MAJOR.$PACKAGE_VERSION_MINOR dnl GST_VERSION_MAJOR=$PACKAGE_VERSION_MAJOR
dnl we override it here for release candidates for a new series dnl GST_VERSION_MINOR=$PACKAGE_VERSION_MINOR
GST_MAJORMINOR=0.11 dnl GST_VERSION_MICRO=$PACKAGE_VERSION_MICRO
AC_SUBST(GST_MAJORMINOR) dnl GST_VERSION_NANO=$PACKAGE_VERSION_NANO
AC_DEFINE_UNQUOTED(GST_MAJORMINOR, "$GST_MAJORMINOR", dnl Change this to the above for non-pre
[library major.minor version]) GST_VERSION_MAJOR=1
GST_VERSION_MINOR=0
GST_VERSION_MICRO=0
GST_VERSION_NANO=0
AC_SUBST(GST_VERSION_MAJOR)
AC_SUBST(GST_VERSION_MINOR)
AC_SUBST(GST_VERSION_MICRO)
AC_SUBST(GST_VERSION_NANO)
dnl our libraries and install dirs use GST_API_VERSION in the filename
dnl to allow side-by-side installation of different API versions
GST_API_VERSION=1.0
AC_SUBST(GST_API_VERSION)
AC_DEFINE_UNQUOTED(GST_API_VERSION, "$GST_API_VERSION",
[GStreamer API Version])
dnl CURRENT, REVISION, AGE dnl CURRENT, REVISION, AGE
dnl - library source changed -> increment REVISION dnl - library source changed -> increment REVISION
@ -48,7 +62,7 @@ dnl - interfaces added/removed/changed -> increment CURRENT, REVISION = 0
dnl - interfaces added -> increment AGE dnl - interfaces added -> increment AGE
dnl - interfaces removed -> AGE = 0 dnl - interfaces removed -> AGE = 0
dnl sets GST_LT_LDFLAGS dnl sets GST_LT_LDFLAGS
AS_LIBTOOL(GST, 33, 0, 0) AS_LIBTOOL(GST, 0, 0, 0)
dnl FIXME: this macro doesn't actually work; dnl FIXME: this macro doesn't actually work;
dnl the generated libtool script has no support for the listed tags. dnl the generated libtool script has no support for the listed tags.
@ -70,7 +84,7 @@ dnl set up gettext
dnl the version check needs to stay here because autopoint greps for it dnl the version check needs to stay here because autopoint greps for it
AM_GNU_GETTEXT_VERSION([0.17]) AM_GNU_GETTEXT_VERSION([0.17])
AM_GNU_GETTEXT([external]) AM_GNU_GETTEXT([external])
AG_GST_GETTEXT([gstreamer-$GST_MAJORMINOR]) AG_GST_GETTEXT([gstreamer-$GST_API_VERSION])
dnl *** check for arguments to configure *** dnl *** check for arguments to configure ***
@ -680,7 +694,7 @@ dnl default vars for all internal objects built on libgstreamer
dnl includes GST_ALL_* dnl includes GST_ALL_*
GST_OBJ_CFLAGS="\$(GST_ALL_CFLAGS)" GST_OBJ_CFLAGS="\$(GST_ALL_CFLAGS)"
GST_OBJ_CXXFLAGS="\$(GST_ALL_CXXFLAGS)" GST_OBJ_CXXFLAGS="\$(GST_ALL_CXXFLAGS)"
GST_OBJ_LIBS="\$(top_builddir)/gst/libgstreamer-$GST_MAJORMINOR.la \$(GST_ALL_LIBS)" GST_OBJ_LIBS="\$(top_builddir)/gst/libgstreamer-$GST_API_VERSION.la \$(GST_ALL_LIBS)"
AC_SUBST(GST_OBJ_CFLAGS) AC_SUBST(GST_OBJ_CFLAGS)
AC_SUBST(GST_OBJ_CXXFLAGS) AC_SUBST(GST_OBJ_CXXFLAGS)
AC_SUBST(GST_OBJ_LIBS) AC_SUBST(GST_OBJ_LIBS)
@ -691,7 +705,7 @@ GST_PLUGIN_LDFLAGS="-module -avoid-version -export-symbols-regex '^[_]*gst_plugi
AC_SUBST(GST_PLUGIN_LDFLAGS, "$GST_PLUGIN_LDFLAGS") AC_SUBST(GST_PLUGIN_LDFLAGS, "$GST_PLUGIN_LDFLAGS")
dnl plugin scanner locations dnl plugin scanner locations
AS_AC_EXPAND(GST_PLUGIN_SCANNER_INSTALLED,${libexecdir}/gstreamer-$GST_MAJORMINOR/gst-plugin-scanner) AS_AC_EXPAND(GST_PLUGIN_SCANNER_INSTALLED,${libexecdir}/gstreamer-$GST_API_VERSION/gst-plugin-scanner)
AC_DEFINE_UNQUOTED(GST_PLUGIN_SCANNER_INSTALLED, AC_DEFINE_UNQUOTED(GST_PLUGIN_SCANNER_INSTALLED,
"$GST_PLUGIN_SCANNER_INSTALLED", [location of the installed gst-plugin-scanner]) "$GST_PLUGIN_SCANNER_INSTALLED", [location of the installed gst-plugin-scanner])
AC_SUBST(GST_PLUGIN_SCANNER_INSTALLED) AC_SUBST(GST_PLUGIN_SCANNER_INSTALLED)
@ -773,7 +787,7 @@ sed \
-e 's/.* GST_DATADIR$/#define GST_DATADIR PREFIX "\\\\share"/' \ -e 's/.* GST_DATADIR$/#define GST_DATADIR PREFIX "\\\\share"/' \
-e 's/.* GST_LEVEL_DEFAULT$/#define GST_LEVEL_DEFAULT GST_LEVEL_ERROR/' \ -e 's/.* GST_LEVEL_DEFAULT$/#define GST_LEVEL_DEFAULT GST_LEVEL_ERROR/' \
-e 's/.* GST_LICENSE$/#define GST_LICENSE "'$GST_LICENSE'"/' \ -e 's/.* GST_LICENSE$/#define GST_LICENSE "'$GST_LICENSE'"/' \
-e 's/.* GST_MAJORMINOR$/#define GST_MAJORMINOR "'$GST_MAJORMINOR'"/' \ -e 's/.* GST_API_VERSION$/#define GST_API_VERSION "'$GST_API_VERSION'"/' \
-e "s,.* GST_PACKAGE_NAME$,#define GST_PACKAGE_NAME \"${GST_PACKAGE_NAME}\"," \ -e "s,.* GST_PACKAGE_NAME$,#define GST_PACKAGE_NAME \"${GST_PACKAGE_NAME}\"," \
-e 's/.* GST_PACKAGE_ORIGIN$/#define GST_PACKAGE_ORIGIN "Unknown package origin"/' \ -e 's/.* GST_PACKAGE_ORIGIN$/#define GST_PACKAGE_ORIGIN "Unknown package origin"/' \
-e "s,.* GST_PACKAGE_RELEASE_DATETIME$,#define GST_PACKAGE_RELEASE_DATETIME \"${GST_PACKAGE_RELEASE_DATETIME}\"," \ -e "s,.* GST_PACKAGE_RELEASE_DATETIME$,#define GST_PACKAGE_RELEASE_DATETIME \"${GST_PACKAGE_RELEASE_DATETIME}\"," \
@ -797,7 +811,7 @@ sed \
-e "s/.* PACKAGE_STRING$/#define PACKAGE_STRING \"$PACKAGE_STRING\"/" \ -e "s/.* PACKAGE_STRING$/#define PACKAGE_STRING \"$PACKAGE_STRING\"/" \
-e 's/.* PACKAGE_TARNAME$/#define PACKAGE_TARNAME "'$PACKAGE_TARNAME'"/' \ -e 's/.* PACKAGE_TARNAME$/#define PACKAGE_TARNAME "'$PACKAGE_TARNAME'"/' \
-e 's/.* PACKAGE_VERSION$/#define PACKAGE_VERSION "'$PACKAGE_VERSION'"/' \ -e 's/.* PACKAGE_VERSION$/#define PACKAGE_VERSION "'$PACKAGE_VERSION'"/' \
-e 's/.* PLUGINDIR$/#ifdef _DEBUG\n# define PLUGINDIR PREFIX "\\\\debug\\\\lib\\\\gstreamer-0.11"\n#else\n# define PLUGINDIR PREFIX "\\\\lib\\\\gstreamer-0.11"\n#endif/' \ -e 's/.* PLUGINDIR$/#ifdef _DEBUG\n# define PLUGINDIR PREFIX "\\\\debug\\\\lib\\\\gstreamer-1.0"\n#else\n# define PLUGINDIR PREFIX "\\\\lib\\\\gstreamer-1.0"\n#endif/' \
-e 's/.* GST_PLUGIN_SCANNER_INSTALLED$/#define GST_PLUGIN_SCANNER_INSTALLED LIBDIR "\\\\gst-plugin-scanner"/' \ -e 's/.* GST_PLUGIN_SCANNER_INSTALLED$/#define GST_PLUGIN_SCANNER_INSTALLED LIBDIR "\\\\gst-plugin-scanner"/' \
-e 's/.* VERSION$/#define VERSION "'$VERSION'"/' \ -e 's/.* VERSION$/#define VERSION "'$VERSION'"/' \
config.h.in >win32/common/config.h-new config.h.in >win32/common/config.h-new

4
docs/faq/developing.xml
View file

@ -19,12 +19,12 @@ If you're not familiar with pkg-config to compile and link a small
one-file program, pass the --cflags and --libs arguments to pkg-config. one-file program, pass the --cflags and --libs arguments to pkg-config.
For example: For example:
<programlisting> <programlisting>
$ libtool --mode=link gcc `pkg-config --cflags --libs gstreamer-&GST_MAJORMINOR;` -o myprog myprog.c $ libtool --mode=link gcc `pkg-config --cflags --libs gstreamer-&GST_API_VERSION;` -o myprog myprog.c
</programlisting> </programlisting>
would be sufficient for a gstreamer-only program. would be sufficient for a gstreamer-only program.
If (for example) your app also used GTK+ 2.0, you could use If (for example) your app also used GTK+ 2.0, you could use
<programlisting> <programlisting>
$ libtool --mode=link gcc `pkg-config --cflags --libs gstreamer-&GST_MAJORMINOR; gtk+-2.0` -o myprog myprog.c $ libtool --mode=link gcc `pkg-config --cflags --libs gstreamer-&GST_API_VERSION; gtk+-2.0` -o myprog myprog.c
</programlisting> </programlisting>
Those are back-ticks (on the same key with the tilde on US keyboards), Those are back-ticks (on the same key with the tilde on US keyboards),
not single quotes. not single quotes.

2
docs/gst/Makefile.am
View file

@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in ## Process this file with automake to produce Makefile.in
# The name of the module, e.g. 'glib'. # The name of the module, e.g. 'glib'.
# DOC_MODULE=gstreamer-@GST_MAJORMINOR@ # DOC_MODULE=gstreamer-@GST_API_VERSION@
DOC_MODULE=gstreamer DOC_MODULE=gstreamer
# don't want $(DOC_MODULE)-scan.c to be built with -Werror # don't want $(DOC_MODULE)-scan.c to be built with -Werror

6
docs/gst/gstreamer-docs.sgml
View file

@ -8,9 +8,9 @@
]> ]>
<book id="index" xmlns:xi="http://www.w3.org/2003/XInclude"> <book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
<bookinfo> <bookinfo>
<title>GStreamer &GST_MAJORMINOR; Core Reference Manual</title> <title>GStreamer &GST_API_VERSION; Core Reference Manual</title>
<releaseinfo> <releaseinfo>
for GStreamer Core &GST_MAJORMINOR; (&GST_VERSION;) for GStreamer Core &GST_API_VERSION; (&GST_VERSION;)
The latest version of this documentation can be found on-line at The latest version of this documentation can be found on-line at
<ulink role="online-location" url="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/">http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/</ulink>. <ulink role="online-location" url="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/">http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/</ulink>.
</releaseinfo> </releaseinfo>
@ -50,7 +50,7 @@ Windows. It is released under the GNU Library General Public License
<title>GStreamer Core Library</title> <title>GStreamer Core Library</title>
<para> <para>
libgstreamer-&GST_MAJORMINOR;.so provides all the core GStreamer services, libgstreamer-&GST_API_VERSION;.so provides all the core GStreamer services,
including initialization, plugin management and types, including initialization, plugin management and types,
as well as the object hierarchy that defines elements and bins, as well as the object hierarchy that defines elements and bins,
along with some more specialized elements. along with some more specialized elements.

2
docs/gst/running.xml
View file

@ -43,7 +43,7 @@ with
<para> <para>
plug-ins in the user's home directory. These are stored in a directory called plug-ins in the user's home directory. These are stored in a directory called
<filename>plugins</filename> inside the <filename>plugins</filename> inside the
<filename>.gstreamer-&GST_MAJORMINOR;</filename> directory in the user's <filename>.gstreamer-&GST_API_VERSION;</filename> directory in the user's
home directory. home directory.
</para> </para>
</listitem> </listitem>

8
docs/libs/Makefile.am
View file

@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in ## Process this file with automake to produce Makefile.in
# The name of the module, e.g. 'glib'. # The name of the module, e.g. 'glib'.
#DOC_MODULE=gstreamer-libs-@GST_MAJORMINOR@ #DOC_MODULE=gstreamer-libs-@GST_API_VERSION@
DOC_MODULE=gstreamer-libs DOC_MODULE=gstreamer-libs
# don't want $(DOC_MODULE)-scan.c to be built with -Werror # don't want $(DOC_MODULE)-scan.c to be built with -Werror
@ -59,9 +59,9 @@ extra_files =
# contains GtkObjects/GObjects and you want to document signals and properties. # contains GtkObjects/GObjects and you want to document signals and properties.
GTKDOC_CFLAGS = -I$(top_builddir) -I$(top_builddir)/libs $(GST_OBJ_CFLAGS) GTKDOC_CFLAGS = -I$(top_builddir) -I$(top_builddir)/libs $(GST_OBJ_CFLAGS)
GTKDOC_LIBS = \ GTKDOC_LIBS = \
$(top_builddir)/libs/gst/controller/libgstcontroller-@GST_MAJORMINOR@.la \ $(top_builddir)/libs/gst/controller/libgstcontroller-@GST_API_VERSION@.la \
$(top_builddir)/libs/gst/base/libgstbase-@GST_MAJORMINOR@.la \ $(top_builddir)/libs/gst/base/libgstbase-@GST_API_VERSION@.la \
$(top_builddir)/libs/gst/net/libgstnet-@GST_MAJORMINOR@.la \ $(top_builddir)/libs/gst/net/libgstnet-@GST_API_VERSION@.la \
$(GST_OBJ_LIBS) $(GST_OBJ_LIBS)
GTKDOC_CC=$(LIBTOOL) --tag=CC --mode=compile $(CC) GTKDOC_CC=$(LIBTOOL) --tag=CC --mode=compile $(CC)

12
docs/libs/gstreamer-libs-docs.sgml
View file

@ -8,9 +8,9 @@
]> ]>
<book id="index" xmlns:xi="http://www.w3.org/2003/XInclude"> <book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
<bookinfo> <bookinfo>
<title>GStreamer &GST_MAJORMINOR; Library Reference Manual</title> <title>GStreamer &GST_API_VERSION; Library Reference Manual</title>
<releaseinfo> <releaseinfo>
for GStreamer Library &GST_MAJORMINOR; (&GST_VERSION;) for GStreamer Library &GST_API_VERSION; (&GST_VERSION;)
The latest version of this documentation can be found on-line at The latest version of this documentation can be found on-line at
<ulink role="online-location" url="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer-libs/html/">http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer-libs/html/</ulink>. <ulink role="online-location" url="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer-libs/html/">http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer-libs/html/</ulink>.
</releaseinfo> </releaseinfo>
@ -29,7 +29,7 @@
<chapter id="gstreamer-base"> <chapter id="gstreamer-base">
<title>GStreamer Base and Utillity Classes</title> <title>GStreamer Base and Utillity Classes</title>
<para> <para>
libgstbase-&GST_MAJORMINOR;.so provides some base classes to be extended libgstbase-&GST_API_VERSION;.so provides some base classes to be extended
by elements and utillity classes that are most useful for plugin developers. by elements and utillity classes that are most useful for plugin developers.
</para> </para>
@ -50,7 +50,7 @@
<chapter id="gstreamer-control"> <chapter id="gstreamer-control">
<title>GStreamer Dynamic Parameter Control</title> <title>GStreamer Dynamic Parameter Control</title>
<para> <para>
libgstcontroller-&GST_MAJORMINOR;.so provides functionality to animate libgstcontroller-&GST_API_VERSION;.so provides functionality to animate
element properties over time. element properties over time.
</para> </para>
@ -63,7 +63,7 @@
<chapter id="gstreamer-net"> <chapter id="gstreamer-net">
<title>GStreamer Network Classes</title> <title>GStreamer Network Classes</title>
<para> <para>
libgstnet-&GST_MAJORMINOR;.so provides network elements and objects. libgstnet-&GST_API_VERSION;.so provides network elements and objects.
</para> </para>
<xi:include href="xml/gstnetclientclock.xml" /> <xi:include href="xml/gstnetclientclock.xml" />
@ -74,7 +74,7 @@
<chapter id="gstreamer-check"> <chapter id="gstreamer-check">
<title>GStreamer Check Unit Testing</title> <title>GStreamer Check Unit Testing</title>
<para> <para>
libgstcheck-&GST_MAJORMINOR;.so provides functionality for writing libgstcheck-&GST_API_VERSION;.so provides functionality for writing
unit tests that use the check framework. unit tests that use the check framework.
</para> </para>

4
docs/manual/basics-helloworld.xml
View file

@ -223,7 +223,7 @@ main (int argc,
<para> <para>
To compile the helloworld example, use: <command>gcc -Wall To compile the helloworld example, use: <command>gcc -Wall
helloworld.c -o helloworld helloworld.c -o helloworld
$(pkg-config --cflags --libs gstreamer-&GST_MAJORMINOR;)</command>. $(pkg-config --cflags --libs gstreamer-&GST_API_VERSION;)</command>.
&GStreamer; makes use of <command>pkg-config</command> to get compiler &GStreamer; makes use of <command>pkg-config</command> to get compiler
and linker flags needed to compile this application. and linker flags needed to compile this application.
</para> </para>
@ -238,7 +238,7 @@ main (int argc,
setup (ie. gst-uninstalled), you will need to use libtool to build the setup (ie. gst-uninstalled), you will need to use libtool to build the
hello world program, like this: <command>libtool --mode=link gcc -Wall hello world program, like this: <command>libtool --mode=link gcc -Wall
helloworld.c -o helloworld helloworld.c -o helloworld
$(pkg-config --cflags --libs gstreamer-&GST_MAJORMINOR;)</command>. $(pkg-config --cflags --libs gstreamer-&GST_API_VERSION;)</command>.
</para> </para>
<para> <para>
You can run this example application with <command>./helloworld You can run this example application with <command>./helloworld

2
docs/plugins/Makefile.am
View file

@ -3,7 +3,7 @@ GST_DOC_SCANOBJ = $(top_srcdir)/common/gstdoc-scangobj
## Process this file with automake to produce Makefile.in ## Process this file with automake to produce Makefile.in
# The name of the module, e.g. 'glib'. # The name of the module, e.g. 'glib'.
#DOC_MODULE=gst-plugins-libs-@GST_MAJORMINOR@ #DOC_MODULE=gst-plugins-libs-@GST_API_VERSION@
MODULE=gstreamer MODULE=gstreamer
DOC_MODULE=$(MODULE)-plugins DOC_MODULE=$(MODULE)-plugins

4
docs/plugins/gstreamer-plugins-docs.sgml
View file

@ -7,9 +7,9 @@
<book id="index" xmlns:xi="http://www.w3.org/2003/XInclude"> <book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
<bookinfo> <bookinfo>
<title>GStreamer Core Plugins &GST_MAJORMINOR; Plugins Reference Manual</title> <title>GStreamer Core Plugins &GST_API_VERSION; Plugins Reference Manual</title>
<releaseinfo> <releaseinfo>
for GStreamer Core Plugins &GST_MAJORMINOR; (&GST_VERSION;) for GStreamer Core Plugins &GST_API_VERSION; (&GST_VERSION;)
The latest version of this documentation can be found on-line at The latest version of this documentation can be found on-line at
<ulink role="online-location" url="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer-plugins/html/">http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer-plugins/html/</ulink>. <ulink role="online-location" url="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer-plugins/html/">http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer-plugins/html/</ulink>.
</releaseinfo> </releaseinfo>

8
docs/random/autotools
View file

@ -16,12 +16,12 @@ plugin Makefile.am:
- DO NOT put any libraries in _LDFLAGS. Typically, _LDFLAGS should only - DO NOT put any libraries in _LDFLAGS. Typically, _LDFLAGS should only
have $(GST_PLUGIN_LDFLAGS) have $(GST_PLUGIN_LDFLAGS)
- when using gst-plugins-base libraries, use $(GST_PLUGINS_BASE_LIBS) then - when using gst-plugins-base libraries, use $(GST_PLUGINS_BASE_LIBS) then
add -lgst(library)-$(GST_MAJORMINOR). Example: add -lgst(library)-$(GST_API_VERSION). Example:
libgstsdlvideosink_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \ libgstsdlvideosink_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
-lgstvideo-$(GST_MAJORMINOR) \ -lgstvideo-$(GST_API_VERSION) \
-lgstaudio-$(GST_MAJORMINOR) \ -lgstaudio-$(GST_API_VERSION) \
-lgstinterfaces-$(GST_MAJORMINOR) \ -lgstinterfaces-$(GST_API_VERSION) \
$(SDL_LIBS) $(SDL_LIBS)

2
docs/version.entities.in
View file

@ -1,3 +1,3 @@
<!ENTITY GST_MAJORMINOR "@GST_MAJORMINOR@"> <!ENTITY GST_API_VERSION "@GST_API_VERSION@">
<!ENTITY GST_VERSION "@PACKAGE_VERSION@"> <!ENTITY GST_VERSION "@PACKAGE_VERSION@">
<!ENTITY GST_PLUGINS_DIR "@PLUGINDIR@"> <!ENTITY GST_PLUGINS_DIR "@PLUGINDIR@">

4
gst-element-check.m4.in
View file

@ -7,11 +7,11 @@ dnl AM_GST_ELEMENT_CHECK(ELEMENT-NAME, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND)
AC_DEFUN([AM_GST_ELEMENT_CHECK], AC_DEFUN([AM_GST_ELEMENT_CHECK],
[ [
if test "x$GST_INSPECT" = "x"; then if test "x$GST_INSPECT" = "x"; then
AC_CHECK_PROG(GST_INSPECT, gst-inspect-@GST_MAJORMINOR@, gst-inspect-@GST_MAJORMINOR@, []) AC_CHECK_PROG(GST_INSPECT, gst-inspect-@GST_API_VERSION@, gst-inspect-@GST_API_VERSION@, [])
fi fi
if test "x$GST_INSPECT" != "x"; then if test "x$GST_INSPECT" != "x"; then
AC_MSG_CHECKING(GStreamer @GST_MAJORMINOR@ element $1) AC_MSG_CHECKING(GStreamer @GST_API_VERSION@ element $1)
if [ $GST_INSPECT $1 > /dev/null 2> /dev/null ]; then if [ $GST_INSPECT $1 > /dev/null 2> /dev/null ]; then
AC_MSG_RESULT(found.) AC_MSG_RESULT(found.)
$2 $2

60
gst/Makefile.am
View file

@ -1,4 +1,4 @@
lib_LTLIBRARIES = libgstreamer-@GST_MAJORMINOR@.la lib_LTLIBRARIES = libgstreamer-@GST_API_VERSION@.la
if GST_DISABLE_REGISTRY if GST_DISABLE_REGISTRY
GST_REGISTRY_SRC = GST_REGISTRY_SRC =
@ -37,7 +37,7 @@ built_header_configure = gstconfig.h gstversion.h
built_header_make = gstenumtypes.h built_header_make = gstenumtypes.h
built_source_make = gstenumtypes.c built_source_make = gstenumtypes.c
EXTRA_libgstreamer_@GST_MAJORMINOR@_la_SOURCES = \ EXTRA_libgstreamer_@GST_API_VERSION@_la_SOURCES = \
gsttrace.c \ gsttrace.c \
gstregistrybinary.c gstregistrybinary.c
@ -45,7 +45,7 @@ EXTRA_libgstreamer_@GST_MAJORMINOR@_la_SOURCES = \
# temporarily not used # temporarily not used
# glib-compat.c # glib-compat.c
libgstreamer_@GST_MAJORMINOR@_la_SOURCES = \ libgstreamer_@GST_API_VERSION@_la_SOURCES = \
gst.c \ gst.c \
gstobject.c \ gstobject.c \
gstbin.c \ gstbin.c \
@ -106,7 +106,7 @@ libgstreamer_@GST_MAJORMINOR@_la_SOURCES = \
$(GST_REGISTRY_SRC) $(GST_REGISTRY_SRC)
# do not put files in the distribution that are generated # do not put files in the distribution that are generated
nodist_libgstreamer_@GST_MAJORMINOR@_la_SOURCES = $(built_source_make) nodist_libgstreamer_@GST_API_VERSION@_la_SOURCES = $(built_source_make)
# BUILT_SOURCES are built on make all/check/install before all other targets # BUILT_SOURCES are built on make all/check/install before all other targets
BUILT_SOURCES = \ BUILT_SOURCES = \
@ -118,25 +118,25 @@ CLEANFILES = $(built_header_make) $(built_source_make) $(as_dll_cleanfiles) *.gc
# DISTCLEANFILES is for files generated by configure # DISTCLEANFILES is for files generated by configure
DISTCLEANFILES = $(built_header_configure) DISTCLEANFILES = $(built_header_configure)
libgstreamer_@GST_MAJORMINOR@_la_CFLAGS = \ libgstreamer_@GST_API_VERSION@_la_CFLAGS = \
-D_GNU_SOURCE \ -D_GNU_SOURCE \
-DGST_EXPORTS \ -DGST_EXPORTS \
-DG_LOG_DOMAIN=g_log_domain_gstreamer \ -DG_LOG_DOMAIN=g_log_domain_gstreamer \
-DGST_MAJORMINOR=\""$(GST_MAJORMINOR)"\" \ -DGST_API_VERSION=\""$(GST_API_VERSION)"\" \
-DGST_DISABLE_DEPRECATED \ -DGST_DISABLE_DEPRECATED \
$(VALGRIND_CFLAGS) \ $(VALGRIND_CFLAGS) \
$(GST_ALL_CFLAGS) $(GST_ALL_CFLAGS)
libgstreamer_@GST_MAJORMINOR@_la_LIBADD = \ libgstreamer_@GST_API_VERSION@_la_LIBADD = \
$(GST_PARSE_LA) \ $(GST_PARSE_LA) \
$(GST_ALL_LIBS) \ $(GST_ALL_LIBS) \
$(WIN32_LIBS) \ $(WIN32_LIBS) \
$(LIBM) $(LIBM)
libgstreamer_@GST_MAJORMINOR@_la_LDFLAGS = \ libgstreamer_@GST_API_VERSION@_la_LDFLAGS = \
$(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
libgstreamer_@GST_MAJORMINOR@includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst libgstreamer_@GST_API_VERSION@includedir = $(includedir)/gstreamer-@GST_API_VERSION@/gst
gst_headers = \ gst_headers = \
gst.h \ gst.h \
@ -197,9 +197,9 @@ gst_headers = \
gstregistry.h \ gstregistry.h \
gstparse.h gstparse.h
libgstreamer_@GST_MAJORMINOR@include_HEADERS = $(gst_headers) math-compat.h libgstreamer_@GST_API_VERSION@include_HEADERS = $(gst_headers) math-compat.h
nodist_libgstreamer_@GST_MAJORMINOR@include_HEADERS = \ nodist_libgstreamer_@GST_API_VERSION@include_HEADERS = \
$(built_header_configure) $(built_header_make) $(built_header_configure) $(built_header_make)
noinst_HEADERS = \ noinst_HEADERS = \
@ -232,45 +232,45 @@ gstenumtypes.c: $(gst_headers)
--vtail " { 0, NULL, NULL }\n };\n\n if (g_once_init_enter (&id)) {\n GType tmp = g_@type@_register_static (\"@EnumName@\", values);\n g_once_init_leave (&id, tmp);\n }\n\n return (GType) id;\n}" \ --vtail " { 0, NULL, NULL }\n };\n\n if (g_once_init_enter (&id)) {\n GType tmp = g_@type@_register_static (\"@EnumName@\", values);\n g_once_init_leave (&id, tmp);\n }\n\n return (GType) id;\n}" \
$^ > gstenumtypes.c $^ > gstenumtypes.c
%.c.gcov: .libs/libgstreamer_@GST_MAJORMINOR@_la-%.gcda %.c %.c.gcov: .libs/libgstreamer_@GST_API_VERSION@_la-%.gcda %.c
$(GCOV) -b -f -o $^ > $@.out $(GCOV) -b -f -o $^ > $@.out
gcov: $(libgstreamer_@GST_MAJORMINOR@_la_SOURCES:=.gcov) gcov: $(libgstreamer_@GST_API_VERSION@_la_SOURCES:=.gcov)
Android.mk: Makefile.am Android.mk: Makefile.am
androgenizer -:PROJECT gstreamer -:SHARED libgstreamer-@GST_MAJORMINOR@ \ androgenizer -:PROJECT gstreamer -:SHARED libgstreamer-@GST_API_VERSION@ \
-:TAGS eng debug \ -:TAGS eng debug \
-:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
-:SOURCES $(libgstreamer_@GST_MAJORMINOR@_la_SOURCES) \ -:SOURCES $(libgstreamer_@GST_API_VERSION@_la_SOURCES) \
$(nodist_libgstreamer_@GST_MAJORMINOR@_la_SOURCES) \ $(nodist_libgstreamer_@GST_API_VERSION@_la_SOURCES) \
-:CFLAGS $(DEFS) $(libgstreamer_@GST_MAJORMINOR@_la_CFLAGS) \ -:CFLAGS $(DEFS) $(libgstreamer_@GST_API_VERSION@_la_CFLAGS) \
-:LDFLAGS $(libgstreamer_@GST_MAJORMINOR@_la_LDFLAGS) \ -:LDFLAGS $(libgstreamer_@GST_API_VERSION@_la_LDFLAGS) \
$(libgstreamer_@GST_MAJORMINOR@_la_LIBADD) \ $(libgstreamer_@GST_API_VERSION@_la_LIBADD) \
-ldl \ -ldl \
-:SUBDIR gst/parse \ -:SUBDIR gst/parse \
-:HEADER_TARGET gstreamer-@GST_MAJORMINOR@/gst \ -:HEADER_TARGET gstreamer-@GST_API_VERSION@/gst \
-:HEADERS $(libgstreamer_@GST_MAJORMINOR@include_HEADERS) \ -:HEADERS $(libgstreamer_@GST_API_VERSION@include_HEADERS) \
-:LIBFILTER_STATIC gstparse \ -:LIBFILTER_STATIC gstparse \
-:PASSTHROUGH LOCAL_ARM_MODE:=arm \ -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
> $@ > $@
if HAVE_INTROSPECTION if HAVE_INTROSPECTION
BUILT_GIRSOURCES = Gst-@GST_MAJORMINOR@.gir BUILT_GIRSOURCES = Gst-@GST_API_VERSION@.gir
gir_headers=$(patsubst %,$(srcdir)/%, $(libgstreamer_@GST_MAJORMINOR@include_HEADERS)) gir_headers=$(patsubst %,$(srcdir)/%, $(libgstreamer_@GST_API_VERSION@include_HEADERS))
gir_sources=$(patsubst %,$(srcdir)/%, $(libgstreamer_@GST_MAJORMINOR@_la_SOURCES)) gir_sources=$(patsubst %,$(srcdir)/%, $(libgstreamer_@GST_API_VERSION@_la_SOURCES))
Gst-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstreamer-@GST_MAJORMINOR@.la Gst-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstreamer-@GST_API_VERSION@.la
$(AM_V_GEN)GST_PLUGIN_SYSTEM_PATH="" GST_PLUGIN_PATH="" GST_REGISTRY_UPDATE=no \ $(AM_V_GEN)GST_PLUGIN_SYSTEM_PATH="" GST_PLUGIN_PATH="" GST_REGISTRY_UPDATE=no \
$(INTROSPECTION_SCANNER) -v --namespace Gst \ $(INTROSPECTION_SCANNER) -v --namespace Gst \
--nsversion=@GST_MAJORMINOR@ \ --nsversion=@GST_API_VERSION@ \
--warn-all \ --warn-all \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_builddir) \ -I$(top_builddir) \
-DIN_GOBJECT_INTROSPECTION=1 \ -DIN_GOBJECT_INTROSPECTION=1 \
-DGST_USE_UNSTABLE_API \ -DGST_USE_UNSTABLE_API \
--c-include='gst/gst.h' \ --c-include='gst/gst.h' \
--library=libgstreamer-0.11.la \ --library=libgstreamer-@GST_API_VERSION@.la \
--include=GLib-2.0 \ --include=GLib-2.0 \
--include=GObject-2.0 \ --include=GObject-2.0 \
--include=GModule-2.0 \ --include=GModule-2.0 \
@ -279,7 +279,7 @@ Gst-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstreamer-@GST_MAJORMINOR@
--pkg gobject-2.0 \ --pkg gobject-2.0 \
--pkg gmodule-no-export-2.0 \ --pkg gmodule-no-export-2.0 \
--pkg gthread-2.0 \ --pkg gthread-2.0 \
--pkg-export gstreamer-@GST_MAJORMINOR@ \ --pkg-export gstreamer-@GST_API_VERSION@ \
--add-init-section="gst_init(NULL, NULL);" \ --add-init-section="gst_init(NULL, NULL);" \
--output $@ \ --output $@ \
$(gir_headers) \ $(gir_headers) \
@ -302,11 +302,11 @@ endif
# try to prevent packaging errors # try to prevent packaging errors
check-libexecdir-consistency: check-libexecdir-consistency:
@if test "${GST_PLUGIN_SCANNER_INSTALLED}" != "${libexecdir}/gstreamer-$(GST_MAJORMINOR)/gst-plugin-scanner"; then \ @if test "${GST_PLUGIN_SCANNER_INSTALLED}" != "${libexecdir}/gstreamer-$(GST_API_VERSION)/gst-plugin-scanner"; then \
echo "*** Inconsistent libexecdir! Please use ./configure --libexecdir=/foo/bar"; \ echo "*** Inconsistent libexecdir! Please use ./configure --libexecdir=/foo/bar"; \
echo "*** to set the libexecdir and not make libexecdir=/foo/bar or the like."; \ echo "*** to set the libexecdir and not make libexecdir=/foo/bar or the like."; \
echo "*** The same goes for prefix, libdir etc."; \ echo "*** The same goes for prefix, libdir etc."; \
echo "*** ${GST_PLUGIN_SCANNER_INSTALLED} != ${libexecdir}/gstreamer-$(GST_MAJORMINOR)/gst-plugin-scanner"; \ echo "*** ${GST_PLUGIN_SCANNER_INSTALLED} != ${libexecdir}/gstreamer-$(GST_API_VERSION)/gst-plugin-scanner"; \
exit 1; \ exit 1; \
fi fi

2
gst/gstplugin.c
View file

@ -477,7 +477,7 @@ gst_plugin_check_version (gint major, gint minor)
{ {
/* return NULL if the major and minor version numbers are not compatible */ /* return NULL if the major and minor version numbers are not compatible */
/* with ours. */ /* with ours. */
if (major != GST_VERSION_MAJOR || minor != GST_VERSION_MINOR) if (major != GST_VERSION_MAJOR || minor > GST_VERSION_MINOR)
return FALSE; return FALSE;
return TRUE; return TRUE;

4
gst/gstpreset.c
View file

@ -160,7 +160,7 @@ preset_get_paths (GstPreset * preset, const gchar ** preset_user_path,
/* user presets go in user's XDG data directory. */ /* user presets go in user's XDG data directory. */
preset_dir = g_build_filename (g_get_user_data_dir (), preset_dir = g_build_filename (g_get_user_data_dir (),
"gstreamer-" GST_MAJORMINOR, "presets", NULL); "gstreamer-" GST_API_VERSION, "presets", NULL);
GST_INFO_OBJECT (preset, "user_preset_dir: '%s'", preset_dir); GST_INFO_OBJECT (preset, "user_preset_dir: '%s'", preset_dir);
preset_path = preset_path =
g_strdup_printf ("%s" G_DIR_SEPARATOR_S "%s.prs", preset_dir, g_strdup_printf ("%s" G_DIR_SEPARATOR_S "%s.prs", preset_dir,
@ -198,7 +198,7 @@ preset_get_paths (GstPreset * preset, const gchar ** preset_user_path,
gchar *preset_dir; gchar *preset_dir;
/* system presets in '$GST_DATADIR/gstreamer-0.10/presets/GstAudioPanorama.prs' */ /* system presets in '$GST_DATADIR/gstreamer-0.10/presets/GstAudioPanorama.prs' */
preset_dir = g_build_filename (GST_DATADIR, "gstreamer-" GST_MAJORMINOR, preset_dir = g_build_filename (GST_DATADIR, "gstreamer-" GST_API_VERSION,
"presets", NULL); "presets", NULL);
GST_INFO_OBJECT (preset, "system_preset_dir: '%s'", preset_dir); GST_INFO_OBJECT (preset, "system_preset_dir: '%s'", preset_dir);
preset_path = g_strdup_printf ("%s" G_DIR_SEPARATOR_S "%s.prs", preset_path = g_strdup_printf ("%s" G_DIR_SEPARATOR_S "%s.prs",

10
gst/gstregistry.c
View file

@ -57,13 +57,13 @@
* <listitem> * <listitem>
* <para>default locations (if GST_PLUGIN_SYSTEM_PATH is not set). Those * <para>default locations (if GST_PLUGIN_SYSTEM_PATH is not set). Those
* default locations are: * default locations are:
* <filename>~/.gstreamer-$GST_MAJORMINOR/plugins/</filename> * <filename>~/.gstreamer-$GST_API_VERSION/plugins/</filename>
* and <filename>$prefix/libs/gstreamer-$GST_MAJORMINOR/</filename>. * and <filename>$prefix/libs/gstreamer-$GST_API_VERSION/</filename>.
* </para> * </para>
* </listitem> * </listitem>
* </itemizedlist> * </itemizedlist>
* The registry cache file is loaded from * The registry cache file is loaded from
* <filename>~/.gstreamer-$GST_MAJORMINOR/registry-$ARCH.bin</filename> or the * <filename>~/.gstreamer-$GST_API_VERSION/registry-$ARCH.bin</filename> or the
* file listed in the GST_REGISTRY env var. One reason to change the registry * file listed in the GST_REGISTRY env var. One reason to change the registry
* location is for testing. * location is for testing.
* *
@ -1574,7 +1574,7 @@ scan_and_update_registry (GstRegistry * default_registry,
/* plugins in the user's home directory take precedence over /* plugins in the user's home directory take precedence over
* system-installed ones */ * system-installed ones */
home_plugins = g_build_filename (g_get_user_data_dir (), home_plugins = g_build_filename (g_get_user_data_dir (),
"gstreamer-" GST_MAJORMINOR, "plugins", NULL); "gstreamer-" GST_API_VERSION, "plugins", NULL);
GST_DEBUG ("scanning home plugins %s", home_plugins); GST_DEBUG ("scanning home plugins %s", home_plugins);
changed |= gst_registry_scan_path_internal (&context, home_plugins); changed |= gst_registry_scan_path_internal (&context, home_plugins);
@ -1656,7 +1656,7 @@ ensure_current_registry (GError ** error)
registry_file = g_strdup (g_getenv ("GST_REGISTRY")); registry_file = g_strdup (g_getenv ("GST_REGISTRY"));
if (registry_file == NULL) { if (registry_file == NULL) {
registry_file = g_build_filename (g_get_user_cache_dir (), registry_file = g_build_filename (g_get_user_cache_dir (),
"gstreamer-" GST_MAJORMINOR, "registry." HOST_CPU ".bin", NULL); "gstreamer-" GST_API_VERSION, "registry." HOST_CPU ".bin", NULL);
} }
if (!_gst_disable_registry_cache) { if (!_gst_disable_registry_cache) {

8
gst/gstversion.h.in
View file

@ -45,26 +45,26 @@ G_BEGIN_DECLS
* *
* The major version of GStreamer at compile time: * The major version of GStreamer at compile time:
*/ */
#define GST_VERSION_MAJOR (@PACKAGE_VERSION_MAJOR@) #define GST_VERSION_MAJOR (@GST_VERSION_MAJOR@)
/** /**
* GST_VERSION_MINOR: * GST_VERSION_MINOR:
* *
* The minor version of GStreamer at compile time: * The minor version of GStreamer at compile time:
*/ */
#define GST_VERSION_MINOR (@PACKAGE_VERSION_MINOR@) #define GST_VERSION_MINOR (@GST_VERSION_MINOR@)
/** /**
* GST_VERSION_MICRO: * GST_VERSION_MICRO:
* *
* The micro version of GStreamer at compile time: * The micro version of GStreamer at compile time:
*/ */
#define GST_VERSION_MICRO (@PACKAGE_VERSION_MICRO@) #define GST_VERSION_MICRO (@GST_VERSION_MICRO@)
/** /**
* GST_VERSION_NANO: * GST_VERSION_NANO:
* *
* The nano version of GStreamer at compile time: * The nano version of GStreamer at compile time:
* Actual releases have 0, GIT versions have 1, prerelease versions have 2-... * Actual releases have 0, GIT versions have 1, prerelease versions have 2-...
*/ */
#define GST_VERSION_NANO (@PACKAGE_VERSION_NANO@) #define GST_VERSION_NANO (@GST_VERSION_NANO@)
/** /**
* GST_CHECK_VERSION: * GST_CHECK_VERSION:

2
gstreamer.spec.in
View file

@ -1,5 +1,5 @@
%define gstreamer gstreamer011 %define gstreamer gstreamer011
%define majorminor @GST_MAJORMINOR@ %define majorminor @GST_API_VERSION@
%define _glib2 @GLIB_REQ@ %define _glib2 @GLIB_REQ@

60
libs/gst/base/Makefile.am
View file

@ -1,8 +1,8 @@
lib_LTLIBRARIES = libgstbase-@GST_MAJORMINOR@.la lib_LTLIBRARIES = libgstbase-@GST_API_VERSION@.la
libgstbase_@GST_MAJORMINOR@_la_DEPENDENCIES = \ libgstbase_@GST_API_VERSION@_la_DEPENDENCIES = \
$(top_builddir)/gst/libgstreamer-@GST_MAJORMINOR@.la $(top_builddir)/gst/libgstreamer-@GST_API_VERSION@.la
libgstbase_@GST_MAJORMINOR@_la_SOURCES = \ libgstbase_@GST_API_VERSION@_la_SOURCES = \
gstadapter.c \ gstadapter.c \
gstbaseparse.c \ gstbaseparse.c \
gstbasesink.c \ gstbasesink.c \
@ -15,14 +15,14 @@ libgstbase_@GST_MAJORMINOR@_la_SOURCES = \
gstpushsrc.c \ gstpushsrc.c \
gsttypefindhelper.c gsttypefindhelper.c
libgstbase_@GST_MAJORMINOR@_la_CFLAGS = $(GST_OBJ_CFLAGS) libgstbase_@GST_API_VERSION@_la_CFLAGS = $(GST_OBJ_CFLAGS)
libgstbase_@GST_MAJORMINOR@_la_LIBADD = $(GST_OBJ_LIBS) libgstbase_@GST_API_VERSION@_la_LIBADD = $(GST_OBJ_LIBS)
libgstbase_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) libgstbase_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
libgstbase_@GST_MAJORMINOR@includedir = \ libgstbase_@GST_API_VERSION@includedir = \
$(includedir)/gstreamer-@GST_MAJORMINOR@/gst/base $(includedir)/gstreamer-@GST_API_VERSION@/gst/base
libgstbase_@GST_MAJORMINOR@include_HEADERS = \ libgstbase_@GST_API_VERSION@include_HEADERS = \
gstadapter.h \ gstadapter.h \
gstbaseparse.h \ gstbaseparse.h \
gstbasesink.h \ gstbasesink.h \
@ -45,35 +45,35 @@ EXTRA_DIST = gstindex.c gstmemindex.c
CLEANFILES = *.gcno *.gcda *.gcov CLEANFILES = *.gcno *.gcda *.gcov
%.c.gcov: .libs/libgstbase_@GST_MAJORMINOR@_la-%.gcda %.c %.c.gcov: .libs/libgstbase_@GST_API_VERSION@_la-%.gcda %.c
$(GCOV) -b -f -o $^ > $@.out $(GCOV) -b -f -o $^ > $@.out
gcov: $(libgstbase_@GST_MAJORMINOR@_la_SOURCES:=.gcov) gcov: $(libgstbase_@GST_API_VERSION@_la_SOURCES:=.gcov)
Android.mk: Makefile.am Android.mk: Makefile.am
androgenizer -:PROJECT gstreamer -:SHARED libgstbase-@GST_MAJORMINOR@ -:TAGS eng debug \ androgenizer -:PROJECT gstreamer -:SHARED libgstbase-@GST_API_VERSION@ -:TAGS eng debug \
-:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
-:SOURCES $(libgstbase_@GST_MAJORMINOR@_la_SOURCES) \ -:SOURCES $(libgstbase_@GST_API_VERSION@_la_SOURCES) \
-:CFLAGS $(DEFS) $(libgstbase_@GST_MAJORMINOR@_la_CFLAGS) \ -:CFLAGS $(DEFS) $(libgstbase_@GST_API_VERSION@_la_CFLAGS) \
-:LDFLAGS $(libgstbase_@GST_MAJORMINOR@_la_LDFLAGS) \ -:LDFLAGS $(libgstbase_@GST_API_VERSION@_la_LDFLAGS) \
$(libgstbase_@GST_MAJORMINOR@_la_LIBADD) \ $(libgstbase_@GST_API_VERSION@_la_LIBADD) \
-:HEADER_TARGET gstreamer-@GST_MAJORMINOR@/gst/base \ -:HEADER_TARGET gstreamer-@GST_API_VERSION@/gst/base \
-:HEADERS $(libgstbase_@GST_MAJORMINOR@include_HEADERS) \ -:HEADERS $(libgstbase_@GST_API_VERSION@include_HEADERS) \
-:PASSTHROUGH LOCAL_ARM_MODE:=arm \ -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
> $@ > $@
if HAVE_INTROSPECTION if HAVE_INTROSPECTION
BUILT_GIRSOURCES = GstBase-@GST_MAJORMINOR@.gir BUILT_GIRSOURCES = GstBase-@GST_API_VERSION@.gir
gir_headers=$(patsubst %,$(srcdir)/%, $(libgstbase_@GST_MAJORMINOR@include_HEADERS)) gir_headers=$(patsubst %,$(srcdir)/%, $(libgstbase_@GST_API_VERSION@include_HEADERS))
gir_sources=$(patsubst %,$(srcdir)/%, $(libgstbase_@GST_MAJORMINOR@_la_SOURCES)) gir_sources=$(patsubst %,$(srcdir)/%, $(libgstbase_@GST_API_VERSION@_la_SOURCES))
gir_cincludes=$(patsubst %,--c-include='gst/base/%',$(libgstbase_@GST_MAJORMINOR@include_HEADERS)) gir_cincludes=$(patsubst %,--c-include='gst/base/%',$(libgstbase_@GST_API_VERSION@include_HEADERS))
GstBase-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstbase-@GST_MAJORMINOR@.la GstBase-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstbase-@GST_API_VERSION@.la
$(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \ $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \
GST_PLUGIN_SYSTEM_PATH="" GST_PLUGIN_PATH="" GST_REGISTRY_UPDATE=no \ GST_PLUGIN_SYSTEM_PATH="" GST_PLUGIN_PATH="" GST_REGISTRY_UPDATE=no \
$(INTROSPECTION_SCANNER) -v --namespace GstBase \ $(INTROSPECTION_SCANNER) -v --namespace GstBase \
--nsversion=@GST_MAJORMINOR@ \ --nsversion=@GST_API_VERSION@ \
--warn-all \ --warn-all \
--strip-prefix=Gst \ --strip-prefix=Gst \
-DGST_USE_UNSTABLE_API \ -DGST_USE_UNSTABLE_API \
@ -84,12 +84,12 @@ GstBase-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstbase-@GST_MAJORMINO
$(gir_cincludes) \ $(gir_cincludes) \
--add-include-path=$(top_builddir)/gst \ --add-include-path=$(top_builddir)/gst \
--library-path=$(top_builddir)/gst \ --library-path=$(top_builddir)/gst \
--library=$(top_builddir)/gst/libgstreamer-0.11.la \ --library=$(top_builddir)/gst/libgstreamer-@GST_API_VERSION@.la \
--library=libgstbase-0.11.la \ --library=libgstbase-@GST_API_VERSION@.la \
--include=Gst-0.11 \ --include=Gst-@GST_API_VERSION@ \
--libtool="$(top_builddir)/libtool" \ --libtool="$(top_builddir)/libtool" \
--pkg gstreamer-@GST_MAJORMINOR@ \ --pkg gstreamer-@GST_API_VERSION@ \
--pkg-export gstreamer-base-@GST_MAJORMINOR@ \ --pkg-export gstreamer-base-@GST_API_VERSION@ \
--add-init-section="gst_init(NULL,NULL);" \ --add-init-section="gst_init(NULL,NULL);" \
--output $@ \ --output $@ \
$(gir_headers) \ $(gir_headers) \

52
libs/gst/check/Makefile.am
View file

@ -1,37 +1,37 @@
lib_LTLIBRARIES = libgstcheck-@GST_MAJORMINOR@.la lib_LTLIBRARIES = libgstcheck-@GST_API_VERSION@.la
SYMBOLS_FILE = exports.sym SYMBOLS_FILE = exports.sym
BUILT_SOURCES = internal-check.h BUILT_SOURCES = internal-check.h
libgstcheck_@GST_MAJORMINOR@_la_DEPENDENCIES = \ libgstcheck_@GST_API_VERSION@_la_DEPENDENCIES = \
$(top_builddir)/gst/libgstreamer-@GST_MAJORMINOR@.la \ $(top_builddir)/gst/libgstreamer-@GST_API_VERSION@.la \
internal-check.h \ internal-check.h \
$(SYMBOLS_FILE) $(SYMBOLS_FILE)
libgstcheck_@GST_MAJORMINOR@_la_SOURCES = \ libgstcheck_@GST_API_VERSION@_la_SOURCES = \
gstbufferstraw.c \ gstbufferstraw.c \
gstcheck.c \ gstcheck.c \
gstconsistencychecker.c gstconsistencychecker.c
libgstcheck_@GST_MAJORMINOR@_la_CFLAGS = $(GST_OBJ_CFLAGS) \ libgstcheck_@GST_API_VERSION@_la_CFLAGS = $(GST_OBJ_CFLAGS) \
-I$(top_builddir)/libs \ -I$(top_builddir)/libs \
-I$(top_builddir)/libs/gst/check \ -I$(top_builddir)/libs/gst/check \
-I$(top_builddir)/libs/gst/check/libcheck -I$(top_builddir)/libs/gst/check/libcheck
libgstcheck_@GST_MAJORMINOR@_la_LIBADD = $(GST_OBJ_LIBS) \ libgstcheck_@GST_API_VERSION@_la_LIBADD = $(GST_OBJ_LIBS) \
$(top_builddir)/libs/gst/check/libcheck/libcheckinternal.la \ $(top_builddir)/libs/gst/check/libcheck/libcheckinternal.la \
$(LIBM) $(LIBM)
libgstcheck_@GST_MAJORMINOR@_la_LDFLAGS = \ libgstcheck_@GST_API_VERSION@_la_LDFLAGS = \
-export-symbols $(SYMBOLS_FILE) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) -export-symbols $(SYMBOLS_FILE) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
libgstcheck_@GST_MAJORMINOR@includedir = \ libgstcheck_@GST_API_VERSION@includedir = \
$(includedir)/gstreamer-@GST_MAJORMINOR@/gst/check $(includedir)/gstreamer-@GST_API_VERSION@/gst/check
libgstcheck_@GST_MAJORMINOR@include_HEADERS = \ libgstcheck_@GST_API_VERSION@include_HEADERS = \
gstbufferstraw.h \ gstbufferstraw.h \
gstcheck.h \ gstcheck.h \
gstconsistencychecker.h gstconsistencychecker.h
nodist_libgstcheck_@GST_MAJORMINOR@include_HEADERS = \ nodist_libgstcheck_@GST_API_VERSION@include_HEADERS = \
internal-check.h internal-check.h
CLEANFILES = *.gcno *.gcda *.gcov internal-check.h $(SYMBOLS_FILE) CLEANFILES = *.gcno *.gcda *.gcov internal-check.h $(SYMBOLS_FILE)
@ -39,10 +39,10 @@ CLEANFILES = *.gcno *.gcda *.gcov internal-check.h $(SYMBOLS_FILE)
internal-check.h: $(top_builddir)/libs/gst/check/libcheck/check.h internal-check.h: $(top_builddir)/libs/gst/check/libcheck/check.h
$(AM_V_GEN)cp $(top_builddir)/libs/gst/check/libcheck/check.h internal-check.h $(AM_V_GEN)cp $(top_builddir)/libs/gst/check/libcheck/check.h internal-check.h
%.c.gcov: .libs/libgstcheck_@GST_MAJORMINOR@_la-%.gcda %.c %.c.gcov: .libs/libgstcheck_@GST_API_VERSION@_la-%.gcda %.c
$(GCOV) -b -f -o $^ > $@.out $(GCOV) -b -f -o $^ > $@.out
gcov: $(libgstcheck_@GST_MAJORMINOR@_la_SOURCES:=.gcov) gcov: $(libgstcheck_@GST_API_VERSION@_la_SOURCES:=.gcov)
SUBDIRS = libcheck SUBDIRS = libcheck
@ -108,19 +108,19 @@ $(SYMBOLS_FILE):
done done
if HAVE_INTROSPECTION if HAVE_INTROSPECTION
BUILT_GIRSOURCES = GstCheck-@GST_MAJORMINOR@.gir BUILT_GIRSOURCES = GstCheck-@GST_API_VERSION@.gir
gir_headers=$(patsubst %,$(srcdir)/%, $(libgstcheck_@GST_MAJORMINOR@include_HEADERS)) \ gir_headers=$(patsubst %,$(srcdir)/%, $(libgstcheck_@GST_API_VERSION@include_HEADERS)) \
$(patsubst %,$(builddir)/%, $(nodist_libgstcheck_@GST_MAJORMINOR@include_HEADERS)) $(patsubst %,$(builddir)/%, $(nodist_libgstcheck_@GST_API_VERSION@include_HEADERS))
gir_sources=$(patsubst %,$(srcdir)/%, $(libgstcheck_@GST_MAJORMINOR@_la_SOURCES)) gir_sources=$(patsubst %,$(srcdir)/%, $(libgstcheck_@GST_API_VERSION@_la_SOURCES))
gir_cincludes=$(patsubst %,--c-include='gst/check/%',$(libgstcheck_@GST_MAJORMINOR@include_HEADERS)) \ gir_cincludes=$(patsubst %,--c-include='gst/check/%',$(libgstcheck_@GST_API_VERSION@include_HEADERS)) \
$(patsubst %,--c-include='gst/check/%',$(nodist_libgstcheck_@GST_MAJORMINOR@include_HEADERS)) $(patsubst %,--c-include='gst/check/%',$(nodist_libgstcheck_@GST_API_VERSION@include_HEADERS))
GstCheck-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstcheck-@GST_MAJORMINOR@.la GstCheck-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstcheck-@GST_API_VERSION@.la
$(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \ $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \
GST_PLUGIN_SYSTEM_PATH="" GST_PLUGIN_PATH="" GST_REGISTRY_UPDATE=no \ GST_PLUGIN_SYSTEM_PATH="" GST_PLUGIN_PATH="" GST_REGISTRY_UPDATE=no \
$(INTROSPECTION_SCANNER) -v --namespace GstCheck \ $(INTROSPECTION_SCANNER) -v --namespace GstCheck \
--nsversion=@GST_MAJORMINOR@ \ --nsversion=@GST_API_VERSION@ \
--strip-prefix=Gst \ --strip-prefix=Gst \
--warn-all \ --warn-all \
-DGST_USE_UNSTABLE_API \ -DGST_USE_UNSTABLE_API \
@ -131,12 +131,12 @@ GstCheck-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstcheck-@GST_MAJORMI
$(gir_cincludes) \ $(gir_cincludes) \
--add-include-path=$(top_builddir)/gst \ --add-include-path=$(top_builddir)/gst \
--library-path=$(top_builddir)/gst \ --library-path=$(top_builddir)/gst \
--library=$(top_builddir)/gst/libgstreamer-0.11.la \ --library=$(top_builddir)/gst/libgstreamer-@GST_API_VERSION@.la \
--library=libgstcheck-0.11.la \ --library=libgstcheck-@GST_API_VERSION@.la \
--include=Gst-0.11 \ --include=Gst-@GST_API_VERSION@ \
--libtool="$(top_builddir)/libtool" \ --libtool="$(top_builddir)/libtool" \
--pkg gstreamer-@GST_MAJORMINOR@ \ --pkg gstreamer-@GST_API_VERSION@ \
--pkg-export gstreamer-check-@GST_MAJORMINOR@ \ --pkg-export gstreamer-check-@GST_API_VERSION@ \
--add-init-section="gst_init(NULL,NULL);" \ --add-init-section="gst_init(NULL,NULL);" \
--output $@ \ --output $@ \
$(gir_headers) \ $(gir_headers) \

54
libs/gst/controller/Makefile.am
View file

@ -1,7 +1,7 @@
lib_LTLIBRARIES = libgstcontroller-@GST_MAJORMINOR@.la lib_LTLIBRARIES = libgstcontroller-@GST_API_VERSION@.la
libgstcontroller_@GST_MAJORMINOR@_includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/controller libgstcontroller_@GST_API_VERSION@_includedir = $(includedir)/gstreamer-@GST_API_VERSION@/gst/controller
libgstcontroller_@GST_MAJORMINOR@_include_HEADERS = \ libgstcontroller_@GST_API_VERSION@_include_HEADERS = \
gstargbcontrolbinding.h \ gstargbcontrolbinding.h \
gstdirectcontrolbinding.h \ gstdirectcontrolbinding.h \
gsttimedvaluecontrolsource.h \ gsttimedvaluecontrolsource.h \
@ -9,7 +9,7 @@ libgstcontroller_@GST_MAJORMINOR@_include_HEADERS = \
gsttriggercontrolsource.h \ gsttriggercontrolsource.h \
gstlfocontrolsource.h gstlfocontrolsource.h
libgstcontroller_@GST_MAJORMINOR@_la_SOURCES = \ libgstcontroller_@GST_API_VERSION@_la_SOURCES = \
gstargbcontrolbinding.c \ gstargbcontrolbinding.c \
gstdirectcontrolbinding.c \ gstdirectcontrolbinding.c \
gsttimedvaluecontrolsource.c \ gsttimedvaluecontrolsource.c \
@ -17,41 +17,41 @@ libgstcontroller_@GST_MAJORMINOR@_la_SOURCES = \
gsttriggercontrolsource.c \ gsttriggercontrolsource.c \
gstlfocontrolsource.c gstlfocontrolsource.c
libgstcontroller_@GST_MAJORMINOR@_la_CFLAGS = $(GST_OBJ_CFLAGS) libgstcontroller_@GST_API_VERSION@_la_CFLAGS = $(GST_OBJ_CFLAGS)
libgstcontroller_@GST_MAJORMINOR@_la_LIBADD = $(GST_OBJ_LIBS) $(LIBM) libgstcontroller_@GST_API_VERSION@_la_LIBADD = $(GST_OBJ_LIBS) $(LIBM)
libgstcontroller_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) libgstcontroller_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
CLEANFILES = *.gcno *.gcda *.gcov CLEANFILES = *.gcno *.gcda *.gcov
%.c.gcov: .libs/libgstcontroller_@GST_MAJORMINOR@_la-%.gcda %.c %.c.gcov: .libs/libgstcontroller_@GST_API_VERSION@_la-%.gcda %.c
$(GCOV) -b -f -o $^ > $@.out $(GCOV) -b -f -o $^ > $@.out
gcov: $(libgstcontroller_@GST_MAJORMINOR@_la_SOURCES:=.gcov) gcov: $(libgstcontroller_@GST_API_VERSION@_la_SOURCES:=.gcov)
Android.mk: Makefile.am Android.mk: Makefile.am
androgenizer -:PROJECT gstreamer -:SHARED libgstcontroller-@GST_MAJORMINOR@ -:TAGS eng debug \ androgenizer -:PROJECT gstreamer -:SHARED libgstcontroller-@GST_API_VERSION@ -:TAGS eng debug \
-:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
-:SOURCES $(libgstcontroller_@GST_MAJORMINOR@_la_SOURCES) \ -:SOURCES $(libgstcontroller_@GST_API_VERSION@_la_SOURCES) \
-:CFLAGS $(libgstcontroller_@GST_MAJORMINOR@_la_CFLAGS) \ -:CFLAGS $(libgstcontroller_@GST_API_VERSION@_la_CFLAGS) \
-:LDFLAGS $(libgstcontroller_@GST_MAJORMINOR@_la_LDFLAGS) \ -:LDFLAGS $(libgstcontroller_@GST_API_VERSION@_la_LDFLAGS) \
$(libgstcontroller_@GST_MAJORMINOR@_la_LIBADD) \ $(libgstcontroller_@GST_API_VERSION@_la_LIBADD) \
-:HEADER_TARGET gstreamer-@GST_MAJORMINOR@/gst/controller \ -:HEADER_TARGET gstreamer-@GST_API_VERSION@/gst/controller \
-:HEADERS $(libgstcontroller_@GST_MAJORMINOR@_include_HEADERS) \ -:HEADERS $(libgstcontroller_@GST_API_VERSION@_include_HEADERS) \
-:PASSTHROUGH LOCAL_ARM_MODE:=arm \ -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
> $@ > $@
if HAVE_INTROSPECTION if HAVE_INTROSPECTION
BUILT_GIRSOURCES = GstController-@GST_MAJORMINOR@.gir BUILT_GIRSOURCES = GstController-@GST_API_VERSION@.gir
gir_headers=$(patsubst %,$(srcdir)/%, $(libgstcontroller_@GST_MAJORMINOR@_include_HEADERS)) gir_headers=$(patsubst %,$(srcdir)/%, $(libgstcontroller_@GST_API_VERSION@_include_HEADERS))
gir_sources=$(patsubst %,$(srcdir)/%, $(libgstcontroller_@GST_MAJORMINOR@_la_SOURCES)) gir_sources=$(patsubst %,$(srcdir)/%, $(libgstcontroller_@GST_API_VERSION@_la_SOURCES))
gir_cincludes=$(patsubst %,--c-include='gst/controller/%',$(libgstcontroller_@GST_MAJORMINOR@_include_HEADERS)) gir_cincludes=$(patsubst %,--c-include='gst/controller/%',$(libgstcontroller_@GST_API_VERSION@_include_HEADERS))
GstController-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstcontroller-@GST_MAJORMINOR@.la GstController-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstcontroller-@GST_API_VERSION@.la
$(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \ $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \
GST_PLUGIN_SYSTEM_PATH="" GST_PLUGIN_PATH="" GST_REGISTRY_UPDATE=no \ GST_PLUGIN_SYSTEM_PATH="" GST_PLUGIN_PATH="" GST_REGISTRY_UPDATE=no \
$(INTROSPECTION_SCANNER) -v --namespace GstController \ $(INTROSPECTION_SCANNER) -v --namespace GstController \
--nsversion=@GST_MAJORMINOR@ \ --nsversion=@GST_API_VERSION@ \
--warn-all \ --warn-all \
--strip-prefix=Gst \ --strip-prefix=Gst \
-DGST_USE_UNSTABLE_API \ -DGST_USE_UNSTABLE_API \
@ -62,12 +62,12 @@ GstController-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstcontroller-@G
$(gir_cincludes) \ $(gir_cincludes) \
--add-include-path=$(top_builddir)/gst \ --add-include-path=$(top_builddir)/gst \
--library-path=$(top_builddir)/gst \ --library-path=$(top_builddir)/gst \
--library=$(top_builddir)/gst/libgstreamer-0.11.la \ --library=$(top_builddir)/gst/libgstreamer-@GST_API_VERSION@.la \
--library=libgstcontroller-0.11.la \ --library=libgstcontroller-@GST_API_VERSION@.la \
--include=Gst-0.11 \ --include=Gst-@GST_API_VERSION@ \
--libtool="$(top_builddir)/libtool" \ --libtool="$(top_builddir)/libtool" \
--pkg gstreamer-@GST_MAJORMINOR@ \ --pkg gstreamer-@GST_API_VERSION@ \
--pkg-export gstreamer-controller-@GST_MAJORMINOR@ \ --pkg-export gstreamer-controller-@GST_API_VERSION@ \
--add-init-section="gst_init(NULL,NULL);" \ --add-init-section="gst_init(NULL,NULL);" \
--output $@ \ --output $@ \
$(gir_headers) \ $(gir_headers) \

2
libs/gst/helpers/Makefile.am
View file

@ -1,5 +1,5 @@
helpers_PROGRAMS = gst-plugin-scanner helpers_PROGRAMS = gst-plugin-scanner
helpersdir=$(libexecdir)/gstreamer-$(GST_MAJORMINOR) helpersdir=$(libexecdir)/gstreamer-$(GST_API_VERSION)
gst_plugin_scanner_SOURCES = gst-plugin-scanner.c gst_plugin_scanner_SOURCES = gst-plugin-scanner.c
gst_plugin_scanner_CFLAGS = $(GST_OBJ_CFLAGS) gst_plugin_scanner_CFLAGS = $(GST_OBJ_CFLAGS)

52
libs/gst/net/Makefile.am
View file

@ -1,57 +1,57 @@
lib_LTLIBRARIES = libgstnet-@GST_MAJORMINOR@.la lib_LTLIBRARIES = libgstnet-@GST_API_VERSION@.la
libgstnet_@GST_MAJORMINOR@_includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/net libgstnet_@GST_API_VERSION@_includedir = $(includedir)/gstreamer-@GST_API_VERSION@/gst/net
libgstnet_@GST_MAJORMINOR@_include_HEADERS = \ libgstnet_@GST_API_VERSION@_include_HEADERS = \
gstnet.h \ gstnet.h \
gstnetaddressmeta.h \ gstnetaddressmeta.h \
gstnetclientclock.h \ gstnetclientclock.h \
gstnettimepacket.h \ gstnettimepacket.h \
gstnettimeprovider.h gstnettimeprovider.h
libgstnet_@GST_MAJORMINOR@_la_SOURCES = \ libgstnet_@GST_API_VERSION@_la_SOURCES = \
gstnetaddressmeta.c \ gstnetaddressmeta.c \
gstnetclientclock.c \ gstnetclientclock.c \
gstnettimepacket.c \ gstnettimepacket.c \
gstnettimeprovider.c gstnettimeprovider.c
libgstnet_@GST_MAJORMINOR@_la_CFLAGS = $(GST_OBJ_CFLAGS) $(GIO_CFLAGS) libgstnet_@GST_API_VERSION@_la_CFLAGS = $(GST_OBJ_CFLAGS) $(GIO_CFLAGS)
libgstnet_@GST_MAJORMINOR@_la_LIBADD = $(GST_OBJ_LIBS) $(GIO_LIBS) libgstnet_@GST_API_VERSION@_la_LIBADD = $(GST_OBJ_LIBS) $(GIO_LIBS)
libgstnet_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) libgstnet_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
CLEANFILES = *.gcno *.gcda *.gcov CLEANFILES = *.gcno *.gcda *.gcov
%.c.gcov: .libs/libgstnet_@GST_MAJORMINOR@_la-%.gcda %.c %.c.gcov: .libs/libgstnet_@GST_API_VERSION@_la-%.gcda %.c
$(GCOV) -b -f -o $^ > $@.out $(GCOV) -b -f -o $^ > $@.out
gcov: $(libgstnet_@GST_MAJORMINOR@_la_SOURCES:=.gcov) gcov: $(libgstnet_@GST_API_VERSION@_la_SOURCES:=.gcov)
Android.mk: Makefile.am Android.mk: Makefile.am
androgenizer -:PROJECT gstreamer -:SHARED libgstnet-@GST_MAJORMINOR@ -:TAGS eng debug \ androgenizer -:PROJECT gstreamer -:SHARED libgstnet-@GST_API_VERSION@ -:TAGS eng debug \
-:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
-:SOURCES $(libgstnet_@GST_MAJORMINOR@_la_SOURCES) \ -:SOURCES $(libgstnet_@GST_API_VERSION@_la_SOURCES) \
-:CFLAGS $(libgstnet_@GST_MAJORMINOR@_la_CFLAGS) \ -:CFLAGS $(libgstnet_@GST_API_VERSION@_la_CFLAGS) \
-:LDFLAGS $(libgstnet_@GST_MAJORMINOR@_la_LDFLAGS) \ -:LDFLAGS $(libgstnet_@GST_API_VERSION@_la_LDFLAGS) \
$(libgstnet_@GST_MAJORMINOR@_la_LIBADD) \ $(libgstnet_@GST_API_VERSION@_la_LIBADD) \
-:HEADER_TARGET gstreamer-@GST_MAJORMINOR@/gst/net \ -:HEADER_TARGET gstreamer-@GST_API_VERSION@/gst/net \
-:HEADERS $(libgstnet_@GST_MAJORMINOR@_include_HEADERS) \ -:HEADERS $(libgstnet_@GST_API_VERSION@_include_HEADERS) \
-:PASSTHROUGH LOCAL_ARM_MODE:=arm \ -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
> $@ > $@
if HAVE_INTROSPECTION if HAVE_INTROSPECTION
BUILT_GIRSOURCES = GstNet-@GST_MAJORMINOR@.gir BUILT_GIRSOURCES = GstNet-@GST_API_VERSION@.gir
gir_headers=$(patsubst %,$(srcdir)/%, $(libgstnet_@GST_MAJORMINOR@_include_HEADERS)) gir_headers=$(patsubst %,$(srcdir)/%, $(libgstnet_@GST_API_VERSION@_include_HEADERS))
gir_sources=$(patsubst %,$(srcdir)/%, $(libgstnet_@GST_MAJORMINOR@_la_SOURCES)) gir_sources=$(patsubst %,$(srcdir)/%, $(libgstnet_@GST_API_VERSION@_la_SOURCES))
gir_cincludes=--c-include="gst/net/gstnet.h" gir_cincludes=--c-include="gst/net/gstnet.h"
GstNet-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstnet-@GST_MAJORMINOR@.la GstNet-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstnet-@GST_API_VERSION@.la
$(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \ $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \
GST_PLUGIN_SYSTEM_PATH="" GST_PLUGIN_PATH="" GST_REGISTRY_UPDATE=no \ GST_PLUGIN_SYSTEM_PATH="" GST_PLUGIN_PATH="" GST_REGISTRY_UPDATE=no \
$(INTROSPECTION_SCANNER) -v --namespace GstNet \ $(INTROSPECTION_SCANNER) -v --namespace GstNet \
--strip-prefix=Gst \ --strip-prefix=Gst \
--warn-all \ --warn-all \
--nsversion=@GST_MAJORMINOR@ \ --nsversion=@GST_API_VERSION@ \
-DGST_USE_UNSTABLE_API \ -DGST_USE_UNSTABLE_API \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/libs \ -I$(top_srcdir)/libs \
@ -60,14 +60,14 @@ GstNet-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstnet-@GST_MAJORMINOR@
$(gir_cincludes) \ $(gir_cincludes) \
--add-include-path=$(top_builddir)/gst \ --add-include-path=$(top_builddir)/gst \
--library-path=$(top_builddir)/gst \ --library-path=$(top_builddir)/gst \
--library=$(top_builddir)/gst/libgstreamer-@GST_MAJORMINOR@.la \ --library=$(top_builddir)/gst/libgstreamer-@GST_API_VERSION@.la \
--library=libgstnet-@GST_MAJORMINOR@.la \ --library=libgstnet-@GST_API_VERSION@.la \
--include=Gst-@GST_MAJORMINOR@ \ --include=Gst-@GST_API_VERSION@ \
--include=Gio-2.0 \ --include=Gio-2.0 \
--libtool="$(top_builddir)/libtool" \ --libtool="$(top_builddir)/libtool" \
--pkg gstreamer-@GST_MAJORMINOR@ \ --pkg gstreamer-@GST_API_VERSION@ \
--pkg gio-2.0 \ --pkg gio-2.0 \
--pkg-export="gstreamer-net-@GST_MAJORMINOR@" \ --pkg-export="gstreamer-net-@GST_API_VERSION@" \
--add-init-section="gst_init(NULL,NULL);" \ --add-init-section="gst_init(NULL,NULL);" \
--output $@ \ --output $@ \
$(gir_headers) \ $(gir_headers) \

24
pkgconfig/Makefile.am
View file

@ -1,25 +1,25 @@
### all of the standard pc files we need to generate ### all of the standard pc files we need to generate
if HAVE_CHECK if HAVE_CHECK
CHECK_PC_I = gstreamer-check-@GST_MAJORMINOR@.pc CHECK_PC_I = gstreamer-check-@GST_API_VERSION@.pc
CHECK_PC_U = gstreamer-check-@GST_MAJORMINOR@-uninstalled.pc CHECK_PC_U = gstreamer-check-@GST_API_VERSION@-uninstalled.pc
else else
CHECK_PC_I = CHECK_PC_I =
CHECK_PC_U = CHECK_PC_U =
endif endif
pcfiles = \ pcfiles = \
gstreamer-@GST_MAJORMINOR@.pc \ gstreamer-@GST_API_VERSION@.pc \
gstreamer-base-@GST_MAJORMINOR@.pc \ gstreamer-base-@GST_API_VERSION@.pc \
$(CHECK_PC_I) \ $(CHECK_PC_I) \
gstreamer-controller-@GST_MAJORMINOR@.pc \ gstreamer-controller-@GST_API_VERSION@.pc \
gstreamer-net-@GST_MAJORMINOR@.pc gstreamer-net-@GST_API_VERSION@.pc
pcfiles_uninstalled = \ pcfiles_uninstalled = \
gstreamer-@GST_MAJORMINOR@-uninstalled.pc \ gstreamer-@GST_API_VERSION@-uninstalled.pc \
gstreamer-base-@GST_MAJORMINOR@-uninstalled.pc \ gstreamer-base-@GST_API_VERSION@-uninstalled.pc \
$(CHECK_PC_U) \ $(CHECK_PC_U) \
gstreamer-controller-@GST_MAJORMINOR@-uninstalled.pc \ gstreamer-controller-@GST_API_VERSION@-uninstalled.pc \
gstreamer-net-@GST_MAJORMINOR@-uninstalled.pc gstreamer-net-@GST_API_VERSION@-uninstalled.pc
all-local: $(pcfiles) $(pcfiles_uninstalled) all-local: $(pcfiles) $(pcfiles_uninstalled)
@ -28,9 +28,9 @@ cp_verbose_ = $(cp_verbose_$(AM_DEFAULT_VERBOSITY))
cp_verbose_0 = @echo " CP $@"; cp_verbose_0 = @echo " CP $@";
### how to generate pc files ### how to generate pc files
%-@GST_MAJORMINOR@.pc: %.pc %-@GST_API_VERSION@.pc: %.pc
$(cp_verbose_0)cp $< $@ $(cp_verbose_0)cp $< $@
%-@GST_MAJORMINOR@-uninstalled.pc: %-uninstalled.pc %-@GST_API_VERSION@-uninstalled.pc: %-uninstalled.pc
$(cp_verbose_0)cp $< $@ $(cp_verbose_0)cp $< $@
pkgconfigdir = $(libdir)/pkgconfig pkgconfigdir = $(libdir)/pkgconfig

4
pkgconfig/gstreamer-base-uninstalled.pc.in
View file

@ -8,8 +8,8 @@ typelibdir=@abs_top_builddir@/libs/gst/base
Name: GStreamer base classes, uninstalled Name: GStreamer base classes, uninstalled
Description: Base classes for GStreamer elements, Not Installed Description: Base classes for GStreamer elements, Not Installed
Requires: gstreamer-@GST_MAJORMINOR@ = @VERSION@ Requires: gstreamer-@GST_API_VERSION@ = @VERSION@
Version: @VERSION@ Version: @VERSION@
Libs: @abs_top_builddir@/libs/gst/base/libgstbase-@GST_MAJORMINOR@.la Libs: @abs_top_builddir@/libs/gst/base/libgstbase-@GST_API_VERSION@.la
Cflags: -I@abs_top_srcdir@/libs -I@abs_top_builddir@/libs Cflags: -I@abs_top_srcdir@/libs -I@abs_top_builddir@/libs

6
pkgconfig/gstreamer-base.pc.in
View file

@ -1,7 +1,7 @@
prefix=@prefix@ prefix=@prefix@
exec_prefix=@exec_prefix@ exec_prefix=@exec_prefix@
libdir=@libdir@ libdir=@libdir@
includedir=@includedir@/gstreamer-@GST_MAJORMINOR@ includedir=@includedir@/gstreamer-@GST_API_VERSION@
datarootdir=${prefix}/share datarootdir=${prefix}/share
datadir=${datarootdir} datadir=${datarootdir}
girdir=${datadir}/gir-1.0 girdir=${datadir}/gir-1.0
@ -9,7 +9,7 @@ typelibdir=${libdir}/girepository-1.0
Name: GStreamer base classes Name: GStreamer base classes
Description: Base classes for GStreamer elements Description: Base classes for GStreamer elements
Requires: gstreamer-@GST_MAJORMINOR@ Requires: gstreamer-@GST_API_VERSION@
Version: @VERSION@ Version: @VERSION@
Libs: -L${libdir} -lgstbase-@GST_MAJORMINOR@ Libs: -L${libdir} -lgstbase-@GST_API_VERSION@
Cflags: -I${includedir} Cflags: -I${includedir}

4
pkgconfig/gstreamer-check-uninstalled.pc.in
View file

@ -8,8 +8,8 @@ typelibdir=@abs_top_builddir@/libs/gst/check
Name: GStreamer check unit testing, uninstalled Name: GStreamer check unit testing, uninstalled
Description: Unit testing helper library for GStreamer modules, Not Installed Description: Unit testing helper library for GStreamer modules, Not Installed
Requires: gstreamer-@GST_MAJORMINOR@ = @VERSION@ Requires: gstreamer-@GST_API_VERSION@ = @VERSION@
Version: @VERSION@ Version: @VERSION@
Libs: @abs_top_builddir@/libs/gst/check/libgstcheck-@GST_MAJORMINOR@.la @LIBM@ Libs: @abs_top_builddir@/libs/gst/check/libgstcheck-@GST_API_VERSION@.la @LIBM@
Cflags: -I@abs_top_srcdir@/libs -I@abs_top_builddir@/libs Cflags: -I@abs_top_srcdir@/libs -I@abs_top_builddir@/libs

6
pkgconfig/gstreamer-check.pc.in
View file

@ -1,7 +1,7 @@
prefix=@prefix@ prefix=@prefix@
exec_prefix=@exec_prefix@ exec_prefix=@exec_prefix@
libdir=@libdir@ libdir=@libdir@
includedir=@includedir@/gstreamer-@GST_MAJORMINOR@ includedir=@includedir@/gstreamer-@GST_API_VERSION@
datarootdir=${prefix}/share datarootdir=${prefix}/share
datadir=${datarootdir} datadir=${datarootdir}
girdir=${datadir}/gir-1.0 girdir=${datadir}/gir-1.0
@ -9,7 +9,7 @@ typelibdir=${libdir}/girepository-1.0
Name: GStreamer check unit testing Name: GStreamer check unit testing
Description: Unit testing helper library for GStreamer modules Description: Unit testing helper library for GStreamer modules
Requires: gstreamer-@GST_MAJORMINOR@ Requires: gstreamer-@GST_API_VERSION@
Version: @VERSION@ Version: @VERSION@
Libs: -L${libdir} -lgstcheck-@GST_MAJORMINOR@ @LIBM@ Libs: -L${libdir} -lgstcheck-@GST_API_VERSION@ @LIBM@
Cflags: -I${includedir} Cflags: -I${includedir}

4
pkgconfig/gstreamer-controller-uninstalled.pc.in
View file

@ -8,8 +8,8 @@ typelibdir=@abs_top_builddir@/libs/gst/controller
Name: GStreamer controller, uninstalled Name: GStreamer controller, uninstalled
Description: Dynamic parameter control for GStreamer elements, Not Installed Description: Dynamic parameter control for GStreamer elements, Not Installed
Requires: gstreamer-@GST_MAJORMINOR@ = @VERSION@ Requires: gstreamer-@GST_API_VERSION@ = @VERSION@
Version: @VERSION@ Version: @VERSION@
Libs: @abs_top_builddir@/libs/gst/controller/libgstcontroller-@GST_MAJORMINOR@.la Libs: @abs_top_builddir@/libs/gst/controller/libgstcontroller-@GST_API_VERSION@.la
Cflags: -I@abs_top_srcdir@/libs -I@abs_top_builddir@/libs Cflags: -I@abs_top_srcdir@/libs -I@abs_top_builddir@/libs

6
pkgconfig/gstreamer-controller.pc.in
View file

@ -1,7 +1,7 @@
prefix=@prefix@ prefix=@prefix@
exec_prefix=@exec_prefix@ exec_prefix=@exec_prefix@
libdir=@libdir@ libdir=@libdir@
includedir=@includedir@/gstreamer-@GST_MAJORMINOR@ includedir=@includedir@/gstreamer-@GST_API_VERSION@
datarootdir=${prefix}/share datarootdir=${prefix}/share
datadir=${datarootdir} datadir=${datarootdir}
girdir=${datadir}/gir-1.0 girdir=${datadir}/gir-1.0
@ -9,7 +9,7 @@ typelibdir=${libdir}/girepository-1.0
Name: GStreamer controller Name: GStreamer controller
Description: Dynamic parameter control for GStreamer elements Description: Dynamic parameter control for GStreamer elements
Requires: gstreamer-@GST_MAJORMINOR@ Requires: gstreamer-@GST_API_VERSION@
Version: @VERSION@ Version: @VERSION@
Libs: -L${libdir} -lgstcontroller-@GST_MAJORMINOR@ Libs: -L${libdir} -lgstcontroller-@GST_API_VERSION@
Cflags: -I${includedir} Cflags: -I${includedir}

4
pkgconfig/gstreamer-net-uninstalled.pc.in
View file

@ -8,8 +8,8 @@ typelibdir=@abs_top_builddir@/libs/gst/net
Name: GStreamer networking library, uninstalled Name: GStreamer networking library, uninstalled
Description: Network-enabled GStreamer plug-ins and clocking, uninstalled Description: Network-enabled GStreamer plug-ins and clocking, uninstalled
Requires: gstreamer-@GST_MAJORMINOR@ = @VERSION@ gio-2.0 Requires: gstreamer-@GST_API_VERSION@ = @VERSION@ gio-2.0
Version: @VERSION@ Version: @VERSION@
Libs: @abs_top_builddir@/libs/gst/net/libgstnet-@GST_MAJORMINOR@.la Libs: @abs_top_builddir@/libs/gst/net/libgstnet-@GST_API_VERSION@.la
Cflags: -I@abs_top_srcdir@/libs -I@abs_top_builddir@/libs Cflags: -I@abs_top_srcdir@/libs -I@abs_top_builddir@/libs

6
pkgconfig/gstreamer-net.pc.in
View file

@ -1,7 +1,7 @@
prefix=@prefix@ prefix=@prefix@
exec_prefix=@exec_prefix@ exec_prefix=@exec_prefix@
libdir=@libdir@ libdir=@libdir@
includedir=@includedir@/gstreamer-@GST_MAJORMINOR@ includedir=@includedir@/gstreamer-@GST_API_VERSION@
datarootdir=${prefix}/share datarootdir=${prefix}/share
datadir=${datarootdir} datadir=${datarootdir}
girdir=${datadir}/gir-1.0 girdir=${datadir}/gir-1.0
@ -9,7 +9,7 @@ typelibdir=${libdir}/girepository-1.0
Name: GStreamer networking library Name: GStreamer networking library
Description: Network-enabled GStreamer plug-ins and clocking Description: Network-enabled GStreamer plug-ins and clocking
Requires: gstreamer-@GST_MAJORMINOR@ gio-2.0 Requires: gstreamer-@GST_API_VERSION@ gio-2.0
Version: @VERSION@ Version: @VERSION@
Libs: -L${libdir} -lgstnet-@GST_MAJORMINOR@ Libs: -L${libdir} -lgstnet-@GST_API_VERSION@
Cflags: -I${includedir} Cflags: -I${includedir}

2
pkgconfig/gstreamer-uninstalled.pc.in
View file

@ -13,6 +13,6 @@ Name: GStreamer Uninstalled
Description: Streaming media framework, Not Installed Description: Streaming media framework, Not Installed
Version: @VERSION@ Version: @VERSION@
Requires: @GST_PKG_DEPS@ Requires: @GST_PKG_DEPS@
Libs: @abs_top_builddir@/gst/libgstreamer-@GST_MAJORMINOR@.la Libs: @abs_top_builddir@/gst/libgstreamer-@GST_API_VERSION@.la
# FIXME: the libs dir doesn't really belong here # FIXME: the libs dir doesn't really belong here
Cflags: -I@abs_top_srcdir@ -I@abs_top_srcdir@/libs -I@abs_top_builddir@ -I@abs_top_builddir@/libs Cflags: -I@abs_top_srcdir@ -I@abs_top_srcdir@/libs -I@abs_top_builddir@ -I@abs_top_builddir@/libs

6
pkgconfig/gstreamer.pc.in
View file

@ -1,9 +1,9 @@
prefix=@prefix@ prefix=@prefix@
exec_prefix=@exec_prefix@ exec_prefix=@exec_prefix@
libdir=@libdir@ libdir=@libdir@
includedir=@includedir@/gstreamer-@GST_MAJORMINOR@ includedir=@includedir@/gstreamer-@GST_API_VERSION@
toolsdir=${exec_prefix}/bin toolsdir=${exec_prefix}/bin
pluginsdir=@libdir@/gstreamer-@GST_MAJORMINOR@ pluginsdir=@libdir@/gstreamer-@GST_API_VERSION@
datarootdir=${prefix}/share datarootdir=${prefix}/share
datadir=${datarootdir} datadir=${datarootdir}
girdir=${datadir}/gir-1.0 girdir=${datadir}/gir-1.0
@ -13,5 +13,5 @@ Name: GStreamer
Description: Streaming media framework Description: Streaming media framework
Requires: @GST_PKG_DEPS@ Requires: @GST_PKG_DEPS@
Version: @VERSION@ Version: @VERSION@
Libs: -L${libdir} -lgstreamer-@GST_MAJORMINOR@ Libs: -L${libdir} -lgstreamer-@GST_API_VERSION@
Cflags: -I${includedir} Cflags: -I${includedir}

6
plugins/elements/Makefile.am
View file

@ -1,7 +1,7 @@
plugin_LTLIBRARIES = libgstcoreelements.la plugin_LTLIBRARIES = libgstcoreelements.la
libgstcoreelements_la_DEPENDENCIES = $(top_builddir)/gst/libgstreamer-@GST_MAJORMINOR@.la libgstcoreelements_la_DEPENDENCIES = $(top_builddir)/gst/libgstreamer-@GST_API_VERSION@.la
libgstcoreelements_la_SOURCES = \ libgstcoreelements_la_SOURCES = \
gstcapsfilter.c \ gstcapsfilter.c \
gstelements.c \ gstelements.c \
@ -25,7 +25,7 @@ libgstcoreelements_la_SOURCES = \
libgstcoreelements_la_CFLAGS = $(GST_OBJ_CFLAGS) libgstcoreelements_la_CFLAGS = $(GST_OBJ_CFLAGS)
libgstcoreelements_la_LIBADD = \ libgstcoreelements_la_LIBADD = \
$(top_builddir)/libs/gst/base/libgstbase-@GST_MAJORMINOR@.la \ $(top_builddir)/libs/gst/base/libgstbase-@GST_API_VERSION@.la \
$(GST_OBJ_LIBS) $(GST_OBJ_LIBS)
libgstcoreelements_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstcoreelements_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
libgstcoreelements_la_LIBTOOLFLAGS = --tag=disable-static libgstcoreelements_la_LIBTOOLFLAGS = --tag=disable-static
@ -69,5 +69,5 @@ Android.mk: Makefile.am
-:LDFLAGS $(libgstcoreelements_la_LDFLAGS) \ -:LDFLAGS $(libgstcoreelements_la_LDFLAGS) \
$(libgstcoreelements_la_LIBADD) \ $(libgstcoreelements_la_LIBADD) \
-:PASSTHROUGH LOCAL_ARM_MODE:=arm \ -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
LOCAL_MODULE_PATH:=$$\(TARGET_OUT\)/lib/gstreamer-@GST_MAJORMINOR@ \ LOCAL_MODULE_PATH:=$$\(TARGET_OUT\)/lib/gstreamer-@GST_API_VERSION@ \
> $@ > $@

2
tests/benchmarks/Makefile.am
View file

@ -13,5 +13,5 @@ LDADD = $(GST_OBJ_LIBS)
AM_CFLAGS = $(GST_OBJ_CFLAGS) AM_CFLAGS = $(GST_OBJ_CFLAGS)
controller_CFLAGS = $(GST_OBJ_CFLAGS) -I$(top_builddir)/libs controller_CFLAGS = $(GST_OBJ_CFLAGS) -I$(top_builddir)/libs
controller_LDADD = $(top_builddir)/libs/gst/controller/libgstcontroller-@GST_MAJORMINOR@.la $(LDADD) controller_LDADD = $(top_builddir)/libs/gst/controller/libgstcontroller-@GST_API_VERSION@.la $(LDADD)

12
tests/check/Makefile.am
View file

@ -14,7 +14,7 @@ TESTS_ENVIRONMENT = \
GST_PLUGIN_SYSTEM_PATH= \ GST_PLUGIN_SYSTEM_PATH= \
GST_PLUGIN_PATH=$(top_builddir)/plugins GST_PLUGIN_PATH=$(top_builddir)/plugins
plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugindir = $(libdir)/gstreamer-@GST_API_VERSION@
# override to _not_ install the test plugins # override to _not_ install the test plugins
install-pluginLTLIBRARIES: install-pluginLTLIBRARIES:
@ -173,8 +173,8 @@ EXTRA_DIST = \
AM_CFLAGS = $(GST_OBJ_CFLAGS) -UG_DISABLE_ASSERT -UG_DISABLE_CAST_CHECKS AM_CFLAGS = $(GST_OBJ_CFLAGS) -UG_DISABLE_ASSERT -UG_DISABLE_CAST_CHECKS
AM_CXXFLAGS = $(GST_OBJ_CXXFLAGS) -UG_DISABLE_ASSERT -UG_DISABLE_CAST_CHECKS AM_CXXFLAGS = $(GST_OBJ_CXXFLAGS) -UG_DISABLE_ASSERT -UG_DISABLE_CAST_CHECKS
LDADD = $(top_builddir)/libs/gst/check/libgstcheck-@GST_MAJORMINOR@.la \ LDADD = $(top_builddir)/libs/gst/check/libgstcheck-@GST_API_VERSION@.la \
$(top_builddir)/libs/gst/base/libgstbase-@GST_MAJORMINOR@.la \ $(top_builddir)/libs/gst/base/libgstbase-@GST_API_VERSION@.la \
$(GST_OBJ_LIBS) $(GST_OBJ_LIBS)
gst_gstcpp_SOURCES = gst/gstcpp.cc gst_gstcpp_SOURCES = gst/gstcpp.cc
@ -189,13 +189,13 @@ elements_filesrc_CFLAGS=$(GST_OBJ_CFLAGS) $(AM_CFLAGS) \
-DTESTFILE=\"$(top_srcdir)/configure.ac\" -DTESTFILE=\"$(top_srcdir)/configure.ac\"
libs_controller_LDADD = \ libs_controller_LDADD = \
$(top_builddir)/libs/gst/controller/libgstcontroller-@GST_MAJORMINOR@.la \ $(top_builddir)/libs/gst/controller/libgstcontroller-@GST_API_VERSION@.la \
$(LDADD) $(LDADD)
libs_gstnetclientclock_LDADD = \ libs_gstnetclientclock_LDADD = \
$(top_builddir)/libs/gst/net/libgstnet-@GST_MAJORMINOR@.la \ $(top_builddir)/libs/gst/net/libgstnet-@GST_API_VERSION@.la \
$(LDADD) $(LDADD)
libs_gstnettimeprovider_LDADD = \ libs_gstnettimeprovider_LDADD = \
$(top_builddir)/libs/gst/net/libgstnet-@GST_MAJORMINOR@.la \ $(top_builddir)/libs/gst/net/libgstnet-@GST_API_VERSION@.la \
$(GIO_LIBS) $(LDADD) $(GIO_LIBS) $(LDADD)
# valgrind testing # valgrind testing

4
tests/check/gst/gstpreset.c
View file

@ -249,7 +249,7 @@ remove_preset_file (void)
gchar *preset_file_name; gchar *preset_file_name;
preset_file_name = g_build_filename (g_get_user_data_dir (), preset_file_name = g_build_filename (g_get_user_data_dir (),
"gstreamer-" GST_MAJORMINOR, "presets", "GstPresetTest.prs", NULL); "gstreamer-" GST_API_VERSION, "presets", "GstPresetTest.prs", NULL);
g_unlink (preset_file_name); g_unlink (preset_file_name);
g_free (preset_file_name); g_free (preset_file_name);
} }
@ -283,7 +283,7 @@ gst_preset_suite (void)
/* check if we can create presets */ /* check if we can create presets */
gst_dir = g_build_filename (g_get_user_data_dir (), gst_dir = g_build_filename (g_get_user_data_dir (),
"gstreamer-" GST_MAJORMINOR, NULL); "gstreamer-" GST_API_VERSION, NULL);
can_write = (g_access (gst_dir, R_OK | W_OK | X_OK) == 0); can_write = (g_access (gst_dir, R_OK | W_OK | X_OK) == 0);
g_free (gst_dir); g_free (gst_dir);

2
tests/examples/adapter/Makefile.am
View file

@ -1,4 +1,4 @@
noinst_PROGRAMS = adapter_test noinst_PROGRAMS = adapter_test
adapter_test_LDADD = $(GST_OBJ_LIBS) $(top_builddir)/libs/gst/base/libgstbase-@GST_MAJORMINOR@.la adapter_test_LDADD = $(GST_OBJ_LIBS) $(top_builddir)/libs/gst/base/libgstbase-@GST_API_VERSION@.la
adapter_test_CFLAGS = $(GST_OBJ_CFLAGS) adapter_test_CFLAGS = $(GST_OBJ_CFLAGS)

4
tests/examples/controller/Makefile.am
View file

@ -3,7 +3,7 @@ noinst_PROGRAMS = audio-example control-sources text-color-example
AM_CFLAGS = $(GST_OBJ_CFLAGS) -I$(top_builddir)/libs AM_CFLAGS = $(GST_OBJ_CFLAGS) -I$(top_builddir)/libs
LDADD = \ LDADD = \
$(top_builddir)/libs/gst/controller/libgstcontroller-@GST_MAJORMINOR@.la \ $(top_builddir)/libs/gst/controller/libgstcontroller-@GST_API_VERSION@.la \
$(GST_OBJ_LIBS) $(GST_OBJ_LIBS)
Android.mk: Makefile.am audio-example.c Android.mk: Makefile.am audio-example.c
@ -13,7 +13,7 @@ Android.mk: Makefile.am audio-example.c
-:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
-:SOURCES audio-example.c \ -:SOURCES audio-example.c \
-:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(audio_example_CFLAGS) \ -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(audio_example_CFLAGS) \
-:LDFLAGS -lgstcontroller-@GST_MAJORMINOR@ \ -:LDFLAGS -lgstcontroller-@GST_API_VERSION@ \
$(GST_OBJ_LIBS) -ldl \ $(GST_OBJ_LIBS) -ldl \
-:PASSTHROUGH LOCAL_ARM_MODE:=arm \ -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
> $@ > $@

2
tests/examples/manual/Makefile.am
View file

@ -54,7 +54,7 @@ BUILT_SOURCES = \
CLEANFILES = core core.* test-registry.* *.gcno *.gcda $(BUILT_SOURCES) CLEANFILES = core core.* test-registry.* *.gcno *.gcda $(BUILT_SOURCES)
AM_CFLAGS = $(GST_OBJ_CFLAGS) AM_CFLAGS = $(GST_OBJ_CFLAGS)
LDADD = $(top_builddir)/libs/gst/base/libgstbase-@GST_MAJORMINOR@.la \ LDADD = $(top_builddir)/libs/gst/base/libgstbase-@GST_API_VERSION@.la \
$(GST_OBJ_LIBS) $(GST_OBJ_LIBS)
elementmake.c elementcreate.c elementget.c elementlink.c elementfactory.c: $(top_srcdir)/docs/manual/basics-elements.xml elementmake.c elementcreate.c elementget.c elementlink.c elementfactory.c: $(top_srcdir)/docs/manual/basics-elements.xml

56
tools/Makefile.am
View file

@ -1,45 +1,45 @@
bin_PROGRAMS = \ bin_PROGRAMS = \
gst-inspect-@GST_MAJORMINOR@ \ gst-inspect-@GST_API_VERSION@ \
gst-typefind-@GST_MAJORMINOR@ gst-typefind-@GST_API_VERSION@
gst_inspect_@GST_MAJORMINOR@_SOURCES = gst-inspect.c tools.h gst_inspect_@GST_API_VERSION@_SOURCES = gst-inspect.c tools.h
gst_inspect_@GST_MAJORMINOR@_CFLAGS = $(GST_OBJ_CFLAGS) gst_inspect_@GST_API_VERSION@_CFLAGS = $(GST_OBJ_CFLAGS)
gst_inspect_@GST_MAJORMINOR@_LDADD = $(GST_OBJ_LIBS) gst_inspect_@GST_API_VERSION@_LDADD = $(GST_OBJ_LIBS)
gst_typefind_@GST_MAJORMINOR@_SOURCES = gst-typefind.c tools.h gst_typefind_@GST_API_VERSION@_SOURCES = gst-typefind.c tools.h
gst_typefind_@GST_MAJORMINOR@_CFLAGS = $(GST_OBJ_CFLAGS) gst_typefind_@GST_API_VERSION@_CFLAGS = $(GST_OBJ_CFLAGS)
gst_typefind_@GST_MAJORMINOR@_LDADD = $(GST_OBJ_LIBS) gst_typefind_@GST_API_VERSION@_LDADD = $(GST_OBJ_LIBS)
if !GST_DISABLE_PARSE if !GST_DISABLE_PARSE
bin_PROGRAMS += gst-launch-@GST_MAJORMINOR@ bin_PROGRAMS += gst-launch-@GST_API_VERSION@
gst_launch_@GST_MAJORMINOR@_SOURCES = gst-launch.c tools.h gst_launch_@GST_API_VERSION@_SOURCES = gst-launch.c tools.h
gst_launch_@GST_MAJORMINOR@_CFLAGS = $(GST_OBJ_CFLAGS) gst_launch_@GST_API_VERSION@_CFLAGS = $(GST_OBJ_CFLAGS)
gst_launch_@GST_MAJORMINOR@_LDADD = $(GST_OBJ_LIBS) gst_launch_@GST_API_VERSION@_LDADD = $(GST_OBJ_LIBS)
endif endif
Android.mk: Makefile.am Android.mk: Makefile.am
androgenizer -:PROJECT gstreamer \ androgenizer -:PROJECT gstreamer \
-:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
-:EXECUTABLE gst-inspect-@GST_MAJORMINOR@ -:TAGS eng debug \ -:EXECUTABLE gst-inspect-@GST_API_VERSION@ -:TAGS eng debug \
-:SOURCES $(gst_inspect_@GST_MAJORMINOR@_SOURCES) \ -:SOURCES $(gst_inspect_@GST_API_VERSION@_SOURCES) \
-:CFLAGS $(DEFS) $(gst_inspect_@GST_MAJORMINOR@_CFLAGS) \ -:CFLAGS $(DEFS) $(gst_inspect_@GST_API_VERSION@_CFLAGS) \
-:LDFLAGS $(gst_inspect_@GST_MAJORMINOR@_LDADD) \ -:LDFLAGS $(gst_inspect_@GST_API_VERSION@_LDADD) \
-:PASSTHROUGH LOCAL_ARM_MODE:=arm \ -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
-:EXECUTABLE gst-launch-@GST_MAJORMINOR@ -:TAGS eng debug \ -:EXECUTABLE gst-launch-@GST_API_VERSION@ -:TAGS eng debug \
-:SOURCES $(gst_launch_@GST_MAJORMINOR@_SOURCES) \ -:SOURCES $(gst_launch_@GST_API_VERSION@_SOURCES) \
-:CFLAGS $(DEFS) $(gst_launch_@GST_MAJORMINOR@_CFLAGS) \ -:CFLAGS $(DEFS) $(gst_launch_@GST_API_VERSION@_CFLAGS) \
-:LDFLAGS $(gst_launch_@GST_MAJORMINOR@_LDADD) \ -:LDFLAGS $(gst_launch_@GST_API_VERSION@_LDADD) \
-:PASSTHROUGH LOCAL_ARM_MODE:=arm \ -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
> $@ > $@
manpages = \ manpages = \
gst-inspect-@GST_MAJORMINOR@.1 \ gst-inspect-@GST_API_VERSION@.1 \
gst-typefind-@GST_MAJORMINOR@.1 gst-typefind-@GST_API_VERSION@.1
if !GST_DISABLE_PARSE if !GST_DISABLE_PARSE
manpages += gst-launch-@GST_MAJORMINOR@.1 manpages += gst-launch-@GST_API_VERSION@.1
endif endif
CLEANFILES = $(manpages) *.gcno *.gcda CLEANFILES = $(manpages) *.gcno *.gcda
@ -57,11 +57,11 @@ EXTRA_DIST = \
gst-typefind.1.in \ gst-typefind.1.in \
gst-plot-timeline.py gst-plot-timeline.py
%-@GST_MAJORMINOR@.1: %.1.in %-@GST_API_VERSION@.1: %.1.in
$(AM_V_GEN)sed \ $(AM_V_GEN)sed \
-e s,gst-inspect,gst-inspect-@GST_MAJORMINOR@,g \ -e s,gst-inspect,gst-inspect-@GST_API_VERSION@,g \
-e s,gst-launch,gst-launch-@GST_MAJORMINOR@,g \ -e s,gst-launch,gst-launch-@GST_API_VERSION@,g \
-e s,gst-typefind,gst-typefind-@GST_MAJORMINOR@,g \ -e s,gst-typefind,gst-typefind-@GST_API_VERSION@,g \
-e s,GST_MAJORMINOR,@GST_MAJORMINOR@,g \ -e s,GST_API_VERSION,@GST_API_VERSION@,g \
$< >$@ $< >$@

4
tools/gst-launch.1.in
View file

@ -411,7 +411,7 @@ When set to a filesystem path, store dot files of pipeline graphs there.
.TP .TP
\fBGST_REGISTRY\fR \fBGST_REGISTRY\fR
Path of the plugin registry file. Default is Path of the plugin registry file. Default is
~/.gstreamer-GST_MAJORMINOR/registry-CPU.bin where CPU is the machine/cpu type ~/.gstreamer-GST_API_VERSION/registry-CPU.bin where CPU is the machine/cpu type
GStreamer was compiled for, e.g. 'i486', 'i686', 'x86-64', 'ppc', etc. (check GStreamer was compiled for, e.g. 'i486', 'i686', 'x86-64', 'ppc', etc. (check
the output of "uname -i" and "uname -m" for details). the output of "uname -i" and "uname -m" for details).
.TP .TP
@ -448,7 +448,7 @@ a stack trace in the usual way.
. .
.SH FILES .SH FILES
.TP 8 .TP 8
~/.gstreamer-GST_MAJORMINOR/registry-*.bin ~/.gstreamer-GST_API_VERSION/registry-*.bin
The plugin cache; can be deleted at any time, will be re-created The plugin cache; can be deleted at any time, will be re-created
automatically when it does not exist yet or plugins change. automatically when it does not exist yet or plugins change.
. .

4
tools/gstreamer-completion
View file

@ -6,8 +6,8 @@ _gst_launch()
{ {
local cur local cur
: ${GST_REGISTRY:=~/.gstreamer-0.11/registry.xml} : ${GST_REGISTRY:=~/.gstreamer-1.0/registry.xml}
: ${GST_COMPLETE:=~/.gstreamer-0.11/complete} : ${GST_COMPLETE:=~/.gstreamer-1.0/complete}
if [ ! -f "${GST_REGISTRY}" ] ; then if [ ! -f "${GST_REGISTRY}" ] ; then
return 0 return 0

2
win32/common/config.h
View file

@ -53,7 +53,7 @@
#define GST_LICENSE "LGPL" #define GST_LICENSE "LGPL"
/* library major.minor version */ /* library major.minor version */
#define GST_MAJORMINOR "0.11" #define GST_API_VERSION "0.11"
/* package name in plugins */ /* package name in plugins */
#define GST_PACKAGE_NAME "GStreamer source release" #define GST_PACKAGE_NAME "GStreamer source release"