commit ffd833e293f1111aa9bfc3d20ad542f4fe269247 Author: Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net&gt; Date: Wed Nov 20 10:35:32 2019 +0100 update bundled libav to 0.8.21 fix build with orc >= 0.4.30 gst-ffmpeg-0.10.13-orc-0.4.30.patch | 24 ++++++++++++++++++++++++ gstreamer-ffmpeg.spec | 17 +++++++++++++---- sources | 4 ++-- 3 files changed, 39 insertions(+), 6 deletions(-) --- diff --git a/gst-ffmpeg-0.10.13-orc-0.4.30.patch b/gst-ffmpeg-0.10.13-orc-0.4.30.patch new file mode 100644 index 0000000..4727512 --- /dev/null +++ b/gst-ffmpeg-0.10.13-orc-0.4.30.patch @@ -0,0 +1,24 @@ +diff -up gst-ffmpeg-0.10.13/ext/libswscale/gstffmpegscale.c.orc gst-ffmpeg-0.10.13/ext/libswscale/gstffmpegscale.c +--- gst-ffmpeg-0.10.13/ext/libswscale/gstffmpegscale.c.orc 2019-11-20 10:08:09.730167627 +0100 ++++ gst-ffmpeg-0.10.13/ext/libswscale/gstffmpegscale.c 2019-11-20 10:13:36.888577009 +0100 +@@ -636,7 +636,7 @@ gst_ffmpegscale_set_caps (GstBaseTransfo + swsflags = (mmx_flags & ORC_TARGET_MMX_MMX ? SWS_CPU_CAPS_MMX : 0) + | (mmx_flags & ORC_TARGET_MMX_MMXEXT ? SWS_CPU_CAPS_MMX2 : 0) + | (mmx_flags & ORC_TARGET_MMX_3DNOW ? SWS_CPU_CAPS_3DNOW : 0) +- | (altivec_flags & ORC_TARGET_ALTIVEC_ALTIVEC ? SWS_CPU_CAPS_ALTIVEC : 0); ++ | (altivec_flags & ORC_TARGET_POWERPC_ALTIVEC ? SWS_CPU_CAPS_ALTIVEC : 0); + #else + mmx_flags = 0; + altivec_flags = 0; +diff -up gst-ffmpeg-0.10.13/ext/libpostproc/gstpostproc.c.orc gst-ffmpeg-0.10.13/ext/libpostproc/gstpostproc.c +--- gst-ffmpeg-0.10.13/ext/libpostproc/gstpostproc.c.orc 2019-11-20 10:23:40.014758297 +0100 ++++ gst-ffmpeg-0.10.13/ext/libpostproc/gstpostproc.c 2019-11-20 10:27:56.561215105 +0100 +@@ -299,7 +299,7 @@ change_context (GstPostProc * postproc, + ppflags = (mmx_flags & ORC_TARGET_MMX_MMX ? PP_CPU_CAPS_MMX : 0) + | (mmx_flags & ORC_TARGET_MMX_MMXEXT ? PP_CPU_CAPS_MMX2 : 0) + | (mmx_flags & ORC_TARGET_MMX_3DNOW ? PP_CPU_CAPS_3DNOW : 0) +- | (altivec_flags & ORC_TARGET_ALTIVEC_ALTIVEC ? PP_CPU_CAPS_ALTIVEC : ++ | (altivec_flags & ORC_TARGET_POWERPC_ALTIVEC ? PP_CPU_CAPS_ALTIVEC : + 0); + #else + mmx_flags = 0; diff --git a/gstreamer-ffmpeg.spec b/gstreamer-ffmpeg.spec index fe1ef96..c2033f6 100644 --- a/gstreamer-ffmpeg.spec +++ b/gstreamer-ffmpeg.spec @@ -1,6 +1,8 @@ +%global libav_ver 0.8.21 + Name: gstreamer-ffmpeg Version: 0.10.13 -Release: 22%{?dist} +Release: 23%{?dist} Summary: GStreamer FFmpeg-based plug-ins Group: Applications/Multimedia # the ffmpeg plugin is LGPL, the postproc plugin is GPL @@ -8,7 +10,7 @@ License: GPLv2+ and LGPLv2+ URL: http://gstreamer.freedesktop.org/ Source0: http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-%{version}.tar... # We drop in a newer libav to get all the security bugfixes from there! -Source1: http://libav.org/releases/libav-0.8.18.tar.xz +Source1: http://libav.org/releases/libav-%{libav_ver}.tar.xz Patch0: gst-ffmpeg-0.10.12-ChangeLog-UTF-8.patch # Patches cherry picked from upstream for newer libav and bugfixes Patch1: 0001-configure.ac-Fix-for-new-libav.patch @@ -23,9 +25,11 @@ Patch9: 0009-codecmap-Add-mapping-for-Indeo-4-video-codec.patch Patch10: 0010-ffmpegdec-Use-auto-threads-if-available-and-only-sli.patch Patch11: 0011-ffmux-Use-correct-enum-type-for-return-value.patch Patch12: 0012-ffdec-don-t-flush-buffers-on-DISCONT.patch +# fix build with orc >= 0.4.30 +Patch20: gst-ffmpeg-0.10.13-orc-0.4.30.patch BuildRequires: gstreamer-devel >= 0.10.0 BuildRequires: gstreamer-plugins-base-devel >= 0.10.0 -BuildRequires: orc-devel bzip2-devel zlib-devel +BuildRequires: orc-devel >= 0.4.30 bzip2-devel zlib-devel %ifarch %{ix86} x86_64 BuildRequires: yasm %endif @@ -57,8 +61,9 @@ This package provides FFmpeg-based GStreamer plug-ins. %patch10 -p1 %patch11 -p1 %patch12 -p1 +%patch20 -p1 rm -r gst-libs/ext/libav -mv libav-0.8.18 gst-libs/ext/libav +mv libav-%{libav_ver} gst-libs/ext/libav %build @@ -84,6 +89,10 @@ rm $RPM_BUILD_ROOT%{_libdir}/gstreamer-0.10/libgst*.la %changelog +* Wed Nov 20 2019 Dominik Mierzejewski <rpm(a)greysector.net&gt; - 0.10.13-23 +- update bundled libav to 0.8.21 +- fix build with orc >= 0.4.30 + * Fri Aug 09 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com&gt; - 0.10.13-22 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 6bf47f8..0d8b63e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -ed9c19d21c8190e3ac6f683ba6592618 libav-0.8.18.tar.xz -7f5beacaf1312db2db30a026b36888c4 gst-ffmpeg-0.10.13.tar.bz2 +SHA512 (libav-0.8.21.tar.xz) = 3299ad0135f6c5d97bca3c1feb6ea043cd4f7482bf8fc647882f715e0e4dc394c1e75a4db13501a128115728466c308bec6a20abbc2b4b7e4d97653776942707 +SHA512 (gst-ffmpeg-0.10.13.tar.bz2) = f1141fc73b4bf1d774053ce53c4a67d5e600d6f0118ee7824cd2ff4fc8af8ba1dfbd5cf82d9e15872f3e6f8730112ddfc520a7d8df3cf605a9725e959f37e6ed