build: add gsth265parse patches conditionally

As gsth265parse was added in GStreamer 1.4, and gstreamer-vaapi still support
GStreamer 1.2, the patching of gsth265parse must be conditional to the target
GStreamer version.

Signed-off-by: Víctor Manuel Jáquez Leal <victorx.jaquez@intel.com>
https://bugzilla.gnome.org/show_bug.cgi?id=755525

diff --git a/gst/vaapi/Makefile.am b/gst/vaapi/Makefile.am
index 1d5a250..e99493e 100644 (file)
--- a/gst/vaapi/Makefile.am
+++ b/gst/vaapi/Makefile.am
@@ -230,6 +230,10 @@ videoparsers_patches_dir = \
 include $(videoparsers_patches_dir)/series.frag
 videoparsers_patches = \
        $(videoparsers_patches_base:%=$(top_srcdir)/patches/videoparsers/%)
+if USE_GST_API_1_4p
+videoparsers_patches += \
+       $(videoparsers_patches_1_4p:%=$(top_srcdir)/patches/videoparsers/%)
+endif
 videoparsers_orig_sources = \
        $(libgstvaapi_parse_gen_sources:%=$(videoparsers_sources_dir)/%)
 

diff --git a/patches/videoparsers/Makefile.am b/patches/videoparsers/Makefile.am
index 401b2ad..cf1b2a8 100644 (file)
--- a/patches/videoparsers/Makefile.am
+++ b/patches/videoparsers/Makefile.am
@@ -1,5 +1,9 @@
 include series.frag
 
-EXTRA_DIST = series.frag $(videoparsers_patches_base)
+EXTRA_DIST = \
+       series.frag                     \
+       $(videoparsers_patches_base)    \
+       $(videoparsers_patches_1_4p)    \
+       $(NULL)
 
 -include $(top_srcdir)/git.mk

diff --git a/patches/videoparsers/series.frag b/patches/videoparsers/series.frag
index 5d06453..d9f809c 100644 (file)
--- a/patches/videoparsers/series.frag
+++ b/patches/videoparsers/series.frag
@@ -5,6 +5,9 @@ videoparsers_patches_base = \
        0002-h264parse-fix-build-with-older-GStreamer-1.x-stacks.patch  \
         0003-h264parse-default-to-byte-stream-nalu-format-Annex-B.patch \
         0004-h264parse-Disable-3D-video-support-for-GStreamer-1.5.patch \
-        0005-h265parse-include-gstvaapiparse.h.patch \
-        0006-h265parse-fix-build-with-GStreamer-1.5.patch \
+       $(NULL)
+
+videoparsers_patches_1_4p = \
+        0005-h265parse-include-gstvaapiparse.h.patch           \
+        0006-h265parse-fix-build-with-GStreamer-1.5.patch      \
        $(NULL)