gst: Change versioning
authorSebastian Dröge <sebastian.droege@collabora.co.uk>
Wed, 4 Apr 2012 11:13:52 +0000 (13:13 +0200)
committerSebastian Dröge <sebastian.droege@collabora.co.uk>
Wed, 4 Apr 2012 12:28:55 +0000 (14:28 +0200)
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.

47 files changed:
Makefile.am
configure.ac
docs/faq/developing.xml
docs/gst/Makefile.am
docs/gst/gstreamer-docs.sgml
docs/gst/running.xml
docs/libs/Makefile.am
docs/libs/gstreamer-libs-docs.sgml
docs/manual/basics-helloworld.xml
docs/plugins/Makefile.am
docs/plugins/gstreamer-plugins-docs.sgml
docs/random/autotools
docs/version.entities.in
gst-element-check.m4.in
gst/Makefile.am
gst/gstplugin.c
gst/gstpreset.c
gst/gstregistry.c
gst/gstversion.h.in
gstreamer.spec.in
libs/gst/base/Makefile.am
libs/gst/check/Makefile.am
libs/gst/controller/Makefile.am
libs/gst/helpers/Makefile.am
libs/gst/net/Makefile.am
pkgconfig/Makefile.am
pkgconfig/gstreamer-base-uninstalled.pc.in
pkgconfig/gstreamer-base.pc.in
pkgconfig/gstreamer-check-uninstalled.pc.in
pkgconfig/gstreamer-check.pc.in
pkgconfig/gstreamer-controller-uninstalled.pc.in
pkgconfig/gstreamer-controller.pc.in
pkgconfig/gstreamer-net-uninstalled.pc.in
pkgconfig/gstreamer-net.pc.in
pkgconfig/gstreamer-uninstalled.pc.in
pkgconfig/gstreamer.pc.in
plugins/elements/Makefile.am
tests/benchmarks/Makefile.am
tests/check/Makefile.am
tests/check/gst/gstpreset.c
tests/examples/adapter/Makefile.am
tests/examples/controller/Makefile.am
tests/examples/manual/Makefile.am
tools/Makefile.am
tools/gst-launch.1.in
tools/gstreamer-completion
win32/common/config.h

index e39b86df5b0e08e0adb67537e7cba496fcf0812a..671aec1ee0788e737a8e5141bb9f62669162fbe2 100644 (file)
@@ -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
index 59447c21ca1dda48909bac480e1ab4ef3bfe2be5..c9a73805aa0eac3830044d3af8074fd546c77f23 100644 (file)
@@ -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
index dafbc4cdae5bf1e57bae506afefc655b1fb139cd..b1459891e9d58754ffa43ccf9fc0939eaf4a3997 100644 (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.
 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.
index cb93e888ebb17fa9ca0f0138fb88b44801ed537d..23eac9f485758e526a3e3f1f50a5bd7142916263 100644 (file)
@@ -1,7 +1,7 @@
 ## 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
index 46de797efe4a82047b7e4af124f77d3cf8bd902f..10045098f008470f97c01576e6b14c0aa424ea77 100644 (file)
@@ -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.
index 3800437ec16e8fdd9cb54f47065e5a191d4594a5..c84b0f6206b26392e5f070969eb9350d87d26d10 100644 (file)
@@ -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>
index 932eb31d5577c9910c1be1ad25f590f0a1923623..60d7318a453b8fe72bd3ce6d1b268959b8470dc0 100644 (file)
@@ -1,7 +1,7 @@
 ## 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)
index 502bd82a227c5148bf22bace570ca958827e9b95..1d98145f5ba47f6fcf5e96a92fc3e31f62d7c042 100644 (file)
@@ -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>
 
index 55399fbb6e663a81855ea01e9549f1d84343459f..46360ddaf92a33465f8d6489aa4c409c2acb82e2 100644 (file)
@@ -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
index cd6ea638394b66cb2db4bd0614aad5ce35f48dad..6bb5083ddd4d8c291c2373304e1e683102d6d8c3 100644 (file)
@@ -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
 
index a6c34e9e0f4affdfbc1c2e1fcdf6e575fae806cc..3787b42abd7d347ec6d34390bc6f407e4343a28f 100644 (file)
@@ -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>
index 6cbf1a3888341f84ee02668549eb3aeb2c11cf9f..585c49d0830e4e984d117b81002706b785dacbd8 100644 (file)
@@ -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)
 
 
index 7ed71e43c249fcff6aa4dccfd84a40bf09cacb5a..be8ed4bb3ec81751e696bc4a07d679969af2322d 100644 (file)
@@ -1,3 +1,3 @@
-<!ENTITY GST_MAJORMINOR "@GST_MAJORMINOR@">
+<!ENTITY GST_API_VERSION "@GST_API_VERSION@">
 <!ENTITY GST_VERSION "@PACKAGE_VERSION@">
 <!ENTITY GST_PLUGINS_DIR "@PLUGINDIR@">
