configure: rename GST_MAJORMINOR to GST_API_VERSION.

configure.ac

@@ -15,36 +15,13 @@ m4_define([gst_vaapi_lt_revision], [0])
 m4_define([gst_vaapi_lt_age],      [0])
 
 # glib version number
-m4_define([glib_major_version], [2])
+m4_define([glib_version], [2.28])
-m4_define([glib_minor_version], [28])
-m4_define([glib_micro_version], [0])
-m4_define([glib_major_minor_version],
-          [glib_major_version.glib_minor_version])
-m4_define([glib_version],
-          [glib_major_version.glib_minor_version.glib_micro_version])
 
-# gst version number
+# gstreamer version number
-m4_define([gst_major_version], [0])
+m4_define([gst_api_version],            [0.10])
-m4_define([gst_minor_version], [10])
+m4_define([gst_version],                [0.10.36])
-m4_define([gst_micro_version], [36])
+m4_define([gst_plugins_base_version],   [0.10.31])
-m4_define([gst_major_minor_version],
+m4_define([gst_plugins_bad_version],    [0.10.22])
-          [gst_major_version.gst_minor_version])
-m4_define([gst_version],
-          [gst_major_version.gst_minor_version.gst_micro_version])
-
-# gst plugins-base version number
-m4_define([gst_plugins_base_major_version], [0])
-m4_define([gst_plugins_base_minor_version], [10])
-m4_define([gst_plugins_base_micro_version], [31])
-m4_define([gst_plugins_base_version],
-          [gst_plugins_base_major_version.gst_plugins_base_minor_version.gst_plugins_base_micro_version])
-
-# gst plugins-bad version number
-m4_define([gst_plugins_bad_major_version], [0])
-m4_define([gst_plugins_bad_minor_version], [10])
-m4_define([gst_plugins_bad_micro_version], [22])
-m4_define([gst_plugins_bad_version],
-          [gst_plugins_bad_major_version.gst_plugins_bad_minor_version.gst_plugins_bad_micro_version])
 
 # Wayland minimum version number
 m4_define([wayland_api_version], [1.0.0])
@@ -64,9 +41,7 @@ m4_define([libva_wld_package_version], [1.1.0])
 
 # gtk-doc version number
 # XXX: introspection annotations require gtk-doc >= 1.12
