From f5294b813adae6b521b0be0eec2f27c465425570 Mon Sep 17 00:00:00 2001 From: Gwenole Beauchesne Date: Tue, 18 Dec 2012 15:15:52 +0100 Subject: [PATCH] Bump library major version. Increase library major so that to cope with API/ABI incompatible changes since 0.4.x series and avoid user issues. --- configure.ac | 16 +++++++++++++++- gst-libs/gst/vaapi/Makefile.am | 5 +++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 256608a..748b1d9 100644 --- a/configure.ac +++ b/configure.ac @@ -9,6 +9,11 @@ m4_if(gst_vaapi_pre_version, [0], [], [ m4_append([gst_vaapi_version], gst_vaapi_pre_version, [.pre]) ]) +# gstreamer-vaapi library (libtool) version number +m4_define([gst_vaapi_lt_current], [1]) +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_minor_version], [28]) @@ -80,7 +85,7 @@ AM_INIT_AUTOMAKE([1.11 tar-ustar no-dist-gzip dist-bzip2]) TODAY="`LC_ALL=C date +'%a, %d %b %Y %X %z'`" AC_SUBST(TODAY) -GST_VAAPI_MAJOR_VERSION=gst_vaapi_major_version +GST_VAAPI_MAJOR_VERSION=gst_vaapi_lt_current AC_SUBST(GST_VAAPI_MAJOR_VERSION) LIBVA_PACKAGE_VERSION=libva_x11_package_version @@ -282,6 +287,15 @@ AC_CACHE_CHECK([for JPEG parser], AM_CONDITIONAL([USE_LOCAL_CODEC_PARSERS_JPEG], [test "$ac_cv_have_gst_jpeg_parser" != "yes"]) +dnl GST_VAAPI_LT_LDFLAGS: +GST_VAAPI_LT_CURRENT=gst_vaapi_lt_current +GST_VAAPI_LT_REV=gst_vaapi_lt_revision +GST_VAAPI_LT_AGE=gst_vaapi_lt_age +GST_VAAPI_LT_VERSION="$GST_VAAPI_LT_CURRENT:$GST_VAAPI_LT_REV:$GST_VAAPI_LT_AGE" +GST_VAAPI_LT_LDFLAGS="-version-info $GST_VAAPI_LT_VERSION" +AC_SUBST(GST_VAAPI_LT_VERSION) +AC_SUBST(GST_VAAPI_LT_LDFLAGS) + dnl GST_ALL_LDFLAGS: dnl LDFLAGS really should only contain flags, not libs - they get added before dnl whatevertarget_LIBS and -L flags here affect the rest of the linking diff --git a/gst-libs/gst/vaapi/Makefile.am b/gst-libs/gst/vaapi/Makefile.am index 143794b..b0779d4 100644 --- a/gst-libs/gst/vaapi/Makefile.am +++ b/gst-libs/gst/vaapi/Makefile.am @@ -226,6 +226,7 @@ libgstvaapi_@GST_MAJORMINOR@_la_LIBADD = \ libgstvaapi_@GST_MAJORMINOR@_la_LDFLAGS = \ $(GST_ALL_LDFLAGS) \ + $(GST_VAAPI_LT_LDFLAGS) \ -export-symbols-regex "^gst_.*vaapi.*" \ $(NULL) @@ -261,6 +262,7 @@ libgstvaapi_drm_@GST_MAJORMINOR@_la_LIBADD = \ libgstvaapi_drm_@GST_MAJORMINOR@_la_LDFLAGS = \ $(GST_ALL_LDFLAGS) \ + $(GST_VAAPI_LT_LDFLAGS) \ $(NULL) libgstvaapi_x11_@GST_MAJORMINOR@_la_SOURCES = \ @@ -295,6 +297,7 @@ libgstvaapi_x11_@GST_MAJORMINOR@_la_LIBADD = \ libgstvaapi_x11_@GST_MAJORMINOR@_la_LDFLAGS = \ $(GST_ALL_LDFLAGS) \ + $(GST_VAAPI_LT_LDFLAGS) \ $(NULL) libgstvaapi_glx_@GST_MAJORMINOR@_la_SOURCES = \ @@ -330,6 +333,7 @@ libgstvaapi_glx_@GST_MAJORMINOR@_la_LIBADD = \ libgstvaapi_glx_@GST_MAJORMINOR@_la_LDFLAGS = \ $(GST_ALL_LDFLAGS) \ + $(GST_VAAPI_LT_LDFLAGS) \ $(NULL) libgstvaapi_wayland_@GST_MAJORMINOR@_la_SOURCES = \ @@ -362,6 +366,7 @@ libgstvaapi_wayland_@GST_MAJORMINOR@_la_LIBADD = \ libgstvaapi_wayland_@GST_MAJORMINOR@_la_LDFLAGS = \ $(GST_ALL_LDFLAGS) \ + $(GST_VAAPI_LT_LDFLAGS) \ $(NULL) # Extra clean files so that maintainer-clean removes *everything* -- 2.7.4