diff --git a/configure.ac b/configure.ac index 528dfe6e41..536f90ee80 100644 --- a/configure.ac +++ b/configure.ac @@ -36,10 +36,10 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])], AC_SUBST(AM_DEFAULT_VERBOSITY)]) dnl our libraries and install dirs use major.minor as a version -GST_MAJORMINOR=$PACKAGE_VERSION_MAJOR.$PACKAGE_VERSION_MINOR +GST_API_VERSION=$PACKAGE_VERSION_MAJOR.$PACKAGE_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) +GST_API_VERSION=1.0 +AC_SUBST(GST_API_VERSION) AG_GST_LIBTOOL_PREPARE @@ -116,10 +116,10 @@ dnl *** checks for dependancy libraries *** dnl checks for gstreamer dnl uninstalled is selected preferentially -- see pkg-config(1) -AG_GST_CHECK_GST($GST_MAJORMINOR, [$GST_REQ]) -AG_GST_CHECK_GST_BASE($GST_MAJORMINOR, [$GST_REQ]) -AG_GST_CHECK_GST_PLUGINS_BASE($GST_MAJORMINOR, [$GST_REQ]) -AG_GST_CHECK_GST_CHECK($GST_MAJORMINOR, [$GST_REQ], no) +AG_GST_CHECK_GST($GST_API_VERSION, [$GST_REQ]) +AG_GST_CHECK_GST_BASE($GST_API_VERSION, [$GST_REQ]) +AG_GST_CHECK_GST_PLUGINS_BASE($GST_API_VERSION, [$GST_REQ]) +AG_GST_CHECK_GST_CHECK($GST_API_VERSION, [$GST_REQ], no) AM_CONDITIONAL(HAVE_GST_CHECK, test "x$HAVE_GST_CHECK" = "xyes") AC_MSG_NOTICE(Using GStreamer Core Plugins in $GST_PLUGINS_DIR) diff --git a/docs/plugins/Makefile.am b/docs/plugins/Makefile.am index b0ba1d8156..547844d8c9 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-ffmpeg DOC_MODULE=$(MODULE)-plugins diff --git a/docs/plugins/gst-ffmpeg-plugins-docs.sgml b/docs/plugins/gst-ffmpeg-plugins-docs.sgml index 610417bd20..dc906d1d31 100644 --- a/docs/plugins/gst-ffmpeg-plugins-docs.sgml +++ b/docs/plugins/gst-ffmpeg-plugins-docs.sgml @@ -7,9 +7,9 @@ - GStreamer FFMPeg &GST_MAJORMINOR; Plugins Reference Manual + GStreamer FFMPeg &GST_API_VERSION; Plugins Reference Manual - for GStreamer FFMPeg Plugins &GST_MAJORMINOR; (&GST_VERSION;) + for GStreamer FFMPeg Plugins &GST_API_VERSION; (&GST_VERSION;) The latest version of this documentation can be found on-line at http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gst-ffmpeg-plugins/html/. diff --git a/docs/version.entities.in b/docs/version.entities.in index 79a68981d5..286989f56e 100644 --- a/docs/version.entities.in +++ b/docs/version.entities.in @@ -1,2 +1,2 @@ - + diff --git a/ext/ffmpeg/Makefile.am b/ext/ffmpeg/Makefile.am index 7fbebdf40b..8ed6e8ddcb 100644 --- a/ext/ffmpeg/Makefile.am +++ b/ext/ffmpeg/Makefile.am @@ -23,8 +23,8 @@ libgstffmpeg_la_SOURCES = gstffmpeg.c \ libgstffmpeg_la_CFLAGS = $(FFMPEG_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) libgstffmpeg_la_LIBADD = $(FFMPEG_LIBS) $(GST_PLUGINS_BASE_LIBS) \ - -lgstaudio-$(GST_MAJORMINOR) -lgstvideo-$(GST_MAJORMINOR) \ - -lgstpbutils-$(GST_MAJORMINOR) $(GST_BASE_LIBS) \ + -lgstaudio-$(GST_API_VERSION) -lgstvideo-$(GST_API_VERSION) \ + -lgstpbutils-$(GST_API_VERSION) $(GST_BASE_LIBS) \ $(LIBM) $(WIN32_LIBS) -lz $(BZ2_LIBS) libgstffmpeg_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(DARWIN_LDFLAGS) libgstffmpeg_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/ext/libpostproc/Makefile.am b/ext/libpostproc/Makefile.am index e77dd0081c..0385e4468b 100644 --- a/ext/libpostproc/Makefile.am +++ b/ext/libpostproc/Makefile.am @@ -3,7 +3,7 @@ plugin_LTLIBRARIES = libgstpostproc.la libgstpostproc_la_SOURCES = gstpostproc.c libgstpostproc_la_CFLAGS = $(POSTPROC_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(ORC_CFLAGS) -libgstpostproc_la_LIBADD = -lgstvideo-@GST_MAJORMINOR@ \ +libgstpostproc_la_LIBADD = -lgstvideo-@GST_API_VERSION@ \ $(POSTPROC_LIBS) \ $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(ORC_LIBS) diff --git a/ext/libswscale/Makefile.am b/ext/libswscale/Makefile.am index 8bc2e35b24..3b0dbbd390 100644 --- a/ext/libswscale/Makefile.am +++ b/ext/libswscale/Makefile.am @@ -5,7 +5,7 @@ libgstffmpegscale_la_SOURCES = gstffmpegscale.c libgstffmpegscale_la_CFLAGS = $(SWSCALE_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) \ $(ORC_CFLAGS) libgstffmpegscale_la_LIBADD = $(SWSCALE_LIBS) \ - $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) \ + $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) \ $(GST_BASE_LIBS) $(ORC_LIBS) $(LIBM) -lz libgstffmpegscale_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(DARWIN_LDFLAGS) libgstffmpegscale_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/gst-ffmpeg.spec.in b/gst-ffmpeg.spec.in index 0e512d3520..9dca0f7f60 100644 --- a/gst-ffmpeg.spec.in +++ b/gst-ffmpeg.spec.in @@ -1,4 +1,4 @@ -%define majorminor @GST_MAJORMINOR@ +%define majorminor @GST_API_VERSION@ %define gstreamer gstreamer %define gst_minver 0.10.0 %define gst_majorminor 0.10