From 67285a0b57a37e49087e183c745fdafaec4d17cc Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Thu, 22 Feb 2018 11:40:16 +0100 Subject: [PATCH] Update to 1.13.1 --- ...ns-Remove-the-mpegaudioversion-field.patch | 12 ++++----- 0002-video-chroma-disable-ORC_RESTRICT.patch | 27 +++++++++++++++++++ gstreamer1-plugins-base.spec | 3 +++ 3 files changed, 36 insertions(+), 6 deletions(-) create mode 100644 0002-video-chroma-disable-ORC_RESTRICT.patch diff --git a/0001-missing-plugins-Remove-the-mpegaudioversion-field.patch b/0001-missing-plugins-Remove-the-mpegaudioversion-field.patch index 4a92322..e7dea07 100644 --- a/0001-missing-plugins-Remove-the-mpegaudioversion-field.patch +++ b/0001-missing-plugins-Remove-the-mpegaudioversion-field.patch @@ -1,21 +1,21 @@ -From d4e6ecc9799b05e20cd36ea6c5392380fb7f8cc2 Mon Sep 17 00:00:00 2001 +From 06ca82cad9898f5df40011fe0614ee1dfd89f1ae Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Fri, 3 Aug 2012 17:50:24 +0100 -Subject: [PATCH] missing-plugins: Remove the mpegaudioversion field +Subject: [PATCH 1/2] missing-plugins: Remove the mpegaudioversion field From missing plugins requests as it's a duplicate of mpegversion and its presence would break codec discovery when using RPM. https://bugzilla.redhat.com/show_bug.cgi?id=680809 --- - gst-libs/gst/pbutils/missing-plugins.c | 3 +++ + gst-libs/gst/pbutils/missing-plugins.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gst-libs/gst/pbutils/missing-plugins.c b/gst-libs/gst/pbutils/missing-plugins.c -index 1b6d44b..6b343c5 100644 +index a08803b18..cdce4bf05 100644 --- a/gst-libs/gst/pbutils/missing-plugins.c +++ b/gst-libs/gst/pbutils/missing-plugins.c -@@ -152,6 +152,9 @@ copy_and_clean_caps (const GstCaps * caps) +@@ -151,6 +151,9 @@ copy_and_clean_caps (const GstCaps * caps) gst_structure_remove_field (s, "play-speed"); gst_structure_remove_field (s, "play-scale"); gst_structure_remove_field (s, "dynamic_range"); @@ -26,5 +26,5 @@ index 1b6d44b..6b343c5 100644 return ret; } -- -1.7.10.2 +2.14.3 diff --git a/0002-video-chroma-disable-ORC_RESTRICT.patch b/0002-video-chroma-disable-ORC_RESTRICT.patch new file mode 100644 index 0000000..bcf017c --- /dev/null +++ b/0002-video-chroma-disable-ORC_RESTRICT.patch @@ -0,0 +1,27 @@ +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/gstreamer1-plugins-base.spec b/gstreamer1-plugins-base.spec index 465e278..ee3b525 100644 --- a/gstreamer1-plugins-base.spec +++ b/gstreamer1-plugins-base.spec @@ -19,6 +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 BuildRequires: gstreamer1-devel >= %{version} BuildRequires: gobject-introspection-devel >= 1.31.1 @@ -97,6 +98,7 @@ for the GStreamer Base Plugins library. %prep %setup -q -n gst-plugins-base-%{version} %patch0 -p1 +%patch0 -p2 %build %configure \ @@ -431,6 +433,7 @@ chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gst-play-1.0 %changelog * Thu Feb 22 2018 Wim Taymans - 1.13.1-1 - Update to 1.13.1 +- Add patch to fix aliasing compilation error * Wed Feb 07 2018 Fedora Release Engineering - 1.12.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild