build: fix packaging for GStreamer 1.2.

Fix gstreamer-vaapi includedir for GStreamer 1.2 setups. i.e. use
the pkgconfig version (1.0) instead of the intended API version (1.2).
libgstvaapi1.0-dev and libgstvaapi1.2-dev packages will now conflict,
as would core GStreamer 1.0 and GStreamer 1.2 dev packages anyway.

diff --git a/debian.upstream/libgstvaapi-dev.install.in b/debian.upstream/libgstvaapi-dev.install.in
index 764bc3a..33d178a 100644 (file)
--- a/debian.upstream/libgstvaapi-dev.install.in
+++ b/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_API_VERSION@/gst/vaapi/*.h
+debian/tmp/usr/include/gstreamer-@GST_PKG_VERSION@/gst/vaapi/*.h

diff --git a/gst-libs/gst/vaapi/Makefile.am b/gst-libs/gst/vaapi/Makefile.am
index 69eda14..4d61713 100644 (file)
--- a/gst-libs/gst/vaapi/Makefile.am
+++ b/gst-libs/gst/vaapi/Makefile.am
@@ -17,7 +17,7 @@ lib_LTLIBRARIES += libgstvaapi-wayland-@GST_API_VERSION@.la
 endif
 
 libgstvaapi_includedir = \
-       $(includedir)/gstreamer-$(GST_API_VERSION)/gst/vaapi
+       $(includedir)/gstreamer-$(GST_PKG_VERSION)/gst/vaapi
 
 libgstvaapi_cflags =                           \
        -DIN_LIBGSTVAAPI                        \

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