From c72dab64c06eaf3036c8ddcb36424f466b7cb57f Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Thu, 22 Feb 2018 12:23:00 +0100 Subject: [PATCH] Update to 1.13.1 Add patch to fix aliasing compilation error --- 0002-video-chroma-disable-ORC_RESTRICT.patch | 27 ------------- 0002-video-disable-ORC_RESTRICT.patch | 42 ++++++++++++++++++++ gstreamer1-plugins-base.spec | 2 +- 3 files changed, 43 insertions(+), 28 deletions(-) delete mode 100644 0002-video-chroma-disable-ORC_RESTRICT.patch create mode 100644 0002-video-disable-ORC_RESTRICT.patch diff --git a/0002-video-chroma-disable-ORC_RESTRICT.patch b/0002-video-chroma-disable-ORC_RESTRICT.patch deleted file mode 100644 index bcf017c..0000000 --- a/0002-video-chroma-disable-ORC_RESTRICT.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 6d508298753196cfe4e89f0ebbe73f067ee0abc2 Mon Sep 17 00:00:00 2001 -From: Wim Taymans -Date: Thu, 22 Feb 2018 11:37:07 +0100 -Subject: [PATCH 2/2] video-chroma: disable ORC_RESTRICT - -We pass the same pointers to the video_chroma_up and -video_chroma_down functions, which causes the compiler to complain. ---- - gst-libs/gst/video/video-chroma.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/gst-libs/gst/video/video-chroma.c b/gst-libs/gst/video/video-chroma.c -index b994658a9..0cba36838 100644 ---- a/gst-libs/gst/video/video-chroma.c -+++ b/gst-libs/gst/video/video-chroma.c -@@ -24,6 +24,8 @@ - #include - #include - -+#define ORC_RESTRICT -+ - #include "video-orc.h" - #include "video-format.h" - --- -2.14.3 - diff --git a/0002-video-disable-ORC_RESTRICT.patch b/0002-video-disable-ORC_RESTRICT.patch new file mode 100644 index 0000000..3b3eada --- /dev/null +++ b/0002-video-disable-ORC_RESTRICT.patch @@ -0,0 +1,42 @@ +From 303c62f25d9d8361f62c1eb00655efb6c4e89f21 Mon Sep 17 00:00:00 2001 +From: Wim Taymans +Date: Thu, 22 Feb 2018 11:37:07 +0100 +Subject: [PATCH 2/2] video: disable ORC_RESTRICT + +We pass the same pointers to the video_chroma_up, +video_chroma_down fnd video_convert unctions, which causes the +compiler to complain. +--- + gst-libs/gst/video/video-chroma.c | 2 ++ + gst-libs/gst/video/video-converter.c | 2 ++ + 2 files changed, 4 insertions(+) + +diff --git a/gst-libs/gst/video/video-chroma.c b/gst-libs/gst/video/video-chroma.c +index b994658a9..0cba36838 100644 +--- a/gst-libs/gst/video/video-chroma.c ++++ b/gst-libs/gst/video/video-chroma.c +@@ -24,6 +24,8 @@ + #include + #include + ++#define ORC_RESTRICT ++ + #include "video-orc.h" + #include "video-format.h" + +diff --git a/gst-libs/gst/video/video-converter.c b/gst-libs/gst/video/video-converter.c +index 31e866a79..03c23a56f 100644 +--- a/gst-libs/gst/video/video-converter.c ++++ b/gst-libs/gst/video/video-converter.c +@@ -29,6 +29,8 @@ + #endif + #endif + ++#define ORC_RESTRICT ++ + #include "video-converter.h" + + #include +-- +2.14.3 + diff --git a/gstreamer1-plugins-base.spec b/gstreamer1-plugins-base.spec index 328eefb..06ebc41 100644 --- a/gstreamer1-plugins-base.spec +++ b/gstreamer1-plugins-base.spec @@ -19,7 +19,7 @@ Source0: gst-plugins-base-%{version}.tar.xz Source0: http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-%{version}.tar.xz %endif Patch0: 0001-missing-plugins-Remove-the-mpegaudioversion-field.patch -Patch1: 0002-video-chroma-disable-ORC_RESTRICT.patch +Patch1: 0002-video-disable-ORC_RESTRICT.patch BuildRequires: gstreamer1-devel >= %{version} BuildRequires: gobject-introspection-devel >= 1.31.1