index fedeace9e98074ff4defd96908619432074c7c70..e144490e3c0babbdbb857cb419899f5db892623e 100644 (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],
 [
   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
index 51d5acb63b7c54e632defc556c744ecff6c07f69..542f45dea3ee94b3756d2d76791129a7d28e26b6 100644 (file)
@@ -1,4 +1,4 @@
-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
 
index 6f54246a1683724af4c5bd2cb0b412322dcb594a..413ffd75c3bcc5afe59b2ed75b25f991940d79ff 100644 (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 */
   /* with ours. */
-  if (major != GST_VERSION_MAJOR || minor != GST_VERSION_MINOR)
+  if (major != GST_VERSION_MAJOR || minor > GST_VERSION_MINOR)
     return FALSE;
 
   return TRUE;
index a30d2e6a03b07743f1c18537b69ccfedc57f9655..3277f21c0c38d0894e515ff71878cdb2951ef205 100644 (file)
@@ -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",
index 59653d013dfbd73eeeaa2c51235e2028c7de98e0..6f41dcf8560f35c0e454a851270debdb4db70c2f 100644 (file)
  *   <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) {
index 86a66090b1d3be8f0c8deacbc30bca9636f871f0..eb3f75d72e2243671a0b7e61e9e90cf529a10076 100644 (file)
@@ -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:
index a8716aa4a98b4e4cd60b6a52d66f08848adb9068..66d2e8072ef1563b9043910ee743ecef1f4abccc 100644 (file)
@@ -1,5 +1,5 @@
 %define                gstreamer       gstreamer011
-%define                majorminor      @GST_MAJORMINOR@
+%define                majorminor      @GST_API_VERSION@
 
 %define        _glib2          @GLIB_REQ@
 
index e3e5f62ac20e7063c0057b8504862532c842ef65..18b8e48e630992107d3aaeaee3f9256b568d4861 100644 (file)
@@ -1,8 +1,8 @@
-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) \
index d04069c9622e73eaa316603b51ce5a0fe382933a..c1e41f7b69c7d2458ce449047548921bac31d6be 100644 (file)
@@ -1,37 +1,37 @@
-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
 
 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)) \
-    $(patsubst %,$(builddir)/%, $(nodist_libgstcheck_@GST_MAJORMINOR@include_HEADERS))
-gir_sources=$(patsubst %,$(srcdir)/%, $(libgstcheck_@GST_MAJORMINOR@_la_SOURCES))
-gir_cincludes=$(patsubst %,--c-include='gst/check/%',$(libgstcheck_@GST_MAJORMINOR@include_HEADERS)) \
-    $(patsubst %,--c-include='gst/check/%',$(nodist_libgstcheck_@GST_MAJORMINOR@include_HEADERS))
+gir_headers=$(patsubst %,$(srcdir)/%, $(libgstcheck_@GST_API_VERSION@include_HEADERS)) \
+    $(patsubst %,$(builddir)/%, $(nodist_libgstcheck_@GST_API_VERSION@include_HEADERS))
+gir_sources=$(patsubst %,$(srcdir)/%, $(libgstcheck_@GST_API_VERSION@_la_SOURCES))
+gir_cincludes=$(patsubst %,--c-include='gst/check/%',$(libgstcheck_@GST_API_VERSION@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)" \
                GST_PLUGIN_SYSTEM_PATH="" GST_PLUGIN_PATH="" GST_REGISTRY_UPDATE=no \
                $(INTROSPECTION_SCANNER) -v --namespace GstCheck \
-               --nsversion=@GST_MAJORMINOR@ \
+               --nsversion=@GST_API_VERSION@ \
                --strip-prefix=Gst \
                --warn-all \
                -DGST_USE_UNSTABLE_API \
@@ -131,12 +131,12 @@ GstCheck-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstcheck-@GST_MAJORMI
                $(gir_cincludes) \
                --add-include-path=$(top_builddir)/gst \
                --library-path=$(top_builddir)/gst \
-               --library=$(top_builddir)/gst/libgstreamer-0.11.la \
-               --library=libgstcheck-0.11.la \
-               --include=Gst-0.11 \
+               --library=$(top_builddir)/gst/libgstreamer-@GST_API_VERSION@.la \
+               --library=libgstcheck-@GST_API_VERSION@.la \
+               --include=Gst-@GST_API_VERSION@ \
                --libtool="$(top_builddir)/libtool" \
-               --pkg gstreamer-@GST_MAJORMINOR@ \
-               --pkg-export gstreamer-check-@GST_MAJORMINOR@ \
+               --pkg gstreamer-@GST_API_VERSION@ \
+               --pkg-export gstreamer-check-@GST_API_VERSION@ \
                --add-init-section="gst_init(NULL,NULL);" \
                --output $@ \
                $(gir_headers) \
index 5290a204ef5c51409b9de937d3b47b2474fa0718..3ccf92a831c1a3c9537fe77a3ab697e80f120e58 100644 (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_MAJORMINOR@_include_HEADERS = \
+libgstcontroller_@GST_API_VERSION@_includedir = $(includedir)/gstreamer-@GST_API_VERSION@/gst/controller
+libgstcontroller_@GST_API_VERSION@_include_HEADERS = \
        gstargbcontrolbinding.h \
        gstdirectcontrolbinding.h \
        gsttimedvaluecontrolsource.h \
@@ -9,7 +9,7 @@ libgstcontroller_@GST_MAJORMINOR@_include_HEADERS = \
        gsttriggercontrolsource.h \
        gstlfocontrolsource.h
 
-libgstcontroller_@GST_MAJORMINOR@_la_SOURCES = \
+libgstcontroller_@GST_API_VERSION@_la_SOURCES = \
        gstargbcontrolbinding.c \
        gstdirectcontrolbinding.c \
        gsttimedvaluecontrolsource.c \
@@ -17,41 +17,41 @@ libgstcontroller_@GST_MAJORMINOR@_la_SOURCES = \
        gsttriggercontrolsource.c \
        gstlfocontrolsource.c
 
-libgstcontroller_@GST_MAJORMINOR@_la_CFLAGS = $(GST_OBJ_CFLAGS)
-libgstcontroller_@GST_MAJORMINOR@_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_CFLAGS = $(GST_OBJ_CFLAGS)
+libgstcontroller_@GST_API_VERSION@_la_LIBADD = $(GST_OBJ_LIBS) $(LIBM)
+libgstcontroller_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
 
 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: $(libgstcontroller_@GST_MAJORMINOR@_la_SOURCES:=.gcov)
+gcov: $(libgstcontroller_@GST_API_VERSION@_la_SOURCES:=.gcov)
 
 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) \
-        -:SOURCES $(libgstcontroller_@GST_MAJORMINOR@_la_SOURCES) \
-        -:CFLAGS $(libgstcontroller_@GST_MAJORMINOR@_la_CFLAGS) \
-        -:LDFLAGS $(libgstcontroller_@GST_MAJORMINOR@_la_LDFLAGS) \
-                  $(libgstcontroller_@GST_MAJORMINOR@_la_LIBADD) \
-        -:HEADER_TARGET gstreamer-@GST_MAJORMINOR@/gst/controller \
-        -:HEADERS $(libgstcontroller_@GST_MAJORMINOR@_include_HEADERS) \
+        -:SOURCES $(libgstcontroller_@GST_API_VERSION@_la_SOURCES) \
+        -:CFLAGS $(libgstcontroller_@GST_API_VERSION@_la_CFLAGS) \
+        -:LDFLAGS $(libgstcontroller_@GST_API_VERSION@_la_LDFLAGS) \
+                  $(libgstcontroller_@GST_API_VERSION@_la_LIBADD) \
+        -:HEADER_TARGET gstreamer-@GST_API_VERSION@/gst/controller \
+        -:HEADERS $(libgstcontroller_@GST_API_VERSION@_include_HEADERS) \
         -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
        > $@
 
 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_sources=$(patsubst %,$(srcdir)/%, $(libgstcontroller_@GST_MAJORMINOR@_la_SOURCES))
-gir_cincludes=$(patsubst %,--c-include='gst/controller/%',$(libgstcontroller_@GST_MAJORMINOR@_include_HEADERS))
+gir_headers=$(patsubst %,$(srcdir)/%, $(libgstcontroller_@GST_API_VERSION@_include_HEADERS))
+gir_sources=$(patsubst %,$(srcdir)/%, $(libgstcontroller_@GST_API_VERSION@_la_SOURCES))
+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)" \
                GST_PLUGIN_SYSTEM_PATH="" GST_PLUGIN_PATH="" GST_REGISTRY_UPDATE=no \
                $(INTROSPECTION_SCANNER) -v --namespace GstController \
-               --nsversion=@GST_MAJORMINOR@ \
+               --nsversion=@GST_API_VERSION@ \
                --warn-all \
                --strip-prefix=Gst \
                -DGST_USE_UNSTABLE_API \
@@ -62,12 +62,12 @@ GstController-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstcontroller-@G
                $(gir_cincludes) \
                --add-include-path=$(top_builddir)/gst \
                --library-path=$(top_builddir)/gst \
