Commit b0d89da6 authored by Sebastian Dröge's avatar Sebastian Dröge

gst: Change versioning

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.
parent 6a0e594e
......@@ -4,7 +4,7 @@ DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc --enable-docbook
ACLOCAL_AMFLAGS = -I m4 -I common/m4
aclocaldir = $(datadir)/aclocal
aclocal_DATA = gst-element-check-@GST_MAJORMINOR@.m4
aclocal_DATA = gst-element-check-@GST_API_VERSION@.m4
SUBDIRS = pkgconfig \
gst libs plugins tools tests \
......@@ -32,7 +32,7 @@ EXTRA_DIST = \
scripts/gst-uninstalled \
$(win32)
CLEANFILES = gst-element-check-@GST_MAJORMINOR@.m4
CLEANFILES = gst-element-check-@GST_API_VERSION@.m4
DISTCLEANFILES = _stdint.h
......@@ -148,8 +148,8 @@ endif
check: $(CHECK_EXPORTS) check-enum-gettypes
gst-element-check-@GST_MAJORMINOR@.m4: gst-element-check.m4
$(AM_V_GEN)cp gst-element-check.m4 gst-element-check-@GST_MAJORMINOR@.m4
gst-element-check-@GST_API_VERSION@.m4: gst-element-check.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
......@@ -198,4 +198,4 @@ CRUFT_DIRS = \
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
......@@ -34,13 +34,27 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])],
[AM_DEFAULT_VERBOSITY=1
AC_SUBST(AM_DEFAULT_VERBOSITY)])
dnl our libraries and install dirs use major.minor as a version
GST_MAJORMINOR=$PACKAGE_VERSION_MAJOR.$PACKAGE_VERSION_MINOR
dnl we override it here for release candidates for a new series
GST_MAJORMINOR=0.11
AC_SUBST(GST_MAJORMINOR)
AC_DEFINE_UNQUOTED(GST_MAJORMINOR, "$GST_MAJORMINOR",
[library major.minor version])
dnl GStreamer versioning, this is mostly informational
dnl GST_VERSION_MAJOR=$PACKAGE_VERSION_MAJOR
dnl GST_VERSION_MINOR=$PACKAGE_VERSION_MINOR
dnl GST_VERSION_MICRO=$PACKAGE_VERSION_MICRO
dnl GST_VERSION_NANO=$PACKAGE_VERSION_NANO
dnl Change this to the above for non-pre
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 - 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 removed -> AGE = 0
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 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
AM_GNU_GETTEXT_VERSION([0.17])
AM_GNU_GETTEXT([external])
AG_GST_GETTEXT([gstreamer-$GST_MAJORMINOR])
AG_GST_GETTEXT([gstreamer-$GST_API_VERSION])
dnl *** check for arguments to configure ***
......@@ -680,7 +694,7 @@ dnl default vars for all internal objects built on libgstreamer
dnl includes GST_ALL_*
GST_OBJ_CFLAGS="\$(GST_ALL_CFLAGS)"
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_CXXFLAGS)
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")
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,
"$GST_PLUGIN_SCANNER_INSTALLED", [location of the installed gst-plugin-scanner])
AC_SUBST(GST_PLUGIN_SCANNER_INSTALLED)
......@@ -773,7 +787,7 @@ sed \
-e 's/.* GST_DATADIR$/#define GST_DATADIR PREFIX "\\\\share"/' \
-e 's/.* GST_LEVEL_DEFAULT$/#define GST_LEVEL_DEFAULT GST_LEVEL_ERROR/' \
-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_ORIGIN$/#define GST_PACKAGE_ORIGIN "Unknown package origin"/' \
-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_TARNAME$/#define PACKAGE_TARNAME "'$PACKAGE_TARNAME'"/' \
-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/.* VERSION$/#define VERSION "'$VERSION'"/' \
config.h.in >win32/common/config.h-new
......
......@@ -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.
For example:
<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>
would be sufficient for a gstreamer-only program.
If (for example) your app also used GTK+ 2.0, you could use
<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>
Those are back-ticks (on the same key with the tilde on US keyboards),
not single quotes.
......
## Process this file with automake to produce Makefile.in
# The name of the module, e.g. 'glib'.
# DOC_MODULE=gstreamer-@GST_MAJORMINOR@
# DOC_MODULE=gstreamer-@GST_API_VERSION@
DOC_MODULE=gstreamer
# don't want $(DOC_MODULE)-scan.c to be built with -Werror
......
......@@ -8,9 +8,9 @@
]>
<book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
<bookinfo>
<title>GStreamer &GST_MAJORMINOR; Core Reference Manual</title>
<title>GStreamer &GST_API_VERSION; Core Reference Manual</title>
<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
<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>
......@@ -50,7 +50,7 @@ Windows. It is released under the GNU Library General Public License
<title>GStreamer Core Library</title>
<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,
as well as the object hierarchy that defines elements and bins,
along with some more specialized elements.
......
......@@ -43,7 +43,7 @@ with
<para>
plug-ins in the user's home directory. These are stored in a directory called
<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.
</para>
</listitem>
......
## Process this file with automake to produce Makefile.in
# 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
# 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.
GTKDOC_CFLAGS = -I$(top_builddir) -I$(top_builddir)/libs $(GST_OBJ_CFLAGS)
GTKDOC_LIBS = \
$(top_builddir)/libs/gst/controller/libgstcontroller-@GST_MAJORMINOR@.la \
$(top_builddir)/libs/gst/base/libgstbase-@GST_MAJORMINOR@.la \
$(top_builddir)/libs/gst/net/libgstnet-@GST_MAJORMINOR@.la \
$(top_builddir)/libs/gst/controller/libgstcontroller-@GST_API_VERSION@.la \
$(top_builddir)/libs/gst/base/libgstbase-@GST_API_VERSION@.la \
$(top_builddir)/libs/gst/net/libgstnet-@GST_API_VERSION@.la \
$(GST_OBJ_LIBS)
GTKDOC_CC=$(LIBTOOL) --tag=CC --mode=compile $(CC)
......
......@@ -8,9 +8,9 @@
]>
<book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
<bookinfo>
<title>GStreamer &GST_MAJORMINOR; Library Reference Manual</title>
<title>GStreamer &GST_API_VERSION; Library Reference Manual</title>
<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
<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>
......@@ -29,7 +29,7 @@
<chapter id="gstreamer-base">
<title>GStreamer Base and Utillity Classes</title>
<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.
</para>
......@@ -50,7 +50,7 @@
<chapter id="gstreamer-control">
<title>GStreamer Dynamic Parameter Control</title>
<para>
libgstcontroller-&GST_MAJORMINOR;.so provides functionality to animate
libgstcontroller-&GST_API_VERSION;.so provides functionality to animate
element properties over time.
</para>
......@@ -63,7 +63,7 @@
<chapter id="gstreamer-net">
<title>GStreamer Network Classes</title>
<para>
libgstnet-&GST_MAJORMINOR;.so provides network elements and objects.
libgstnet-&GST_API_VERSION;.so provides network elements and objects.
</para>
<xi:include href="xml/gstnetclientclock.xml" />
......@@ -74,7 +74,7 @@
<chapter id="gstreamer-check">
<title>GStreamer Check Unit Testing</title>
<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.
</para>
......
......@@ -223,7 +223,7 @@ main (int argc,
<para>
To compile the helloworld example, use: <command>gcc -Wall
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
and linker flags needed to compile this application.
</para>
......@@ -238,7 +238,7 @@ main (int argc,
setup (ie. gst-uninstalled), you will need to use libtool to build the
hello world program, like this: <command>libtool --mode=link gcc -Wall
helloworld.c -o helloworld
$(pkg-config --cflags --libs gstreamer-&GST_MAJORMINOR;)</command>.
$(pkg-config --cflags --libs gstreamer-&GST_API_VERSION;)</command>.
</para>
<para>
You can run this example application with <command>./helloworld
......
......@@ -3,7 +3,7 @@ GST_DOC_SCANOBJ = $(top_srcdir)/common/gstdoc-scangobj
## Process this file with automake to produce Makefile.in
# 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
DOC_MODULE=$(MODULE)-plugins
......
......@@ -7,9 +7,9 @@
<book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
<bookinfo>
<title>GStreamer Core Plugins &GST_MAJORMINOR; Plugins Reference Manual</title>
<title>GStreamer Core Plugins &GST_API_VERSION; Plugins Reference Manual</title>
<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
<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>
......
......@@ -16,12 +16,12 @@ plugin Makefile.am:
- DO NOT put any libraries in _LDFLAGS. Typically, _LDFLAGS should only
have $(GST_PLUGIN_LDFLAGS)
- 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) \
-lgstvideo-$(GST_MAJORMINOR) \
-lgstaudio-$(GST_MAJORMINOR) \
-lgstinterfaces-$(GST_MAJORMINOR) \
-lgstvideo-$(GST_API_VERSION) \
-lgstaudio-$(GST_API_VERSION) \
-lgstinterfaces-$(GST_API_VERSION) \
$(SDL_LIBS)
......
<!ENTITY GST_MAJORMINOR "@GST_MAJORMINOR@">
<!ENTITY GST_API_VERSION "@GST_API_VERSION@">
<!ENTITY GST_VERSION "@PACKAGE_VERSION@">
<!ENTITY GST_PLUGINS_DIR "@PLUGINDIR@">
......@@ -7,11 +7,11 @@ dnl AM_GST_ELEMENT_CHECK(ELEMENT-NAME, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND)
AC_DEFUN([AM_GST_ELEMENT_CHECK],
[
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
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
AC_MSG_RESULT(found.)
$2
......
lib_LTLIBRARIES = libgstreamer-@GST_MAJORMINOR@.la
lib_LTLIBRARIES = libgstreamer-@GST_API_VERSION@.la
if GST_DISABLE_REGISTRY
GST_REGISTRY_SRC =
......@@ -37,7 +37,7 @@ built_header_configure = gstconfig.h gstversion.h
built_header_make = gstenumtypes.h
built_source_make = gstenumtypes.c
EXTRA_libgstreamer_@GST_MAJORMINOR@_la_SOURCES = \
EXTRA_libgstreamer_@GST_API_VERSION@_la_SOURCES = \
gsttrace.c \
gstregistrybinary.c
......@@ -45,7 +45,7 @@ EXTRA_libgstreamer_@GST_MAJORMINOR@_la_SOURCES = \
# temporarily not used
# glib-compat.c
libgstreamer_@GST_MAJORMINOR@_la_SOURCES = \
libgstreamer_@GST_API_VERSION@_la_SOURCES = \
gst.c \
gstobject.c \
gstbin.c \
......@@ -106,7 +106,7 @@ libgstreamer_@GST_MAJORMINOR@_la_SOURCES = \
$(GST_REGISTRY_SRC)
# 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 = \
......@@ -118,25 +118,25 @@ CLEANFILES = $(built_header_make) $(built_source_make) $(as_dll_cleanfiles) *.gc
# DISTCLEANFILES is for files generated by configure
DISTCLEANFILES = $(built_header_configure)
libgstreamer_@GST_MAJORMINOR@_la_CFLAGS = \
libgstreamer_@GST_API_VERSION@_la_CFLAGS = \
-D_GNU_SOURCE \
-DGST_EXPORTS \
-DG_LOG_DOMAIN=g_log_domain_gstreamer \
-DGST_MAJORMINOR=\""$(GST_MAJORMINOR)"\" \
-DGST_API_VERSION=\""$(GST_API_VERSION)"\" \
-DGST_DISABLE_DEPRECATED \
$(VALGRIND_CFLAGS) \
$(GST_ALL_CFLAGS)
libgstreamer_@GST_MAJORMINOR@_la_LIBADD = \
libgstreamer_@GST_API_VERSION@_la_LIBADD = \
$(GST_PARSE_LA) \
$(GST_ALL_LIBS) \
$(WIN32_LIBS) \
$(LIBM)
libgstreamer_@GST_MAJORMINOR@_la_LDFLAGS = \
libgstreamer_@GST_API_VERSION@_la_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.h \
......@@ -197,9 +197,9 @@ gst_headers = \
gstregistry.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)
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}" \
$^ > 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: $(libgstreamer_@GST_MAJORMINOR@_la_SOURCES:=.gcov)
gcov: $(libgstreamer_@GST_API_VERSION@_la_SOURCES:=.gcov)
Android.mk: Makefile.am
androgenizer -:PROJECT gstreamer -:SHARED libgstreamer-@GST_MAJORMINOR@ \
androgenizer -:PROJECT gstreamer -:SHARED libgstreamer-@GST_API_VERSION@ \
-:TAGS eng debug \
-:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
-:SOURCES $(libgstreamer_@GST_MAJORMINOR@_la_SOURCES) \
$(nodist_libgstreamer_@GST_MAJORMINOR@_la_SOURCES) \
-:CFLAGS $(DEFS) $(libgstreamer_@GST_MAJORMINOR@_la_CFLAGS) \
-:LDFLAGS $(libgstreamer_@GST_MAJORMINOR@_la_LDFLAGS) \
$(libgstreamer_@GST_MAJORMINOR@_la_LIBADD) \
-:SOURCES $(libgstreamer_@GST_API_VERSION@_la_SOURCES) \
$(nodist_libgstreamer_@GST_API_VERSION@_la_SOURCES) \
-:CFLAGS $(DEFS) $(libgstreamer_@GST_API_VERSION@_la_CFLAGS) \
-:LDFLAGS $(libgstreamer_@GST_API_VERSION@_la_LDFLAGS) \
$(libgstreamer_@GST_API_VERSION@_la_LIBADD) \
-ldl \
-:SUBDIR gst/parse \
-:HEADER_TARGET gstreamer-@GST_MAJORMINOR@/gst \
-:HEADERS $(libgstreamer_@GST_MAJORMINOR@include_HEADERS) \
-:HEADER_TARGET gstreamer-@GST_API_VERSION@/gst \
-:HEADERS $(libgstreamer_@GST_API_VERSION@include_HEADERS) \
-:LIBFILTER_STATIC gstparse \
-:PASSTHROUGH LOCAL_ARM_MODE:=arm \
> $@
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_sources=$(patsubst %,$(srcdir)/%, $(libgstreamer_@GST_MAJORMINOR@_la_SOURCES))
gir_headers=$(patsubst %,$(srcdir)/%, $(libgstreamer_@GST_API_VERSION@include_HEADERS))
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 \
$(INTROSPECTION_SCANNER) -v --namespace Gst \
--nsversion=@GST_MAJORMINOR@ \
--nsversion=@GST_API_VERSION@ \
--warn-all \
-I$(top_srcdir) \
-I$(top_builddir) \
-DIN_GOBJECT_INTROSPECTION=1 \
-DGST_USE_UNSTABLE_API \
--c-include='gst/gst.h' \
--library=libgstreamer-0.11.la \
--library=libgstreamer-@GST_API_VERSION@.la \
--include=GLib-2.0 \
--include=GObject-2.0 \
--include=GModule-2.0 \
......@@ -279,7 +279,7 @@ Gst-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstreamer-@GST_MAJORMINOR@
--pkg gobject-2.0 \
--pkg gmodule-no-export-2.0 \
--pkg gthread-2.0 \
--pkg-export gstreamer-@GST_MAJORMINOR@ \
--pkg-export gstreamer-@GST_API_VERSION@ \
--add-init-section="gst_init(NULL, NULL);" \
--output $@ \
$(gir_headers) \
......@@ -302,11 +302,11 @@ endif
# try to prevent packaging errors
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 "*** to set the libexecdir and not make libexecdir=/foo/bar or the like."; \
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; \
fi
......
......@@ -477,7 +477,7 @@ gst_plugin_check_version (gint major, gint minor)
{
/* return NULL if the major and minor version numbers are not compatible */
/* with ours. */
if (major != GST_VERSION_MAJOR || minor != GST_VERSION_MINOR)
if (major != GST_VERSION_MAJOR || minor > GST_VERSION_MINOR)
return FALSE;
return TRUE;
......
......@@ -160,7 +160,7 @@ preset_get_paths (GstPreset * preset, const gchar ** preset_user_path,
/* user presets go in user's XDG data directory. */
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);
preset_path =
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;
/* 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);
GST_INFO_OBJECT (preset, "system_preset_dir: '%s'", preset_dir);
preset_path = g_strdup_printf ("%s" G_DIR_SEPARATOR_S "%s.prs",
......
......@@ -57,13 +57,13 @@
* <listitem>
* <para>default locations (if GST_PLUGIN_SYSTEM_PATH is not set). Those
* default locations are:
* <filename>~/.gstreamer-$GST_MAJORMINOR/plugins/</filename>
* and <filename>$prefix/libs/gstreamer-$GST_MAJORMINOR/</filename>.
* <filename>~/.gstreamer-$GST_API_VERSION/plugins/</filename>
* and <filename>$prefix/libs/gstreamer-$GST_API_VERSION/</filename>.
* </para>
* </listitem>
* </itemizedlist>
* 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
* 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
* system-installed ones */
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);
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"));
if (registry_file == NULL) {
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) {
......
......@@ -45,26 +45,26 @@ G_BEGIN_DECLS
*
* 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:
*
* 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:
*
* 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:
*
* The nano version of GStreamer at compile time:
* 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:
......
%define gstreamer gstreamer011
%define majorminor @GST_MAJORMINOR@
%define majorminor @GST_API_VERSION@
%define _glib2 @GLIB_REQ@
......
lib_LTLIBRARIES = libgstbase-@GST_MAJORMINOR@.la
lib_LTLIBRARIES = libgstbase-@GST_API_VERSION@.la
libgstbase_@GST_MAJORMINOR@_la_DEPENDENCIES = \
$(top_builddir)/gst/libgstreamer-@GST_MAJORMINOR@.la
libgstbase_@GST_MAJORMINOR@_la_SOURCES = \
libgstbase_@GST_API_VERSION@_la_DEPENDENCIES = \
$(top_builddir)/gst/libgstreamer-@GST_API_VERSION@.la
libgstbase_@GST_API_VERSION@_la_SOURCES = \
gstadapter.c \
gstbaseparse.c \
gstbasesink.c \
......@@ -15,14 +15,14 @@ libgstbase_@GST_MAJORMINOR@_la_SOURCES = \
gstpushsrc.c \
gsttypefindhelper.c
libgstbase_@GST_MAJORMINOR@_la_CFLAGS = $(GST_OBJ_CFLAGS)
libgstbase_@GST_MAJORMINOR@_la_LIBADD = $(GST_OBJ_LIBS)
libgstbase_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
libgstbase_@GST_API_VERSION@_la_CFLAGS = $(GST_OBJ_CFLAGS)
libgstbase_@GST_API_VERSION@_la_LIBADD = $(GST_OBJ_LIBS)
libgstbase_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
libgstbase_@GST_MAJORMINOR@includedir = \
$(includedir)/gstreamer-@GST_MAJORMINOR@/gst/base
libgstbase_@GST_API_VERSION@includedir = \
$(includedir)/gstreamer-@GST_API_VERSION@/gst/base
libgstbase_@GST_MAJORMINOR@include_HEADERS = \
libgstbase_@GST_API_VERSION@include_HEADERS = \
gstadapter.h \
gstbaseparse.h \
gstbasesink.h \
......@@ -45,35 +45,35 @@ EXTRA_DIST = gstindex.c gstmemindex.c
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: $(libgstbase_@GST_MAJORMINOR@_la_SOURCES:=.gcov)
gcov: $(libgstbase_@GST_API_VERSION@_la_SOURCES:=.gcov)
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) \
-:SOURCES $(libgstbase_@GST_MAJORMINOR@_la_SOURCES) \
-:CFLAGS $(DEFS) $(libgstbase_@GST_MAJORMINOR@_la_CFLAGS) \
-:LDFLAGS $(libgstbase_@GST_MAJORMINOR@_la_LDFLAGS) \
$(libgstbase_@GST_MAJORMINOR@_la_LIBADD) \
-:HEADER_TARGET gstreamer-@GST_MAJORMINOR@/gst/base \
-:HEADERS $(libgstbase_@GST_MAJORMINOR@include_HEADERS) \
-:SOURCES $(libgstbase_@GST_API_VERSION@_la_SOURCES) \
-:CFLAGS $(DEFS) $(libgstbase_@GST_API_VERSION@_la_CFLAGS) \
-:LDFLAGS $(libgstbase_@GST_API_VERSION@_la_LDFLAGS) \
$(libgstbase_@GST_API_VERSION@_la_LIBADD) \
-:HEADER_TARGET gstreamer-@GST_API_VERSION@/gst/base \
-:HEADERS $(libgstbase_@GST_API_VERSION@include_HEADERS) \
-:PASSTHROUGH LOCAL_ARM_MODE:=arm \
> $@
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_sources=$(patsubst %,$(srcdir)/%, $(libgstbase_@GST_MAJORMINOR@_la_SOURCES))
gir_cincludes=$(patsubst %,--c-include='gst/base/%',$(libgstbase_@GST_MAJORMINOR@include_HEADERS))
gir_headers=$(patsubst %,$(srcdir)/%, $(libgstbase_@GST_API_VERSION@include_HEADERS))
gir_sources=$(patsubst %,$(srcdir)/%, $(libgstbase_@GST_API_VERSION@_la_SOURCES))
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)" \
GST_PLUGIN_SYSTEM_PATH="" GST_PLUGIN_PATH="" GST_REGISTRY_UPDATE=no \
$(INTROSPECTION_SCANNER) -v --namespace GstBase \
--nsversion=@GST_MAJORMINOR@ \
--nsversion=@GST_API_VERSION@ \
--warn-all \
--strip-prefix=Gst \
-DGST_USE_UNSTABLE_API \
......@@ -84,12 +84,12 @@ GstBase-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstbase-@GST_MAJORMINO
$(gir_cincludes) \
--add-include-path=$(top_builddir)/gst \
--library-path=$(top_builddir)/gst \
--library=$(top_builddir)/gst/libgstreamer-0.11.la \
--library=libgstbase-0.11.la \
--include=Gst-0.11 \
--library=$(top_builddir)/gst/libgstreamer-@GST_API_VERSION@.la \
--library=libgstbase-@GST_API_VERSION@.la \
--include=Gst-@GST_API_VERSION@ \
--libtool="$(top_builddir)/libtool" \
--pkg gstreamer-@GST_MAJORMINOR@ \
--pkg-export gstreamer-base-@GST_MAJORMINOR@ \
--pkg gstreamer-@GST_API_VERSION@ \
--pkg-export gstreamer-base-@GST_API_VERSION@ \
--add-init-section="gst_init(NULL,NULL);" \
--output $@ \
$(gir_headers) \
......
lib_LTLIBRARIES = libgstcheck-@GST_MAJORMINOR@.la
lib_LTLIBRARIES = libgstcheck-@GST_API_VERSION@.la
SYMBOLS_FILE = exports.sym
BUILT_SOURCES = internal-check.h
libgstcheck_@GST_MAJORMINOR@_la_DEPENDENCIES = \
$(top_builddir)/gst/libgstreamer-@GST_MAJORMINOR@.la \
libgstcheck_@GST_API_VERSION@_la_DEPENDENCIES = \
$(top_builddir)/gst/libgstreamer-@GST_API_VERSION@.la \
internal-check.h \
$(SYMBOLS_FILE)
libgstcheck_@GST_MAJORMINOR@_la_SOURCES = \
libgstcheck_@GST_API_VERSION@_la_SOURCES = \
gstbufferstraw.c \
gstcheck.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/gst/check \
-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 \
$(LIBM)
libgstcheck_@GST_MAJORMINOR@_la_LDFLAGS = \
libgstcheck_@GST_API_VERSION@_la_LDFLAGS = \
-export-symbols $(SYMBOLS_FILE) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
libgstcheck_@GST_MAJORMINOR@includedir = \
$(includedir)/gstreamer-@GST_MAJORMINOR@/gst/check
libgstcheck_@GST_API_VERSION@includedir = \
$(includedir)/gstreamer-@GST_API_VERSION@/gst/check
libgstcheck_@GST_MAJORMINOR@include_HEADERS = \
libgstcheck_@GST_API_VERSION@include_HEADERS = \
gstbufferstraw.h \
gstcheck.h \
gstconsistencychecker.h
nodist_libgstcheck_@GST_MAJORMINOR@include_HEADERS = \
nodist_libgstcheck_@GST_API_VERSION@include_HEADERS = \
internal-check.h
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
$(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: $(libgstcheck_@GST_MAJORMINOR@_la_SOURCES:=.gcov)
gcov: $(libgstcheck_@GST_API_VERSION@_la_SOURCES:=.gcov)
SUBDIRS = libcheck
......@@ -108,19 +108,19 @@ $(SYMBOLS_FILE):
done