-m4_define([gtkdoc_major_version], [1])
+m4_define([gtkdoc_version], [1.9])
-m4_define([gtkdoc_minor_version], [9])
-m4_define([gtkdoc_version], [gtkdoc_major_version.gtkdoc_minor_version])
 
 AC_PREREQ([2.58])
 AC_INIT([gst_vaapi], [gst_vaapi_version],
@@ -95,11 +70,11 @@ WAYLAND_API_VERSION=wayland_api_version
 AC_SUBST(WAYLAND_API_VERSION)
 
 dnl Versions for GStreamer and plugins-base
-GST_MAJORMINOR=gst_major_minor_version
+GST_API_VERSION=gst_api_version
 GST_VERSION_REQUIRED=gst_version
 GST_PLUGINS_BASE_VERSION_REQUIRED=gst_plugins_base_version
 GST_PLUGINS_BAD_VERSION_REQUIRED=gst_plugins_bad_version
-AC_SUBST(GST_MAJORMINOR)
+AC_SUBST(GST_API_VERSION)
 AC_SUBST(GST_VERSION_REQUIRED)
 AC_SUBST(GST_PLUGINS_BASE_VERSION_REQUIRED)
 AC_SUBST(GST_PLUGINS_BAD_VERSION_REQUIRED)
@@ -163,8 +138,8 @@ dnl -- GStreamer                                                             --
 dnl ---------------------------------------------------------------------------
 
 dnl GStreamer Core
-PKG_CHECK_MODULES([GST],      [gstreamer-$GST_MAJORMINOR >= gst_version])
+PKG_CHECK_MODULES([GST],      [gstreamer-$GST_API_VERSION >= gst_version])
-PKG_CHECK_MODULES([GST_BASE], [gstreamer-base-$GST_MAJORMINOR >= gst_version])
+PKG_CHECK_MODULES([GST_BASE], [gstreamer-base-$GST_API_VERSION >= gst_version])
 
 AC_CACHE_CHECK([for GstBaseSink::query hook], ac_cv_have_gst_base_sink_query, [
     saved_CPPFLAGS="$CPPFLAGS"
@@ -187,13 +162,13 @@ fi
 
 dnl GStreamer -base plugins
 PKG_CHECK_MODULES([GST_PLUGINS_BASE],
-    [gstreamer-plugins-base-$GST_MAJORMINOR >= gst_plugins_base_version])
+    [gstreamer-plugins-base-$GST_API_VERSION >= gst_plugins_base_version])
 PKG_CHECK_MODULES([GST_INTERFACES],
-    [gstreamer-interfaces-$GST_MAJORMINOR >= gst_plugins_base_version])
+    [gstreamer-interfaces-$GST_API_VERSION >= gst_plugins_base_version])
 
 dnl ... GstVideoOverlayComposition (gstreamer-video)
 PKG_CHECK_MODULES([GST_VIDEO],
-    [gstreamer-video-$GST_MAJORMINOR >= gst_plugins_base_version])
+    [gstreamer-video-$GST_API_VERSION >= gst_plugins_base_version])
 
 AC_CACHE_CHECK([for GstVideoOverlayComposition],
     ac_cv_have_gst_video_overlay_composition, [
@@ -272,11 +247,11 @@ AM_CONDITIONAL([USE_LOCAL_GST_VIDEO_DECODER],
 
 dnl GStreamer -bad plugins
 PKG_CHECK_MODULES([GST_BASEVIDEO],
-    [gstreamer-basevideo-$GST_MAJORMINOR >= gst_plugins_bad_version])
+    [gstreamer-basevideo-$GST_API_VERSION >= gst_plugins_bad_version])
 
 dnl ... bitstream parsers
 PKG_CHECK_MODULES([GST_CODEC_PARSERS],
-    [gstreamer-codecparsers-$GST_MAJORMINOR >= gst_plugins_bad_version])
+    [gstreamer-codecparsers-$GST_API_VERSION >= gst_plugins_bad_version])
 
 dnl ... MPEG-2 parser, with the required extensions
 AC_CACHE_CHECK([for MPEG-2 parser],
@@ -374,9 +349,9 @@ AC_MSG_CHECKING([for GStreamer plugins directory])
 if test -d "$GST_PLUGIN_PATH"; then
     GST_PLUGINS_DIR="$GST_PLUGIN_PATH"
 else
-    GST_PLUGINS_DIR=`$PKG_CONFIG gstreamer-$GST_MAJORMINOR --variable pluginsdir`
+    GST_PLUGINS_DIR=`$PKG_CONFIG gstreamer-$GST_API_VERSION --variable pluginsdir`
     if test -z "$GST_PLUGINS_DIR"; then
-        GST_PLUGINS_DIR="\$(libdir)/gstreamer-$GST_MAJORMINOR"
+        GST_PLUGINS_DIR="\$(libdir)/gstreamer-$GST_API_VERSION"
     fi
 fi
 AC_MSG_RESULT([$GST_PLUGINS_DIR])
@@ -604,9 +579,9 @@ AC_CONFIG_FILES([
     debian.upstream/Makefile
     debian.upstream/changelog
     debian.upstream/control
-    debian.upstream/gstreamer$GST_MAJORMINOR-vaapi-doc.install:\
+    debian.upstream/gstreamer$GST_API_VERSION-vaapi-doc.install:\
 debian.upstream/gstreamer-vaapi-doc.install.in
-    debian.upstream/gstreamer$GST_MAJORMINOR-vaapi.install:\
+    debian.upstream/gstreamer$GST_API_VERSION-vaapi.install:\
 debian.upstream/gstreamer-vaapi.install.in
     debian.upstream/libgstvaapi$GST_VAAPI_MAJOR_VERSION.install:\
 debian.upstream/libgstvaapi.install.in
@@ -634,15 +609,15 @@ debian.upstream/libgstvaapi-x11.install.in
     gst/Makefile
     gst/vaapi/Makefile
     pkgconfig/Makefile
-    pkgconfig/gstreamer-vaapi-$GST_MAJORMINOR.pc:\
+    pkgconfig/gstreamer-vaapi-$GST_API_VERSION.pc:\
 pkgconfig/gstreamer-vaapi.pc.in
-    pkgconfig/gstreamer-vaapi-drm-$GST_MAJORMINOR.pc:\
+    pkgconfig/gstreamer-vaapi-drm-$GST_API_VERSION.pc:\
 pkgconfig/gstreamer-vaapi-drm.pc.in
-    pkgconfig/gstreamer-vaapi-glx-$GST_MAJORMINOR.pc:\
+    pkgconfig/gstreamer-vaapi-glx-$GST_API_VERSION.pc:\
 pkgconfig/gstreamer-vaapi-glx.pc.in
-    pkgconfig/gstreamer-vaapi-wayland-$GST_MAJORMINOR.pc:\
+    pkgconfig/gstreamer-vaapi-wayland-$GST_API_VERSION.pc:\
 pkgconfig/gstreamer-vaapi-wayland.pc.in
-    pkgconfig/gstreamer-vaapi-x11-$GST_MAJORMINOR.pc:\
+    pkgconfig/gstreamer-vaapi-x11-$GST_API_VERSION.pc:\
 pkgconfig/gstreamer-vaapi-x11.pc.in
     tests/Makefile
 ])

debian.upstream/Makefile.am

@@ -24,8 +24,8 @@ DEBIANFILES = \
 DEBIANGENFILES = \
 	changelog						\
 	control							\
-	gstreamer$(GST_MAJORMINOR)-vaapi-doc.install		\
+	gstreamer$(GST_API_VERSION)-vaapi-doc.install		\
-	gstreamer$(GST_MAJORMINOR)-vaapi.install		\
+	gstreamer$(GST_API_VERSION)-vaapi.install		\
 	libgstvaapi$(GST_VAAPI_MAJOR_VERSION).install		\
 	libgstvaapi-dev.install					\
 	libgstvaapi-drm-$(GST_VAAPI_MAJOR_VERSION).install	\

debian.upstream/changelog.in

@@ -1,4 +1,4 @@
-gstreamer@GST_MAJORMINOR@-vaapi (@PACKAGE_VERSION@-1) unstable; urgency=low
+gstreamer@GST_API_VERSION@-vaapi (@PACKAGE_VERSION@-1) unstable; urgency=low
 
   * Autogenerated package, see NEWS file for ChangeLog.
 

debian.upstream/control.in

@@ -1,13 +1,13 @@
-Source: gstreamer@GST_MAJORMINOR@-vaapi
+Source: gstreamer@GST_API_VERSION@-vaapi
 Section: libs
 Priority: optional
 Maintainer: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
 Build-Depends: debhelper (>= 5),
 	       cdbs,
 	       libglib2.0-dev (>= @GLIB_VERSION_REQUIRED@),
-	       libgstreamer@GST_MAJORMINOR@-dev (>= @GST_VERSION_REQUIRED@),
+	       libgstreamer@GST_API_VERSION@-dev (>= @GST_VERSION_REQUIRED@),
-	       libgstreamer-plugins-base@GST_MAJORMINOR@-dev (>= @GST_PLUGINS_BASE_VERSION_REQUIRED@),
+	       libgstreamer-plugins-base@GST_API_VERSION@-dev (>= @GST_PLUGINS_BASE_VERSION_REQUIRED@),
-	       libgstreamer-plugins-bad@GST_MAJORMINOR@-dev (>= @GST_PLUGINS_BAD_VERSION_REQUIRED@),
+	       libgstreamer-plugins-bad@GST_API_VERSION@-dev (>= @GST_PLUGINS_BAD_VERSION_REQUIRED@),
 @USE_DRM_TRUE@	       libdrm-dev, libudev-dev,
 @USE_X11_TRUE@	       libx11-dev, libxrandr-dev,
 @USE_GLX_TRUE@	       libgl-dev,
@@ -16,11 +16,11 @@ Build-Depends: debhelper (>= 5),
 Build-Depends-Indep: gtk-doc-tools (>= @GTKDOC_VERSION@)
 Standards-Version: 3.7.2
 
-Package: gstreamer@GST_MAJORMINOR@-vaapi
+Package: gstreamer@GST_API_VERSION@-vaapi
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Suggests: gstreamer@GST_MAJORMINOR@-vaapi-doc
+Suggests: gstreamer@GST_API_VERSION@-vaapi-doc
 Description: VA-API plugins for GStreamer
  This package contains GStreamer plugins for VA-API support:
  - `vaapidecode': decode bitstreams using VA-API
@@ -29,17 +29,17 @@ Description: VA-API plugins for GStreamer
  - `vaapipostproc': postprocess VA surfaces, e.g. deinterlacing
  - `vaapisink': a VA-API based video sink
 
-Package: gstreamer@GST_MAJORMINOR@-vaapi-doc
+Package: gstreamer@GST_API_VERSION@-vaapi-doc
 Architecture: all
 Section: doc
 Recommends: libgstvaapi@GST_VAAPI_MAJOR_VERSION@-dev (= ${source:Version})
 Description: GStreamer VA-API documentation and manuals
  This packages contains documentation for libraries and elements.
 
-Package: gstreamer@GST_MAJORMINOR@-vaapi-dbg
+Package: gstreamer@GST_API_VERSION@-vaapi-dbg
 Section: libdevel
 Architecture: any
-Depends: gstreamer@GST_MAJORMINOR@-vaapi (= ${Source-Version})
+Depends: gstreamer@GST_API_VERSION@-vaapi (= ${Source-Version})
 Description: VA-API plugins for GStreamer
  VA-API support plugins for GStreamer.
  .

debian.upstream/gstreamer-vaapi-doc.install.in

@@ -1 +1 @@
-debian/tmp/usr/share/doc/gstreamer@GST_MAJORMINOR@-vaapi
+debian/tmp/usr/share/doc/gstreamer@GST_API_VERSION@-vaapi

debian.upstream/libgstvaapi-dev.install.in

@@ -1,3 +1,3 @@
 debian/tmp/usr/lib/libgstvaapi*.so
 debian/tmp/usr/lib/pkgconfig/gstreamer-vaapi*.pc
-debian/tmp/usr/include/gstreamer-@GST_MAJORMINOR@/gst/vaapi/*.h
+debian/tmp/usr/include/gstreamer-@GST_API_VERSION@/gst/vaapi/*.h

debian.upstream/libgstvaapi-drm.install.in

@@ -1 +1 @@
-debian/tmp/usr/lib/libgstvaapi-drm-@GST_MAJORMINOR@.so.*
+debian/tmp/usr/lib/libgstvaapi-drm-@GST_API_VERSION@.so.*

debian.upstream/libgstvaapi-glx.install.in

@@ -1 +1 @@
-debian/tmp/usr/lib/libgstvaapi-glx-@GST_MAJORMINOR@.so.*
+debian/tmp/usr/lib/libgstvaapi-glx-@GST_API_VERSION@.so.*

debian.upstream/libgstvaapi-wayland.install.in

@@ -1 +1 @@
-debian/tmp/usr/lib/libgstvaapi-wayland-@GST_MAJORMINOR@.so.*
+debian/tmp/usr/lib/libgstvaapi-wayland-@GST_API_VERSION@.so.*

debian.upstream/libgstvaapi-x11.install.in

@@ -1 +1 @@
-debian/tmp/usr/lib/libgstvaapi-x11-@GST_MAJORMINOR@.so.*
+debian/tmp/usr/lib/libgstvaapi-x11-@GST_API_VERSION@.so.*

debian.upstream/libgstvaapi.install.in

@@ -1 +1 @@
-debian/tmp/usr/lib/libgstvaapi-@GST_MAJORMINOR@.so.*
+debian/tmp/usr/lib/libgstvaapi-@GST_API_VERSION@.so.*

docs/reference/libs/Makefile.am

@@ -108,14 +108,14 @@ INCLUDES = \
 GTKDOC_LIBS = \
 	$(GLIB_LIBS) \
 	$(GST_LIBS) \
-	$(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-$(GST_MAJORMINOR).la
+	$(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-$(GST_API_VERSION).la
 
 GTKDOC_LIBS += \
-	$(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-x11-$(GST_MAJORMINOR).la
+	$(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-x11-$(GST_API_VERSION).la
 
 if USE_GLX
 GTKDOC_LIBS += \
-	$(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-glx-$(GST_MAJORMINOR).la
+	$(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-glx-$(GST_API_VERSION).la
 endif
 
 $(srcdir)/$(DOC_MODULE).types: $(SCANOBJ_TYPES)

docs/reference/libs/libs-docs.xml.in

@@ -3,7 +3,7 @@
                "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
 <book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
   <bookinfo>
-    <title>GStreamer VA-API Plugins @GST_MAJORMINOR@ Library Reference Manual</title>
+    <title>GStreamer VA-API Plugins @GST_API_VERSION@ Library Reference Manual</title>
   </bookinfo>
 
   <chapter>

docs/reference/plugins/Makefile.am

@@ -88,8 +88,8 @@ INCLUDES = \
 	$(NULL)
 
 GTKDOC_LIBS = \
-	$(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-$(GST_MAJORMINOR).la \
+	$(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-$(GST_API_VERSION).la \
-	$(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-x11-$(GST_MAJORMINOR).la \
+	$(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-x11-$(GST_API_VERSION).la \
 	$(top_builddir)/gst/vaapi/libgstvaapi.la \
 	$(GLIB_LIBS) \
 	$(GST_LIBS) \

docs/reference/plugins/plugins-docs.xml.in

@@ -6,7 +6,7 @@
 ]>
 <book id="index">
   <bookinfo>
-    <title>GStreamer VA-API Plugins @GST_MAJORMINOR@ Plugins Reference Manual</title>
+    <title>GStreamer VA-API Plugins @GST_API_VERSION@ Plugins Reference Manual</title>
   </bookinfo>
 
   <chapter>

gst-libs/gst/vaapi/Makefile.am

@@ -1,23 +1,23 @@
-lib_LTLIBRARIES = libgstvaapi-@GST_MAJORMINOR@.la
+lib_LTLIBRARIES = libgstvaapi-@GST_API_VERSION@.la
 
 if USE_DRM
-lib_LTLIBRARIES += libgstvaapi-drm-@GST_MAJORMINOR@.la
+lib_LTLIBRARIES += libgstvaapi-drm-@GST_API_VERSION@.la
 endif
 
 if USE_X11
-lib_LTLIBRARIES += libgstvaapi-x11-@GST_MAJORMINOR@.la
+lib_LTLIBRARIES += libgstvaapi-x11-@GST_API_VERSION@.la
 endif
 
 if USE_GLX
-lib_LTLIBRARIES += libgstvaapi-glx-@GST_MAJORMINOR@.la
+lib_LTLIBRARIES += libgstvaapi-glx-@GST_API_VERSION@.la
 endif
 
 if USE_WAYLAND
-lib_LTLIBRARIES += libgstvaapi-wayland-@GST_MAJORMINOR@.la
+lib_LTLIBRARIES += libgstvaapi-wayland-@GST_API_VERSION@.la
 endif
 
-libgstvaapi_includedir =			\
+libgstvaapi_includedir = \
-	$(includedir)/gstreamer-@GST_MAJORMINOR@/gst/vaapi
+	$(includedir)/gstreamer-$(GST_API_VERSION)/gst/vaapi
 
 libgstvaapi_cflags =				\
 	-DGST_USE_UNSTABLE_API			\
@@ -205,45 +205,45 @@ libgstvaapi_wayland_source_priv_h =		\
 	gstvaapiutils.h				\
 	$(NULL)
 
-libgstvaapi_@GST_MAJORMINOR@_la_SOURCES =	\
+libgstvaapi_@GST_API_VERSION@_la_SOURCES =	\
 	$(libgstvaapi_source_c)			\
 	$(libgstvaapi_source_priv_h)		\
 	$(NULL)
 
-libgstvaapi_@GST_MAJORMINOR@include_HEADERS =	\
+libgstvaapi_@GST_API_VERSION@include_HEADERS =	\
 	$(libgstvaapi_source_h)			\
 	$(NULL)
 
-libgstvaapi_@GST_MAJORMINOR@includedir =	\
+libgstvaapi_@GST_API_VERSION@includedir =	\
 	$(libgstvaapi_includedir)
 
-libgstvaapi_@GST_MAJORMINOR@_la_CFLAGS =	\
+libgstvaapi_@GST_API_VERSION@_la_CFLAGS =	\
 	$(libgstvaapi_cflags)			\
 	$(NULL)
 
-libgstvaapi_@GST_MAJORMINOR@_la_LIBADD =	\
+libgstvaapi_@GST_API_VERSION@_la_LIBADD =	\
 	$(libgstvaapi_libs)			\
 	$(NULL)
 
-libgstvaapi_@GST_MAJORMINOR@_la_LDFLAGS =	\
+libgstvaapi_@GST_API_VERSION@_la_LDFLAGS =	\
 	$(GST_ALL_LDFLAGS)			\
 	$(GST_VAAPI_LT_LDFLAGS)			\
 	-export-symbols-regex "^gst_.*vaapi.*"	\
 	$(NULL)
 
-libgstvaapi_drm_@GST_MAJORMINOR@_la_SOURCES =	\
+libgstvaapi_drm_@GST_API_VERSION@_la_SOURCES =	\
 	$(libgstvaapi_drm_source_c)		\
 	$(libgstvaapi_drm_source_priv_h)	\
 	$(NULL)
 
-libgstvaapi_drm_@GST_MAJORMINOR@include_HEADERS = \
+libgstvaapi_drm_@GST_API_VERSION@include_HEADERS = \
 	$(libgstvaapi_drm_source_h)		\
 	$(NULL)
 
-libgstvaapi_drm_@GST_MAJORMINOR@includedir =	\
+libgstvaapi_drm_@GST_API_VERSION@includedir =	\
 	$(libgstvaapi_includedir)
 
-libgstvaapi_drm_@GST_MAJORMINOR@_la_CFLAGS =	\
+libgstvaapi_drm_@GST_API_VERSION@_la_CFLAGS =	\
 	-DGST_USE_UNSTABLE_API			\
 	-I$(top_srcdir)/gst-libs		\
 	$(GLIB_CFLAGS)				\
@@ -253,32 +253,32 @@ libgstvaapi_drm_@GST_MAJORMINOR@_la_CFLAGS =	\
 	$(LIBVA_DRM_CFLAGS)			\
 	$(NULL)
 
-libgstvaapi_drm_@GST_MAJORMINOR@_la_LIBADD =	\
+libgstvaapi_drm_@GST_API_VERSION@_la_LIBADD =	\
 	$(GLIB_LIBS)				\
 	$(UDEV_LIBS)				\
 	$(DRM_LIBS)				\
 	$(LIBVA_DRM_LIBS)			\
-	libgstvaapi-@GST_MAJORMINOR@.la		\
+	libgstvaapi-$(GST_API_VERSION).la	\
 	$(NULL)
 
-libgstvaapi_drm_@GST_MAJORMINOR@_la_LDFLAGS =	\
+libgstvaapi_drm_@GST_API_VERSION@_la_LDFLAGS =	\
 	$(GST_ALL_LDFLAGS)			\
 	$(GST_VAAPI_LT_LDFLAGS)			\
 	$(NULL)
 
-libgstvaapi_x11_@GST_MAJORMINOR@_la_SOURCES =	\
+libgstvaapi_x11_@GST_API_VERSION@_la_SOURCES =	\
 	$(libgstvaapi_x11_source_c)		\
 	$(libgstvaapi_x11_source_priv_h)	\
 	$(NULL)
 
-libgstvaapi_x11_@GST_MAJORMINOR@include_HEADERS = \
+libgstvaapi_x11_@GST_API_VERSION@include_HEADERS = \
 	$(libgstvaapi_x11_source_h)		\
 	$(NULL)
 
-libgstvaapi_x11_@GST_MAJORMINOR@includedir =	\
+libgstvaapi_x11_@GST_API_VERSION@includedir =	\
 	$(libgstvaapi_includedir)
 
-libgstvaapi_x11_@GST_MAJORMINOR@_la_CFLAGS =	\
+libgstvaapi_x11_@GST_API_VERSION@_la_CFLAGS =	\
 	-DGST_USE_UNSTABLE_API			\
 	-I$(top_srcdir)/gst-libs		\
 	$(GLIB_CFLAGS)				\
@@ -288,32 +288,32 @@ libgstvaapi_x11_@GST_MAJORMINOR@_la_CFLAGS =	\
 	$(LIBVA_X11_CFLAGS)			\
 	$(NULL)
 
-libgstvaapi_x11_@GST_MAJORMINOR@_la_LIBADD =	\
+libgstvaapi_x11_@GST_API_VERSION@_la_LIBADD =	\
 	$(GLIB_LIBS)				\
 	$(X11_LIBS)				\
 	$(XRANDR_LIBS)				\
 	$(LIBVA_X11_LIBS)			\
-	libgstvaapi-@GST_MAJORMINOR@.la		\
+	libgstvaapi-$(GST_API_VERSION).la	\
 	$(NULL)
 
-libgstvaapi_x11_@GST_MAJORMINOR@_la_LDFLAGS =	\
+libgstvaapi_x11_@GST_API_VERSION@_la_LDFLAGS =	\
 	$(GST_ALL_LDFLAGS)			\
 	$(GST_VAAPI_LT_LDFLAGS)			\
 	$(NULL)
 
-libgstvaapi_glx_@GST_MAJORMINOR@_la_SOURCES =	\
+libgstvaapi_glx_@GST_API_VERSION@_la_SOURCES =	\
 	$(libgstvaapi_glx_source_c)		\
 	$(libgstvaapi_glx_source_priv_h)	\
 	$(NULL)
 
-libgstvaapi_glx_@GST_MAJORMINOR@include_HEADERS = \
+libgstvaapi_glx_@GST_API_VERSION@include_HEADERS = \
 	$(libgstvaapi_glx_source_h)		\
 	$(NULL)
 
-libgstvaapi_glx_@GST_MAJORMINOR@includedir =	\
+libgstvaapi_glx_@GST_API_VERSION@includedir =	\
 	$(libgstvaapi_includedir)
 
-libgstvaapi_glx_@GST_MAJORMINOR@_la_CFLAGS =	\
+libgstvaapi_glx_@GST_API_VERSION@_la_CFLAGS =	\
 	-DGST_USE_UNSTABLE_API			\
 	-I$(top_srcdir)/gst-libs		\
 	$(GLIB_CFLAGS)				\
@@ -323,33 +323,33 @@ libgstvaapi_glx_@GST_MAJORMINOR@_la_CFLAGS =	\
 	$(LIBVA_GLX_CFLAGS)			\
 	$(NULL)
 
-libgstvaapi_glx_@GST_MAJORMINOR@_la_LIBADD =	\
+libgstvaapi_glx_@GST_API_VERSION@_la_LIBADD =	\
 	$(GLIB_LIBS)				\
 	$(GST_BASE_LIBS)			\
 	$(GST_VIDEO_LIBS)			\
 	$(GL_LIBS)				\
 	$(LIBVA_GLX_LIBS)			\
-	libgstvaapi-x11-@GST_MAJORMINOR@.la	\
+	libgstvaapi-x11-$(GST_API_VERSION).la	\
 	$(NULL)
 
-libgstvaapi_glx_@GST_MAJORMINOR@_la_LDFLAGS =	\
+libgstvaapi_glx_@GST_API_VERSION@_la_LDFLAGS =	\
 	$(GST_ALL_LDFLAGS)			\
 	$(GST_VAAPI_LT_LDFLAGS)			\
 	$(NULL)
 
-libgstvaapi_wayland_@GST_MAJORMINOR@_la_SOURCES = \
+libgstvaapi_wayland_@GST_API_VERSION@_la_SOURCES = \
 	$(libgstvaapi_wayland_source_c)		\
 	$(libgstvaapi_wayland_source_priv_h)	\
 	$(NULL)
 
-libgstvaapi_wayland_@GST_MAJORMINOR@include_HEADERS = \
+libgstvaapi_wayland_@GST_API_VERSION@include_HEADERS = \
 	$(libgstvaapi_wayland_source_h)		\
 	$(NULL)
 
-libgstvaapi_wayland_@GST_MAJORMINOR@includedir = \
+libgstvaapi_wayland_@GST_API_VERSION@includedir = \
 	$(libgstvaapi_includedir)
 
-libgstvaapi_wayland_@GST_MAJORMINOR@_la_CFLAGS = \
+libgstvaapi_wayland_@GST_API_VERSION@_la_CFLAGS = \
 	-DGST_USE_UNSTABLE_API			\
 	-I$(top_srcdir)/gst-libs		\
 	$(GLIB_CFLAGS)				\
@@ -358,14 +358,14 @@ libgstvaapi_wayland_@GST_MAJORMINOR@_la_CFLAGS = \
 	$(LIBVA_WAYLAND_CFLAGS)			\
 	$(NULL)
 
-libgstvaapi_wayland_@GST_MAJORMINOR@_la_LIBADD = \
+libgstvaapi_wayland_@GST_API_VERSION@_la_LIBADD = \
 	$(GLIB_LIBS)				\
 	$(WAYLAND_LIBS)				\
 	$(LIBVA_WAYLAND_LIBS)			\
-	libgstvaapi-@GST_MAJORMINOR@.la		\
+	libgstvaapi-$(GST_API_VERSION).la	\
 	$(NULL)
 
-libgstvaapi_wayland_@GST_MAJORMINOR@_la_LDFLAGS = \
+libgstvaapi_wayland_@GST_API_VERSION@_la_LDFLAGS = \
 	$(GST_ALL_LDFLAGS)			\
 	$(GST_VAAPI_LT_LDFLAGS)			\
 	$(NULL)

gst/vaapi/Makefile.am

@@ -11,22 +11,22 @@ libgstvaapi_LIBS =
 
 if USE_DRM
 libgstvaapi_LIBS += \
-	$(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-drm-$(GST_MAJORMINOR).la
+	$(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-drm-$(GST_API_VERSION).la
 endif
 
 if USE_X11
 libgstvaapi_LIBS += \
-	$(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-x11-$(GST_MAJORMINOR).la
+	$(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-x11-$(GST_API_VERSION).la
 endif
 
 if USE_GLX
 libgstvaapi_LIBS += \
-	$(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-glx-$(GST_MAJORMINOR).la
+	$(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-glx-$(GST_API_VERSION).la
 endif
 
 if USE_WAYLAND
 libgstvaapi_LIBS += \
-	$(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-wayland-$(GST_MAJORMINOR).la
+	$(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-wayland-$(GST_API_VERSION).la
 endif
 
 libgstvaapi_la_SOURCES =	\

pkgconfig/Makefile.am

@@ -12,7 +12,7 @@ if USE_WAYLAND
 pcfiles_in += gstreamer-vaapi-wayland.pc.in
 endif
 
-pcfiles = $(pcfiles_in:%.pc.in=%-@GST_MAJORMINOR@.pc)
+pcfiles = $(pcfiles_in:%.pc.in=%-$(GST_API_VERSION).pc)
 
 all_pcfiles_in  = gstreamer-vaapi.pc.in
 all_pcfiles_in += gstreamer-vaapi-drm.pc.in
@@ -20,7 +20,7 @@ all_pcfiles_in += gstreamer-vaapi-x11.pc.in
 all_pcfiles_in += gstreamer-vaapi-glx.pc.in
 all_pcfiles_in += gstreamer-vaapi-wayland.pc.in
 
-all_pcfiles = $(all_pcfiles_in:%.pc.in=%-@GST_MAJORMINOR@.pc)
+all_pcfiles = $(all_pcfiles_in:%.pc.in=%-$(GST_API_VERSION).pc)
 
 pkgconfigdir = @pkgconfigdir@
 pkgconfig_DATA = $(pcfiles)

pkgconfig/gstreamer-vaapi-drm.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@
-pluginsdir=@libdir@/gstreamer-@GST_MAJORMINOR@
+pluginsdir=@libdir@/gstreamer-@GST_API_VERSION@
 
 Name: GStreamer VA-API (DRM) Plugins Libraries
 Description: Streaming media framework, VA-API (DRM) plugins libraries
-Requires: gstreamer-vaapi-@GST_MAJORMINOR@ libva-drm
+Requires: gstreamer-vaapi-@GST_API_VERSION@ libva-drm
 Version: @VERSION@
-Libs: -L${libdir} -lgstvaapi-drm-@GST_MAJORMINOR@
+Libs: -L${libdir} -lgstvaapi-drm-@GST_API_VERSION@
 Cflags: -I${includedir}

pkgconfig/gstreamer-vaapi-glx.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@
-pluginsdir=@libdir@/gstreamer-@GST_MAJORMINOR@
+pluginsdir=@libdir@/gstreamer-@GST_API_VERSION@
 
 Name: GStreamer VA-API (GLX) Plugins Libraries
 Description: Streaming media framework, VA-API (GLX) plugins libraries
-Requires: gstreamer-vaapi-@GST_MAJORMINOR@ @LIBVA_GLX_PKGNAME@
+Requires: gstreamer-vaapi-@GST_API_VERSION@ @LIBVA_GLX_PKGNAME@
 Version: @VERSION@
-Libs: -L${libdir} -lgstvaapi-glx-@GST_MAJORMINOR@
+Libs: -L${libdir} -lgstvaapi-glx-@GST_API_VERSION@
 Cflags: -I${includedir}

pkgconfig/gstreamer-vaapi-wayland.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@
-pluginsdir=@libdir@/gstreamer-@GST_MAJORMINOR@
+pluginsdir=@libdir@/gstreamer-@GST_API_VERSION@
 
 Name: GStreamer VA-API (Wayland) Plugins Libraries
 Description: Streaming media framework, VA-API (Wayland) plugins libraries
-Requires: gstreamer-vaapi-@GST_MAJORMINOR@ libva-wayland
+Requires: gstreamer-vaapi-@GST_API_VERSION@ libva-wayland
 Version: @VERSION@
-Libs: -L${libdir} -lgstvaapi-wayland-@GST_MAJORMINOR@
+Libs: -L${libdir} -lgstvaapi-wayland-@GST_API_VERSION@
 Cflags: -I${includedir}

pkgconfig/gstreamer-vaapi-x11.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@
-pluginsdir=@libdir@/gstreamer-@GST_MAJORMINOR@
+pluginsdir=@libdir@/gstreamer-@GST_API_VERSION@
 
 Name: GStreamer VA-API (X11) Plugins Libraries
 Description: Streaming media framework, VA-API (X11) plugins libraries
-Requires: gstreamer-vaapi-@GST_MAJORMINOR@ @LIBVA_X11_PKGNAME@
+Requires: gstreamer-vaapi-@GST_API_VERSION@ @LIBVA_X11_PKGNAME@
 Version: @VERSION@
-Libs: -L${libdir} -lgstvaapi-x11-@GST_MAJORMINOR@
+Libs: -L${libdir} -lgstvaapi-x11-@GST_API_VERSION@
 Cflags: -I${includedir}

pkgconfig/gstreamer-vaapi.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@
-pluginsdir=@libdir@/gstreamer-@GST_MAJORMINOR@
+pluginsdir=@libdir@/gstreamer-@GST_API_VERSION@
 
 Name: GStreamer VA-API Plugins Libraries
 Description: Streaming media framework, VA-API plugins libraries
-Requires: gstreamer-@GST_MAJORMINOR@ gstreamer-base-@GST_MAJORMINOR@ @LIBVA_PKGNAME@
+Requires: gstreamer-@GST_API_VERSION@ gstreamer-base-@GST_API_VERSION@ @LIBVA_PKGNAME@
 Version: @VERSION@
-Libs: -L${libdir} -lgstvaapi-@GST_MAJORMINOR@
+Libs: -L${libdir} -lgstvaapi-@GST_API_VERSION@
 Cflags: -I${includedir}

tests/Makefile.am

@@ -24,13 +24,13 @@ TEST_CFLAGS = \
 TEST_LIBS = \
 	$(LIBVA_LIBS)			\
 	$(GST_LIBS)			\
-	$(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-@GST_MAJORMINOR@.la
+	$(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-$(GST_API_VERSION).la
 
 if USE_DRM
 TEST_CFLAGS	+= $(LIBVA_DRM_CFLAGS)
 TEST_LIBS	+= \
 	$(LIBVA_DRM_LIBS)		\
-	$(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-drm-@GST_MAJORMINOR@.la
+	$(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-drm-$(GST_API_VERSION).la
 endif
 
 if USE_X11
@@ -38,7 +38,7 @@ TEST_CFLAGS	+= $(X11_CFLAGS)
 TEST_LIBS	+= \
 	$(LIBVA_X11_LIBS)		\
 	$(X11_LIBS)			\
-	$(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-x11-@GST_MAJORMINOR@.la
+	$(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-x11-$(GST_API_VERSION).la
 endif
 
 if USE_GLX
@@ -47,7 +47,7 @@ TEST_LIBS	+= \
 	$(LIBVA_GLX_LIBS)		\
 	$(X11_LIBS)			\
 	$(GL_LIBS)			\
-	$(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-glx-@GST_MAJORMINOR@.la
+	$(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-glx-$(GST_API_VERSION).la
 endif
 
 if USE_WAYLAND
@@ -55,7 +55,7 @@ TEST_CFLAGS	+= $(WAYLAND_CFLAGS)
 TEST_LIBS	+= \
 	$(LIBVA_WAYLAND_LIBS)		\
 	$(WAYLAND_LIBS)			\
-	$(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-wayland-@GST_MAJORMINOR@.la
+	$(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-wayland-$(GST_API_VERSION).la
 endif
 
 test_utils_dec_source_c =	\