-               --library=$(top_builddir)/gst/libgstreamer-0.11.la \
-               --library=libgstcontroller-0.11.la \
-               --include=Gst-0.11 \
+               --library=$(top_builddir)/gst/libgstreamer-@GST_API_VERSION@.la \
+               --library=libgstcontroller-@GST_API_VERSION@.la \
+               --include=Gst-@GST_API_VERSION@ \
                --libtool="$(top_builddir)/libtool" \
-               --pkg gstreamer-@GST_MAJORMINOR@ \
-               --pkg-export gstreamer-controller-@GST_MAJORMINOR@ \
+               --pkg gstreamer-@GST_API_VERSION@ \
+               --pkg-export gstreamer-controller-@GST_API_VERSION@ \
                --add-init-section="gst_init(NULL,NULL);" \
                --output $@ \
                $(gir_headers) \
index ca46fd67d79aba0e5a218febc3f9ece6d649c213..2816bc20b9c41285d29f84ef33c3cef6f4cbfe4e 100644 (file)
@@ -1,5 +1,5 @@
 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_CFLAGS = $(GST_OBJ_CFLAGS)
index 1436f1d99f1d6a19f870a0a5d3cb5d56a8e3029b..4fa252c56d2fa8a61c5c01b72accb8e95889330f 100644 (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_MAJORMINOR@_include_HEADERS = \
+libgstnet_@GST_API_VERSION@_includedir = $(includedir)/gstreamer-@GST_API_VERSION@/gst/net
+libgstnet_@GST_API_VERSION@_include_HEADERS = \
     gstnet.h \
     gstnetaddressmeta.h \
     gstnetclientclock.h \
     gstnettimepacket.h \
     gstnettimeprovider.h
 
-libgstnet_@GST_MAJORMINOR@_la_SOURCES = \
+libgstnet_@GST_API_VERSION@_la_SOURCES = \
     gstnetaddressmeta.c \
     gstnetclientclock.c \
     gstnettimepacket.c \
     gstnettimeprovider.c
 
-libgstnet_@GST_MAJORMINOR@_la_CFLAGS = $(GST_OBJ_CFLAGS) $(GIO_CFLAGS)
-libgstnet_@GST_MAJORMINOR@_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_CFLAGS = $(GST_OBJ_CFLAGS) $(GIO_CFLAGS)
+libgstnet_@GST_API_VERSION@_la_LIBADD = $(GST_OBJ_LIBS) $(GIO_LIBS)
+libgstnet_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
 
 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: $(libgstnet_@GST_MAJORMINOR@_la_SOURCES:=.gcov)
+gcov: $(libgstnet_@GST_API_VERSION@_la_SOURCES:=.gcov)
 
 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) \
