pkgconfig: plugin dir should use PKG version not API version.

Fix the pluginsdir and includedir variables in the generated pkgconfig
(.pc) files. The location needs to be built with the PKG version in
mind instead of the API version.

While we are at it, also fix the PKG version for GStreamer >= 1.3.

https://bugzilla.gnome.org/show_bug.cgi?id=720820

[additional fixes for includedir and pkg requirements]
Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>

diff --git a/configure.ac b/configure.ac
index 3710658..db40b5e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -447,10 +447,9 @@ dnl Check for the GStreamer plugins directory
 AC_ARG_VAR([GST_PLUGIN_PATH], [installation path for gstreamer-vaapi plugin elements for GStreamer 0.10])
 AC_ARG_VAR([GST_PLUGIN_PATH_1_0], [installation path for gstreamer-vaapi plugin elements for GStreamer 1.0])
 AC_MSG_CHECKING([for GStreamer plugins directory])
-case $GST_API_VERSION in
+case $GST_PKG_VERSION in
 0.10)   _gst_plugin_path="$GST_PLUGIN_PATH";;
 1.0)    _gst_plugin_path="$GST_PLUGIN_PATH_1_0";;
-1.2)    _gst_plugin_path="$GST_PLUGIN_PATH_1_0";;
 esac
 if test -d "$_gst_plugin_path"; then
     GST_PLUGINS_DIR="$_gst_plugin_path"

diff --git a/pkgconfig/gstreamer-vaapi-drm.pc.in b/pkgconfig/gstreamer-vaapi-drm.pc.in
index b7f3d91..799592b 100644 (file)
--- a/pkgconfig/gstreamer-vaapi-drm.pc.in
+++ b/pkgconfig/gstreamer-vaapi-drm.pc.in
@@ -1,8 +1,8 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
-includedir=@includedir@/gstreamer-@GST_API_VERSION@
-pluginsdir=@libdir@/gstreamer-@GST_API_VERSION@
+includedir=@includedir@/gstreamer-@GST_PKG_VERSION@
+pluginsdir=@libdir@/gstreamer-@GST_PKG_VERSION@
 
 Name: GStreamer VA-API (DRM) Plugins Libraries
 Description: Streaming media framework, VA-API (DRM) plugins libraries

diff --git a/pkgconfig/gstreamer-vaapi-glx.pc.in b/pkgconfig/gstreamer-vaapi-glx.pc.in
index 789a2e1..7a71b14 100644 (file)
--- a/pkgconfig/gstreamer-vaapi-glx.pc.in
+++ b/pkgconfig/gstreamer-vaapi-glx.pc.in
@@ -1,8 +1,8 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
-includedir=@includedir@/gstreamer-@GST_API_VERSION@
-pluginsdir=@libdir@/gstreamer-@GST_API_VERSION@
+includedir=@includedir@/gstreamer-@GST_PKG_VERSION@
+pluginsdir=@libdir@/gstreamer-@GST_PKG_VERSION@
 
 Name: GStreamer VA-API (GLX) Plugins Libraries
 Description: Streaming media framework, VA-API (GLX) plugins libraries

diff --git a/pkgconfig/gstreamer-vaapi-wayland.pc.in b/pkgconfig/gstreamer-vaapi-wayland.pc.in
index 9049208..05f5128 100644 (file)
--- a/pkgconfig/gstreamer-vaapi-wayland.pc.in
+++ b/pkgconfig/gstreamer-vaapi-wayland.pc.in
@@ -1,8 +1,8 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
-includedir=@includedir@/gstreamer-@GST_API_VERSION@
-pluginsdir=@libdir@/gstreamer-@GST_API_VERSION@
+includedir=@includedir@/gstreamer-@GST_PKG_VERSION@
+pluginsdir=@libdir@/gstreamer-@GST_PKG_VERSION@
 
 Name: GStreamer VA-API (Wayland) Plugins Libraries
 Description: Streaming media framework, VA-API (Wayland) plugins libraries

diff --git a/pkgconfig/gstreamer-vaapi-x11.pc.in b/pkgconfig/gstreamer-vaapi-x11.pc.in
index fd968b6..acdbb51 100644 (file)
--- a/pkgconfig/gstreamer-vaapi-x11.pc.in
+++ b/pkgconfig/gstreamer-vaapi-x11.pc.in
@@ -1,8 +1,8 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
-includedir=@includedir@/gstreamer-@GST_API_VERSION@
-pluginsdir=@libdir@/gstreamer-@GST_API_VERSION@
+includedir=@includedir@/gstreamer-@GST_PKG_VERSION@
+pluginsdir=@libdir@/gstreamer-@GST_PKG_VERSION@
 
 Name: GStreamer VA-API (X11) Plugins Libraries
 Description: Streaming media framework, VA-API (X11) plugins libraries

diff --git a/pkgconfig/gstreamer-vaapi.pc.in b/pkgconfig/gstreamer-vaapi.pc.in
index a33fc51..af6706b 100644 (file)
--- a/pkgconfig/gstreamer-vaapi.pc.in
+++ b/pkgconfig/gstreamer-vaapi.pc.in
@@ -1,12 +1,12 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
-includedir=@includedir@/gstreamer-@GST_API_VERSION@
-pluginsdir=@libdir@/gstreamer-@GST_API_VERSION@
+includedir=@includedir@/gstreamer-@GST_PKG_VERSION@
+pluginsdir=@libdir@/gstreamer-@GST_PKG_VERSION@
 
 Name: GStreamer VA-API Plugins Libraries
 Description: Streaming media framework, VA-API plugins libraries
-Requires: gstreamer-@GST_API_VERSION@ gstreamer-base-@GST_API_VERSION@ @LIBVA_PKGNAME@
+Requires: gstreamer-@GST_PKG_VERSION@ gstreamer-base-@GST_PKG_VERSION@ @LIBVA_PKGNAME@
 Version: @VERSION@
 Libs: -L${libdir} -lgstvaapi-@GST_API_VERSION@
 Cflags: -I${includedir}