From 65f897df6afc15095ef49d874cc1fe0f8e3e277f Mon Sep 17 00:00:00 2001 From: Gwenole Beauchesne Date: Thu, 3 Jul 2014 18:01:09 +0200 Subject: [PATCH] build: fix for GStreamer 1.0.x. --- ...64parse-fix-build-with-GStreamer-1.2.patch | 26 ---------- ...uild-with-older-GStreamer-1.x-stacks.patch | 48 +++++++++++++++++++ patches/videoparsers/series.frag | 2 +- 3 files changed, 49 insertions(+), 27 deletions(-) delete mode 100644 patches/videoparsers/0002-h264parse-fix-build-with-GStreamer-1.2.patch create mode 100644 patches/videoparsers/0002-h264parse-fix-build-with-older-GStreamer-1.x-stacks.patch diff --git a/patches/videoparsers/0002-h264parse-fix-build-with-GStreamer-1.2.patch b/patches/videoparsers/0002-h264parse-fix-build-with-GStreamer-1.2.patch deleted file mode 100644 index 29f979ed6f..0000000000 --- a/patches/videoparsers/0002-h264parse-fix-build-with-GStreamer-1.2.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 4a209977a61d156433dddbf21bddc0b1e89098e1 Mon Sep 17 00:00:00 2001 -From: Gwenole Beauchesne -Date: Mon, 28 Apr 2014 17:17:04 +0200 -Subject: [PATCH 2/3] h264parse: fix build with GStreamer 1.2. - ---- - gst/vaapi/gsth264parse.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/gst/vaapi/gsth264parse.c b/gst/vaapi/gsth264parse.c -index 4246b6e..7c970ee 100644 ---- a/gst/vaapi/gsth264parse.c -+++ b/gst/vaapi/gsth264parse.c -@@ -148,7 +148,9 @@ gst_h264_parse_init (GstH264Parse * h264parse) - { - h264parse->frame_out = gst_adapter_new (); - gst_base_parse_set_pts_interpolation (GST_BASE_PARSE (h264parse), FALSE); -+#if GST_CHECK_VERSION(1,3,0) - GST_PAD_SET_ACCEPT_INTERSECT (GST_BASE_PARSE_SINK_PAD (h264parse)); -+#endif - } - - --- -1.7.9.5 - diff --git a/patches/videoparsers/0002-h264parse-fix-build-with-older-GStreamer-1.x-stacks.patch b/patches/videoparsers/0002-h264parse-fix-build-with-older-GStreamer-1.x-stacks.patch new file mode 100644 index 0000000000..02f17bf1e3 --- /dev/null +++ b/patches/videoparsers/0002-h264parse-fix-build-with-older-GStreamer-1.x-stacks.patch @@ -0,0 +1,48 @@ +From 92908c46e7dd90063a613742f285e9c494c90d6f Mon Sep 17 00:00:00 2001 +From: Gwenole Beauchesne +Date: Mon, 28 Apr 2014 17:17:04 +0200 +Subject: [PATCH 2/3] h264parse: fix build with older GStreamer 1.x stacks. + +--- + gst/vaapi/gsth264parse.c | 4 +++- + gst/vaapi/gsth264parse.h | 1 + + 2 files changed, 4 insertions(+), 1 deletion(-) + +diff --git a/gst/vaapi/gsth264parse.c b/gst/vaapi/gsth264parse.c +index 678c7f7..37ce228 100644 +--- a/gst/vaapi/gsth264parse.c ++++ b/gst/vaapi/gsth264parse.c +@@ -27,7 +27,7 @@ + #endif + + #include "gstvaapiparse.h" +-#include ++#include + #include + #include + #include "gsth264parse.h" +@@ -148,7 +148,9 @@ gst_h264_parse_init (GstH264Parse * h264parse) + { + h264parse->frame_out = gst_adapter_new (); + gst_base_parse_set_pts_interpolation (GST_BASE_PARSE (h264parse), FALSE); ++#if GST_CHECK_VERSION(1,3,0) + GST_PAD_SET_ACCEPT_INTERSECT (GST_BASE_PARSE_SINK_PAD (h264parse)); ++#endif + } + + +diff --git a/gst/vaapi/gsth264parse.h b/gst/vaapi/gsth264parse.h +index 4c3fdd4..3db8f21 100644 +--- a/gst/vaapi/gsth264parse.h ++++ b/gst/vaapi/gsth264parse.h +@@ -27,6 +27,7 @@ + + #include + #include ++#include + #include + + G_BEGIN_DECLS +-- +1.7.9.5 + diff --git a/patches/videoparsers/series.frag b/patches/videoparsers/series.frag index b929daf850..f9aac326de 100644 --- a/patches/videoparsers/series.frag +++ b/patches/videoparsers/series.frag @@ -2,7 +2,7 @@ videoparsers_patches_base = \ 0001-plugins-compile-the-built-in-video-parsers-as-vaapip.patch \ - 0002-h264parse-fix-build-with-GStreamer-1.2.patch \ + 0002-h264parse-fix-build-with-older-GStreamer-1.x-stacks.patch \ 0004-h264parse-default-to-byte-stream-nalu-format-Annex-B.patch \ 0003-h264parse-add-initial-support-for-MVC-NAL-units.patch \ $(NULL)