-        -:SOURCES $(libgstnet_@GST_MAJORMINOR@_la_SOURCES) \
-        -:CFLAGS $(libgstnet_@GST_MAJORMINOR@_la_CFLAGS) \
-        -:LDFLAGS $(libgstnet_@GST_MAJORMINOR@_la_LDFLAGS) \
-                  $(libgstnet_@GST_MAJORMINOR@_la_LIBADD) \
-        -:HEADER_TARGET gstreamer-@GST_MAJORMINOR@/gst/net \
-        -:HEADERS $(libgstnet_@GST_MAJORMINOR@_include_HEADERS) \
+        -:SOURCES $(libgstnet_@GST_API_VERSION@_la_SOURCES) \
+        -:CFLAGS $(libgstnet_@GST_API_VERSION@_la_CFLAGS) \
+        -:LDFLAGS $(libgstnet_@GST_API_VERSION@_la_LDFLAGS) \
+                  $(libgstnet_@GST_API_VERSION@_la_LIBADD) \
+        -:HEADER_TARGET gstreamer-@GST_API_VERSION@/gst/net \
+        -:HEADERS $(libgstnet_@GST_API_VERSION@_include_HEADERS) \
         -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
        > $@
 
 
 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_sources=$(patsubst %,$(srcdir)/%, $(libgstnet_@GST_MAJORMINOR@_la_SOURCES))
+gir_headers=$(patsubst %,$(srcdir)/%, $(libgstnet_@GST_API_VERSION@_include_HEADERS))
+gir_sources=$(patsubst %,$(srcdir)/%, $(libgstnet_@GST_API_VERSION@_la_SOURCES))
 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)" \
                GST_PLUGIN_SYSTEM_PATH="" GST_PLUGIN_PATH="" GST_REGISTRY_UPDATE=no \
                $(INTROSPECTION_SCANNER) -v --namespace GstNet \
                --strip-prefix=Gst \
                --warn-all \
-               --nsversion=@GST_MAJORMINOR@ \
+               --nsversion=@GST_API_VERSION@ \
                -DGST_USE_UNSTABLE_API \
                -I$(top_srcdir) \
                -I$(top_srcdir)/libs \
@@ -60,14 +60,14 @@ GstNet-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstnet-@GST_MAJORMINOR@
                $(gir_cincludes) \
                --add-include-path=$(top_builddir)/gst \
                --library-path=$(top_builddir)/gst \
-               --library=$(top_builddir)/gst/libgstreamer-@GST_MAJORMINOR@.la \
-               --library=libgstnet-@GST_MAJORMINOR@.la \
-               --include=Gst-@GST_MAJORMINOR@ \
+               --library=$(top_builddir)/gst/libgstreamer-@GST_API_VERSION@.la \
+               --library=libgstnet-@GST_API_VERSION@.la \
+               --include=Gst-@GST_API_VERSION@ \
                --include=Gio-2.0 \
                --libtool="$(top_builddir)/libtool" \
-               --pkg gstreamer-@GST_MAJORMINOR@ \
+               --pkg gstreamer-@GST_API_VERSION@ \
                --pkg gio-2.0 \
-               --pkg-export="gstreamer-net-@GST_MAJORMINOR@" \
+               --pkg-export="gstreamer-net-@GST_API_VERSION@" \
                --add-init-section="gst_init(NULL,NULL);" \
                --output $@ \
                $(gir_headers) \
index e4b3831b4980e057da787b6a222bd7941fb20b99..5da63ed8ae1be682562fb697fb619546b668d968 100644 (file)
@@ -1,25 +1,25 @@
 ### all of the standard pc files we need to generate
 if HAVE_CHECK
-CHECK_PC_I = gstreamer-check-@GST_MAJORMINOR@.pc
-CHECK_PC_U = gstreamer-check-@GST_MAJORMINOR@-uninstalled.pc
+CHECK_PC_I = gstreamer-check-@GST_API_VERSION@.pc
+CHECK_PC_U = gstreamer-check-@GST_API_VERSION@-uninstalled.pc
 else
 CHECK_PC_I =
 CHECK_PC_U =
 endif
 
 pcfiles =                                                      \
-       gstreamer-@GST_MAJORMINOR@.pc                           \
-       gstreamer-base-@GST_MAJORMINOR@.pc                      \
+       gstreamer-@GST_API_VERSION@.pc                          \
+       gstreamer-base-@GST_API_VERSION@.pc                     \
        $(CHECK_PC_I)                                           \
-       gstreamer-controller-@GST_MAJORMINOR@.pc                \
-       gstreamer-net-@GST_MAJORMINOR@.pc
+       gstreamer-controller-@GST_API_VERSION@.pc               \
+       gstreamer-net-@GST_API_VERSION@.pc
 
 pcfiles_uninstalled =                                          \
