diff options
| author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-04-04 14:41:22 +0200 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-04-04 14:44:34 +0200 |
| commit | 1318a97e0ac9e11e6cea726cf08d1701c23eb9ae (patch) | |
| tree | a35fe4fb2dc6299c42c90df6c4c0288381a0aa56 | |
| parent | 4c0b7fd03b9ca24d0aff6a68519e382b80d2a196 (diff) | |
| download | gstreamer-plugins-bad-1318a97e0ac9e11e6cea726cf08d1701c23eb9ae.tar.gz | |
gst: Update versioning
122 files changed, 311 insertions, 310 deletions
diff --git a/configure.ac b/configure.ac index 22fe31be2..0de43b383 100644 --- a/configure.ac +++ b/configure.ac @@ -35,11 +35,12 @@ 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=$GST_PLUGINS_BAD_VERSION_MAJOR.$GST_PLUGINS_BAD_VERSION_MINOR -dnl we override it here if we need to for the release candidate of new series -GST_MAJORMINOR=0.11 -AC_SUBST(GST_MAJORMINOR) +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 @@ -47,7 +48,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, 24, 0, 0) +AS_LIBTOOL(GST, 0, 0, 0) AG_GST_LIBTOOL_PREPARE @@ -75,7 +76,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([gst-plugins-bad-$GST_MAJORMINOR]) +AG_GST_GETTEXT([gst-plugins-bad-$GST_API_VERSION]) dnl *** check for arguments to configure *** @@ -195,25 +196,25 @@ AG_GST_GLIB_CHECK([$GLIB_REQ]) dnl checks for gstreamer dnl uninstalled is selected preferentially -- see pkg-config(1) -AG_GST_CHECK_GST($GST_MAJORMINOR, [$GST_REQ], yes) -AG_GST_CHECK_GST_BASE($GST_MAJORMINOR, [$GST_REQ], yes) -AG_GST_CHECK_GST_CHECK($GST_MAJORMINOR, [$GST_REQ], no) -AG_GST_CHECK_GST_CONTROLLER($GST_MAJORMINOR, [$GST_REQ], yes) +AG_GST_CHECK_GST($GST_API_VERSION, [$GST_REQ], yes) +AG_GST_CHECK_GST_BASE($GST_API_VERSION, [$GST_REQ], yes) +AG_GST_CHECK_GST_CHECK($GST_API_VERSION, [$GST_REQ], no) +AG_GST_CHECK_GST_CONTROLLER($GST_API_VERSION, [$GST_REQ], yes) AM_CONDITIONAL(HAVE_GST_CHECK, test "x$HAVE_GST_CHECK" = "xyes") -AG_GST_CHECK_GST_PLUGINS_BASE($GST_MAJORMINOR, [$GSTPB_REQ], yes) +AG_GST_CHECK_GST_PLUGINS_BASE($GST_API_VERSION, [$GSTPB_REQ], yes) dnl check for uninstalled plugin directories for unit tests AG_GST_CHECK_UNINSTALLED_SETUP([ - AG_GST_CHECK_GST_PLUGINS_GOOD($GST_MAJORMINOR, [0.11.0]) - AG_GST_CHECK_GST_PLUGINS_UGLY($GST_MAJORMINOR, [0.11.0]) - AG_GST_CHECK_GST_PLUGINS_FFMPEG($GST_MAJORMINOR, [0.11.0]) + AG_GST_CHECK_GST_PLUGINS_GOOD($GST_API_VERSION, [0.11.0]) + AG_GST_CHECK_GST_PLUGINS_UGLY($GST_API_VERSION, [0.11.0]) + AG_GST_CHECK_GST_PLUGINS_FFMPEG($GST_API_VERSION, [0.11.0]) ]) dnl Check for documentation xrefs GLIB_PREFIX="`$PKG_CONFIG --variable=prefix glib-2.0`" -GST_PREFIX="`$PKG_CONFIG --variable=prefix gstreamer-$GST_MAJORMINOR`" -GSTPB_PREFIX="`$PKG_CONFIG --variable=prefix gstreamer-plugins-base-$GST_MAJORMINOR`" +GST_PREFIX="`$PKG_CONFIG --variable=prefix gstreamer-$GST_API_VERSION`" +GSTPB_PREFIX="`$PKG_CONFIG --variable=prefix gstreamer-plugins-base-$GST_API_VERSION`" AC_SUBST(GLIB_PREFIX) AC_SUBST(GST_PREFIX) AC_SUBST(GSTPB_PREFIX) diff --git a/docs/libs/Makefile.am b/docs/libs/Makefile.am index 016b843c8..7e9b966a8 100644 --- a/docs/libs/Makefile.am +++ b/docs/libs/Makefile.am @@ -4,7 +4,7 @@ DOCS_ARE_INCOMPLETE_PLEASE_FIXME=yespleasedo # The name of the module, e.g. 'glib'. -#DOC_MODULE=gst-plugins-libs-@GST_MAJORMINOR@ +#DOC_MODULE=gst-plugins-libs-@GST_API_VERSION@ DOC_MODULE=gst-plugins-bad-libs # for upload-doc.mak @@ -51,11 +51,11 @@ extra_files = # contains GtkObjects/GObjects and you want to document signals and properties. GTKDOC_CFLAGS = -DGST_USE_UNSTABLE_API $(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) GTKDOC_LIBS = \ - $(top_builddir)/gst-libs/gst/codecparsers/libgstcodecparsers-@GST_MAJORMINOR@.la \ - $(top_builddir)/gst-libs/gst/basecamerabinsrc/libgstbasecamerabinsrc-@GST_MAJORMINOR@.la \ - $(top_builddir)/gst-libs/gst/interfaces/libgstphotography-@GST_MAJORMINOR@.la \ - $(top_builddir)/gst-libs/gst/signalprocessor/libgstsignalprocessor-@GST_MAJORMINOR@.la \ - $(top_builddir)/gst-libs/gst/video/libgstbasevideo-@GST_MAJORMINOR@.la \ + $(top_builddir)/gst-libs/gst/codecparsers/libgstcodecparsers-@GST_API_VERSION@.la \ + $(top_builddir)/gst-libs/gst/basecamerabinsrc/libgstbasecamerabinsrc-@GST_API_VERSION@.la \ + $(top_builddir)/gst-libs/gst/interfaces/libgstphotography-@GST_API_VERSION@.la \ + $(top_builddir)/gst-libs/gst/signalprocessor/libgstsignalprocessor-@GST_API_VERSION@.la \ + $(top_builddir)/gst-libs/gst/video/libgstbasevideo-@GST_API_VERSION@.la \ $(GST_BASE_LIBS) GTKDOC_CC=$(LIBTOOL) --tag=CC --mode=compile $(CC) diff --git a/docs/libs/compiling.sgml b/docs/libs/compiling.sgml index 949209a06..e6f8662bd 100644 --- a/docs/libs/compiling.sgml +++ b/docs/libs/compiling.sgml @@ -30,10 +30,10 @@ find the header files and libraries. This is done with the The following interactive shell session demonstrates how <application>pkg-config</application> is used: <programlisting> -$ pkg-config --cflags gstreamer-plugins-bad-&GST_MAJORMINOR; --D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -pthread -I/usr/include/gstreamer-&GST_MAJORMINOR; -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libxml2 -$ pkg-config --libs gstreamer-plugins-bad-&GST_MAJORMINOR; --Wl,--export-dynamic -pthread -lgstreamer-&GST_MAJORMINOR; -lgobject-2.0 -lgmodule-2.0 -ldl -lgthread-2.0 -lxml2 -lpthread -lz -lm -lglib-2.0 +$ pkg-config --cflags gstreamer-plugins-bad-&GST_API_VERSION; +-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -pthread -I/usr/include/gstreamer-&GST_API_VERSION; -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libxml2 +$ pkg-config --libs gstreamer-plugins-bad-&GST_API_VERSION; +-Wl,--export-dynamic -pthread -lgstreamer-&GST_API_VERSION; -lgobject-2.0 -lgmodule-2.0 -ldl -lgthread-2.0 -lxml2 -lpthread -lz -lm -lglib-2.0 </programlisting> </para> diff --git a/docs/libs/gst-plugins-bad-libs-docs.sgml b/docs/libs/gst-plugins-bad-libs-docs.sgml index cf6885b44..3384e9fd4 100644 --- a/docs/libs/gst-plugins-bad-libs-docs.sgml +++ b/docs/libs/gst-plugins-bad-libs-docs.sgml @@ -6,9 +6,9 @@ ]> <book id="index" xmlns:xi="http://www.w3.org/2003/XInclude"> <bookinfo> - <title>GStreamer Bad Plugins &GST_MAJORMINOR; Library Reference Manual</title> + <title>GStreamer Bad Plugins &GST_API_VERSION; Library Reference Manual</title> <releaseinfo> - for GStreamer Bad Library &GST_MAJORMINOR; (&GST_VERSION;) + for GStreamer Bad Library &GST_API_VERSION; (&GST_VERSION;) <ulink role="online-location" url="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gst-plugins-bad-libs/html/">http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gst-plugins-bad-libs/html/</ulink>. </releaseinfo> </bookinfo> @@ -25,8 +25,8 @@ <title>Bitstream parsing Library</title> <para> This library should be linked to by getting cflags and libs from - <filename>gstreamer-plugins-bad-&GST_MAJORMINOR;.pc</filename> and adding - <filename>-lgscodeparsers-&GST_MAJORMINOR;</filename> to the library flags. + <filename>gstreamer-plugins-bad-&GST_API_VERSION;.pc</filename> and adding + <filename>-lgscodeparsers-&GST_API_VERSION;</filename> to the library flags. </para> <xi:include href="xml/gsth264parser.xml" /> <xi:include href="xml/gstmpegvideoparser.xml" /> diff --git a/docs/plugins/Makefile.am b/docs/plugins/Makefile.am index 4b72e5d74..0dbff8d75 100644 --- a/docs/plugins/Makefile.am +++ b/docs/plugins/Makefile.am @@ -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=gst-plugins-bad DOC_MODULE=$(MODULE)-plugins @@ -191,7 +191,7 @@ extra_files = # contains GtkObjects/GObjects and you want to document signals and properties. GTKDOC_CFLAGS = -DGST_USE_UNSTABLE_API $(GST_PLUGINS_BAD_CFLAGS) $(GST_BASE_CFLAGS) -I$(top_builddir) GTKDOC_LIBS = \ - $(top_builddir)/gst-libs/gst/interfaces/libgstphotography-@GST_MAJORMINOR@.la \ + $(top_builddir)/gst-libs/gst/interfaces/libgstphotography-@GST_API_VERSION@.la \ $(GST_BASE_LIBS) GTKDOC_CC=$(LIBTOOL) --tag=CC --mode=compile $(CC) diff --git a/docs/plugins/gst-plugins-bad-plugins-docs.sgml b/docs/plugins/gst-plugins-bad-plugins-docs.sgml index 6fb475d91..606c8eac3 100644 --- a/docs/plugins/gst-plugins-bad-plugins-docs.sgml +++ b/docs/plugins/gst-plugins-bad-plugins-docs.sgml @@ -7,9 +7,9 @@ <book id="index" xmlns:xi="http://www.w3.org/2003/XInclude"> <bookinfo> - <title>GStreamer Bad Plugins &GST_MAJORMINOR; Plugins Reference Manual</title> + <title>GStreamer Bad Plugins &GST_API_VERSION; Plugins Reference Manual</title> <releaseinfo> - for GStreamer Bad Plugins &GST_MAJORMINOR; (&GST_VERSION;) + for GStreamer Bad 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/gst-plugins-bad/html/">http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gst-plugins-bad/html/</ulink>. </releaseinfo> diff --git a/docs/version.entities.in b/docs/version.entities.in index 79a68981d..286989f56 100644 --- a/docs/version.entities.in +++ b/docs/version.entities.in @@ -1,2 +1,2 @@ -<!ENTITY GST_MAJORMINOR "@GST_MAJORMINOR@"> +<!ENTITY GST_API_VERSION "@GST_API_VERSION@"> <!ENTITY GST_VERSION "@VERSION@"> diff --git a/ext/apexsink/Makefile.am b/ext/apexsink/Makefile.am index 0bd41ca32..a288ccdee 100644 --- a/ext/apexsink/Makefile.am +++ b/ext/apexsink/Makefile.am @@ -4,7 +4,7 @@ libgstapexsink_la_SOURCES = gstapexplugin.c gstapexraop.c gstapexsink.c libgstapexsink_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \ $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(APEXSINK_CFLAGS) libgstapexsink_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \ - -lgstaudio-$(GST_MAJORMINOR) -lgstinterfaces-$(GST_MAJORMINOR) \ + -lgstaudio-$(GST_API_VERSION) -lgstinterfaces-$(GST_API_VERSION) \ $(GST_BASE_LIBS) $(GST_LIBS) $(APEXSINK_LIBS) libgstapexsink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstapexsink_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/ext/assrender/Makefile.am b/ext/assrender/Makefile.am index 44e63094d..b9b32a704 100644 --- a/ext/assrender/Makefile.am +++ b/ext/assrender/Makefile.am @@ -2,7 +2,7 @@ plugin_LTLIBRARIES = libgstassrender.la libgstassrender_la_SOURCES = gstassrender.c libgstassrender_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(ASSRENDER_CFLAGS) -libgstassrender_la_LIBADD = $(ASSRENDER_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) -lgstvideo-@GST_MAJORMINOR@ +libgstassrender_la_LIBADD = $(ASSRENDER_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) -lgstvideo-@GST_API_VERSION@ libgstassrender_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstassrender_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/ext/celt/Makefile.am b/ext/celt/Makefile.am index 01153b135..001398089 100644 --- a/ext/celt/Makefile.am +++ b/ext/celt/Makefile.am @@ -7,7 +7,7 @@ libgstcelt_la_CFLAGS = -DGST_USE_UNSTABLE_API \ $(CELT_CFLAGS) libgstcelt_la_LIBADD = \ $(GST_PLUGINS_BASE_LIBS) \ - -lgstaudio-$(GST_MAJORMINOR) -lgsttag-$(GST_MAJORMINOR) \ + -lgstaudio-$(GST_API_VERSION) -lgsttag-$(GST_API_VERSION) \ $(GST_BASE_LIBS) \ $(GST_LIBS) \ $(CELT_LIBS) diff --git a/ext/chromaprint/Makefile.am b/ext/chromaprint/Makefile.am index 115d8c298..2ced007a6 100644 --- a/ext/chromaprint/Makefile.am +++ b/ext/chromaprint/Makefile.am @@ -6,7 +6,7 @@ libgstchromaprint_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) \ $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) \ $(CHROMAPRINT_CFLAGS) libgstchromaprint_la_LIBADD = \ - $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) $(GST_LIBS) \ + $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_API_VERSION) $(GST_LIBS) \ $(CHROMAPRINT_LIBS) libgstchromaprint_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstchromaprint_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/ext/cog/Makefile.am b/ext/cog/Makefile.am index bbed6fe0e..6ea839a03 100644 --- a/ext/cog/Makefile.am +++ b/ext/cog/Makefile.am @@ -12,7 +12,7 @@ libgstcog_la_CFLAGS = \ $(ORC_CFLAGS) \ $(COG_CFLAGS) libgstcog_la_LIBADD = \ - $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) \ + $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) \ $(GST_BASE_LIBS) \ $(GST_LIBS) \ $(ORC_LIBS) \ diff --git a/ext/dirac/Makefile.am b/ext/dirac/Makefile.am index c93a3d477..3defb7ab2 100644 --- a/ext/dirac/Makefile.am +++ b/ext/dirac/Makefile.am @@ -11,7 +11,7 @@ libgstdirac_la_CXXFLAGS = \ $(DIRAC_CFLAGS) \ -DGST_USE_UNSTABLE_API libgstdirac_la_LIBADD = \ - $(top_builddir)/gst-libs/gst/video/libgstbasevideo-@GST_MAJORMINOR@.la \ + $(top_builddir)/gst-libs/gst/video/libgstbasevideo-@GST_API_VERSION@.la \ $(GST_PLUGINS_BASE_LIBS) \ $(GST_BASE_LIBS) $(GST_LIBS) \ $(DIRAC_LIBS) -lz $(LIBM) diff --git a/ext/directfb/Makefile.am b/ext/directfb/Makefile.am index 05e79ac15..32b99adfb 100644 --- a/ext/directfb/Makefile.am +++ b/ext/directfb/Makefile.am @@ -5,8 +5,8 @@ libgstdfbvideosink_la_SOURCES = dfbvideosink.c libgstdfbvideosink_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) \ $(DIRECTFB_CFLAGS) libgstdfbvideosink_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \ - -lgstvideo-$(GST_MAJORMINOR) \ - -lgstinterfaces-$(GST_MAJORMINOR) \ + -lgstvideo-$(GST_API_VERSION) \ + -lgstinterfaces-$(GST_API_VERSION) \ $(DIRECTFB_LIBS) $(LIBOIL_LIBS) libgstdfbvideosink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstdfbvideosink_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/ext/dts/Makefile.am b/ext/dts/Makefile.am index 97a838531..467e30c7a 100644 --- a/ext/dts/Makefile.am +++ b/ext/dts/Makefile.am @@ -4,7 +4,7 @@ libgstdtsdec_la_SOURCES = gstdtsdec.c libgstdtsdec_la_CFLAGS = -DGST_USE_UNSTABLE_API \ $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(ORC_CFLAGS) libgstdtsdec_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) \ - -lgstaudio-@GST_MAJORMINOR@ \ + -lgstaudio-@GST_API_VERSION@ \ $(DTS_LIBS) $(ORC_LIBS) libgstdtsdec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstdtsdec_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/ext/faac/Makefile.am b/ext/faac/Makefile.am index 2aafa0229..eb230dc8b 100644 --- a/ext/faac/Makefile.am +++ b/ext/faac/Makefile.am @@ -5,7 +5,7 @@ libgstfaac_la_CFLAGS = -DGST_USE_UNSTABLE_API \ $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) \ $(GST_CFLAGS) $(FAAC_CFLAGS) libgstfaac_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \ - -lgstaudio-@GST_MAJORMINOR@ -lgstpbutils-@GST_MAJORMINOR@ \ + -lgstaudio-@GST_API_VERSION@ -lgstpbutils-@GST_API_VERSION@ \ $(GST_BASE_LIBS) $(FAAC_LIBS) libgstfaac_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstfaac_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/ext/faad/Makefile.am b/ext/faad/Makefile.am index cc7636dca..1f863f0b9 100644 --- a/ext/faad/Makefile.am +++ b/ext/faad/Makefile.am @@ -4,7 +4,7 @@ libgstfaad_la_SOURCES = gstfaad.c libgstfaad_la_CFLAGS = -DGST_USE_UNSTABLE_API \ $(GST_PLUGINS_BASE_CFLAGS) \ $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(FAAD_CFLAGS) -libgstfaad_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_MAJORMINOR@ \ +libgstfaad_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_API_VERSION@ \ $(GST_BASE_LIBS) $(GST_LIBS) $(FAAD_LIBS) libgstfaad_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstfaad_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/ext/flite/Makefile.am b/ext/flite/Makefile.am index 84d87dec0..c807aada4 100644 --- a/ext/flite/Makefile.am +++ b/ext/flite/Makefile.am @@ -7,7 +7,7 @@ libgstflite_la_CFLAGS = \ $(FLITE_CFLAGS) libgstflite_la_LIBADD = \ $(GST_PLUGINS_BASE_LIBS) \ - -lgstaudio-@GST_MAJORMINOR@ \ + -lgstaudio-@GST_API_VERSION@ \ $(GST_BASE_LIBS) \ $(GST_LIBS) \ $(FLITE_LIBS) diff --git a/ext/gsettings/Makefile.am b/ext/gsettings/Makefile.am index 6cef006a6..99b8b4125 100644 --- a/ext/gsettings/Makefile.am +++ b/ext/gsettings/Makefile.am @@ -1,7 +1,7 @@ -gsettings_SCHEMAS = org.freedesktop.gstreamer-@GST_MAJORMINOR@.default-elements.gschema.xml +gsettings_SCHEMAS = org.freedesktop.gstreamer-@GST_API_VERSION@.default-elements.gschema.xml -org.freedesktop.gstreamer-@GST_MAJORMINOR@.default-elements.gschema.xml: org.freedesktop.gstreamer.default-elements.gschema.xml - cp org.freedesktop.gstreamer.default-elements.gschema.xml org.freedesktop.gstreamer-@GST_MAJORMINOR@.default-elements.gschema.xml +org.freedesktop.gstreamer-@GST_API_VERSION@.default-elements.gschema.xml: org.freedesktop.gstreamer.default-elements.gschema.xml + cp org.freedesktop.gstreamer.default-elements.gschema.xml org.freedesktop.gstreamer-@GST_API_VERSION@.default-elements.gschema.xml if USE_GSETTINGS @GSETTINGS_RULES@ diff --git a/ext/gsettings/org.freedesktop.gstreamer.default-elements.gschema.xml.in b/ext/gsettings/org.freedesktop.gstreamer.default-elements.gschema.xml.in index f10e44bf3..58f1b33c7 100644 --- a/ext/gsettings/org.freedesktop.gstreamer.default-elements.gschema.xml.in +++ b/ext/gsettings/org.freedesktop.gstreamer.default-elements.gschema.xml.in @@ -1,5 +1,5 @@ <schemalist> - <schema id="org.freedesktop.gstreamer-@GST_MAJORMINOR@.default-elements" path="/desktop/gstreamer/@GST_MAJORMINOR@/default-elements/" gettext-domain="@GETTEXT_PACKAGE@"> + <schema id="org.freedesktop.gstreamer-@GST_API_VERSION@.default-elements" path="/desktop/gstreamer/@GST_API_VERSION@/default-elements/" gettext-domain="@GETTEXT_PACKAGE@"> <key name="sounds-audiosink" type="s"> <default>"@DEFAULT_AUDIOSINK@"</default> <summary>default GStreamer sound events audiosink</summary> diff --git a/ext/gsm/Makefile.am b/ext/gsm/Makefile.am index cd2f0dfad..8a98b55e5 100644 --- a/ext/gsm/Makefile.am +++ b/ext/gsm/Makefile.am @@ -7,7 +7,7 @@ libgstgsm_la_CFLAGS = \ $(GST_BASE_CFLAGS) libgstgsm_la_LIBADD = \ $(GSM_LIBS) \ - $(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_MAJORMINOR@ \ + $(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_API_VERSION@ \ $(GST_BASE_LIBS) libgstgsm_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstgsm_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/ext/jp2k/Makefile.am b/ext/jp2k/Makefile.am index 79aef3ad7..c5a9dc68c 100644 --- a/ext/jp2k/Makefile.am +++ b/ext/jp2k/Makefile.am @@ -4,7 +4,7 @@ libgstjp2k_la_SOURCES = gstjasperdec.c gstjasperenc.c gstjp2k.c libgstjp2k_la_CFLAGS = \ $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(JP2K_CFLAGS) libgstjp2k_la_LIBADD = \ - $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) \ + $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) \ $(GST_LIBS) $(JP2K_LIBS) libgstjp2k_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstjp2k_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/ext/kate/Makefile.am b/ext/kate/Makefile.am index 4e310d92b..b3c395f96 100644 --- a/ext/kate/Makefile.am +++ b/ext/kate/Makefile.am @@ -10,7 +10,7 @@ endif # flags used to compile this plugin libgstkate_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(TIGER_CFLAGS) $(KATE_CFLAGS) -libgstkate_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) -lgsttag-$(GST_MAJORMINOR) $(GST_LIBS) $(TIGER_LIBS) $(KATE_LIBS) +libgstkate_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) -lgsttag-$(GST_API_VERSION) $(GST_LIBS) $(TIGER_LIBS) $(KATE_LIBS) libgstkate_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstkate_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/ext/ladspa/Makefile.am b/ext/ladspa/Makefile.am index 3d9695338..c1f14e9e9 100644 --- a/ext/ladspa/Makefile.am +++ b/ext/ladspa/Makefile.am @@ -6,8 +6,8 @@ libgstladspa_la_CFLAGS = \ $(GST_PLUGINS_BASE_CFLAGS) \ $(GST_CFLAGS) $(LRDF_CFLAGS) libgstladspa_la_LIBADD = \ - $(top_builddir)/gst-libs/gst/signalprocessor/libgstsignalprocessor-@GST_MAJORMINOR@.la \ - $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) \ + $(top_builddir)/gst-libs/gst/signalprocessor/libgstsignalprocessor-@GST_API_VERSION@.la \ + $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_API_VERSION) \ $(LIBM) $(LRDF_LIBS) libgstladspa_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstladspa_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/ext/lv2/Makefile.am b/ext/lv2/Makefile.am index 76333e79e..d1c33affa 100644 --- a/ext/lv2/Makefile.am +++ b/ext/lv2/Makefile.am @@ -6,8 +6,8 @@ libgstlv2_la_CFLAGS = \ $(GST_PLUGINS_BASE_CFLAGS) \ $(GST_CFLAGS) $(SLV2_CFLAGS) libgstlv2_la_LIBADD = \ - $(top_builddir)/gst-libs/gst/signalprocessor/libgstsignalprocessor-@GST_MAJORMINOR@.la \ - $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) \ + $(top_builddir)/gst-libs/gst/signalprocessor/libgstsignalprocessor-@GST_API_VERSION@.la \ + $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_API_VERSION) \ $(LIBM) $(SLV2_LIBS) libgstlv2_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstlv2_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/ext/mpeg2enc/Makefile.am b/ext/mpeg2enc/Makefile.am index 9b79185ff..f5f8b28f0 100644 --- a/ext/mpeg2enc/Makefile.am +++ b/ext/mpeg2enc/Makefile.am @@ -10,7 +10,7 @@ libgstmpeg2enc_la_SOURCES = \ libgstmpeg2enc_la_CXXFLAGS = \ $(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CXXFLAGS) $(MPEG2ENC_CFLAGS) libgstmpeg2enc_la_LIBADD = \ - $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_MAJORMINOR@ \ + $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_API_VERSION@ \ $(GST_LIBS) $(MPEG2ENC_LIBS) libgstmpeg2enc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstmpeg2enc_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/ext/mplex/Makefile.am b/ext/mplex/Makefile.am index 84243ffea..4154181c7 100644 --- a/ext/mplex/Makefile.am +++ b/ext/mplex/Makefile.am @@ -9,7 +9,7 @@ libgstmplex_la_SOURCES = \ libgstmplex_la_CXXFLAGS = \ $(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CXXFLAGS) $(MPLEX_CFLAGS) libgstmplex_la_LIBADD = \ - $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) \ + $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) -lgstaudio-$(GST_API_VERSION) \ $(GST_LIBS) $(MPLEX_LIBS) libgstmplex_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(MPLEX_LDFLAGS) libgstmplex_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/ext/musicbrainz/Makefile.am b/ext/musicbrainz/Makefile.am index ab536c6ca..f0d838b74 100644 --- a/ext/musicbrainz/Makefile.am +++ b/ext/musicbrainz/Makefile.am @@ -5,7 +5,7 @@ noinst_HEADERS = gsttrm.h libgsttrm_la_SOURCES = gsttrm.c libgsttrm_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(MUSICBRAINZ_CFLAGS) libgsttrm_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) $(MUSICBRAINZ_LIBS) \ - -lgsttag-@GST_MAJORMINOR@ + -lgsttag-@GST_API_VERSION@ libgsttrm_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgsttrm_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/ext/nas/Makefile.am b/ext/nas/Makefile.am index ef1dbbad2..ceeb72a67 100644 --- a/ext/nas/Makefile.am +++ b/ext/nas/Makefile.am @@ -4,7 +4,7 @@ libgstnassink_la_SOURCES = nassink.c libgstnassink_la_CFLAGS = \ $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(NAS_CFLAGS) libgstnassink_la_LIBADD = \ - $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) $(NAS_LIBS) + $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_API_VERSION) $(NAS_LIBS) libgstnassink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstnassink_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/ext/ofa/Makefile.am b/ext/ofa/Makefile.am index 9a674e08b..48ecaa8c9 100644 --- a/ext/ofa/Makefile.am +++ b/ext/ofa/Makefile.am @@ -8,7 +8,7 @@ libgstofa_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \ $(OFA_CFLAGS) libgstofa_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \ - -lgstaudio-$(GST_MAJORMINOR) \ + -lgstaudio-$(GST_API_VERSION) \ $(GST_BASE_LIBS) \ $(GST_LIBS) \ $(OFA_LIBS) diff --git a/ext/openal/Makefile.am b/ext/openal/Makefile.am index b5e4e5b90..6a6781cc9 100644 --- a/ext/openal/Makefile.am +++ b/ext/openal/Makefile.am @@ -7,7 +7,7 @@ libgstopenal_la_SOURCES = gstopenal.c gstopenalsink.c gstopenalsrc.c # compiler and linker flags used to compile this plugin, set in configure.ac libgstopenal_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(OPENAL_CFLAGS) $(GST_PLUGINS_BAD_CFLAGS) -libgstopenal_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_MAJORMINOR@ $(GST_BASE_LIBS) $(GST_LIBS) $(OPENAL_LIBS) +libgstopenal_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_API_VERSION@ $(GST_BASE_LIBS) $(GST_LIBS) $(OPENAL_LIBS) libgstopenal_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstopenal_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/ext/opencv/Makefile.am b/ext/opencv/Makefile.am index d466bbb0b..c02037b22 100644 --- a/ext/opencv/Makefile.am +++ b/ext/opencv/Makefile.am @@ -33,7 +33,7 @@ libgstopencv_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) $(OPENCV_CFLAGS) \ -DCV_NO_BACKWARD_COMPATIBILITY libgstopencv_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) $(OPENCV_LIBS) \ - $(GSTPB_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) + $(GSTPB_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) libgstopencv_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstopencv_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/ext/opus/Makefile.am b/ext/opus/Makefile.am index 48a7eade4..13ae8a2f0 100644 --- a/ext/opus/Makefile.am +++ b/ext/opus/Makefile.am @@ -8,8 +8,8 @@ libgstopus_la_CFLAGS = \ $(GST_CFLAGS) \ $(OPUS_CFLAGS) libgstopus_la_LIBADD = \ - $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) \ - -lgsttag-$(GST_MAJORMINOR) -lgstrtp-$(GST_MAJORMINOR) \ + $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_API_VERSION) \ + -lgsttag-$(GST_API_VERSION) -lgstrtp-$(GST_API_VERSION) \ $(GST_BASE_LIBS) \ $(GST_LIBS) \ $(OPUS_LIBS) diff --git a/ext/resindvd/Makefile.am b/ext/resindvd/Makefile.am index e9ef5abb0..365fcb30a 100644 --- a/ext/resindvd/Makefile.am +++ b/ext/resindvd/Makefile.am @@ -19,8 +19,8 @@ libresindvd_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) \ $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) \ $(GST_CFLAGS) $(DVDNAV_CFLAGS) libresindvd_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \ --lgstinterfaces-$(GST_MAJORMINOR) -lgstvideo-$(GST_MAJORMINOR) \ --lgstpbutils-$(GST_MAJORMINOR) \ +-lgstinterfaces-$(GST_API_VERSION) -lgstvideo-$(GST_API_VERSION) \ +-lgstpbutils-$(GST_API_VERSION) \ $(GST_BASE_LIBS) $(GST_LIBS) $(DVDNAV_LIBS) libresindvd_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libresindvd_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/ext/rsvg/Makefile.am b/ext/rsvg/Makefile.am index d1b04b943..7cdfbd689 100644 --- a/ext/rsvg/Makefile.am +++ b/ext/rsvg/Makefile.am @@ -6,7 +6,7 @@ libgstrsvg_la_CFLAGS = \ $(GST_CFLAGS) \ $(RSVG_CFLAGS) libgstrsvg_la_LIBADD = \ - $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) \ + $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) \ $(GST_BASE_LIBS) \ $(GST_LIBS) \ $(RSVG_LIBS) diff --git a/ext/schroedinger/Makefile.am b/ext/schroedinger/Makefile.am index 66b2e1e2f..62c049f40 100644 --- a/ext/schroedinger/Makefile.am +++ b/ext/schroedinger/Makefile.am @@ -17,8 +17,8 @@ libgstschro_la_CFLAGS = \ -DGST_USE_UNSTABLE_API \ $(SCHRO_CFLAGS) libgstschro_la_LIBADD = \ - $(top_builddir)/gst-libs/gst/video/libgstbasevideo-@GST_MAJORMINOR@.la \ - $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_MAJORMINOR@ \ + $(top_builddir)/gst-libs/gst/video/libgstbasevideo-@GST_API_VERSION@.la \ + $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_API_VERSION@ \ $(GST_BASE_LIBS) $(GST_LIBS) \ $(SCHRO_LIBS) libgstschro_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) diff --git a/ext/sdl/Makefile.am b/ext/sdl/Makefile.am index 6bc4264f6..5715ce67c 100644 --- a/ext/sdl/Makefile.am +++ b/ext/sdl/Makefile.am @@ -7,9 +7,9 @@ libgstsdl_la_SOURCES = \ libgstsdl_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(SDL_CFLAGS) libgstsdl_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) libgstsdl_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstsdl_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/ext/soundtouch/Makefile.am b/ext/soundtouch/Makefile.am index 07832a7bc..34365f6ae 100644 --- a/ext/soundtouch/Makefile.am +++ b/ext/soundtouch/Makefile.am @@ -7,7 +7,7 @@ libgstsoundtouch_la_SOURCES = \ libgstsoundtouch_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(SOUNDTOUCH_CFLAGS) libgstsoundtouch_la_CXXFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CXXFLAGS) $(SOUNDTOUCH_CFLAGS) -libgstsoundtouch_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) $(GST_BASE_LIBS) $(GST_LIBS) $(SOUNDTOUCH_LIBS) $(LIBM) +libgstsoundtouch_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_API_VERSION) $(GST_BASE_LIBS) $(GST_LIBS) $(SOUNDTOUCH_LIBS) $(LIBM) libgstsoundtouch_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstsoundtouch_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/ext/voaacenc/Makefile.am b/ext/voaacenc/Makefile.am index 8f58c2092..2e1f28f53 100644 --- a/ext/voaacenc/Makefile.am +++ b/ext/voaacenc/Makefile.am @@ -11,8 +11,8 @@ libgstvoaacenc_la_CFLAGS = -DGST_USE_UNSTABLE_API \ $(VOAACENC_CFLAGS) libgstvoaacenc_la_LIBADD = \ $(GST_PLUGINS_BASE_LIBS) \ - -lgstaudio-$(GST_MAJORMINOR) \ - -lgstpbutils-$(GST_MAJORMINOR) \ + -lgstaudio-$(GST_API_VERSION) \ + -lgstpbutils-$(GST_API_VERSION) \ $(GST_BASE_LIBS) \ $(GST_LIBS) \ $(VOAACENC_LIBS) @@ -22,6 +22,6 @@ libgstvoaacenc_la_LIBTOOLFLAGS = --tag=disable-static noinst_HEADERS = \ gstvoaacenc.h -presetdir = $(datadir)/gstreamer-$(GST_MAJORMINOR)/presets +presetdir = $(datadir)/gstreamer-$(GST_API_VERSION)/presets EXTRA_DIST = $(preset_DATA) diff --git a/ext/voamrwbenc/Makefile.am b/ext/voamrwbenc/Makefile.am index b96239033..64c6ae780 100644 --- a/ext/voamrwbenc/Makefile.am +++ b/ext/voamrwbenc/Makefile.am @@ -7,14 +7,14 @@ libgstvoamrwbenc_la_SOURCES = \ libgstvoamrwbenc_la_CFLAGS = -DGST_USE_UNSTABLE_API \ $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(VOAMRWBENC_CFLAGS) libgstvoamrwbenc_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \ - -lgstaudio-$(GST_MAJORMINOR) $(GST_BASE_LIBS) $(VOAMRWBENC_LIBS) + -lgstaudio-$(GST_API_VERSION) $(GST_BASE_LIBS) $(VOAMRWBENC_LIBS) libgstvoamrwbenc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstvoamrwbenc_la_LIBTOOLFLAGS = --tag=disable-static noinst_HEADERS = \ gstvoamrwbenc.h -presetdir = $(datadir)/gstreamer-$(GST_MAJORMINOR)/presets +presetdir = $(datadir)/gstreamer-$(GST_API_VERSION)/presets preset_DATA = GstVoAmrwbEnc.prs EXTRA_DIST = $(preset_DATA) diff --git a/ext/vp8/Makefile.am b/ext/vp8/Makefile.am index 312966c6a..5985b0bbe 100644 --- a/ext/vp8/Makefile.am +++ b/ext/vp8/Makefile.am @@ -14,8 +14,8 @@ libgstvp8_la_CFLAGS = \ $(GST_CFLAGS) \ -DGST_USE_UNSTABLE_API libgstvp8_la_LIBADD = \ - $(top_builddir)/gst-libs/gst/video/libgstbasevideo-@GST_MAJORMINOR@.la \ - $(GST_PLUGINS_BASE_LIBS) -lgsttag-@GST_MAJORMINOR@ -lgstvideo-@GST_MAJORMINOR@ \ + $(top_builddir)/gst-libs/gst/video/libgstbasevideo-@GST_API_VERSION@.la \ + $(GST_PLUGINS_BASE_LIBS) -lgsttag-@GST_API_VERSION@ -lgstvideo-@GST_API_VERSION@ \ $(GST_BASE_LIBS) $(GST_LIBS) $(VPX_LIBS) libgstvp8_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstvp8_la_LIBTOOLFLAGS = --tag=disable-static @@ -25,7 +25,7 @@ noinst_HEADERS = \ gstvp8enc.h \ gstvp8utils.h -presetdir = $(datadir)/gstreamer-$(GST_MAJORMINOR)/presets +presetdir = $(datadir)/gstreamer-$(GST_API_VERSION)/presets preset_DATA = GstVP8Enc.prs EXTRA_DIST = $(preset_DATA) diff --git a/ext/wayland/Makefile.am b/ext/wayland/Makefile.am index 122e8f09e..c2dea73c6 100644 --- a/ext/wayland/Makefile.am +++ b/ext/wayland/Makefile.am @@ -4,8 +4,8 @@ libgstwaylandsink_la_SOURCES = gstwaylandsink.c libgstwaylandsink_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) \ $(WAYLAND_CFLAGS) libgstwaylandsink_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \ - -lgstvideo-$(GST_MAJORMINOR) \ - -lgstinterfaces-$(GST_MAJORMINOR) \ + -lgstvideo-$(GST_API_VERSION) \ + -lgstinterfaces-$(GST_API_VERSION) \ $(WAYLAND_LIBS) $(LIBOIL_LIBS) libgstwaylandsink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstwaylandsink_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/ext/zbar/Makefile.am b/ext/zbar/Makefile.am index 2b1f37007..566e2bd92 100644 --- a/ext/zbar/Makefile.am +++ b/ext/zbar/Makefile.am @@ -3,7 +3,7 @@ plugin_LTLIBRARIES = libgstzbar.la libgstzbar_la_SOURCES = gstzbar.c libgstzbar_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(ZBAR_CFLAGS) -libgstzbar_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_MAJORMINOR@ $(GST_BASE_LIBS) $(GST_LIBS) $(ZBAR_LIBS) +libgstzbar_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_API_VERSION@ $(GST_BASE_LIBS) $(GST_LIBS) $(ZBAR_LIBS) libgstzbar_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstzbar_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/gst-libs/gst/basecamerabinsrc/Makefile.am b/gst-libs/gst/basecamerabinsrc/Makefile.am index 2f6408086..51f10bae3 100644 --- a/gst-libs/gst/basecamerabinsrc/Makefile.am +++ b/gst-libs/gst/basecamerabinsrc/Makefile.am @@ -1,39 +1,39 @@ -lib_LTLIBRARIES = libgstbasecamerabinsrc-@GST_MAJORMINOR@.la +lib_LTLIBRARIES = libgstbasecamerabinsrc-@GST_API_VERSION@.la CLEANFILES = $(BUILT_SOURCES) -libgstbasecamerabinsrc_@GST_MAJORMINOR@_la_SOURCES = \ +libgstbasecamerabinsrc_@GST_API_VERSION@_la_SOURCES = \ gstcamerabin-enum.c \ gstcamerabinpreview.c \ gstbasecamerasrc.c -libgstbasecamerabinsrc_@GST_MAJORMINOR@includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/basecamerabinsrc -libgstbasecamerabinsrc_@GST_MAJORMINOR@include_HEADERS = \ +libgstbasecamerabinsrc_@GST_API_VERSION@includedir = $(includedir)/gstreamer-@GST_API_VERSION@/gst/basecamerabinsrc +libgstbasecamerabinsrc_@GST_API_VERSION@include_HEADERS = \ gstcamerabin-enum.h \ gstcamerabinpreview.h \ gstbasecamerasrc.h -libgstbasecamerabinsrc_@GST_MAJORMINOR@_la_CFLAGS = \ +libgstbasecamerabinsrc_@GST_API_VERSION@_la_CFLAGS = \ $(GST_PLUGINS_BAD_CFLAGS) \ $(GST_PLUGINS_BASE_CFLAGS) \ -DGST_USE_UNSTABLE_API \ $(GST_CFLAGS) -libgstbasecamerabinsrc_@GST_MAJORMINOR@_la_LIBADD = \ - -lgstapp-$(GST_MAJORMINOR) $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) +libgstbasecamerabinsrc_@GST_API_VERSION@_la_LIBADD = \ + -lgstapp-$(GST_API_VERSION) $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) -libgstbasecamerabinsrc_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) +libgstbasecamerabinsrc_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) Android.mk: Makefile.am - androgenizer -:PROJECT libgstbasecamerabinsrc -:STATIC libgstbasecamerabinsrc-@GST_MAJORMINOR@ \ + androgenizer -:PROJECT libgstbasecamerabinsrc -:STATIC libgstbasecamerabinsrc-@GST_API_VERSION@ \ -:TAGS eng debug \ -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ - -:SOURCES $(libgstbasecamerabinsrc_@GST_MAJORMINOR@_la_SOURCES) \ - -:CFLAGS $(DEFS) $(libgstbasecamerabinsrc_@GST_MAJORMINOR@_la_CFLAGS) \ - -:LDFLAGS $(libgstbasecamerabinsrc_@GST_MAJORMINOR@_la_LDFLAGS) \ - $(libgstbasecamerabinsrc_@GST_MAJORMINOR@_la_LIBADD) \ + -:SOURCES $(libgstbasecamerabinsrc_@GST_API_VERSION@_la_SOURCES) \ + -:CFLAGS $(DEFS) $(libgstbasecamerabinsrc_@GST_API_VERSION@_la_CFLAGS) \ + -:LDFLAGS $(libgstbasecamerabinsrc_@GST_API_VERSION@_la_LDFLAGS) \ + $(libgstbasecamerabinsrc_@GST_API_VERSION@_la_LIBADD) \ -ldl \ - -:HEADER_TARGET gstreamer-@GST_MAJORMINOR@/gst/basecamerabinsrc \ + -:HEADER_TARGET gstreamer-@GST_API_VERSION@/gst/basecamerabinsrc \ -:HEADERS $(libgstbasecamerabinsrcinclude_HEADERS) \ -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ > $@ diff --git a/gst-libs/gst/codecparsers/Makefile.am b/gst-libs/gst/codecparsers/Makefile.am index 2593f85c5..f6d592630 100644 --- a/gst-libs/gst/codecparsers/Makefile.am +++ b/gst-libs/gst/codecparsers/Makefile.am @@ -1,42 +1,42 @@ -lib_LTLIBRARIES = libgstcodecparsers-@GST_MAJORMINOR@.la +lib_LTLIBRARIES = libgstcodecparsers-@GST_API_VERSION@.la -libgstcodecparsers_@GST_MAJORMINOR@_la_SOURCES = \ +libgstcodecparsers_@GST_API_VERSION@_la_SOURCES = \ gstmpegvideoparser.c gsth264parser.c gstvc1parser.c gstmpeg4parser.c \ parserutils.c -libgstcodecparsers_@GST_MAJORMINOR@includedir = \ - $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/codecparsers +libgstcodecparsers_@GST_API_VERSION@includedir = \ + $(includedir)/gstreamer-@GST_API_VERSION@/gst/codecparsers noinst_HEADERS = parserutils.h -libgstcodecparsers_@GST_MAJORMINOR@include_HEADERS = \ +libgstcodecparsers_@GST_API_VERSION@include_HEADERS = \ gstmpegvideoparser.h gsth264parser.h gstvc1parser.h gstmpeg4parser.h -libgstcodecparsers_@GST_MAJORMINOR@_la_CFLAGS = \ +libgstcodecparsers_@GST_API_VERSION@_la_CFLAGS = \ $(GST_PLUGINS_BAD_CFLAGS) \ -DGST_USE_UNSTABLE_API \ $(GST_CFLAGS) -libgstcodecparsers_@GST_MAJORMINOR@_la_LIBADD = \ +libgstcodecparsers_@GST_API_VERSION@_la_LIBADD = \ $(GST_BASE_LIBS) \ $(GST_LIBS) -libgstcodecparsers_@GST_MAJORMINOR@_la_LDFLAGS = \ +libgstcodecparsers_@GST_API_VERSION@_la_LDFLAGS = \ $(GST_LIB_LDFLAGS) \ $(GST_ALL_LDFLAGS) \ $(GST_LT_LDFLAGS) Android.mk: $(BUILT_SOURCES) Makefile.am - androgenizer -:PROJECT libgstcodecparsers -:STATIC libgstcodecparsers-@GST_MAJORMINOR@ \ + androgenizer -:PROJECT libgstcodecparsers -:STATIC libgstcodecparsers-@GST_API_VERSION@ \ -:TAGS eng debug \ -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ - -:SOURCES $(libgstcodecparsers_@GST_MAJORMINOR@_la_SOURCES) \ + -:SOURCES $(libgstcodecparsers_@GST_API_VERSION@_la_SOURCES) \ $(built_sources) \ - -:CFLAGS $(DEFS) $(libgstcodecparsers_@GST_MAJORMINOR@_la_CFLAGS) \ - -:LDFLAGS $(libgstcodecparsers_@GST_MAJORMINOR@_la_LDFLAGS) \ - $(libgstcodecparsers@GST_MAJORMINOR@_la_LIBADD) \ + -:CFLAGS $(DEFS) $(libgstcodecparsers_@GST_API_VERSION@_la_CFLAGS) \ + -:LDFLAGS $(libgstcodecparsers_@GST_API_VERSION@_la_LDFLAGS) \ + $(libgstcodecparsers@GST_API_VERSION@_la_LIBADD) \ -ldl \ - -:HEADER_TARGET gstreamer-@GST_MAJORMINOR@/gst/codecparsers \ + -:HEADER_TARGET gstreamer-@GST_API_VERSION@/gst/codecparsers \ -:HEADERS $(libgstcodecparsersinclude_HEADERS) \ $(built_headers) \ -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ diff --git a/gst-libs/gst/interfaces/Makefile.am b/gst-libs/gst/interfaces/Makefile.am index e6fb630ad..6401a83f5 100644 --- a/gst-libs/gst/interfaces/Makefile.am +++ b/gst-libs/gst/interfaces/Makefile.am @@ -1,6 +1,6 @@ -lib_LTLIBRARIES = libgstphotography-@GST_MAJORMINOR@.la +lib_LTLIBRARIES = libgstphotography-@GST_API_VERSION@.la libgstphotographyincludedir = \ - $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/interfaces + $(includedir)/gstreamer-@GST_API_VERSION@/gst/interfaces headers_photography = \ photography.h @@ -23,18 +23,18 @@ libgstphotographyinclude_HEADERS = \ nodist_libgstphotographyinclude_HEADERS = \ photography-enumtypes.h -libgstphotography_@GST_MAJORMINOR@_la_SOURCES = \ +libgstphotography_@GST_API_VERSION@_la_SOURCES = \ photography.c -nodist_libgstphotography_@GST_MAJORMINOR@_la_SOURCES = \ +nodist_libgstphotography_@GST_API_VERSION@_la_SOURCES = \ $(built_sources) -libgstphotography_@GST_MAJORMINOR@_la_CFLAGS = \ +libgstphotography_@GST_API_VERSION@_la_CFLAGS = \ -DGST_USE_UNSTABLE_API \ $(GST_PLUGINS_BAD_CFLAGS) \ $(GST_CFLAGS) -libgstphotography_@GST_MAJORMINOR@_la_LIBADD = $(GST_LIBS) -libgstphotography_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) +libgstphotography_@GST_API_VERSION@_la_LIBADD = $(GST_LIBS) +libgstphotography_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) BUILT_SOURCES = \ $(built_sources) \ @@ -45,16 +45,16 @@ CLEANFILES = $(BUILT_SOURCES) include $(top_srcdir)/common/gst-glib-gen.mak Android.mk: $(BUILT_SOURCES) Makefile.am - androgenizer -:PROJECT libgstphotography -:STATIC libgstphotography-@GST_MAJORMINOR@ \ + androgenizer -:PROJECT libgstphotography -:STATIC libgstphotography-@GST_API_VERSION@ \ -:TAGS eng debug \ -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ - -:SOURCES $(libgstphotography_@GST_MAJORMINOR@_la_SOURCES) \ + -:SOURCES $(libgstphotography_@GST_API_VERSION@_la_SOURCES) \ $(built_sources) \ - -:CFLAGS $(DEFS) $(libgstphotography_@GST_MAJORMINOR@_la_CFLAGS) \ - -:LDFLAGS $(libgstphotography_@GST_MAJORMINOR@_la_LDFLAGS) \ - $(libgstphotography_@GST_MAJORMINOR@_la_LIBADD) \ + -:CFLAGS $(DEFS) $(libgstphotography_@GST_API_VERSION@_la_CFLAGS) \ + -:LDFLAGS $(libgstphotography_@GST_API_VERSION@_la_LDFLAGS) \ + $(libgstphotography_@GST_API_VERSION@_la_LIBADD) \ -ldl \ - -:HEADER_TARGET gstreamer-@GST_MAJORMINOR@/gst/photography \ + -:HEADER_TARGET gstreamer-@GST_API_VERSION@/gst/photography \ -:HEADERS $(libgstphotographyinclude_HEADERS) \ $(built_headers) \ -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ diff --git a/gst-libs/gst/signalprocessor/Makefile.am b/gst-libs/gst/signalprocessor/Makefile.am index 9172685fb..c1c6fb152 100644 --- a/gst-libs/gst/signalprocessor/Makefile.am +++ b/gst-libs/gst/signalprocessor/Makefile.am @@ -1,16 +1,16 @@ -lib_LTLIBRARIES = libgstsignalprocessor-@GST_MAJORMINOR@.la +lib_LTLIBRARIES = libgstsignalprocessor-@GST_API_VERSION@.la -libgstsignalprocessor_@GST_MAJORMINOR@includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/signalprocessor -libgstsignalprocessor_@GST_MAJORMINOR@include_HEADERS = gstsignalprocessor.h +libgstsignalprocessor_@GST_API_VERSION@includedir = $(includedir)/gstreamer-@GST_API_VERSION@/gst/signalprocessor +libgstsignalprocessor_@GST_API_VERSION@include_HEADERS = gstsignalprocessor.h -libgstsignalprocessor_@GST_MAJORMINOR@_la_SOURCES = gstsignalprocessor.c -libgstsignalprocessor_@GST_MAJORMINOR@_la_CFLAGS = \ +libgstsignalprocessor_@GST_API_VERSION@_la_SOURCES = gstsignalprocessor.c +libgstsignalprocessor_@GST_API_VERSION@_la_CFLAGS = \ $(GST_PLUGINS_BAD_CFLAGS) \ $(GST_PLUGINS_BASE_CFLAGS) \ $(GST_CFLAGS) -libgstsignalprocessor_@GST_MAJORMINOR@_la_LIBADD = \ - $(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_MAJORMINOR@ \ +libgstsignalprocessor_@GST_API_VERSION@_la_LIBADD = \ + $(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_API_VERSION@ \ $(GST_LIBS) -libgstsignalprocessor_@GST_MAJORMINOR@_la_LDFLAGS = \ +libgstsignalprocessor_@GST_API_VERSION@_la_LDFLAGS = \ $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am index 56f2572b3..52abc1df1 100644 --- a/gst-libs/gst/video/Makefile.am +++ b/gst-libs/gst/video/Makefile.am @@ -1,9 +1,9 @@ -lib_LTLIBRARIES = libgstbasevideo-@GST_MAJORMINOR@.la +lib_LTLIBRARIES = libgstbasevideo-@GST_API_VERSION@.la CLEANFILES = $(BUILT_SOURCES) -libgstbasevideo_@GST_MAJORMINOR@_la_SOURCES = \ +libgstbasevideo_@GST_API_VERSION@_la_SOURCES = \ gstbasevideocodec.c \ gstbasevideoutils.c \ gstbasevideodecoder.c \ @@ -12,8 +12,8 @@ libgstbasevideo_@GST_MAJORMINOR@_la_SOURCES = \ gstsurfaceconverter.c \ videocontext.c -libgstbasevideo_@GST_MAJORMINOR@includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/video -libgstbasevideo_@GST_MAJORMINOR@include_HEADERS = \ +libgstbasevideo_@GST_API_VERSION@includedir = $(includedir)/gstreamer-@GST_API_VERSION@/gst/video +libgstbasevideo_@GST_API_VERSION@include_HEADERS = \ gstbasevideocodec.h \ gstbasevideoutils.h \ gstbasevideodecoder.h \ @@ -22,11 +22,11 @@ libgstbasevideo_@GST_MAJORMINOR@include_HEADERS = \ gstsurfaceconverter.h \ videocontext.h -libgstbasevideo_@GST_MAJORMINOR@_la_CFLAGS = \ +libgstbasevideo_@GST_API_VERSION@_la_CFLAGS = \ $(GST_PLUGINS_BAD_CFLAGS) \ $(GST_PLUGINS_BASE_CFLAGS) \ -DGST_USE_UNSTABLE_API \ $(GST_CFLAGS) -libgstbasevideo_@GST_MAJORMINOR@_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) -lgstvideo-@GST_MAJORMINOR@ -libgstbasevideo_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) +libgstbasevideo_@GST_API_VERSION@_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) -lgstvideo-@GST_API_VERSION@ +libgstbasevideo_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) diff --git a/gst-plugins-bad.spec.in b/gst-plugins-bad.spec.in index 0a728a7fd..03072f3d6 100644 --- a/gst-plugins-bad.spec.in +++ b/gst-plugins-bad.spec.in @@ -1,4 +1,4 @@ -%define majorminor @GST_MAJORMINOR@ +%define majorminor @GST_API_VERSION@ %define gstreamer gstreamer %define gst_minver 0.10.30 diff --git a/gst/adpcmdec/Makefile.am b/gst/adpcmdec/Makefile.am index f82cb9b46..16b29e596 100644 --- a/gst/adpcmdec/Makefile.am +++ b/gst/adpcmdec/Makefile.am @@ -7,7 +7,7 @@ libgstadpcmdec_la_SOURCES = adpcmdec.c # add other _CFLAGS and _LIBS as needed libgstadpcmdec_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) libgstadpcmdec_la_LIBADD = \ - $(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_MAJORMINOR@ \ + $(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_API_VERSION@ \ $(GST_BASE_LIBS) $(GST_LIBS) libgstadpcmdec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstadpcmdec_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/gst/adpcmenc/Makefile.am b/gst/adpcmenc/Makefile.am index bfd945d50..1ae6ebaaa 100644 --- a/gst/adpcmenc/Makefile.am +++ b/gst/adpcmenc/Makefile.am @@ -6,7 +6,7 @@ libgstadpcmenc_la_SOURCES = adpcmenc.c # flags used to compile this plugin # add other _CFLAGS and _LIBS as needed libgstadpcmenc_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) -libgstadpcmenc_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_MAJORMINOR@ \ +libgstadpcmenc_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_API_VERSION@ \ $(GST_LIBS) libgstadpcmenc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstadpcmenc_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/gst/aiff/Makefile.am b/gst/aiff/Makefile.am index 2eb8392b8..7154d3bc8 100644 --- a/gst/aiff/Makefile.am +++ b/gst/aiff/Makefile.am @@ -7,7 +7,7 @@ libgstaiff_la_CFLAGS = \ $(GST_BASE_CFLAGS) \ $(GST_CFLAGS) libgstaiff_la_LIBADD = \ - $(GST_PLUGINS_BASE_LIBS) -lgsttag-$(GST_MAJORMINOR) \ + $(GST_PLUGINS_BASE_LIBS) -lgsttag-$(GST_API_VERSION) \ $(GST_BASE_LIBS) \ $(LIBM) libgstaiff_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) diff --git a/gst/asfmux/Makefile.am b/gst/asfmux/Makefile.am index 8678fee5d..0c23883dc 100644 --- a/gst/asfmux/Makefile.am +++ b/gst/asfmux/Makefile.am @@ -13,7 +13,7 @@ libgstasfmux_la_SOURCES = gstasfmux.c \ # add other _CFLAGS and _LIBS as needed libgstasfmux_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) libgstasfmux_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) \ - -lgstrtp-@GST_MAJORMINOR@ + -lgstrtp-@GST_API_VERSION@ libgstasfmux_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstasfmux_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/gst/audiobuffer/Makefile.am b/gst/audiobuffer/Makefile.am index ff63c8cdb..4bf528f0b 100644 --- a/gst/audiobuffer/Makefile.am +++ b/gst/audiobuffer/Makefile.am @@ -4,7 +4,7 @@ libgstaudiobuffer_la_SOURCES = gstaudioringbuffer.c libgstaudiobuffer_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) \ $(GST_CFLAGS) libgstaudiobuffer_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) \ - -lgstaudio-$(GST_MAJORMINOR) + -lgstaudio-$(GST_API_VERSION) libgstaudiobuffer_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstaudiobuffer_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/gst/audiovisualizers/Makefile.am b/gst/audiovisualizers/Makefile.am index c83f84a35..e92fa1671 100644 --- a/gst/audiovisualizers/Makefile.am +++ b/gst/audiovisualizers/Makefile.am @@ -11,8 +11,8 @@ libgstaudiovisualizers_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) \ $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) \ $(GST_CFLAGS) libgstaudiovisualizers_la_LIBADD = \ - $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) \ - -lgstvideo-$(GST_MAJORMINOR) -lgstfft-$(GST_MAJORMINOR) \ + $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_API_VERSION) \ + -lgstvideo-$(GST_API_VERSION) -lgstfft-$(GST_API_VERSION) \ $(GST_BASE_LIBS) $(GST_LIBS) $(LIBM) libgstaudiovisualizers_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstaudiovisualizers_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/gst/bayer/Makefile.am b/gst/bayer/Makefile.am index d67899ecc..53c810fd2 100644 --- a/gst/bayer/Makefile.am +++ b/gst/bayer/Makefile.am @@ -14,7 +14,7 @@ libgstbayer_la_SOURCES = \ libgstbayer_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) \ $(ORC_CFLAGS) \ $(GST_CFLAGS) -libgstbayer_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) \ +libgstbayer_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) \ $(ORC_LIBS) \ $(GST_BASE_LIBS) libgstbayer_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) diff --git a/gst/camerabin/Makefile.am b/gst/camerabin/Makefile.am index b29a54d0c..58147bc7c 100644 --- a/gst/camerabin/Makefile.am +++ b/gst/camerabin/Makefile.am @@ -29,9 +29,9 @@ libgstcamerabin_la_CFLAGS = \ $(GST_CFLAGS) $(GST_BASE_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) \ -DGST_USE_UNSTABLE_API libgstcamerabin_la_LIBADD = \ - $(top_builddir)/gst-libs/gst/interfaces/libgstphotography-$(GST_MAJORMINOR).la \ + $(top_builddir)/gst-libs/gst/interfaces/libgstphotography-$(GST_API_VERSION).la \ $(GST_LIBS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) \ - -lgstinterfaces-$(GST_MAJORMINOR) -lgsttag-$(GST_MAJORMINOR) + -lgstinterfaces-$(GST_API_VERSION) -lgsttag-$(GST_API_VERSION) libgstcamerabin_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstcamerabin_la_LIBTOOLFLAGS = --tag=disable-static @@ -56,8 +56,8 @@ Android.mk: Makefile.am $(BUILT_SOURCES) -:LDFLAGS $(libgstcamerabin_la_LDFLAGS) \ $(libgstcamerabin_la_LIBADD) \ -ldl \ - -:LIBFILTER_STATIC gstphotography-@GST_MAJORMINOR@ \ - gstbasecamerabinsrc-@GST_MAJORMINOR@ \ + -:LIBFILTER_STATIC gstphotography-@GST_API_VERSION@ \ + gstbasecamerabinsrc-@GST_API_VERSION@ \ -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \ > $@ diff --git a/gst/camerabin2/Makefile.am b/gst/camerabin2/Makefile.am index 3433263ad..011ea7847 100644 --- a/gst/camerabin2/Makefile.am +++ b/gst/camerabin2/Makefile.am @@ -13,9 +13,9 @@ libgstcamerabin2_la_CFLAGS = \ -DGST_USE_UNSTABLE_API libgstcamerabin2_la_LIBADD = \ - $(top_builddir)/gst-libs/gst/interfaces/libgstphotography-$(GST_MAJORMINOR).la \ - $(top_builddir)/gst-libs/gst/basecamerabinsrc/libgstbasecamerabinsrc-$(GST_MAJORMINOR).la \ - $(GST_PLUGINS_BASE_LIBS) -lgstinterfaces-$(GST_MAJORMINOR) -lgsttag-$(GST_MAJORMINOR) -lgstapp-$(GST_MAJORMINOR) -lgstpbutils-$(GST_MAJORMINOR) \ + $(top_builddir)/gst-libs/gst/interfaces/libgstphotography-$(GST_API_VERSION).la \ + $(top_builddir)/gst-libs/gst/basecamerabinsrc/libgstbasecamerabinsrc-$(GST_API_VERSION).la \ + $(GST_PLUGINS_BASE_LIBS) -lgstinterfaces-$(GST_API_VERSION) -lgsttag-$(GST_API_VERSION) -lgstapp-$(GST_API_VERSION) -lgstpbutils-$(GST_API_VERSION) \ $(GST_BASE_LIBS) $(GST_LIBS) libgstcamerabin2_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) @@ -36,8 +36,8 @@ Android.mk: Makefile.am $(BUILT_SOURCES) -:LDFLAGS $(libgstcamerabin2_la_LDFLAGS) \ $(libgstcamerabin2_la_LIBADD) \ -ldl \ - -:LIBFILTER_STATIC gstphotography-@GST_MAJORMINOR@ \ - gstbasecamerabinsrc-@GST_MAJORMINOR@ \ + -:LIBFILTER_STATIC gstphotography-@GST_API_VERSION@ \ + gstbasecamerabinsrc-@GST_API_VERSION@ \ -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \ > $@ diff --git a/gst/cdxaparse/Makefile.am b/gst/cdxaparse/Makefile.am index f7a11db3b..bcf78287d 100644 --- a/gst/cdxaparse/Makefile.am +++ b/gst/cdxaparse/Makefile.am @@ -18,7 +18,7 @@ libgstcdxaparse_la_LIBADD = \ $(GST_LIBS) \ $(GST_BASE_LIBS) \ $(GST_PLUGINS_BASE_LIBS) \ - -lgstriff-@GST_MAJORMINOR@ + -lgstriff-@GST_API_VERSION@ libgstcdxaparse_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstcdxaparse_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/gst/coloreffects/Makefile.am b/gst/coloreffects/Makefile.am index 24a8b8062..839f12762 100644 --- a/gst/coloreffects/Makefile.am +++ b/gst/coloreffects/Makefile.am @@ -9,7 +9,7 @@ libgstcoloreffects_la_CFLAGS = \ $(GST_BASE_CFLAGS) \ $(GST_CFLAGS) libgstcoloreffects_la_LIBADD = \ - $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_MAJORMINOR@ \ + $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_API_VERSION@ \ $(GST_BASE_LIBS) \ $(GST_LIBS) libgstcoloreffects_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) diff --git a/gst/debugutils/Makefile.am b/gst/debugutils/Makefile.am index b35bb4dbb..ebcbde58e 100644 --- a/gst/debugutils/Makefile.am +++ b/gst/debugutils/Makefile.am @@ -29,8 +29,8 @@ libgstdebugutilsbad_la_SOURCES = \ nodist_libgstdebugutilsbad_la_SOURCES = $(BUILT_SOURCES) libgstdebugutilsbad_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) libgstdebugutilsbad_la_LIBADD = $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) \ - -lgstvideo-$(GST_MAJORMINOR) \ - -lgstinterfaces-$(GST_MAJORMINOR) $(GST_LIBS) + -lgstvideo-$(GST_API_VERSION) \ + -lgstinterfaces-$(GST_API_VERSION) $(GST_LIBS) libgstdebugutilsbad_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstdebugutilsbad_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/gst/dtmf/Makefile.am b/gst/dtmf/Makefile.am index d57432363..00b648f34 100644 --- a/gst/dtmf/Makefile.am +++ b/gst/dtmf/Makefile.am @@ -16,7 +16,7 @@ noinst_HEADERS = gstdtmfsrc.h \ libgstdtmf_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) \ -DEXTERN_BUF -DRTP_SUPPORT -libgstdtmf_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstrtp-@GST_MAJORMINOR@ \ +libgstdtmf_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstrtp-@GST_API_VERSION@ \ $(GST_BASE_LIBS) $(GST_LIBS) $(LIBM) libgstdtmf_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstdtmf_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/gst/dvbsuboverlay/Makefile.am b/gst/dvbsuboverlay/Makefile.am index 859861278..8577316bd 100644 --- a/gst/dvbsuboverlay/Makefile.am +++ b/gst/dvbsuboverlay/Makefile.am @@ -3,7 +3,7 @@ plugin_LTLIBRARIES = libgstdvbsuboverlay.la libgstdvbsuboverlay_la_SOURCES = dvb-sub.c gstdvbsuboverlay.c libgstdvbsuboverlay_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) -libgstdvbsuboverlay_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_MAJORMINOR@ $(GST_LIBS) +libgstdvbsuboverlay_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_API_VERSION@ $(GST_LIBS) libgstdvbsuboverlay_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstdvbsuboverlay_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/gst/dvdspu/Makefile.am b/gst/dvdspu/Makefile.am index 0acbcb9ad..b616aae52 100644 --- a/gst/dvdspu/Makefile.am +++ b/gst/dvdspu/Makefile.am @@ -4,7 +4,7 @@ plugin_LTLIBRARIES = libgstdvdspu.la libgstdvdspu_la_SOURCES = gstdvdspu.c gstdvdspu-render.c gstspu-vobsub.c gstspu-vobsub-render.c gstspu-pgs.c libgstdvdspu_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) -libgstdvdspu_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) \ +libgstdvdspu_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) \ $(GST_LIBS) libgstdvdspu_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstdvdspu_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/gst/faceoverlay/Makefile.am b/gst/faceoverlay/Makefile.am index 30b780c20..74ce30a4e 100644 --- a/gst/faceoverlay/Makefile.am +++ b/gst/faceoverlay/Makefile.am @@ -5,7 +5,7 @@ libgstfaceoverlay_la_SOURCES = gstfaceoverlay.c # compiler and linker flags used to compile this plugin, set in configure.ac libgstfaceoverlay_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) -libgstfaceoverlay_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_MAJORMINOR@ $(GST_LIBS) +libgstfaceoverlay_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_API_VERSION@ $(GST_LIBS) libgstfaceoverlay_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstfaceoverlay_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/gst/fieldanalysis/Makefile.am b/gst/fieldanalysis/Makefile.am index e6c02ad2f..aeaf61b27 100644 --- a/gst/fieldanalysis/Makefile.am +++ b/gst/fieldanalysis/Makefile.am @@ -14,8 +14,8 @@ libgstfieldanalysis_la_CFLAGS = \ $(ORC_CFLAGS) libgstfieldanalysis_la_LIBADD = \ - $(top_builddir)/gst-libs/gst/video/libgstbasevideo-@GST_MAJORMINOR@.la \ - $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_MAJORMINOR@ \ + $(top_builddir)/gst-libs/gst/video/libgstbasevideo-@GST_API_VERSION@.la \ + $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_API_VERSION@ \ $(GST_BASE_LIBS) \ $(GST_LIBS) \ $(ORC_LIBS) diff --git a/gst/frei0r/Makefile.am b/gst/frei0r/Makefile.am index 3a1ebbd24..79b23b80e 100644 --- a/gst/frei0r/Makefile.am +++ b/gst/frei0r/Makefile.am @@ -8,7 +8,7 @@ libgstfrei0r_la_SOURCES = \ libgstfrei0r_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) libgstfrei0r_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) \ - -lgstvideo-@GST_MAJORMINOR@ + -lgstvideo-@GST_API_VERSION@ libgstfrei0r_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstfrei0r_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/gst/gaudieffects/Makefile.am b/gst/gaudieffects/Makefile.am index 9537e7af6..84d9fbe28 100644 --- a/gst/gaudieffects/Makefile.am +++ b/gst/gaudieffects/Makefile.am @@ -3,7 +3,7 @@ plugin_LTLIBRARIES = libgstgaudieffects.la libgstgaudieffects_la_SOURCES = gstburn.c gstchromium.c gstdilate.c \ gstdodge.c gstexclusion.c gstgaussblur.c gstsolarize.c gstplugin.c libgstgaudieffects_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) -libgstgaudieffects_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_MAJORMINOR@ $(GST_LIBS) $(LIBM) +libgstgaudieffects_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_API_VERSION@ $(GST_LIBS) $(LIBM) libgstgaudieffects_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstgaudieffects_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/gst/geometrictransform/Makefile.am b/gst/geometrictransform/Makefile.am index 907204463..4f11c8a2a 100644 --- a/gst/geometrictransform/Makefile.am +++ b/gst/geometrictransform/Makefile.am @@ -23,8 +23,8 @@ libgstgeometrictransform_la_SOURCES = plugin.c \ libgstgeometrictransform_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \ $(GST_PLUGINS_BASE_CFLAGS) libgstgeometrictransform_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \ - -lgstvideo-@GST_MAJORMINOR@ \ - -lgstinterfaces-@GST_MAJORMINOR@ \ + -lgstvideo-@GST_API_VERSION@ \ + -lgstinterfaces-@GST_API_VERSION@ \ $(GST_BASE_LIBS) \ $(GST_LIBS) $(LIBM) libgstgeometrictransform_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) diff --git a/gst/id3tag/Makefile.am b/gst/id3tag/Makefile.am index f2ed73df7..8b39b119e 100644 --- a/gst/id3tag/Makefile.am +++ b/gst/id3tag/Makefile.am @@ -9,7 +9,7 @@ libgstid3tag_la_CFLAGS = \ $(GST_CFLAGS) libgstid3tag_la_LIBADD = \ - $(GST_PLUGINS_BASE_LIBS) -lgsttag-$(GST_MAJORMINOR) \ + $(GST_PLUGINS_BASE_LIBS) -lgsttag-$(GST_API_VERSION) \ $(GST_LIBS) libgstid3tag_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) diff --git a/gst/inter/Makefile.am b/gst/inter/Makefile.am index e40495987..5ae09850f 100644 --- a/gst/inter/Makefile.am +++ b/gst/inter/Makefile.am @@ -28,7 +28,7 @@ libgstinter_la_CFLAGS = \ $(GST_CFLAGS) libgstinter_la_LIBADD = \ - $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_MAJORMINOR@ -lgstaudio-@GST_MAJORMINOR@ \ + $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_API_VERSION@ -lgstaudio-@GST_API_VERSION@ \ $(GST_BASE_LIBS) \ $(GST_LIBS) \ $(LIBM) diff --git a/gst/interlace/Makefile.am b/gst/interlace/Makefile.am index 5e29e8b17..53ec1954e 100644 --- a/gst/interlace/Makefile.am +++ b/gst/interlace/Makefile.am @@ -9,7 +9,7 @@ libgstinterlace_la_CFLAGS = \ libgstinterlace_la_LIBADD = \ $(GST_LIBS) \ - $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_MAJORMINOR@ \ + $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_API_VERSION@ \ $(LIBM) libgstinterlace_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) diff --git a/gst/jpegformat/Makefile.am b/gst/jpegformat/Makefile.am index 80355d5df..0fe07a88d 100644 --- a/gst/jpegformat/Makefile.am +++ b/gst/jpegformat/Makefile.am @@ -5,8 +5,8 @@ libgstjpegformat_la_CFLAGS = \ $(GST_PLUGINS_BASE_CFLAGS) \ $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) libgstjpegformat_la_LIBADD = \ - $(GST_PLUGINS_BASE_LIBS) -lgstinterfaces-@GST_MAJORMINOR@ \ - -lgsttag-@GST_MAJORMINOR@ $(GST_LIBS) $(GST_BASE_LIBS) + $(GST_PLUGINS_BASE_LIBS) -lgstinterfaces-@GST_API_VERSION@ \ + -lgsttag-@GST_API_VERSION@ $(GST_LIBS) $(GST_BASE_LIBS) libgstjpegformat_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstjpegformat_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/gst/liveadder/Makefile.am b/gst/liveadder/Makefile.am index 0bbeff90f..303503f40 100644 --- a/gst/liveadder/Makefile.am +++ b/gst/liveadder/Makefile.am @@ -3,7 +3,7 @@ plugin_LTLIBRARIES = libgstliveadder.la libgstliveadder_la_SOURCES = liveadder.c libgstliveadder_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) libgstliveadder_la_LIBADD = \ - $(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_MAJORMINOR@ \ + $(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_API_VERSION@ \ $(GST_BASE_LIBS) $(GST_LIBS) libgstliveadder_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstliveadder_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/gst/mpegdemux/Makefile.am b/gst/mpegdemux/Makefile.am index 2932fee7f..d1372fbd8 100644 --- a/gst/mpegdemux/Makefile.am +++ b/gst/mpegdemux/Makefile.am @@ -17,7 +17,7 @@ libgstmpegdemux_la_CFLAGS = \ $(GST_PLUGINS_BASE_CFLAGS) \ $(GST_BASE_CFLAGS) $(GST_CFLAGS) libgstmpegdemux_la_LIBADD = \ - $(GST_PLUGINS_BASE_LIBS) -lgsttag-$(GST_MAJORMINOR) \ + $(GST_PLUGINS_BASE_LIBS) -lgsttag-$(GST_API_VERSION) \ $(GST_BASE_LIBS) $(GST_LIBS) libgstmpegdemux_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstmpegdemux_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/gst/mpegtsdemux/Makefile.am b/gst/mpegtsdemux/Makefile.am index ced0eacee..e6b727e42 100644 --- a/gst/mpegtsdemux/Makefile.am +++ b/gst/mpegtsdemux/Makefile.am @@ -13,7 +13,7 @@ libgstmpegtsdemux_la_CFLAGS = \ $(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) \ $(GST_BASE_CFLAGS) $(GST_CFLAGS) libgstmpegtsdemux_la_LIBADD = \ - $(GST_PLUGINS_BASE_LIBS) -lgsttag-$(GST_MAJORMINOR) \ + $(GST_PLUGINS_BASE_LIBS) -lgsttag-$(GST_API_VERSION) \ $(GST_BASE_LIBS) $(GST_LIBS) libgstmpegtsdemux_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstmpegtsdemux_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/gst/mpegtsmux/Makefile.am b/gst/mpegtsmux/Makefile.am index 99adf803f..a4a980193 100644 --- a/gst/mpegtsmux/Makefile.am +++ b/gst/mpegtsmux/Makefile.am @@ -9,7 +9,7 @@ libgstmpegtsmux_la_SOURCES = \ libgstmpegtsmux_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) libgstmpegtsmux_la_LIBADD = $(top_builddir)/gst/mpegtsmux/tsmux/libtsmux.la \ - $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_MAJORMINOR@ $(GST_BASE_LIBS) $(GST_LIBS) + $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_API_VERSION@ $(GST_BASE_LIBS) $(GST_LIBS) libgstmpegtsmux_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstmpegtsmux_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/gst/mxf/Makefile.am b/gst/mxf/Makefile.am index ac6478e5c..584991309 100644 --- a/gst/mxf/Makefile.am +++ b/gst/mxf/Makefile.am @@ -21,7 +21,7 @@ libgstmxf_la_SOURCES = \ libgstmxf_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) libgstmxf_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) \ - -lgstvideo-@GST_MAJORMINOR@ + -lgstvideo-@GST_API_VERSION@ libgstmxf_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstmxf_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/gst/patchdetect/Makefile.am b/gst/patchdetect/Makefile.am index 7c0e564d3..5e4452827 100644 --- a/gst/patchdetect/Makefile.am +++ b/gst/patchdetect/Makefile.am @@ -9,7 +9,7 @@ libgstpatchdetect_la_CFLAGS = \ $(GST_PLUGINS_BASE_CFLAGS) \ $(GST_CFLAGS) libgstpatchdetect_la_LIBADD = \ - $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) \ + $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) \ $(GST_BASE_LIBS) \ $(GST_LIBS) \ $(LIBM) diff --git a/gst/pnm/Makefile.am b/gst/pnm/Makefile.am index e702131c0..9d1542b78 100644 --- a/gst/pnm/Makefile.am +++ b/gst/pnm/Makefile.am @@ -2,7 +2,7 @@ plugin_LTLIBRARIES = libgstpnm.la libgstpnm_la_SOURCES = gstpnmutils.c gstpnm.c gstpnmdec.c gstpnmenc.c libgstpnm_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) -libgstpnm_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) -lgstvideo-@GST_MAJORMINOR@ +libgstpnm_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) -lgstvideo-@GST_API_VERSION@ libgstpnm_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstpnm_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/gst/rawparse/Makefile.am b/gst/rawparse/Makefile.am index ac0aadc7d..254f3cf52 100644 --- a/gst/rawparse/Makefile.am +++ b/gst/rawparse/Makefile.am @@ -12,7 +12,7 @@ libgstrawparse_la_CFLAGS = \ $(GST_CFLAGS) libgstrawparse_la_LIBADD = \ $(GST_PLUGINS_BASE_LIBS) \ - -lgstvideo-@GST_MAJORMINOR@ -lgstaudio-@GST_MAJORMINOR@ \ + -lgstvideo-@GST_API_VERSION@ -lgstaudio-@GST_API_VERSION@ \ $(GST_BASE_LIBS) \ $(GST_LIBS) libgstrawparse_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) diff --git a/gst/real/Makefile.am b/gst/real/Makefile.am index 6681e4a56..8fc414ea4 100644 --- a/gst/real/Makefile.am +++ b/gst/real/Makefile.am @@ -10,7 +10,7 @@ libgstreal_la_CFLAGS = \ $(GST_BASE_CFLAGS) \ $(GST_CFLAGS) libgstreal_la_LIBADD = \ - $(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_MAJORMINOR@ \ + $(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_API_VERSION@ \ $(GST_BASE_LIBS) libgstreal_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstreal_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/gst/rtpmux/Makefile.am b/gst/rtpmux/Makefile.am index 39476487b..50fb6d759 100644 --- a/gst/rtpmux/Makefile.am +++ b/gst/rtpmux/Makefile.am @@ -3,7 +3,7 @@ plugin_LTLIBRARIES = libgstrtpmux.la libgstrtpmux_la_SOURCES = gstrtpmuxer.c gstrtpmux.c gstrtpdtmfmux.c libgstrtpmux_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) -libgstrtpmux_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstrtp-@GST_MAJORMINOR@ \ +libgstrtpmux_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstrtp-@GST_API_VERSION@ \ $(GST_BASE_LIBS) $(GST_LIBS) libgstrtpmux_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstrtpmux_la_LIBTOOLFLAGS = --tag=disable-static @@ -21,5 +21,5 @@ Android.mk: Makefile.am $(BUILT_SOURCES) $(libgstrtpmux_la_LIBADD) \ -ldl \ -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ - LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.11' \ - > $@
\ No newline at end of file + LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-@GST_API_VERSION@' \ + > $@ diff --git a/gst/rtpvp8/Makefile.am b/gst/rtpvp8/Makefile.am index c21e27ab1..4af684b76 100644 --- a/gst/rtpvp8/Makefile.am +++ b/gst/rtpvp8/Makefile.am @@ -11,7 +11,7 @@ noinst_HEADERS = gstrtpvp8depay.h \ libgstrtpvp8_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \ $(GST_BASE_CFLAGS) $(GST_CFLAGS) -libgstrtpvp8_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstrtp-@GST_MAJORMINOR@ \ +libgstrtpvp8_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstrtp-@GST_API_VERSION@ \ $(GST_BASE_LIBS) $(GST_LIBS) libgstrtpvp8_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstrtpvp8_la_LIBTOOLFLAGS = --tag=disable-static @@ -27,5 +27,5 @@ Android.mk: Makefile.am $(BUILT_SOURCES) $(libgstrtpvp8_la_LIBADD) \ -ldl \ -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ - LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.11' \ + LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-@GST_API_VERSION@' \ > $@ diff --git a/gst/scaletempo/Makefile.am b/gst/scaletempo/Makefile.am index d9c82932d..b19254b98 100644 --- a/gst/scaletempo/Makefile.am +++ b/gst/scaletempo/Makefile.am @@ -6,7 +6,7 @@ libgstscaletempoplugin_la_SOURCES = gstscaletempoplugin.c gstscaletempo.c # flags used to compile this plugin # add other _CFLAGS and _LIBS as needed libgstscaletempoplugin_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) -libgstscaletempoplugin_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_MAJORMINOR@ \ +libgstscaletempoplugin_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_API_VERSION@ \ $(GST_LIBS) $(GST_BASE_LIBS) libgstscaletempoplugin_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstscaletempoplugin_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/gst/sdp/Makefile.am b/gst/sdp/Makefile.am index c1627c435..b030401cf 100644 --- a/gst/sdp/Makefile.am +++ b/gst/sdp/Makefile.am @@ -4,8 +4,8 @@ libgstsdpelem_la_SOURCES = gstsdpelem.c gstsdpdemux.h gstsdpdemux.c libgstsdpelem_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(GIO_CFLAGS) libgstsdpelem_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GIO_LIBS) \ - -lgstinterfaces-@GST_MAJORMINOR@ \ - -lgstrtp-@GST_MAJORMINOR@ -lgstsdp-@GST_MAJORMINOR@ \ + -lgstinterfaces-@GST_API_VERSION@ \ + -lgstrtp-@GST_API_VERSION@ -lgstsdp-@GST_API_VERSION@ \ $(GST_LIBS) $(WIN32_LIBS) libgstsdpelem_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstsdpelem_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/gst/segmentclip/Makefile.am b/gst/segmentclip/Makefile.am index 82540cbc0..463b4858f 100644 --- a/gst/segmentclip/Makefile.am +++ b/gst/segmentclip/Makefile.am @@ -3,7 +3,7 @@ plugin_LTLIBRARIES = libgstsegmentclip.la libgstsegmentclip_la_SOURCES = gstsegmentclip.c gstaudiosegmentclip.c gstvideosegmentclip.c plugin.c libgstsegmentclip_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) -libgstsegmentclip_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) -lgstaudio-@GST_MAJORMINOR@ +libgstsegmentclip_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) -lgstaudio-@GST_API_VERSION@ libgstsegmentclip_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstsegmentclip_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/gst/siren/Makefile.am b/gst/siren/Makefile.am index c6d1d8cba..21ccd04e4 100644 --- a/gst/siren/Makefile.am +++ b/gst/siren/Makefile.am @@ -10,7 +10,7 @@ libgstsiren_la_SOURCES = gstsiren.c \ libgstsiren_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) \ $(GST_CFLAGS) -libgstsiren_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_MAJORMINOR@ \ +libgstsiren_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_API_VERSION@ \ $(GST_BASE_LIBS) $(GST_LIBS) $(LIBM) libgstsiren_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstsiren_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/gst/smooth/Makefile.am b/gst/smooth/Makefile.am index 36de16113..d3e430e8f 100644 --- a/gst/smooth/Makefile.am +++ b/gst/smooth/Makefile.am @@ -7,7 +7,7 @@ libgstsmooth_la_CFLAGS = \ $(GST_BASE_CFLAGS) \ $(GST_CFLAGS) libgstsmooth_la_LIBADD = \ - $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_MAJORMINOR@ \ + $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_API_VERSION@ \ $(GST_BASE_LIBS) \ $(GST_LIBS) libgstsmooth_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) diff --git a/gst/stereo/Makefile.am b/gst/stereo/Makefile.am index 2efe4a6a4..22a897271 100644 --- a/gst/stereo/Makefile.am +++ b/gst/stereo/Makefile.am @@ -3,7 +3,7 @@ plugin_LTLIBRARIES = libgststereo.la libgststereo_la_SOURCES = gststereo.c libgststereo_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) -libgststereo_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) +libgststereo_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_API_VERSION) libgststereo_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgststereo_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/gst/videofilters/Makefile.am b/gst/videofilters/Makefile.am index 0627ef4c7..6a142f1c4 100644 --- a/gst/videofilters/Makefile.am +++ b/gst/videofilters/Makefile.am @@ -15,7 +15,7 @@ libgstvideofiltersbad_la_CFLAGS = \ $(GST_CFLAGS) \ $(ORC_CFLAGS) libgstvideofiltersbad_la_LIBADD = \ - $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) \ + $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) \ $(GST_BASE_LIBS) \ $(GST_LIBS) \ $(ORC_LIBS) \ diff --git a/gst/videomeasure/Makefile.am b/gst/videomeasure/Makefile.am index f8829d338..8be08e5a5 100644 --- a/gst/videomeasure/Makefile.am +++ b/gst/videomeasure/Makefile.am @@ -13,7 +13,7 @@ libgstvideomeasure_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) \ $(GST_BASE_CFLAGS) \ $(GST_CFLAGS) libgstvideomeasure_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \ - -lgstvideo-@GST_MAJORMINOR@ $(GST_BASE_LIBS) $(GST_LIBS) $(LIBM) + -lgstvideo-@GST_API_VERSION@ $(GST_BASE_LIBS) $(GST_LIBS) $(LIBM) libgstvideomeasure_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstvideomeasure_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/gst/videoparsers/Makefile.am b/gst/videoparsers/Makefile.am index 49baeacd1..6fd7f3f17 100644 --- a/gst/videoparsers/Makefile.am +++ b/gst/videoparsers/Makefile.am @@ -11,8 +11,8 @@ libgstvideoparsersbad_la_CFLAGS = \ -DGST_USE_UNSTABLE_API \ $(GST_BASE_CFLAGS) $(GST_CFLAGS) libgstvideoparsersbad_la_LIBADD = \ - $(top_builddir)/gst-libs/gst/codecparsers/libgstcodecparsers-$(GST_MAJORMINOR).la \ - $(GST_PLUGINS_BASE_LIBS) -lgstpbutils-$(GST_MAJORMINOR) -lgstvideo-$(GST_MAJORMINOR) \ + $(top_builddir)/gst-libs/gst/codecparsers/libgstcodecparsers-$(GST_API_VERSION).la \ + $(GST_PLUGINS_BASE_LIBS) -lgstpbutils-$(GST_API_VERSION) -lgstvideo-$(GST_API_VERSION) \ $(GST_BASE_LIBS) $(GST_LIBS) libgstvideoparsersbad_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstvideoparsersbad_la_LIBTOOLFLAGS = --tag=disable-static @@ -32,8 +32,8 @@ Android.mk: Makefile.am $(BUILT_SOURCES) -:LDFLAGS $(libgstvideoparsersbad_la_LDFLAGS) \ $(libgstvideoparsersbad_la_LIBADD) \ -ldl \ - -:LIBFILTER_STATIC gstbaseparse-@GST_MAJORMINOR@ \ - gstcodecparsers-@GST_MAJORMINOR@ \ + -:LIBFILTER_STATIC gstbaseparse-@GST_API_VERSION@ \ + gstcodecparsers-@GST_API_VERSION@ \ -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \ > $@ diff --git a/gst/videosignal/Makefile.am b/gst/videosignal/Makefile.am index a10ab8ead..1b3fd5142 100644 --- a/gst/videosignal/Makefile.am +++ b/gst/videosignal/Makefile.am @@ -9,7 +9,7 @@ libgstvideosignal_la_SOURCES = gstvideosignal.c \ libgstvideosignal_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \ $(GST_PLUGINS_BASE_CFLAGS) -libgstvideosignal_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_MAJORMINOR@ $(GST_BASE_LIBS) $(GST_LIBS) +libgstvideosignal_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_API_VERSION@ $(GST_BASE_LIBS) $(GST_LIBS) libgstvideosignal_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstvideosignal_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/gst/y4m/Makefile.am b/gst/y4m/Makefile.am index ce35c1832..bee13972d 100644 --- a/gst/y4m/Makefile.am +++ b/gst/y4m/Makefile.am @@ -4,8 +4,8 @@ plugin_LTLIBRARIES = libgsty4mdec.la libgsty4mdec_la_SOURCES = gsty4mdec.c libgsty4mdec_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) libgsty4mdec_la_LIBADD = \ - $(GST_BASE_PLUGINS_LIBS) -lgstvideo-@GST_MAJORMINOR@ \ - $(GST_BASE_LIBS) -lgstbase-@GST_MAJORMINOR@ \ + $(GST_BASE_PLUGINS_LIBS) -lgstvideo-@GST_API_VERSION@ \ + $(GST_BASE_LIBS) -lgstbase-@GST_API_VERSION@ \ $(GST_LIBS) libgsty4mdec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgsty4mdec_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/pkgconfig/Makefile.am b/pkgconfig/Makefile.am index 4058adc2f..6ab9bfd72 100644 --- a/pkgconfig/Makefile.am +++ b/pkgconfig/Makefile.am @@ -1,13 +1,13 @@ ### all of the standard pc files we need to generate pcverfiles = \ - gstreamer-plugins-bad-@GST_MAJORMINOR@.pc \ - gstreamer-codecparsers-@GST_MAJORMINOR@.pc \ - gstreamer-basevideo-@GST_MAJORMINOR@.pc + gstreamer-plugins-bad-@GST_API_VERSION@.pc \ + gstreamer-codecparsers-@GST_API_VERSION@.pc \ + gstreamer-basevideo-@GST_API_VERSION@.pc pcverfiles_uninstalled = \ - gstreamer-plugins-bad-@GST_MAJORMINOR@-uninstalled.pc \ - gstreamer-codecparsers-@GST_MAJORMINOR@-uninstalled.pc \ - gstreamer-basevideo-@GST_MAJORMINOR@-uninstalled.pc + gstreamer-plugins-bad-@GST_API_VERSION@-uninstalled.pc \ + gstreamer-codecparsers-@GST_API_VERSION@-uninstalled.pc \ + gstreamer-basevideo-@GST_API_VERSION@-uninstalled.pc all-local: $(pcverfiles) $(pcverfiles_uninstalled) @@ -16,9 +16,9 @@ cp_verbose_ = $(cp_verbose_$(AM_DEFAULT_VERBOSITY)) cp_verbose_0 = @echo " CP $@"; ### how to generate versioned .pc files from .pc files in this dir -%-@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 diff --git a/pkgconfig/gstreamer-basevideo-uninstalled.pc.in b/pkgconfig/gstreamer-basevideo-uninstalled.pc.in index 151e66f48..901393793 100644 --- a/pkgconfig/gstreamer-basevideo-uninstalled.pc.in +++ b/pkgconfig/gstreamer-basevideo-uninstalled.pc.in @@ -5,8 +5,8 @@ includedir=${pcfiledir}/../gst-libs Name: GStreamer base video, Uninstalled Description: Base class, interface and utilities for video elements, Uninstalled -Requires: gstreamer-@GST_MAJORMINOR@ gstreamer-base-@GST_MAJORMINOR@ +Requires: gstreamer-@GST_API_VERSION@ gstreamer-base-@GST_API_VERSION@ Version: @VERSION@ -Libs: -L${libdir} ${libdir}/libgstbasevideo-@GST_MAJORMINOR@.la +Libs: -L${libdir} ${libdir}/libgstbasevideo-@GST_API_VERSION@.la Cflags: -I${includedir} diff --git a/pkgconfig/gstreamer-basevideo.pc.in b/pkgconfig/gstreamer-basevideo.pc.in index d892fac2d..eac324cff 100644 --- a/pkgconfig/gstreamer-basevideo.pc.in +++ b/pkgconfig/gstreamer-basevideo.pc.in @@ -1,12 +1,12 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ libdir=@libdir@ -includedir=@includedir@/gstreamer-@GST_MAJORMINOR@ +includedir=@includedir@/gstreamer-@GST_API_VERSION@ Name: GStreamer base video Description: Base class, interface and utilities for video elements -Requires: gstreamer-@GST_MAJORMINOR@ gstreamer-base-@GST_MAJORMINOR@ +Requires: gstreamer-@GST_API_VERSION@ gstreamer-base-@GST_API_VERSION@ Version: @VERSION@ -Libs: -L${libdir} -lgstbasevideo-@GST_MAJORMINOR@ +Libs: -L${libdir} -lgstbasevideo-@GST_API_VERSION@ Cflags: -I${includedir} diff --git a/pkgconfig/gstreamer-codecparsers-uninstalled.pc.in b/pkgconfig/gstreamer-codecparsers-uninstalled.pc.in index 5a01ba8d0..d1bb9b0f4 100644 --- a/pkgconfig/gstreamer-codecparsers-uninstalled.pc.in +++ b/pkgconfig/gstreamer-codecparsers-uninstalled.pc.in @@ -5,8 +5,8 @@ includedir=${pcfiledir}/../gst-libs Name: GStreamer codec parsers, Uninstalled Description: Bitstream parsers for GStreamer elements, uninstalled -Requires: gstreamer-@GST_MAJORMINOR@ gstreamer-base-@GST_MAJORMINOR@ +Requires: gstreamer-@GST_API_VERSION@ gstreamer-base-@GST_API_VERSION@ Version: @VERSION@ -Libs: -L${libdir} ${libdir}/libgstcodecparsers-@GST_MAJORMINOR@.la +Libs: -L${libdir} ${libdir}/libgstcodecparsers-@GST_API_VERSION@.la Cflags: -I${includedir} diff --git a/pkgconfig/gstreamer-codecparsers.pc.in b/pkgconfig/gstreamer-codecparsers.pc.in index e2fc6d1ad..9d1010adc 100644 --- a/pkgconfig/gstreamer-codecparsers.pc.in +++ b/pkgconfig/gstreamer-codecparsers.pc.in @@ -1,12 +1,12 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ libdir=@libdir@ -includedir=@includedir@/gstreamer-@GST_MAJORMINOR@ +includedir=@includedir@/gstreamer-@GST_API_VERSION@ Name: GStreamer codec parsers Description: Bitstream parsers for GStreamer elements -Requires: gstreamer-@GST_MAJORMINOR@ gstreamer-base-@GST_MAJORMINOR@ +Requires: gstreamer-@GST_API_VERSION@ gstreamer-base-@GST_API_VERSION@ Version: @VERSION@ -Libs: -L${libdir} -lgstcodecparsers-@GST_MAJORMINOR@ +Libs: -L${libdir} -lgstcodecparsers-@GST_API_VERSION@ Cflags: -I${includedir} diff --git a/pkgconfig/gstreamer-plugins-bad-uninstalled.pc.in b/pkgconfig/gstreamer-plugins-bad-uninstalled.pc.in index 4b6d69d5a..c3ed14c15 100644 --- a/pkgconfig/gstreamer-plugins-bad-uninstalled.pc.in +++ b/pkgconfig/gstreamer-plugins-bad-uninstalled.pc.in @@ -6,8 +6,8 @@ includedir=${pcfiledir}/../gst-libs Name: GStreamer Bad Plugin libraries, Uninstalled Description: Currently includes the photography interface library, uninstalled Version: @VERSION@ -Requires: gstreamer-@GST_MAJORMINOR@ gstreamer-base-@GST_MAJORMINOR@ +Requires: gstreamer-@GST_API_VERSION@ gstreamer-base-@GST_API_VERSION@ -Libs: -L${libdir} ${libdir}/libgstphotography-@GST_MAJORMINOR@.la +Libs: -L${libdir} ${libdir}/libgstphotography-@GST_API_VERSION@.la Cflags: -I${includedir} diff --git a/pkgconfig/gstreamer-plugins-bad.pc.in b/pkgconfig/gstreamer-plugins-bad.pc.in index 5e2130168..753d9f37d 100644 --- a/pkgconfig/gstreamer-plugins-bad.pc.in +++ b/pkgconfig/gstreamer-plugins-bad.pc.in @@ -1,11 +1,11 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ libdir=@libdir@ -includedir=@includedir@/gstreamer-@GST_MAJORMINOR@ +includedir=@includedir@/gstreamer-@GST_API_VERSION@ Name: GStreamer Bad Plugin libraries Description: Currently includes the photography interface library -Requires: gstreamer-@GST_MAJORMINOR@ gstreamer-base-@GST_MAJORMINOR@ +Requires: gstreamer-@GST_API_VERSION@ gstreamer-base-@GST_API_VERSION@ Version: @VERSION@ -Libs: -L${libdir} -lgstphotography-@GST_MAJORMINOR@ +Libs: -L${libdir} -lgstphotography-@GST_API_VERSION@ Cflags: -I${includedir} diff --git a/sys/acmenc/Makefile.am b/sys/acmenc/Makefile.am index eb1b603a6..2abad53a4 100644 --- a/sys/acmenc/Makefile.am +++ b/sys/acmenc/Makefile.am @@ -6,9 +6,9 @@ libgstacmenc_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \ libgstacmenc_la_LIBADD = \ $(GST_BASE_LIBS) \ $(GST_PLUGINS_BASE_LIBS) \ - -lgstriff-$(GST_MAJORMINOR) \ - -lgstaudio-$(GST_MAJORMINOR) \ - -lgsttag-$(GST_MAJORMINOR) \ + -lgstriff-$(GST_API_VERSION) \ + -lgstaudio-$(GST_API_VERSION) \ + -lgsttag-$(GST_API_VERSION) \ -lmsacm32 libgstacmenc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) diff --git a/sys/acmmp3dec/Makefile.am b/sys/acmmp3dec/Makefile.am index f927c7233..1d7b27e58 100644 --- a/sys/acmmp3dec/Makefile.am +++ b/sys/acmmp3dec/Makefile.am @@ -6,9 +6,9 @@ libgstacmmp3dec_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \ libgstacmmp3dec_la_LIBADD = \ $(GST_BASE_LIBS) \ $(GST_PLUGINS_BASE_LIBS) \ - -lgstriff-$(GST_MAJORMINOR) \ - -lgstaudio-$(GST_MAJORMINOR) \ - -lgsttag-$(GST_MAJORMINOR) \ + -lgstriff-$(GST_API_VERSION) \ + -lgstaudio-$(GST_API_VERSION) \ + -lgsttag-$(GST_API_VERSION) \ -lmsacm32 libgstacmmp3dec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(DIRECTSOUND_LDFLAGS) libgstacmmp3dec_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/sys/applemedia/Makefile.am b/sys/applemedia/Makefile.am index f7b853dfe..e2b5395e7 100644 --- a/sys/applemedia/Makefile.am +++ b/sys/applemedia/Makefile.am @@ -25,8 +25,8 @@ libgstapplemedia_la_OBJCFLAGS = \ libgstapplemedia_la_LIBADD = \ $(GST_BASE_LIBS) \ $(GST_PLUGINS_BASE_LIBS) \ - -lgstinterfaces-$(GST_MAJORMINOR) \ - -lgstvideo-$(GST_MAJORMINOR) + -lgstinterfaces-$(GST_API_VERSION) \ + -lgstvideo-$(GST_API_VERSION) libgstapplemedia_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/sys/avc/Makefile.am b/sys/avc/Makefile.am index 963f51494..315127386 100644 --- a/sys/avc/Makefile.am +++ b/sys/avc/Makefile.am @@ -9,8 +9,8 @@ libgstavc_la_CPPFLAGS = \ -framework AVCVideoServices \ -Wno-deprecated-declarations libgstavc_la_LIBADD = \ - $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) \ - -lgstinterfaces-$(GST_MAJORMINOR) \ + $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) \ + -lgstinterfaces-$(GST_API_VERSION) \ $(GST_BASE_LIBS) \ $(GST_LIBS) diff --git a/sys/d3dvideosink/Makefile.am b/sys/d3dvideosink/Makefile.am index 76b79209d..1c6d24b9b 100644 --- a/sys/d3dvideosink/Makefile.am +++ b/sys/d3dvideosink/Makefile.am @@ -6,7 +6,7 @@ libgstd3dvideosink_la_SOURCES = d3dvideosink.c directx/d3d.c directx/dx.c \ directx/directx11/dx11.c directx/directx11/dx11_d3d.c libgstd3dvideosink_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) $(GST_CFLAGS) $(DIRECTX_CFLAGS) libgstd3dvideosink_la_LIBADD = $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) \ - -lgstvideo-$(GST_MAJORMINOR) -lgstinterfaces-$(GST_MAJORMINOR) \ + -lgstvideo-$(GST_API_VERSION) -lgstinterfaces-$(GST_API_VERSION) \ $(DIRECT3D_LIBS) libgstd3dvideosink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(DIRECTX_LDFAGS) libgstd3dvideosink_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/sys/decklink/Makefile.am b/sys/decklink/Makefile.am index 9d1260170..8e959957f 100644 --- a/sys/decklink/Makefile.am +++ b/sys/decklink/Makefile.am @@ -10,8 +10,8 @@ libgstdecklink_la_LIBADD = \ $(GST_PLUGINS_BASE_LIBS) \ $(GST_BASE_LIBS) \ $(GST_LIBS) \ - -lgstvideo-@GST_MAJORMINOR@ \ - -lgstinterfaces-@GST_MAJORMINOR@ \ + -lgstvideo-@GST_API_VERSION@ \ + -lgstinterfaces-@GST_API_VERSION@ \ $(DECKLINK_LIBS) \ $(LIBM) libgstdecklink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) diff --git a/sys/directdraw/Makefile.am b/sys/directdraw/Makefile.am index 559db9b36..16fc15006 100644 --- a/sys/directdraw/Makefile.am +++ b/sys/directdraw/Makefile.am @@ -4,8 +4,8 @@ libgstdirectdrawsink_la_SOURCES = gstdirectdrawsink.c gstdirectdrawplugin.c libgstdirectdrawsink_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \ $(GST_PLUGINS_BASE_CFLAGS) $(DIRECTX_CFLAGS) libgstdirectdrawsink_la_LIBADD = $(DIRECTDRAW_LIBS) \ - $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) \ - -lgstinterfaces-$(GST_MAJORMINOR) + $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) \ + -lgstinterfaces-$(GST_API_VERSION) libgstdirectdrawsink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(DIRECTX_LDFLAGS) libgstdirectdrawsink_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/sys/directsound/Makefile.am b/sys/directsound/Makefile.am index cd1e05944..bdb48bd0f 100644 --- a/sys/directsound/Makefile.am +++ b/sys/directsound/Makefile.am @@ -4,8 +4,8 @@ libgstdirectsoundsrc_la_SOURCES = gstdirectsoundsrc.c gstdirectsoundplugin.c libgstdirectsoundsrc_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \ $(GST_PLUGINS_BASE_CFLAGS) $(DIRECTX_CFLAGS) libgstdirectsoundsrc_la_LIBADD = $(DIRECTDRAW_LIBS) \ - $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) \ - -lgstinterfaces-$(GST_MAJORMINOR) -ldsound + $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_API_VERSION) \ + -lgstinterfaces-$(GST_API_VERSION) -ldsound libgstdirectsoundsrc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(DIRECTX_LDFLAGS) libgstdirectsoundsrc_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/sys/dshowdecwrapper/Makefile.am b/sys/dshowdecwrapper/Makefile.am index c62d46f73..0ad26352e 100644 --- a/sys/dshowdecwrapper/Makefile.am +++ b/sys/dshowdecwrapper/Makefile.am @@ -5,7 +5,7 @@ libgstdshowdecwrapper_la_SOURCES = gstdshowaudiodec.cpp gstdshowdecwrapper.cpp \ gstdshowfakesrc.cpp libgstdshowdecwrapper_la_CFLAGS = $(GST_CFLAGS) -I$(top_srcdir)/gst-libs/gst -DLIBGSTDSHOWDECWRAPPER_EXPORTS -libgstdshowdecwrapper_la_LIBADD = $(top_builddir)/gst-libs/gst/dshow/libgstdshow-@GST_MAJORMINOR@.la \ +libgstdshowdecwrapper_la_LIBADD = $(top_builddir)/gst-libs/gst/dshow/libgstdshow-@GST_API_VERSION@.la \ $(GST_BASE_LIBS) $(GST_LIBS) libgstdshowdecwrapper_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstdshowdecwrapper_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/sys/osxvideo/Makefile.am b/sys/osxvideo/Makefile.am index 53391f7ed..56f432516 100644 --- a/sys/osxvideo/Makefile.am +++ b/sys/osxvideo/Makefile.am @@ -5,8 +5,8 @@ libgstosxvideosrc_la_SOURCES = osxvideoplugin.c osxvideosrc.c libgstosxvideosrc_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \ $(GST_PLUGINS_BASE_CFLAGS) -Wno-deprecated-declarations libgstosxvideosrc_la_LIBADD = \ - $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) \ - -lgstinterfaces-$(GST_MAJORMINOR) + $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) \ + -lgstinterfaces-$(GST_API_VERSION) libgstosxvideosrc_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/sys/pvr2d/Makefile.am b/sys/pvr2d/Makefile.am index b45071063..fd94d4aa3 100644 --- a/sys/pvr2d/Makefile.am +++ b/sys/pvr2d/Makefile.am @@ -8,8 +8,8 @@ libgstpvr_la_SOURCES = \ libgstpvr_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(PVR_CFLAGS) libgstpvr_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) \ - $(GST_PLUGINS_BASE_LIBS) $(X11_LIBS) -lgstvideo-$(GST_MAJORMINOR) \ - -lgstinterfaces-$(GST_MAJORMINOR) -lpvr2d -lpvrPVR2D_DRIWSEGL\ + $(GST_PLUGINS_BASE_LIBS) $(X11_LIBS) -lgstvideo-$(GST_API_VERSION) \ + -lgstinterfaces-$(GST_API_VERSION) -lpvr2d -lpvrPVR2D_DRIWSEGL\ $(PVR_LIBS) \ $(LIBM) diff --git a/sys/vdpau/Makefile.am b/sys/vdpau/Makefile.am index dabba0896..d507d4a37 100644 --- a/sys/vdpau/Makefile.am +++ b/sys/vdpau/Makefile.am @@ -21,9 +21,9 @@ libgstvdpau_la_SOURCES = \ libgstvdpau_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(X11_CFLAGS) $(VDPAU_CFLAGS) libgstvdpau_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) \ - $(GST_PLUGINS_BASE_LIBS) $(X11_LIBS) -lgstvideo-$(GST_MAJORMINOR) \ - -lgstinterfaces-$(GST_MAJORMINOR) $(VDPAU_LIBS) \ - gstvdp/libgstvdp-@GST_MAJORMINOR@.la \ + $(GST_PLUGINS_BASE_LIBS) $(X11_LIBS) -lgstvideo-$(GST_API_VERSION) \ + -lgstinterfaces-$(GST_API_VERSION) $(VDPAU_LIBS) \ + gstvdp/libgstvdp-@GST_API_VERSION@.la \ $(LIBM) libgstvdpau_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) diff --git a/sys/vdpau/basevideodecoder/Makefile.am b/sys/vdpau/basevideodecoder/Makefile.am index 76bdea556..fcd508458 100644 --- a/sys/vdpau/basevideodecoder/Makefile.am +++ b/sys/vdpau/basevideodecoder/Makefile.am @@ -8,7 +8,7 @@ libgstbasevideodecoder_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) \ -DGstBaseVideoDecoder=SatBaseVideoDecoder \ -DGstBaseVideoDecoderClass=SatBaseVideoDecoderClass libgstbasevideodecoder_la_LIBADD = \ - $(GST_PLUGINS_BASE_LIBS) -lgstinterfaces-$(GST_MAJORMINOR) \ + $(GST_PLUGINS_BASE_LIBS) -lgstinterfaces-$(GST_API_VERSION) \ $(GST_BASE_LIBS) $(GST_LIBS) libgstbasevideodecoder_la_LDFLAGS = $(GST_ALL_LDFLAGS) -module -avoid-version diff --git a/sys/vdpau/gstvdp/Makefile.am b/sys/vdpau/gstvdp/Makefile.am index 375969087..982b21fd5 100644 --- a/sys/vdpau/gstvdp/Makefile.am +++ b/sys/vdpau/gstvdp/Makefile.am @@ -1,6 +1,6 @@ -lib_LTLIBRARIES = libgstvdp-@GST_MAJORMINOR@.la +lib_LTLIBRARIES = libgstvdp-@GST_API_VERSION@.la -libgstvdp_@GST_MAJORMINOR@_la_SOURCES = \ +libgstvdp_@GST_API_VERSION@_la_SOURCES = \ gstvdpdevice.c \ gstvdputils.c \ gstvdpbuffer.c \ @@ -14,8 +14,8 @@ libgstvdp_@GST_MAJORMINOR@_la_SOURCES = \ gstvdpdecoder.c \ gstvdp.c -libgstvdp_@GST_MAJORMINOR@includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/vdpau -libgstvdp_@GST_MAJORMINOR@include_HEADERS = \ +libgstvdp_@GST_API_VERSION@includedir = $(includedir)/gstreamer-@GST_API_VERSION@/gst/vdpau +libgstvdp_@GST_API_VERSION@include_HEADERS = \ gstvdpdevice.h \ gstvdputils.h \ gstvdpbuffer.h \ @@ -29,12 +29,12 @@ libgstvdp_@GST_MAJORMINOR@include_HEADERS = \ gstvdpdecoder.h \ gstvdp.h -libgstvdp_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \ +libgstvdp_@GST_API_VERSION@_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \ $(GST_PLUGINS_BASE_CFLAGS) $(X11_CFLAGS) $(VDPAU_CFLAGS) -libgstvdp_@GST_MAJORMINOR@_la_LIBADD = $(GST_LIBS) $(X11_LIBS) $(VDPAU_LIBS) \ - -lgstvideo-$(GST_MAJORMINOR) \ +libgstvdp_@GST_API_VERSION@_la_LIBADD = $(GST_LIBS) $(X11_LIBS) $(VDPAU_LIBS) \ + -lgstvideo-$(GST_API_VERSION) \ ../basevideodecoder/libgstbasevideodecoder.la -libgstvdp_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_LT_LDFLAGS) $(GST_ALL_LDFLAGS) -libgstvdp_@GST_MAJORMINOR@_la_LIBTOOLFLAGS = --tag=disable-static +libgstvdp_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_LT_LDFLAGS) $(GST_ALL_LDFLAGS) +libgstvdp_@GST_API_VERSION@_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am index 1a5d6eeaf..a1e357772 100644 --- a/tests/check/Makefile.am +++ b/tests/check/Makefile.am @@ -21,7 +21,7 @@ TESTS_ENVIRONMENT = \ rsndvdbin sdlaudiosink sdlvideosink vcdsrc rfbsrc vdpauyuvvideo vdpauvideoyuv \ vdpaumpegdec vdpaumpeg4dec vdpauh264dec vdpauvideopostprocess vdpausink neonhttpsrc" -plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ +plugindir = $(libdir)/gstreamer-@GST_API_VERSION@ # override to _not_ install the test plugins install-pluginLTLIBRARIES: @@ -240,8 +240,8 @@ libs_mpegvideoparser_CFLAGS = \ $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(AM_CFLAGS) libs_mpegvideoparser_LDADD = \ - $(top_builddir)/gst-libs/gst/codecparsers/libgstcodecparsers-@GST_MAJORMINOR@.la \ - $(GST_PLUGINS_BAD_LIBS) -lgstcodecparsers-@GST_MAJORMINOR@ \ + $(top_builddir)/gst-libs/gst/codecparsers/libgstcodecparsers-@GST_API_VERSION@.la \ + $(GST_PLUGINS_BAD_LIBS) -lgstcodecparsers-@GST_API_VERSION@ \ $(GST_BASE_LIBS) $(GST_LIBS) $(LDADD) libs_h264parser_CFLAGS = \ @@ -250,8 +250,8 @@ libs_h264parser_CFLAGS = \ $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(AM_CFLAGS) libs_h264parser_LDADD = \ - $(top_builddir)/gst-libs/gst/codecparsers/libgstcodecparsers-@GST_MAJORMINOR@.la \ - $(GST_PLUGINS_BAD_LIBS) -lgstcodecparsers-@GST_MAJORMINOR@ \ + $(top_builddir)/gst-libs/gst/codecparsers/libgstcodecparsers-@GST_API_VERSION@.la \ + $(GST_PLUGINS_BAD_LIBS) -lgstcodecparsers-@GST_API_VERSION@ \ $(GST_BASE_LIBS) $(GST_LIBS) $(LDADD) libs_vc1parser_CFLAGS = \ @@ -260,8 +260,8 @@ libs_vc1parser_CFLAGS = \ $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(AM_CFLAGS) libs_vc1parser_LDADD = \ - $(top_builddir)/gst-libs/gst/codecparsers/libgstcodecparsers-@GST_MAJORMINOR@.la \ - $(GST_PLUGINS_BAD_LIBS) -lgstcodecparsers-@GST_MAJORMINOR@ \ + $(top_builddir)/gst-libs/gst/codecparsers/libgstcodecparsers-@GST_API_VERSION@.la \ + $(GST_PLUGINS_BAD_LIBS) -lgstcodecparsers-@GST_API_VERSION@ \ $(GST_BASE_LIBS) $(GST_LIBS) $(LDADD) elements_faad_CFLAGS = \ @@ -269,28 +269,28 @@ elements_faad_CFLAGS = \ $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(AM_CFLAGS) elements_faad_LDADD = \ $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) $(LDADD) \ - -lgstaudio-@GST_MAJORMINOR@ + -lgstaudio-@GST_API_VERSION@ elements_faac_CFLAGS = \ $(GST_PLUGINS_BASE_CFLAGS) \ $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(AM_CFLAGS) elements_faac_LDADD = \ $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) $(LDADD) \ - -lgstaudio-@GST_MAJORMINOR@ + -lgstaudio-@GST_API_VERSION@ elements_legacyresample_CFLAGS = \ $(GST_PLUGINS_BASE_CFLAGS) \ $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(AM_CFLAGS) elements_legacyresample_LDADD = \ $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) $(LDADD) \ - -lgstaudio-@GST_MAJORMINOR@ + -lgstaudio-@GST_API_VERSION@ elements_voaacenc_CFLAGS = \ $(GST_PLUGINS_BASE_CFLAGS) \ $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(AM_CFLAGS) elements_voaacenc_LDADD = \ $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) $(LDADD) \ - -lgstaudio-@GST_MAJORMINOR@ + -lgstaudio-@GST_API_VERSION@ elements_baseaudiovisualizer_SOURCES = elements/baseaudiovisualizer.c \ $(top_srcdir)/gst/audiovisualizers/gstbaseaudiovisualizer.c \ @@ -299,16 +299,16 @@ elements_baseaudiovisualizer_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) \ -I$(top_srcdir)/gst/audiovisualizers $(GST_PLUGINS_BASE_CFLAGS) \ $(GST_BASE_CFLAGS) $(GST_CONTROLLER_CFLAGS) $(GST_CFLAGS) $(AM_CFLAGS) elements_baseaudiovisualizer_LDADD = \ - $(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_MAJORMINOR@ \ - -lgstvideo-@GST_MAJORMINOR@ $(GST_BASE_LIBS) $(GST_CONTROLLER_LIBS) \ + $(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_API_VERSION@ \ + -lgstvideo-@GST_API_VERSION@ $(GST_BASE_LIBS) $(GST_CONTROLLER_LIBS) \ $(GST_LIBS) $(LDADD) elements_camerabin_CFLAGS = \ $(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) \ $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(AM_CFLAGS) -DGST_USE_UNSTABLE_API elements_camerabin_LDADD = \ - $(top_builddir)/gst-libs/gst/interfaces/libgstphotography-@GST_MAJORMINOR@.la \ - $(GST_PLUGINS_BASE_LIBS) -lgstinterfaces-@GST_MAJORMINOR@ \ + $(top_builddir)/gst-libs/gst/interfaces/libgstphotography-@GST_API_VERSION@.la \ + $(GST_PLUGINS_BASE_LIBS) -lgstinterfaces-@GST_API_VERSION@ \ $(GST_BASE_LIBS) $(GST_LIBS) $(LDADD) elements_camerabin_SOURCES = elements/camerabin.c @@ -317,14 +317,14 @@ elements_camerabin2_CFLAGS = \ $(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) \ $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(AM_CFLAGS) -DGST_USE_UNSTABLE_API elements_camerabin2_LDADD = \ - $(top_builddir)/gst-libs/gst/interfaces/libgstphotography-@GST_MAJORMINOR@.la \ - $(top_builddir)/gst-libs/gst/basecamerabinsrc/libgstbasecamerabinsrc-@GST_MAJORMINOR@.la \ - -lgstpbutils-$(GST_MAJORMINOR) \ + $(top_builddir)/gst-libs/gst/interfaces/libgstphotography-@GST_API_VERSION@.la \ + $(top_builddir)/gst-libs/gst/basecamerabinsrc/libgstbasecamerabinsrc-@GST_API_VERSION@.la \ + -lgstpbutils-$(GST_API_VERSION) \ $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) $(LDADD) elements_camerabin2_SOURCES = elements/camerabin2.c elements_jifmux_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(EXIF_CFLAGS) $(AM_CFLAGS) -elements_jifmux_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgsttag-$(GST_MAJORMINOR) $(GST_CHECK_LIBS) $(EXIF_LIBS) $(LDADD) +elements_jifmux_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgsttag-$(GST_API_VERSION) $(GST_CHECK_LIBS) $(EXIF_LIBS) $(LDADD) elements_jifmux_SOURCES = elements/jifmux.c elements_timidity_CFLAGS = $(GST_BASE_CFLAGS) $(AM_CFLAGS) @@ -334,13 +334,13 @@ elements_kate_CFLAGS = $(GST_BASE_CFLAGS) $(AM_CFLAGS) elements_kate_LDADD = $(GST_BASE_LIBS) $(LDADD) elements_rtpmux_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(AM_CFLAGS) -elements_rtpmux_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgstrtp-$(GST_MAJORMINOR) $(GST_BASE_LIBS) $(LDADD) +elements_rtpmux_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgstrtp-$(GST_API_VERSION) $(GST_BASE_LIBS) $(LDADD) elements_assrender_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(AM_CFLAGS) -elements_assrender_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) -lgstapp-$(GST_MAJORMINOR) $(GST_BASE_LIBS) $(LDADD) +elements_assrender_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) -lgstapp-$(GST_API_VERSION) $(GST_BASE_LIBS) $(LDADD) elements_mpegtsmux_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(AM_CFLAGS) -elements_mpegtsmux_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) $(GST_BASE_LIBS) $(LDADD) +elements_mpegtsmux_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) $(GST_BASE_LIBS) $(LDADD) EXTRA_DIST = gst-plugins-bad.supp diff --git a/tests/examples/camerabin/Makefile.am b/tests/examples/camerabin/Makefile.am index aa9f23f7b..28f0441cb 100644 --- a/tests/examples/camerabin/Makefile.am +++ b/tests/examples/camerabin/Makefile.am @@ -12,10 +12,10 @@ gst_camera_CFLAGS = \ $(GMODULE_EXPORT_CFLAGS) \ -DGST_USE_UNSTABLE_API gst_camera_LDADD = \ - $(top_builddir)/gst-libs/gst/interfaces/libgstphotography-@GST_MAJORMINOR@.la \ + $(top_builddir)/gst-libs/gst/interfaces/libgstphotography-@GST_API_VERSION@.la \ $(GST_PLUGINS_BASE_LIBS) \ - -lgstinterfaces-@GST_MAJORMINOR@ \ - -lgstvideo-@GST_MAJORMINOR@ \ + -lgstinterfaces-@GST_API_VERSION@ \ + -lgstvideo-@GST_API_VERSION@ \ $(GST_LIBS) \ $(GTK_LIBS) \ $(GMODULE_EXPORT_LIBS) @@ -39,9 +39,9 @@ GST_CAMERABIN_X11_EXAMPLES = gst-camerabin-test gst_camerabin_test_SOURCES = gst-camerabin-test.c gst_camerabin_test_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_PLUGINS_BAD_CFLAGS) gst_camerabin_test_LDADD = \ - $(top_builddir)/gst-libs/gst/interfaces/libgstphotography-@GST_MAJORMINOR@.la \ - -lgstinterfaces-@GST_MAJORMINOR@ \ - -lgstvideo-@GST_MAJORMINOR@ \ + $(top_builddir)/gst-libs/gst/interfaces/libgstphotography-@GST_API_VERSION@.la \ + -lgstinterfaces-@GST_API_VERSION@ \ + -lgstvideo-@GST_API_VERSION@ \ $(GST_LIBS) \ $(GST_PLUGINS_BASE_LIBS) \ $(X11_LIBS) diff --git a/tests/examples/camerabin2/Makefile.am b/tests/examples/camerabin2/Makefile.am index acad9c037..2fb8ab130 100644 --- a/tests/examples/camerabin2/Makefile.am +++ b/tests/examples/camerabin2/Makefile.am @@ -12,11 +12,11 @@ gst_camera2_CFLAGS = \ $(GMODULE_EXPORT_CFLAGS) \ -DGST_USE_UNSTABLE_API gst_camera2_LDADD = \ - $(top_builddir)/gst-libs/gst/interfaces/libgstphotography-@GST_MAJORMINOR@.la \ + $(top_builddir)/gst-libs/gst/interfaces/libgstphotography-@GST_API_VERSION@.la \ $(GST_PLUGINS_BASE_LIBS) \ - -lgstinterfaces-@GST_MAJORMINOR@ \ - -lgstpbutils-@GST_MAJORMINOR@ \ - -lgstvideo-@GST_MAJORMINOR@ \ + -lgstinterfaces-@GST_API_VERSION@ \ + -lgstpbutils-@GST_API_VERSION@ \ + -lgstvideo-@GST_API_VERSION@ \ $(GST_LIBS) \ $(GTK_LIBS) \ $(GMODULE_EXPORT_LIBS) @@ -36,11 +36,11 @@ GST_CAMERABIN_X11_EXAMPLES = gst-camerabin2-test gst_camerabin2_test_SOURCES = gst-camerabin2-test.c gst_camerabin2_test_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_PLUGINS_BAD_CFLAGS) gst_camerabin2_test_LDADD = \ - $(top_builddir)/gst-libs/gst/interfaces/libgstphotography-@GST_MAJORMINOR@.la \ + $(top_builddir)/gst-libs/gst/interfaces/libgstphotography-@GST_API_VERSION@.la \ $(GST_PLUGINS_BASE_LIBS) \ - -lgstinterfaces-@GST_MAJORMINOR@ \ - -lgstpbutils-@GST_MAJORMINOR@ \ - -lgstvideo-@GST_MAJORMINOR@ \ + -lgstinterfaces-@GST_API_VERSION@ \ + -lgstpbutils-@GST_API_VERSION@ \ + -lgstvideo-@GST_API_VERSION@ \ $(GST_BASE_LIBS) \ $(GST_LIBS) \ $(X11_LIBS) diff --git a/tests/examples/gstplay/Makefile.am b/tests/examples/gstplay/Makefile.am index cbae9cbf4..6d7cf3afc 100644 --- a/tests/examples/gstplay/Makefile.am +++ b/tests/examples/gstplay/Makefile.am @@ -5,7 +5,7 @@ player_SOURCES = player.c player_CFLAGS = $(GST_CFLAGS) $(GCONF_CFLAGS) player_LDFLAGS = \ $(GST_LIBS) \ - $(top_builddir)/gst-libs/gst/gconf/libgstgconf-@GST_MAJORMINOR@.la \ - $(top_builddir)/gst-libs/gst/play/libgstplay-@GST_MAJORMINOR@.la \ - $(top_builddir)/gst-libs/gst/libgstinterfaces-$(GST_MAJORMINOR).la + $(top_builddir)/gst-libs/gst/gconf/libgstgconf-@GST_API_VERSION@.la \ + $(top_builddir)/gst-libs/gst/play/libgstplay-@GST_API_VERSION@.la \ + $(top_builddir)/gst-libs/gst/libgstinterfaces-$(GST_API_VERSION).la diff --git a/tests/examples/scaletempo/Makefile.am b/tests/examples/scaletempo/Makefile.am index 245084c29..18a1ab9da 100644 --- a/tests/examples/scaletempo/Makefile.am +++ b/tests/examples/scaletempo/Makefile.am @@ -5,7 +5,7 @@ ERROR_CFLAGS= scaletempo_demo_SOURCES = demo-main.c demo-player.c demo-gui.c scaletempo_demo_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(GTK_CFLAGS) -scaletempo_demo_LDFLAGS = $(GST_PLUGINS_BASE_LIBS) -lgstinterfaces-@GST_MAJORMINOR@ $(GST_LIBS) $(GTK_LIBS) +scaletempo_demo_LDFLAGS = $(GST_PLUGINS_BASE_LIBS) -lgstinterfaces-@GST_API_VERSION@ $(GST_LIBS) $(GTK_LIBS) noinst_HEADERS = demo-player.h demo-gui.h diff --git a/win32/common/config.h b/win32/common/config.h index 382a51cd6..c56fa6dea 100644 --- a/win32/common/config.h +++ b/win32/common/config.h @@ -6,7 +6,7 @@ #undef ENABLE_NLS /* gettext package name */ -#define GETTEXT_PACKAGE "gst-plugins-bad-0.11" +#define GETTEXT_PACKAGE "gst-plugins-bad-1.0" /* PREFIX - specifically added for Windows for easier moving */ #define PREFIX "C:\\gstreamer" |