-       gstreamer-@GST_MAJORMINOR@-uninstalled.pc               \
-       gstreamer-base-@GST_MAJORMINOR@-uninstalled.pc          \
+       gstreamer-@GST_API_VERSION@-uninstalled.pc              \
+       gstreamer-base-@GST_API_VERSION@-uninstalled.pc         \
        $(CHECK_PC_U)                                           \
-       gstreamer-controller-@GST_MAJORMINOR@-uninstalled.pc    \
-       gstreamer-net-@GST_MAJORMINOR@-uninstalled.pc
+       gstreamer-controller-@GST_API_VERSION@-uninstalled.pc   \
+       gstreamer-net-@GST_API_VERSION@-uninstalled.pc
 
 all-local: $(pcfiles) $(pcfiles_uninstalled)
 
@@ -28,9 +28,9 @@ cp_verbose_ = $(cp_verbose_$(AM_DEFAULT_VERBOSITY))
 cp_verbose_0 = @echo "  CP     $@";
 
 ### how to generate pc files
-%-@GST_MAJORMINOR@.pc: %.pc
+%-@GST_API_VERSION@.pc: %.pc
        $(cp_verbose_0)cp $< $@
-%-@GST_MAJORMINOR@-uninstalled.pc: %-uninstalled.pc
+%-@GST_API_VERSION@-uninstalled.pc: %-uninstalled.pc
        $(cp_verbose_0)cp $< $@
 
 pkgconfigdir = $(libdir)/pkgconfig
index 72cf0ec0560f06f89e3e5b6b5078daa7f600167c..ab7dacf3df45a4a1175c49a881f727d91dc55722 100644 (file)
@@ -8,8 +8,8 @@ typelibdir=@abs_top_builddir@/libs/gst/base
 
 Name: GStreamer base classes, uninstalled
 Description: Base classes for GStreamer elements, Not Installed
-Requires: gstreamer-@GST_MAJORMINOR@ = @VERSION@
+Requires: gstreamer-@GST_API_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
index 45471a8eda47e5dc05ed78bbbc81e6f8518e0754..e24e050902890d57efcb27825e27345dc00c2838 100644 (file)
@@ -1,7 +1,7 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
-includedir=@includedir@/gstreamer-@GST_MAJORMINOR@
+includedir=@includedir@/gstreamer-@GST_API_VERSION@
 datarootdir=${prefix}/share
 datadir=${datarootdir}
 girdir=${datadir}/gir-1.0
@@ -9,7 +9,7 @@ typelibdir=${libdir}/girepository-1.0
 
 Name: GStreamer base classes
 Description: Base classes for GStreamer elements
-Requires: gstreamer-@GST_MAJORMINOR@
+Requires: gstreamer-@GST_API_VERSION@
 Version: @VERSION@
-Libs: -L${libdir} -lgstbase-@GST_MAJORMINOR@
+Libs: -L${libdir} -lgstbase-@GST_API_VERSION@
 Cflags: -I${includedir}
index 45629cd9f3ed0c8e9bb75983a780a09d2fb795f3..47c2beab8813d2afcdb3f9b38e386831823002ab 100644 (file)
@@ -8,8 +8,8 @@ typelibdir=@abs_top_builddir@/libs/gst/check
 
 Name: GStreamer check unit testing, uninstalled
 Description: Unit testing helper library for GStreamer modules, Not Installed
-Requires: gstreamer-@GST_MAJORMINOR@ = @VERSION@
+Requires: gstreamer-@GST_API_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
index ac2a2c174809667e4fe19009e69446bede777738..8c3a129f6e3061a12751b117faaf75222aaa0465 100644 (file)
@@ -1,7 +1,7 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
-includedir=@includedir@/gstreamer-@GST_MAJORMINOR@
+includedir=@includedir@/gstreamer-@GST_API_VERSION@
 datarootdir=${prefix}/share
 datadir=${datarootdir}
 girdir=${datadir}/gir-1.0
@@ -9,7 +9,7 @@ typelibdir=${libdir}/girepository-1.0
 
 Name: GStreamer check unit testing
 Description: Unit testing helper library for GStreamer modules
-Requires: gstreamer-@GST_MAJORMINOR@
+Requires: gstreamer-@GST_API_VERSION@
 Version: @VERSION@
-Libs: -L${libdir} -lgstcheck-@GST_MAJORMINOR@ @LIBM@
+Libs: -L${libdir} -lgstcheck-@GST_API_VERSION@ @LIBM@
 Cflags: -I${includedir}
index e1b4f884e8c47958aed06cd410ba436546a5906b..d74aa32efff8b13a5e8656a2e53ab3c3085eda38 100644 (file)
@@ -8,8 +8,8 @@ typelibdir=@abs_top_builddir@/libs/gst/controller
 
 Name: GStreamer controller, uninstalled
 Description: Dynamic parameter control for GStreamer elements, Not Installed
-Requires: gstreamer-@GST_MAJORMINOR@ = @VERSION@
+Requires: gstreamer-@GST_API_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
index 8d197ab3acb2f68df1bc599b2bcf0aff5b091b4b..5118de426f988f498764eccfe1ce9656958f40e5 100644 (file)
@@ -1,7 +1,7 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
-includedir=@includedir@/gstreamer-@GST_MAJORMINOR@
+includedir=@includedir@/gstreamer-@GST_API_VERSION@
 datarootdir=${prefix}/share
 datadir=${datarootdir}
 girdir=${datadir}/gir-1.0
@@ -9,7 +9,7 @@ typelibdir=${libdir}/girepository-1.0
 
 Name: GStreamer controller
 Description: Dynamic parameter control for GStreamer elements
-Requires: gstreamer-@GST_MAJORMINOR@
+Requires: gstreamer-@GST_API_VERSION@
 Version: @VERSION@
-Libs: -L${libdir} -lgstcontroller-@GST_MAJORMINOR@
+Libs: -L${libdir} -lgstcontroller-@GST_API_VERSION@
 Cflags: -I${includedir}
index 366df18a1aafc74c20aa24b4e1ea14ce72820f4b..bb972b009c9d457a0515b487c0751761e73a9545 100644 (file)
@@ -8,8 +8,8 @@ typelibdir=@abs_top_builddir@/libs/gst/net
 
 Name: GStreamer networking library, 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@
 
-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
index 582f00ca8c43bd356b9274397eed5485dfcc7f25..aa4c3aba8c4bb7892aba42d8a52190e153c09378 100644 (file)
@@ -1,7 +1,7 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
-includedir=@includedir@/gstreamer-@GST_MAJORMINOR@
+includedir=@includedir@/gstreamer-@GST_API_VERSION@
 datarootdir=${prefix}/share
 datadir=${datarootdir}
 girdir=${datadir}/gir-1.0
@@ -9,7 +9,7 @@ typelibdir=${libdir}/girepository-1.0
 
 Name: GStreamer networking library
 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@
-Libs: -L${libdir} -lgstnet-@GST_MAJORMINOR@
+Libs: -L${libdir} -lgstnet-@GST_API_VERSION@
 Cflags: -I${includedir}
index 481f81ffab2d1452f9d148d03a0353ede9e92059..9e5602bdd630d81cdbe2ceddfd7da1790a2ae80f 100644 (file)
@@ -13,6 +13,6 @@ Name: GStreamer Uninstalled
 Description: Streaming media framework, Not Installed
 Version: @VERSION@
 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
 Cflags: -I@abs_top_srcdir@ -I@abs_top_srcdir@/libs -I@abs_top_builddir@ -I@abs_top_builddir@/libs
index 36fb2f4bedebffc44c0ef89caa5baaaa4fd7f481..914e18681e2b38f42d4c4cbf1f9e0b181513fb34 100644 (file)
@@ -1,9 +1,9 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
-includedir=@includedir@/gstreamer-@GST_MAJORMINOR@
+includedir=@includedir@/gstreamer-@GST_API_VERSION@
 toolsdir=${exec_prefix}/bin
-pluginsdir=@libdir@/gstreamer-@GST_MAJORMINOR@
+pluginsdir=@libdir@/gstreamer-@GST_API_VERSION@
 datarootdir=${prefix}/share
 datadir=${datarootdir}
 girdir=${datadir}/gir-1.0
@@ -13,5 +13,5 @@ Name: GStreamer
 Description: Streaming media framework
 Requires: @GST_PKG_DEPS@
 Version: @VERSION@
-Libs: -L${libdir} -lgstreamer-@GST_MAJORMINOR@
+Libs: -L${libdir} -lgstreamer-@GST_API_VERSION@
 Cflags: -I${includedir}
index a4d4c81be17790f1a3f186815bea87797fae0a07..d451a1f30d509f5e1fcb8f8d5fa429bb4cfae58d 100644 (file)
@@ -1,7 +1,7 @@
 
 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 =        \
        gstcapsfilter.c         \
        gstelements.c           \
@@ -25,7 +25,7 @@ libgstcoreelements_la_SOURCES =       \
 
 libgstcoreelements_la_CFLAGS = $(GST_OBJ_CFLAGS)
 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)
 libgstcoreelements_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstcoreelements_la_LIBTOOLFLAGS = --tag=disable-static
@@ -69,5 +69,5 @@ Android.mk: Makefile.am
         -:LDFLAGS $(libgstcoreelements_la_LDFLAGS) \
                    $(libgstcoreelements_la_LIBADD) \
         -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
-                      LOCAL_MODULE_PATH:=$$\(TARGET_OUT\)/lib/gstreamer-@GST_MAJORMINOR@ \
+                      LOCAL_MODULE_PATH:=$$\(TARGET_OUT\)/lib/gstreamer-@GST_API_VERSION@ \
        > $@
index 5d6171cff9d0d0f07bda4bacb838012fe04ba30b..7e1cb552b4d9afd2e7e492bcf0e601ab087cf94a 100644 (file)
@@ -13,5 +13,5 @@ LDADD = $(GST_OBJ_LIBS)
 AM_CFLAGS = $(GST_OBJ_CFLAGS)
 
 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)
 
index b65737a6acde323bf0fd6da8e7eee92faddf5be3..fa814f88b5d5f690e95e475f20fca956140cb30e 100644 (file)
@@ -14,7 +14,7 @@ TESTS_ENVIRONMENT = \
         GST_PLUGIN_SYSTEM_PATH=                                        \
         GST_PLUGIN_PATH=$(top_builddir)/plugins
 
-plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
+plugindir = $(libdir)/gstreamer-@GST_API_VERSION@
 
 # override to _not_ install the test plugins
 install-pluginLTLIBRARIES:
@@ -173,8 +173,8 @@ EXTRA_DIST = \
 
 AM_CFLAGS = $(GST_OBJ_CFLAGS) -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 \
-       $(top_builddir)/libs/gst/base/libgstbase-@GST_MAJORMINOR@.la \
+LDADD = $(top_builddir)/libs/gst/check/libgstcheck-@GST_API_VERSION@.la \
+       $(top_builddir)/libs/gst/base/libgstbase-@GST_API_VERSION@.la \
        $(GST_OBJ_LIBS)
 
 gst_gstcpp_SOURCES = gst/gstcpp.cc
@@ -189,13 +189,13 @@ elements_filesrc_CFLAGS=$(GST_OBJ_CFLAGS) $(AM_CFLAGS) \
        -DTESTFILE=\"$(top_srcdir)/configure.ac\"
 
 libs_controller_LDADD = \
-       $(top_builddir)/libs/gst/controller/libgstcontroller-@GST_MAJORMINOR@.la \
+       $(top_builddir)/libs/gst/controller/libgstcontroller-@GST_API_VERSION@.la \
        $(LDADD)
 libs_gstnetclientclock_LDADD = \
-       $(top_builddir)/libs/gst/net/libgstnet-@GST_MAJORMINOR@.la \
+       $(top_builddir)/libs/gst/net/libgstnet-@GST_API_VERSION@.la \
        $(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)
 
 # valgrind testing
index 3e624a0250cdfa16c0a0602e91fddcb8675461df..6e4f545b5a13040dc3c23f58c3dfb06f843c81b8 100644 (file)
@@ -249,7 +249,7 @@ remove_preset_file (void)
   gchar *preset_file_name;
 
   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_free (preset_file_name);
 }
@@ -283,7 +283,7 @@ gst_preset_suite (void)
 
   /* check if we can create presets */
   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);
   g_free (gst_dir);
 
index 6e4a4f4d4c6e7eaac076027fffca5dc73f243c5f..cbd29877823ea0404b71c7a1829730f327cc7351 100644 (file)
@@ -1,4 +1,4 @@
 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)
index aee4206139099d719acc1cbe9389f3a7a4204b07..4eded370e2f754536850d6ceca2d439682490622 100644 (file)
@@ -3,7 +3,7 @@ noinst_PROGRAMS = audio-example control-sources text-color-example
 AM_CFLAGS  = $(GST_OBJ_CFLAGS) -I$(top_builddir)/libs
 
 LDADD = \
-       $(top_builddir)/libs/gst/controller/libgstcontroller-@GST_MAJORMINOR@.la \
+       $(top_builddir)/libs/gst/controller/libgstcontroller-@GST_API_VERSION@.la \
        $(GST_OBJ_LIBS)
 
 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) \
         -:SOURCES audio-example.c \
         -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(audio_example_CFLAGS) \
-        -:LDFLAGS -lgstcontroller-@GST_MAJORMINOR@ \
+        -:LDFLAGS -lgstcontroller-@GST_API_VERSION@ \
             $(GST_OBJ_LIBS) -ldl \
         -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
        > $@
index d180a9489e7f711b068b81bdad2dc139e93ee831..7d871115f6e39d5804670b3c785058ade659671b 100644 (file)
@@ -54,7 +54,7 @@ BUILT_SOURCES = \
 CLEANFILES = core core.* test-registry.* *.gcno *.gcda $(BUILT_SOURCES)
 
 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)
 
 elementmake.c elementcreate.c elementget.c elementlink.c elementfactory.c: $(top_srcdir)/docs/manual/basics-elements.xml
index 8fe194cc0cecae1e84a9332b97fabfbdca368a1a..1c60b73c3823a1846814742d1dd92895ce37fc0a 100644 (file)
@@ -1,45 +1,45 @@
 
 bin_PROGRAMS = \
-       gst-inspect-@GST_MAJORMINOR@ \
-       gst-typefind-@GST_MAJORMINOR@
+       gst-inspect-@GST_API_VERSION@ \
+       gst-typefind-@GST_API_VERSION@
 
-gst_inspect_@GST_MAJORMINOR@_SOURCES = gst-inspect.c tools.h
-gst_inspect_@GST_MAJORMINOR@_CFLAGS = $(GST_OBJ_CFLAGS)
-gst_inspect_@GST_MAJORMINOR@_LDADD = $(GST_OBJ_LIBS)
+gst_inspect_@GST_API_VERSION@_SOURCES = gst-inspect.c tools.h
+gst_inspect_@GST_API_VERSION@_CFLAGS = $(GST_OBJ_CFLAGS)
+gst_inspect_@GST_API_VERSION@_LDADD = $(GST_OBJ_LIBS)
 
-gst_typefind_@GST_MAJORMINOR@_SOURCES = gst-typefind.c tools.h
-gst_typefind_@GST_MAJORMINOR@_CFLAGS = $(GST_OBJ_CFLAGS)
-gst_typefind_@GST_MAJORMINOR@_LDADD = $(GST_OBJ_LIBS)
+gst_typefind_@GST_API_VERSION@_SOURCES = gst-typefind.c tools.h
+gst_typefind_@GST_API_VERSION@_CFLAGS = $(GST_OBJ_CFLAGS)
+gst_typefind_@GST_API_VERSION@_LDADD = $(GST_OBJ_LIBS)
 
 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_MAJORMINOR@_CFLAGS = $(GST_OBJ_CFLAGS)
-gst_launch_@GST_MAJORMINOR@_LDADD = $(GST_OBJ_LIBS)
+gst_launch_@GST_API_VERSION@_SOURCES = gst-launch.c tools.h
+gst_launch_@GST_API_VERSION@_CFLAGS = $(GST_OBJ_CFLAGS)
+gst_launch_@GST_API_VERSION@_LDADD = $(GST_OBJ_LIBS)
 endif
 
 Android.mk: Makefile.am
        androgenizer -:PROJECT gstreamer \
         -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
-        -:EXECUTABLE gst-inspect-@GST_MAJORMINOR@ -:TAGS eng debug \
-        -:SOURCES $(gst_inspect_@GST_MAJORMINOR@_SOURCES) \
-        -:CFLAGS $(DEFS) $(gst_inspect_@GST_MAJORMINOR@_CFLAGS) \
-        -:LDFLAGS $(gst_inspect_@GST_MAJORMINOR@_LDADD) \
+        -:EXECUTABLE gst-inspect-@GST_API_VERSION@ -:TAGS eng debug \
+        -:SOURCES $(gst_inspect_@GST_API_VERSION@_SOURCES) \
+        -:CFLAGS $(DEFS) $(gst_inspect_@GST_API_VERSION@_CFLAGS) \
+        -:LDFLAGS $(gst_inspect_@GST_API_VERSION@_LDADD) \
         -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
-        -:EXECUTABLE gst-launch-@GST_MAJORMINOR@ -:TAGS eng debug \
-        -:SOURCES $(gst_launch_@GST_MAJORMINOR@_SOURCES) \
-        -:CFLAGS $(DEFS) $(gst_launch_@GST_MAJORMINOR@_CFLAGS) \
-        -:LDFLAGS $(gst_launch_@GST_MAJORMINOR@_LDADD) \
+        -:EXECUTABLE gst-launch-@GST_API_VERSION@ -:TAGS eng debug \
+        -:SOURCES $(gst_launch_@GST_API_VERSION@_SOURCES) \
+        -:CFLAGS $(DEFS) $(gst_launch_@GST_API_VERSION@_CFLAGS) \
+        -:LDFLAGS $(gst_launch_@GST_API_VERSION@_LDADD) \
         -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
        > $@
 
 manpages = \
-       gst-inspect-@GST_MAJORMINOR@.1 \
-       gst-typefind-@GST_MAJORMINOR@.1
+       gst-inspect-@GST_API_VERSION@.1 \
+       gst-typefind-@GST_API_VERSION@.1
 
 if !GST_DISABLE_PARSE
-manpages += gst-launch-@GST_MAJORMINOR@.1
+manpages += gst-launch-@GST_API_VERSION@.1
 endif
 
 CLEANFILES = $(manpages) *.gcno *.gcda
@@ -57,11 +57,11 @@ EXTRA_DIST = \
        gst-typefind.1.in \
        gst-plot-timeline.py
 
-%-@GST_MAJORMINOR@.1: %.1.in
+%-@GST_API_VERSION@.1: %.1.in
        $(AM_V_GEN)sed \
-               -e s,gst-inspect,gst-inspect-@GST_MAJORMINOR@,g \
-               -e s,gst-launch,gst-launch-@GST_MAJORMINOR@,g \
-               -e s,gst-typefind,gst-typefind-@GST_MAJORMINOR@,g \
-               -e s,GST_MAJORMINOR,@GST_MAJORMINOR@,g \
+               -e s,gst-inspect,gst-inspect-@GST_API_VERSION@,g \
+               -e s,gst-launch,gst-launch-@GST_API_VERSION@,g \
+               -e s,gst-typefind,gst-typefind-@GST_API_VERSION@,g \
+               -e s,GST_API_VERSION,@GST_API_VERSION@,g \
                $< >$@
 
index e6702f4befc72cd06c9ee6e24fabba88ddc29e02..156fd9f3517f58bd1fb06c2e930700aee57e8b2e 100644 (file)
@@ -411,7 +411,7 @@ When set to a filesystem path, store dot files of pipeline graphs there.
 .TP
 \fBGST_REGISTRY\fR
 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
 the output of "uname -i" and "uname -m" for details).
 .TP
@@ -448,7 +448,7 @@ a stack trace in the usual way.
 .
 .SH FILES
 .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
 automatically when it does not exist yet or plugins change.
 .
index d85e49c11befbe00678aa60ad9f55a64750ac37a..dec7db1af2bf3b9152bbe529f97b5fc54df2f580 100644 (file)
@@ -6,8 +6,8 @@ _gst_launch()
 {
   local cur
 
-  : ${GST_REGISTRY:=~/.gstreamer-0.11/registry.xml}
-  : ${GST_COMPLETE:=~/.gstreamer-0.11/complete}
+  : ${GST_REGISTRY:=~/.gstreamer-1.0/registry.xml}
+  : ${GST_COMPLETE:=~/.gstreamer-1.0/complete}
 
   if [ ! -f "${GST_REGISTRY}" ] ; then
     return 0
index eb63debc0c3440ea4653245b6d47af043cf2e2b0..eb1588ece6764fdffa6c68f7211c26d6d10681e2 100644 (file)
@@ -53,7 +53,7 @@
 #define GST_LICENSE "LGPL"
 
 /* library major.minor version */
-#define GST_MAJORMINOR "0.11"
+#define GST_API_VERSION "0.11"
 
 /* package name in plugins */
 #define GST_PACKAGE_NAME "GStreamer source release"