From 17c3233200e36748ce916fdc49b16622b59a8f11 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Tue, 6 Nov 2012 20:24:40 +0000 Subject: [PATCH 001/113] Setup of module gstreamer1-libav --- .gitignore | 0 sources | 0 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 .gitignore create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/sources b/sources new file mode 100644 index 0000000..e69de29 From c6f03d580151f774e503638e4d99747135530bee Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Sat, 10 Nov 2012 16:10:12 +0000 Subject: [PATCH 002/113] Initial gstreamer1-libav import --- .gitignore | 1 + gst-ffmpeg-0.10.12-ChangeLog-UTF-8.patch | 9 +++ gstreamer1-libav.spec | 71 ++++++++++++++++++++++++ sources | 1 + 4 files changed, 82 insertions(+) create mode 100644 gst-ffmpeg-0.10.12-ChangeLog-UTF-8.patch create mode 100644 gstreamer1-libav.spec diff --git a/.gitignore b/.gitignore index e69de29..0181af1 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +gst-libav-1.0.2.tar.xz diff --git a/gst-ffmpeg-0.10.12-ChangeLog-UTF-8.patch b/gst-ffmpeg-0.10.12-ChangeLog-UTF-8.patch new file mode 100644 index 0000000..1651725 --- /dev/null +++ b/gst-ffmpeg-0.10.12-ChangeLog-UTF-8.patch @@ -0,0 +1,9 @@ +diff -U0 gst-ffmpeg-0.10.12/ChangeLog~ gst-ffmpeg-0.10.12/ChangeLog +--- gst-ffmpeg-0.10.12/ChangeLog~ 2011-07-20 12:09:57.000000000 +0200 ++++ gst-ffmpeg-0.10.12/ChangeLog 2011-09-04 10:20:50.064262797 +0200 +@@ -4277 +4277 @@ +-2007-11-08 14:44:36 +0000 Ole Andr� Vadla Ravn�s ++2007-11-08 14:44:36 +0000 Ole André Vadla Ravnås +@@ -4281 +4281 @@ +- Patch by: Ole Andr� Vadla Ravn�s ++ Patch by: Ole André Vadla Ravnås diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec new file mode 100644 index 0000000..93c7b89 --- /dev/null +++ b/gstreamer1-libav.spec @@ -0,0 +1,71 @@ +Name: gstreamer1-libav +Version: 1.0.2 +Release: 2%{?dist} +Summary: GStreamer 1.0 libav-based plug-ins +Group: Applications/Multimedia +License: LGPLv2+ +URL: http://gstreamer.freedesktop.org/ +Source0: http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-%{version}.tar.xz +Patch0: gst-ffmpeg-0.10.12-ChangeLog-UTF-8.patch +BuildRequires: gstreamer1-devel >= 1.0.0 +BuildRequires: gstreamer1-plugins-base-devel >= 1.0.0 +BuildRequires: orc-devel bzip2-devel zlib-devel +%ifarch %{ix86} x86_64 +BuildRequires: yasm +%endif + +%description +GStreamer is a streaming media framework, based on graphs of filters which +operate on media data. Applications using this library can do anything +from real-time sound processing to playing videos, and just about anything +else media-related. Its plugin-based architecture means that new data +types or processing capabilities can be added simply by installing new +plugins. + +This package provides libav-based GStreamer plug-ins. + + +%prep +%setup -q -n gst-libav-%{version} +%patch0 -p1 + + +%build +# Note no --with-system-ffmpeg *for now*, as gst-ffmpeg wants libav-0.8, +# and the system ffmpeg is 0.11, which is more or less libav-0.9 +%configure --disable-dependency-tracking --disable-static \ + --with-package-name="gst-libav 1.0 rpmfusion rpm" \ + --with-package-origin="http://rpmfusion.org/" \ + --with-libav-extra-configure="--enable-runtime-cpudetect --arch=%{_target_cpu} --optflags=\\\"\\\$RPM_OPT_FLAGS\\\"" +make %{?_smp_mflags} V=1 + + +%install +make install V=1 DESTDIR=$RPM_BUILD_ROOT +rm $RPM_BUILD_ROOT%{_libdir}/gstreamer-1.0/libgst*.la + + +%files +%doc AUTHORS COPYING.LIB ChangeLog NEWS README TODO +%{_libdir}/gstreamer-1.0/libgstlibav.so +%{_libdir}/gstreamer-1.0/libgstavscale.so + + +%changelog +* Sat Nov 3 2012 Hans de Goede - 1.0.2-2 +- Build included libav with the default RPM_OPT_FLAGS (rf#2560, rf#2472) + +* Sun Oct 28 2012 Hans de Goede - 1.0.2-1 +- Rebase to 1.0.2 +- Included libav copy updated to 0.8.4 +- Change the license to LGPLv2+, as the GPL only postproc plugin is no longer + included +- Replace references to ffmpeg with libav (rf#2472) +- Add COPYING.LIB to %%doc (rf#2472) +- Run make with V=1 (rf#2472) + +* Sun Sep 23 2012 Hans de Goede - 0.11.99-1 +- New upstream release 0.11.99 + +* Sun Sep 9 2012 Hans de Goede - 0.11.93-1 +- First version of gstreamer1-libav for rpmfusion diff --git a/sources b/sources index e69de29..9d5e0a7 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +b932d386711a1b14d08c3b7d3021934b gst-libav-1.0.2.tar.xz From acba032b440a69099d63718a34c10b39d4726ffe Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Sat, 2 Mar 2013 12:20:51 +0000 Subject: [PATCH 003/113] * Sat Mar 2 2013 Hans de Goede - 1.0.5-1 - Rebase to 1.0.5 (rf#2688) - Upgrade the buildin libav to 0.8.5 to get all the security fixes from upstream libav --- .gitignore | 3 ++- gstreamer1-libav.spec | 15 ++++++++++++--- sources | 3 ++- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 0181af1..3906f06 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -gst-libav-1.0.2.tar.xz +gst-libav-1.0.5.tar.xz +libav-0.8.5.tar.xz diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index 93c7b89..334a4ce 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -1,11 +1,13 @@ Name: gstreamer1-libav -Version: 1.0.2 -Release: 2%{?dist} +Version: 1.0.5 +Release: 1%{?dist} Summary: GStreamer 1.0 libav-based plug-ins Group: Applications/Multimedia License: LGPLv2+ URL: http://gstreamer.freedesktop.org/ Source0: http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-%{version}.tar.xz +# We drop in a newer libav to get all the security bugfixes from there! +Source1: http://libav.org/releases/libav-0.8.5.tar.xz Patch0: gst-ffmpeg-0.10.12-ChangeLog-UTF-8.patch BuildRequires: gstreamer1-devel >= 1.0.0 BuildRequires: gstreamer1-plugins-base-devel >= 1.0.0 @@ -26,7 +28,9 @@ This package provides libav-based GStreamer plug-ins. %prep -%setup -q -n gst-libav-%{version} +%setup -q -n gst-libav-%{version} -a 1 +rm -r gst-libs/ext/libav +mv libav-0.8.5 gst-libs/ext/libav %patch0 -p1 @@ -52,6 +56,11 @@ rm $RPM_BUILD_ROOT%{_libdir}/gstreamer-1.0/libgst*.la %changelog +* Sat Mar 2 2013 Hans de Goede - 1.0.5-1 +- Rebase to 1.0.5 (rf#2688) +- Upgrade the buildin libav to 0.8.5 to get all the security fixes from + upstream libav + * Sat Nov 3 2012 Hans de Goede - 1.0.2-2 - Build included libav with the default RPM_OPT_FLAGS (rf#2560, rf#2472) diff --git a/sources b/sources index 9d5e0a7..0322dd7 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -b932d386711a1b14d08c3b7d3021934b gst-libav-1.0.2.tar.xz +00011aa062ce734ba86da499f800269e gst-libav-1.0.5.tar.xz +3f0fd111575e91c8d57bd8b4d5e3802a libav-0.8.5.tar.xz From c7c9b9b690ec04a244cbf30701f953dd28c0e1bd Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Sun, 10 Mar 2013 12:13:35 +0000 Subject: [PATCH 004/113] * Sun Mar 10 2013 Hans de Goede - 1.0.5-2 - Add a patch from upstream git to fix h264 decoding artifacts (rf#2710) - Add a patch from upstream libav to fix miscompilation with gcc-4.8 (rf#2710, gnome#695166, libav#388) --- gst-libav-fix-h264-decoding.patch | 84 +++++++++++++++++++ gstreamer1-libav.spec | 15 +++- ...segfault-in-dsputil_init-with-gcc4.8.patch | 44 ++++++++++ 3 files changed, 141 insertions(+), 2 deletions(-) create mode 100644 gst-libav-fix-h264-decoding.patch create mode 100644 libav-dsputil-fix-segfault-in-dsputil_init-with-gcc4.8.patch diff --git a/gst-libav-fix-h264-decoding.patch b/gst-libav-fix-h264-decoding.patch new file mode 100644 index 0000000..7586974 --- /dev/null +++ b/gst-libav-fix-h264-decoding.patch @@ -0,0 +1,84 @@ +From 879052472841d584e0aad21ac220131b586c1de5 Mon Sep 17 00:00:00 2001 +From: Tim-Philipp Müller +Date: Mon, 25 Feb 2013 10:38:09 +0000 +Subject: avviddec: fix H.264 decoding errors by disabling multi-threaded decoding + +Multi-threaded decoding does not work properly with the older libav 0.8 +version included in this gst-libav series, so just disable multi-threaded +decoding again entirely for now. (We could also switch from FF_THREAD_SLICE +to FF_THREAD_FRAME, but that may have other side-effects and just disabling +it seems safest for now). + +This works properly in git master with more recent libav 0.9.x versions. + +Adventurous users may still re-enable this functionality by setting +the GST_AVVIDDEC_MAX_THREADS environment variable to 'auto' or the +max. number of threads desired. + +https://bugzilla.gnome.org/show_bug.cgi?id=694230 +--- +diff --git a/ext/libav/gstavutils.c b/ext/libav/gstavutils.c +index 8555d8d..f7a80f6 100644 +--- a/ext/libav/gstavutils.c ++++ b/ext/libav/gstavutils.c +@@ -476,6 +476,7 @@ gst_ffmpeg_auto_max_threads (void) + if (n < 1) + n = 1; + ++ GST_INFO ("threads: %d", n); + g_once_init_leave (&n_threads, n); + } + +diff --git a/ext/libav/gstavviddec.c b/ext/libav/gstavviddec.c +index 669a75d..caf3e2e 100644 +--- a/ext/libav/gstavviddec.c ++++ b/ext/libav/gstavviddec.c +@@ -106,7 +106,7 @@ struct _GstFFMpegVidDecClass + #define DEFAULT_SKIPFRAME 0 + #define DEFAULT_DIRECT_RENDERING TRUE + #define DEFAULT_DEBUG_MV FALSE +-#define DEFAULT_MAX_THREADS 0 ++#define DEFAULT_MAX_THREADS 1 + + enum + { +@@ -470,14 +470,30 @@ gst_ffmpegviddec_set_format (GstVideoDecoder * decoder, + * supports it) */ + ffmpegdec->context->debug_mv = ffmpegdec->debug_mv; + +- if (ffmpegdec->max_threads == 0) { +- if (!(oclass->in_plugin->capabilities & CODEC_CAP_AUTO_THREADS)) +- ffmpegdec->context->thread_count = gst_ffmpeg_auto_max_threads (); +- else +- ffmpegdec->context->thread_count = 0; +- } else +- ffmpegdec->context->thread_count = ffmpegdec->max_threads; ++ { ++ const gchar *env = g_getenv ("GST_AVVIDDEC_MAX_THREADS"); ++ int max_threads = ffmpegdec->max_threads; ++ ++ if (env != NULL) { ++ if (g_str_equal (env, "auto")) ++ max_threads = 0; ++ else ++ max_threads = MAX (atoi (env), 0); ++ ++ if (max_threads != 1) { ++ GST_WARNING_OBJECT (ffmpegdec, "max threads forced to %d, this might " ++ "lead to decoding errors or artefacts", max_threads); ++ } ++ } + ++ if (max_threads == 0) { ++ if (!(oclass->in_plugin->capabilities & CODEC_CAP_AUTO_THREADS)) ++ ffmpegdec->context->thread_count = gst_ffmpeg_auto_max_threads (); ++ else ++ ffmpegdec->context->thread_count = 0; ++ } else ++ ffmpegdec->context->thread_count = max_threads; ++ } + ffmpegdec->context->thread_type = FF_THREAD_SLICE; + + /* open codec - we don't select an output pix_fmt yet, +-- +cgit v0.9.0.2-2-gbebe diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index 334a4ce..2bedc22 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -1,6 +1,6 @@ Name: gstreamer1-libav Version: 1.0.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GStreamer 1.0 libav-based plug-ins Group: Applications/Multimedia License: LGPLv2+ @@ -9,6 +9,8 @@ Source0: http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-%{versi # We drop in a newer libav to get all the security bugfixes from there! Source1: http://libav.org/releases/libav-0.8.5.tar.xz Patch0: gst-ffmpeg-0.10.12-ChangeLog-UTF-8.patch +Patch1: gst-libav-fix-h264-decoding.patch +Patch2: libav-dsputil-fix-segfault-in-dsputil_init-with-gcc4.8.patch BuildRequires: gstreamer1-devel >= 1.0.0 BuildRequires: gstreamer1-plugins-base-devel >= 1.0.0 BuildRequires: orc-devel bzip2-devel zlib-devel @@ -29,9 +31,13 @@ This package provides libav-based GStreamer plug-ins. %prep %setup -q -n gst-libav-%{version} -a 1 +%patch0 -p1 +%patch1 -p1 +pushd libav-0.8.5 +%patch2 -p1 +popd rm -r gst-libs/ext/libav mv libav-0.8.5 gst-libs/ext/libav -%patch0 -p1 %build @@ -56,6 +62,11 @@ rm $RPM_BUILD_ROOT%{_libdir}/gstreamer-1.0/libgst*.la %changelog +* Sun Mar 10 2013 Hans de Goede - 1.0.5-2 +- Add a patch from upstream git to fix h264 decoding artifacts (rf#2710) +- Add a patch from upstream libav to fix miscompilation with gcc-4.8 + (rf#2710, gnome#695166, libav#388) + * Sat Mar 2 2013 Hans de Goede - 1.0.5-1 - Rebase to 1.0.5 (rf#2688) - Upgrade the buildin libav to 0.8.5 to get all the security fixes from diff --git a/libav-dsputil-fix-segfault-in-dsputil_init-with-gcc4.8.patch b/libav-dsputil-fix-segfault-in-dsputil_init-with-gcc4.8.patch new file mode 100644 index 0000000..ceede06 --- /dev/null +++ b/libav-dsputil-fix-segfault-in-dsputil_init-with-gcc4.8.patch @@ -0,0 +1,44 @@ +From ae8f132ace291534ed64023029023c2338f8d3bb Mon Sep 17 00:00:00 2001 +From: Sebastian Keller +Date: Sat, 9 Mar 2013 23:57:14 +0100 +Subject: [PATCH] dsputil: fix segfault in dsputil_init with gcc 4.8 + +--- + libavcodec/dsputil.c | 14 ++++++++------ + 1 file changed, 8 insertions(+), 6 deletions(-) + +diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c +index 66f1f93..621b00c 100644 +--- a/libavcodec/dsputil.c ++++ b/libavcodec/dsputil.c +@@ -2788,7 +2788,7 @@ int ff_check_alignment(void){ + + av_cold void dsputil_init(DSPContext* c, AVCodecContext *avctx) + { +- int i; ++ int i, j; + + ff_check_alignment(); + +@@ -3154,11 +3154,13 @@ av_cold void dsputil_init(DSPContext* c, AVCodecContext *avctx) + if (ARCH_SH4) dsputil_init_sh4 (c, avctx); + if (ARCH_BFIN) dsputil_init_bfin (c, avctx); + +- for(i=0; i<64; i++){ +- if(!c->put_2tap_qpel_pixels_tab[0][i]) +- c->put_2tap_qpel_pixels_tab[0][i]= c->put_h264_qpel_pixels_tab[0][i]; +- if(!c->avg_2tap_qpel_pixels_tab[0][i]) +- c->avg_2tap_qpel_pixels_tab[0][i]= c->avg_h264_qpel_pixels_tab[0][i]; ++ for(i=0; i<4; i++){ ++ for(j=0; j<16; j++) { ++ if(!c->put_2tap_qpel_pixels_tab[i][j]) ++ c->put_2tap_qpel_pixels_tab[i][j]= c->put_h264_qpel_pixels_tab[i][j]; ++ if(!c->avg_2tap_qpel_pixels_tab[i][j]) ++ c->avg_2tap_qpel_pixels_tab[i][j]= c->avg_h264_qpel_pixels_tab[i][j]; ++ } + } + + ff_init_scantable_permutation(c->idct_permutation, +-- +1.8.1.4 + From b262f7bdb63da539ec3108c967be69f032a84f82 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Mon, 25 Mar 2013 09:56:41 +0000 Subject: [PATCH 005/113] * Mon Mar 25 2013 Hans de Goede - 1.0.6-1 - Rebase to 1.0.6 - Upgrade the buildin libav to 0.8.6 to get all the security fixes from upstream libav --- .gitignore | 4 +- gst-libav-configure-set-the-assembler.patch | 25 ++++++ gst-libav-fix-h264-decoding.patch | 84 ------------------- gstreamer1-libav.spec | 20 +++-- ...segfault-in-dsputil_init-with-gcc4.8.patch | 44 ---------- sources | 4 +- 6 files changed, 40 insertions(+), 141 deletions(-) create mode 100644 gst-libav-configure-set-the-assembler.patch delete mode 100644 gst-libav-fix-h264-decoding.patch delete mode 100644 libav-dsputil-fix-segfault-in-dsputil_init-with-gcc4.8.patch diff --git a/.gitignore b/.gitignore index 3906f06..60fb035 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -gst-libav-1.0.5.tar.xz -libav-0.8.5.tar.xz +gst-libav-1.0.6.tar.xz +libav-0.8.6.tar.xz diff --git a/gst-libav-configure-set-the-assembler.patch b/gst-libav-configure-set-the-assembler.patch new file mode 100644 index 0000000..a4b1c60 --- /dev/null +++ b/gst-libav-configure-set-the-assembler.patch @@ -0,0 +1,25 @@ +From 7c160e64686e6b9d971955246ffd0eccad9c3359 Mon Sep 17 00:00:00 2001 +From: Sebastian Dröge +Date: Thu, 07 Mar 2013 08:30:55 +0000 +Subject: configure: Set the assembler used for libav to $CC + +libav assumes that it's not just an assembler but something that +can also handle CPPFLAGS and other things. + +https://bugzilla.gnome.org/show_bug.cgi?id=694416 +--- +diff --git a/configure.ac b/configure.ac +index 22ede88..5317bd1 100644 +--- a/configure ++++ b/configure +@@ -342,7 +342,7 @@ else + fi + + if test x"$AS" != x; then +- emblibav_configure_args="$emblibav_configure_args --as=\\\"\\\$AS\\\"" ++ emblibav_configure_args="$emblibav_configure_args --as=\\\"\\\$CC\\\"" + fi + + if test x"$CC" != x; then +-- +cgit v0.9.0.2-2-gbebe diff --git a/gst-libav-fix-h264-decoding.patch b/gst-libav-fix-h264-decoding.patch deleted file mode 100644 index 7586974..0000000 --- a/gst-libav-fix-h264-decoding.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 879052472841d584e0aad21ac220131b586c1de5 Mon Sep 17 00:00:00 2001 -From: Tim-Philipp Müller -Date: Mon, 25 Feb 2013 10:38:09 +0000 -Subject: avviddec: fix H.264 decoding errors by disabling multi-threaded decoding - -Multi-threaded decoding does not work properly with the older libav 0.8 -version included in this gst-libav series, so just disable multi-threaded -decoding again entirely for now. (We could also switch from FF_THREAD_SLICE -to FF_THREAD_FRAME, but that may have other side-effects and just disabling -it seems safest for now). - -This works properly in git master with more recent libav 0.9.x versions. - -Adventurous users may still re-enable this functionality by setting -the GST_AVVIDDEC_MAX_THREADS environment variable to 'auto' or the -max. number of threads desired. - -https://bugzilla.gnome.org/show_bug.cgi?id=694230 ---- -diff --git a/ext/libav/gstavutils.c b/ext/libav/gstavutils.c -index 8555d8d..f7a80f6 100644 ---- a/ext/libav/gstavutils.c -+++ b/ext/libav/gstavutils.c -@@ -476,6 +476,7 @@ gst_ffmpeg_auto_max_threads (void) - if (n < 1) - n = 1; - -+ GST_INFO ("threads: %d", n); - g_once_init_leave (&n_threads, n); - } - -diff --git a/ext/libav/gstavviddec.c b/ext/libav/gstavviddec.c -index 669a75d..caf3e2e 100644 ---- a/ext/libav/gstavviddec.c -+++ b/ext/libav/gstavviddec.c -@@ -106,7 +106,7 @@ struct _GstFFMpegVidDecClass - #define DEFAULT_SKIPFRAME 0 - #define DEFAULT_DIRECT_RENDERING TRUE - #define DEFAULT_DEBUG_MV FALSE --#define DEFAULT_MAX_THREADS 0 -+#define DEFAULT_MAX_THREADS 1 - - enum - { -@@ -470,14 +470,30 @@ gst_ffmpegviddec_set_format (GstVideoDecoder * decoder, - * supports it) */ - ffmpegdec->context->debug_mv = ffmpegdec->debug_mv; - -- if (ffmpegdec->max_threads == 0) { -- if (!(oclass->in_plugin->capabilities & CODEC_CAP_AUTO_THREADS)) -- ffmpegdec->context->thread_count = gst_ffmpeg_auto_max_threads (); -- else -- ffmpegdec->context->thread_count = 0; -- } else -- ffmpegdec->context->thread_count = ffmpegdec->max_threads; -+ { -+ const gchar *env = g_getenv ("GST_AVVIDDEC_MAX_THREADS"); -+ int max_threads = ffmpegdec->max_threads; -+ -+ if (env != NULL) { -+ if (g_str_equal (env, "auto")) -+ max_threads = 0; -+ else -+ max_threads = MAX (atoi (env), 0); -+ -+ if (max_threads != 1) { -+ GST_WARNING_OBJECT (ffmpegdec, "max threads forced to %d, this might " -+ "lead to decoding errors or artefacts", max_threads); -+ } -+ } - -+ if (max_threads == 0) { -+ if (!(oclass->in_plugin->capabilities & CODEC_CAP_AUTO_THREADS)) -+ ffmpegdec->context->thread_count = gst_ffmpeg_auto_max_threads (); -+ else -+ ffmpegdec->context->thread_count = 0; -+ } else -+ ffmpegdec->context->thread_count = max_threads; -+ } - ffmpegdec->context->thread_type = FF_THREAD_SLICE; - - /* open codec - we don't select an output pix_fmt yet, --- -cgit v0.9.0.2-2-gbebe diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index 2bedc22..bca8f49 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -1,16 +1,15 @@ Name: gstreamer1-libav -Version: 1.0.5 -Release: 2%{?dist} +Version: 1.0.6 +Release: 1%{?dist} Summary: GStreamer 1.0 libav-based plug-ins Group: Applications/Multimedia License: LGPLv2+ URL: http://gstreamer.freedesktop.org/ Source0: http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-%{version}.tar.xz # We drop in a newer libav to get all the security bugfixes from there! -Source1: http://libav.org/releases/libav-0.8.5.tar.xz +Source1: http://libav.org/releases/libav-0.8.6.tar.xz Patch0: gst-ffmpeg-0.10.12-ChangeLog-UTF-8.patch -Patch1: gst-libav-fix-h264-decoding.patch -Patch2: libav-dsputil-fix-segfault-in-dsputil_init-with-gcc4.8.patch +Patch1: gst-libav-configure-set-the-assembler.patch BuildRequires: gstreamer1-devel >= 1.0.0 BuildRequires: gstreamer1-plugins-base-devel >= 1.0.0 BuildRequires: orc-devel bzip2-devel zlib-devel @@ -33,11 +32,9 @@ This package provides libav-based GStreamer plug-ins. %setup -q -n gst-libav-%{version} -a 1 %patch0 -p1 %patch1 -p1 -pushd libav-0.8.5 -%patch2 -p1 -popd +chmod +x configure rm -r gst-libs/ext/libav -mv libav-0.8.5 gst-libs/ext/libav +mv libav-0.8.6 gst-libs/ext/libav %build @@ -62,6 +59,11 @@ rm $RPM_BUILD_ROOT%{_libdir}/gstreamer-1.0/libgst*.la %changelog +* Mon Mar 25 2013 Hans de Goede - 1.0.6-1 +- Rebase to 1.0.6 +- Upgrade the buildin libav to 0.8.6 to get all the security fixes from + upstream libav + * Sun Mar 10 2013 Hans de Goede - 1.0.5-2 - Add a patch from upstream git to fix h264 decoding artifacts (rf#2710) - Add a patch from upstream libav to fix miscompilation with gcc-4.8 diff --git a/libav-dsputil-fix-segfault-in-dsputil_init-with-gcc4.8.patch b/libav-dsputil-fix-segfault-in-dsputil_init-with-gcc4.8.patch deleted file mode 100644 index ceede06..0000000 --- a/libav-dsputil-fix-segfault-in-dsputil_init-with-gcc4.8.patch +++ /dev/null @@ -1,44 +0,0 @@ -From ae8f132ace291534ed64023029023c2338f8d3bb Mon Sep 17 00:00:00 2001 -From: Sebastian Keller -Date: Sat, 9 Mar 2013 23:57:14 +0100 -Subject: [PATCH] dsputil: fix segfault in dsputil_init with gcc 4.8 - ---- - libavcodec/dsputil.c | 14 ++++++++------ - 1 file changed, 8 insertions(+), 6 deletions(-) - -diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c -index 66f1f93..621b00c 100644 ---- a/libavcodec/dsputil.c -+++ b/libavcodec/dsputil.c -@@ -2788,7 +2788,7 @@ int ff_check_alignment(void){ - - av_cold void dsputil_init(DSPContext* c, AVCodecContext *avctx) - { -- int i; -+ int i, j; - - ff_check_alignment(); - -@@ -3154,11 +3154,13 @@ av_cold void dsputil_init(DSPContext* c, AVCodecContext *avctx) - if (ARCH_SH4) dsputil_init_sh4 (c, avctx); - if (ARCH_BFIN) dsputil_init_bfin (c, avctx); - -- for(i=0; i<64; i++){ -- if(!c->put_2tap_qpel_pixels_tab[0][i]) -- c->put_2tap_qpel_pixels_tab[0][i]= c->put_h264_qpel_pixels_tab[0][i]; -- if(!c->avg_2tap_qpel_pixels_tab[0][i]) -- c->avg_2tap_qpel_pixels_tab[0][i]= c->avg_h264_qpel_pixels_tab[0][i]; -+ for(i=0; i<4; i++){ -+ for(j=0; j<16; j++) { -+ if(!c->put_2tap_qpel_pixels_tab[i][j]) -+ c->put_2tap_qpel_pixels_tab[i][j]= c->put_h264_qpel_pixels_tab[i][j]; -+ if(!c->avg_2tap_qpel_pixels_tab[i][j]) -+ c->avg_2tap_qpel_pixels_tab[i][j]= c->avg_h264_qpel_pixels_tab[i][j]; -+ } - } - - ff_init_scantable_permutation(c->idct_permutation, --- -1.8.1.4 - diff --git a/sources b/sources index 0322dd7..9ba7a86 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -00011aa062ce734ba86da499f800269e gst-libav-1.0.5.tar.xz -3f0fd111575e91c8d57bd8b4d5e3802a libav-0.8.5.tar.xz +07e5399c44346a95aafc1d4533125774 gst-libav-1.0.6.tar.xz +c4a57b81a110c1b72c1e875e222ab8d2 libav-0.8.6.tar.xz From 36927c32a884a2e1a2dae7df75b052f35943dbac Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Thu, 8 Aug 2013 17:58:23 +0000 Subject: [PATCH 006/113] * Tue Aug 6 2013 Hans de Goede - 1.0.9-1 - Rebase to 1.0.9 - This includes an upgrade of the buildin libav to 0.8.8 which includes a bunch of security fixes from - No longer overwrite the included libav, as the bundled one is the latest --- .gitignore | 3 +-- gst-libav-configure-set-the-assembler.patch | 25 --------------------- gstreamer1-libav.spec | 24 ++++++++++++-------- sources | 3 +-- 4 files changed, 17 insertions(+), 38 deletions(-) delete mode 100644 gst-libav-configure-set-the-assembler.patch diff --git a/.gitignore b/.gitignore index 60fb035..b0bbd4c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -gst-libav-1.0.6.tar.xz -libav-0.8.6.tar.xz +gst-libav-1.0.9.tar.xz diff --git a/gst-libav-configure-set-the-assembler.patch b/gst-libav-configure-set-the-assembler.patch deleted file mode 100644 index a4b1c60..0000000 --- a/gst-libav-configure-set-the-assembler.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 7c160e64686e6b9d971955246ffd0eccad9c3359 Mon Sep 17 00:00:00 2001 -From: Sebastian Dröge -Date: Thu, 07 Mar 2013 08:30:55 +0000 -Subject: configure: Set the assembler used for libav to $CC - -libav assumes that it's not just an assembler but something that -can also handle CPPFLAGS and other things. - -https://bugzilla.gnome.org/show_bug.cgi?id=694416 ---- -diff --git a/configure.ac b/configure.ac -index 22ede88..5317bd1 100644 ---- a/configure -+++ b/configure -@@ -342,7 +342,7 @@ else - fi - - if test x"$AS" != x; then -- emblibav_configure_args="$emblibav_configure_args --as=\\\"\\\$AS\\\"" -+ emblibav_configure_args="$emblibav_configure_args --as=\\\"\\\$CC\\\"" - fi - - if test x"$CC" != x; then --- -cgit v0.9.0.2-2-gbebe diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index bca8f49..42f3ded 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -1,5 +1,5 @@ Name: gstreamer1-libav -Version: 1.0.6 +Version: 1.0.9 Release: 1%{?dist} Summary: GStreamer 1.0 libav-based plug-ins Group: Applications/Multimedia @@ -7,9 +7,8 @@ License: LGPLv2+ URL: http://gstreamer.freedesktop.org/ Source0: http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-%{version}.tar.xz # We drop in a newer libav to get all the security bugfixes from there! -Source1: http://libav.org/releases/libav-0.8.6.tar.xz +#Source1: http://libav.org/releases/libav-0.8.8.tar.xz Patch0: gst-ffmpeg-0.10.12-ChangeLog-UTF-8.patch -Patch1: gst-libav-configure-set-the-assembler.patch BuildRequires: gstreamer1-devel >= 1.0.0 BuildRequires: gstreamer1-plugins-base-devel >= 1.0.0 BuildRequires: orc-devel bzip2-devel zlib-devel @@ -29,12 +28,13 @@ This package provides libav-based GStreamer plug-ins. %prep -%setup -q -n gst-libav-%{version} -a 1 +%setup -q -n gst-libav-%{version} %patch0 -p1 -%patch1 -p1 -chmod +x configure -rm -r gst-libs/ext/libav -mv libav-0.8.6 gst-libs/ext/libav + +# Use this when overriding the buildin libav +#setup -q -n gst-libav-%{version} -a 1 +#rm -r gst-libs/ext/libav +#mv libav-0.8.8 gst-libs/ext/libav %build @@ -48,7 +48,7 @@ make %{?_smp_mflags} V=1 %install -make install V=1 DESTDIR=$RPM_BUILD_ROOT +%make_install V=1 rm $RPM_BUILD_ROOT%{_libdir}/gstreamer-1.0/libgst*.la @@ -59,6 +59,12 @@ rm $RPM_BUILD_ROOT%{_libdir}/gstreamer-1.0/libgst*.la %changelog +* Tue Aug 6 2013 Hans de Goede - 1.0.9-1 +- Rebase to 1.0.9 +- This includes an upgrade of the buildin libav to 0.8.8 which includes a + bunch of security fixes from +- No longer overwrite the included libav, as the bundled one is the latest + * Mon Mar 25 2013 Hans de Goede - 1.0.6-1 - Rebase to 1.0.6 - Upgrade the buildin libav to 0.8.6 to get all the security fixes from diff --git a/sources b/sources index 9ba7a86..7afa489 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -07e5399c44346a95aafc1d4533125774 gst-libav-1.0.6.tar.xz -c4a57b81a110c1b72c1e875e222ab8d2 libav-0.8.6.tar.xz +8414f8d4c4a239a74a3d5eadf3d14875 gst-libav-1.0.9.tar.xz From 0d00090bd413d0696dddf8c9452cefa0d0755e09 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Thu, 8 Aug 2013 20:26:24 +0000 Subject: [PATCH 007/113] * Thu Aug 8 2013 Hans de Goede - 1.1.3-1 - Rebase to 1.1.3 - Switch back to using system ffmpeg --- .gitignore | 2 +- gst-libav-1.1.3-comma-in-typename.patch | 12 ++++++++++++ gstreamer1-libav.spec | 24 +++++++++++------------- sources | 2 +- 4 files changed, 25 insertions(+), 15 deletions(-) create mode 100644 gst-libav-1.1.3-comma-in-typename.patch diff --git a/.gitignore b/.gitignore index b0bbd4c..5554da2 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -gst-libav-1.0.9.tar.xz +gst-libav-1.1.3.tar.xz diff --git a/gst-libav-1.1.3-comma-in-typename.patch b/gst-libav-1.1.3-comma-in-typename.patch new file mode 100644 index 0000000..a267a79 --- /dev/null +++ b/gst-libav-1.1.3-comma-in-typename.patch @@ -0,0 +1,12 @@ +diff -up gst-libav-1.1.3/ext/libav/gstavmux.c~ gst-libav-1.1.3/ext/libav/gstavmux.c +--- gst-libav-1.1.3/ext/libav/gstavmux.c~ 2013-07-15 08:50:20.000000000 +0200 ++++ gst-libav-1.1.3/ext/libav/gstavmux.c 2013-08-08 22:00:08.311276449 +0200 +@@ -939,6 +939,8 @@ gst_ffmpegmux_register (GstPlugin * plug + while (*p) { + if (*p == '.') + *p = '_'; ++ if (*p == ',') ++ *p = '_'; + p++; + } + diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index 42f3ded..181fdc4 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -1,17 +1,16 @@ Name: gstreamer1-libav -Version: 1.0.9 +Version: 1.1.3 Release: 1%{?dist} Summary: GStreamer 1.0 libav-based plug-ins Group: Applications/Multimedia License: LGPLv2+ URL: http://gstreamer.freedesktop.org/ Source0: http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-%{version}.tar.xz -# We drop in a newer libav to get all the security bugfixes from there! -#Source1: http://libav.org/releases/libav-0.8.8.tar.xz Patch0: gst-ffmpeg-0.10.12-ChangeLog-UTF-8.patch +Patch1: gst-libav-1.1.3-comma-in-typename.patch BuildRequires: gstreamer1-devel >= 1.0.0 BuildRequires: gstreamer1-plugins-base-devel >= 1.0.0 -BuildRequires: orc-devel bzip2-devel zlib-devel +BuildRequires: orc-devel bzip2-devel zlib-devel ffmpeg-devel %ifarch %{ix86} x86_64 BuildRequires: yasm %endif @@ -30,20 +29,16 @@ This package provides libav-based GStreamer plug-ins. %prep %setup -q -n gst-libav-%{version} %patch0 -p1 - -# Use this when overriding the buildin libav -#setup -q -n gst-libav-%{version} -a 1 -#rm -r gst-libs/ext/libav -#mv libav-0.8.8 gst-libs/ext/libav +%patch1 -p1 %build -# Note no --with-system-ffmpeg *for now*, as gst-ffmpeg wants libav-0.8, -# and the system ffmpeg is 0.11, which is more or less libav-0.9 %configure --disable-dependency-tracking --disable-static \ --with-package-name="gst-libav 1.0 rpmfusion rpm" \ --with-package-origin="http://rpmfusion.org/" \ - --with-libav-extra-configure="--enable-runtime-cpudetect --arch=%{_target_cpu} --optflags=\\\"\\\$RPM_OPT_FLAGS\\\"" + --with-system-libav +# Keep this around in case we switch back to the built-in libav +# --with-libav-extra-configure="--enable-runtime-cpudetect --arch=%{_target_cpu} --optflags=\\\"\\\$RPM_OPT_FLAGS\\\"" make %{?_smp_mflags} V=1 @@ -55,10 +50,13 @@ rm $RPM_BUILD_ROOT%{_libdir}/gstreamer-1.0/libgst*.la %files %doc AUTHORS COPYING.LIB ChangeLog NEWS README TODO %{_libdir}/gstreamer-1.0/libgstlibav.so -%{_libdir}/gstreamer-1.0/libgstavscale.so %changelog +* Thu Aug 8 2013 Hans de Goede - 1.1.3-1 +- Rebase to 1.1.3 +- Switch back to using system ffmpeg + * Tue Aug 6 2013 Hans de Goede - 1.0.9-1 - Rebase to 1.0.9 - This includes an upgrade of the buildin libav to 0.8.8 which includes a diff --git a/sources b/sources index 7afa489..354e7ff 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8414f8d4c4a239a74a3d5eadf3d14875 gst-libav-1.0.9.tar.xz +1bdaa82159f7f0028b15025ea4b0d26c gst-libav-1.1.3.tar.xz From e8008436e273060305a0de96a1221140b49e8906 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Mon, 26 Aug 2013 18:02:35 +0000 Subject: [PATCH 008/113] * Thu Aug 8 2013 Hans de Goede - 1.1.3-2 - Rebuild for ffmpeg-2.0 --- gst-libav-1.1.3-ffmpeg-2.0.patch | 121 +++++++++++++++++++++++++++++++ gstreamer1-libav.spec | 8 +- 2 files changed, 128 insertions(+), 1 deletion(-) create mode 100644 gst-libav-1.1.3-ffmpeg-2.0.patch diff --git a/gst-libav-1.1.3-ffmpeg-2.0.patch b/gst-libav-1.1.3-ffmpeg-2.0.patch new file mode 100644 index 0000000..4dd911d --- /dev/null +++ b/gst-libav-1.1.3-ffmpeg-2.0.patch @@ -0,0 +1,121 @@ +diff -up gst-libav-1.1.3/ext/libav/gstavauddec.c~ gst-libav-1.1.3/ext/libav/gstavauddec.c +--- gst-libav-1.1.3/ext/libav/gstavauddec.c~ 2013-08-26 14:17:14.000000000 +0200 ++++ gst-libav-1.1.3/ext/libav/gstavauddec.c 2013-08-26 14:31:07.574677693 +0200 +@@ -420,7 +420,7 @@ gst_ffmpegauddec_audio_frame (GstFFMpegA + GstBuffer ** outbuf, GstFlowReturn * ret) + { + gint len = -1; +- gint have_data = AVCODEC_MAX_AUDIO_FRAME_SIZE; ++ gint have_data = 0; + AVPacket packet; + AVFrame frame; + +diff -up gst-libav-1.1.3/ext/libav/gstavaudenc.c~ gst-libav-1.1.3/ext/libav/gstavaudenc.c +--- gst-libav-1.1.3/ext/libav/gstavaudenc.c~ 2013-08-26 14:17:14.000000000 +0200 ++++ gst-libav-1.1.3/ext/libav/gstavaudenc.c 2013-08-26 14:25:51.873605774 +0200 +@@ -266,7 +266,6 @@ gst_ffmpegaudenc_set_format (GstAudioEnc + ffmpegaudenc->context->coder_type = 0; + ffmpegaudenc->context->context_model = 0; + ffmpegaudenc->context->scenechange_threshold = 0; +- ffmpegaudenc->context->inter_threshold = 0; + + /* fetch pix_fmt and so on */ + gst_ffmpeg_audioinfo_to_context (info, ffmpegaudenc->context); +diff -up gst-libav-1.1.3/ext/libav/gstavcfg.c~ gst-libav-1.1.3/ext/libav/gstavcfg.c +--- gst-libav-1.1.3/ext/libav/gstavcfg.c~ 2013-08-26 14:17:14.000000000 +0200 ++++ gst-libav-1.1.3/ext/libav/gstavcfg.c 2013-08-26 14:38:33.160510256 +0200 +@@ -171,13 +171,10 @@ gst_ffmpeg_idct_algo_get_type (void) + {FF_IDCT_INT, "JPEG reference Integer", "int"}, + {FF_IDCT_SIMPLE, "Simple", "simple"}, + {FF_IDCT_SIMPLEMMX, "Simple MMX", "simplemmx"}, +- {FF_IDCT_LIBMPEG2MMX, "LIBMPEG2MMX", "libmpeg2mmx"}, + {FF_IDCT_ARM, "ARM", "arm"}, + {FF_IDCT_ALTIVEC, "ALTIVEC", "altivec"}, + {FF_IDCT_SH4, "SH4", "sh4"}, + {FF_IDCT_SIMPLEARM, "SIMPLEARM", "simplearm"}, +- {FF_IDCT_H264, "H264", "h264"}, +- {FF_IDCT_VP3, "VP3", "vp3"}, + {FF_IDCT_IPP, "IPP", "ipp"}, + {FF_IDCT_XVIDMMX, "XVIDMMX", "xvidmmx"}, + {0, NULL, NULL}, +@@ -274,9 +271,6 @@ gst_ffmpeg_flags_get_type (void) + "global-headers"}, + {CODEC_FLAG_AC_PRED, "H263 Advanced Intra Coding / MPEG4 AC prediction", + "aic"}, +- {CODEC_FLAG_CBP_RD, "Rate Distoration Optimization for CBP", "cbp-rd"}, +- {CODEC_FLAG_QP_RD, "Rate Distoration Optimization for QP selection", +- "qp-rd"}, + {CODEC_FLAG_CLOSED_GOP, "Closed GOP", "closedgop"}, + {0, NULL, NULL}, + }; +@@ -564,18 +558,6 @@ gst_ffmpeg_cfg_init (void) + -100, G_MAXINT, 0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); + gst_ffmpeg_add_pspec (pspec, max_key_interval, FALSE, mpeg, NULL); + +- pspec = g_param_spec_int ("luma-elim-threshold", +- "Luma Elimination Threshold", +- "Luma Single Coefficient Elimination Threshold", +- -99, 99, 0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); +- gst_ffmpeg_add_pspec (pspec, config.luma_elim_threshold, FALSE, mpeg, NULL); +- +- pspec = g_param_spec_int ("chroma-elim-threshold", +- "Chroma Elimination Threshold", +- "Chroma Single Coefficient Elimination Threshold", +- -99, 99, 0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); +- gst_ffmpeg_add_pspec (pspec, config.chroma_elim_threshold, FALSE, mpeg, NULL); +- + pspec = g_param_spec_float ("lumi-masking", "Luminance Masking", + "Luminance Masking", -1.0f, 1.0f, 0.0f, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); +diff -up gst-libav-1.1.3/ext/libav/gstavcodecmap.c~ gst-libav-1.1.3/ext/libav/gstavcodecmap.c +--- gst-libav-1.1.3/ext/libav/gstavcodecmap.c~ 2013-08-26 14:17:14.000000000 +0200 ++++ gst-libav-1.1.3/ext/libav/gstavcodecmap.c 2013-08-26 14:24:04.231311059 +0200 +@@ -788,18 +788,9 @@ gst_ffmpeg_codecid_to_caps (enum AVCodec + break; + } + +- /* FIXME: context->sub_id must be filled in during decoding */ + caps = + gst_ff_vid_caps_new (context, NULL, codec_id, encode, + "video/x-pn-realvideo", "rmversion", G_TYPE_INT, version, NULL); +- if (context) { +- gst_caps_set_simple (caps, "format", G_TYPE_INT, context->sub_id, NULL); +- if (context->extradata_size >= 8) { +- gst_caps_set_simple (caps, +- "subformat", G_TYPE_INT, GST_READ_UINT32_BE (context->extradata), +- NULL); +- } +- } + } + break; + +@@ -2861,18 +2852,6 @@ gst_ffmpeg_caps_with_codecid (enum AVCod + } + break; + +- case AV_CODEC_ID_RV10: +- case AV_CODEC_ID_RV20: +- case AV_CODEC_ID_RV30: +- case AV_CODEC_ID_RV40: +- { +- gint format; +- +- if (gst_structure_get_int (str, "format", &format)) +- context->sub_id = format; +- +- break; +- } + case AV_CODEC_ID_COOK: + case AV_CODEC_ID_RA_288: + case AV_CODEC_ID_RA_144: +diff -up gst-libav-1.1.3/ext/libav/gstavvidenc.c~ gst-libav-1.1.3/ext/libav/gstavvidenc.c +--- gst-libav-1.1.3/ext/libav/gstavvidenc.c~ 2013-08-26 14:17:14.000000000 +0200 ++++ gst-libav-1.1.3/ext/libav/gstavvidenc.c 2013-08-26 14:26:26.319740315 +0200 +@@ -332,7 +332,6 @@ gst_ffmpegvidenc_set_format (GstVideoEnc + ffmpegenc->context->coder_type = 0; + ffmpegenc->context->context_model = 0; + ffmpegenc->context->scenechange_threshold = 0; +- ffmpegenc->context->inter_threshold = 0; + + /* and last but not least the pass; CBR, 2-pass, etc */ + ffmpegenc->context->flags |= ffmpegenc->pass; diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index 181fdc4..226e577 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -1,6 +1,6 @@ Name: gstreamer1-libav Version: 1.1.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GStreamer 1.0 libav-based plug-ins Group: Applications/Multimedia License: LGPLv2+ @@ -8,6 +8,7 @@ URL: http://gstreamer.freedesktop.org/ Source0: http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-%{version}.tar.xz Patch0: gst-ffmpeg-0.10.12-ChangeLog-UTF-8.patch Patch1: gst-libav-1.1.3-comma-in-typename.patch +Patch2: gst-libav-1.1.3-ffmpeg-2.0.patch BuildRequires: gstreamer1-devel >= 1.0.0 BuildRequires: gstreamer1-plugins-base-devel >= 1.0.0 BuildRequires: orc-devel bzip2-devel zlib-devel ffmpeg-devel @@ -30,6 +31,8 @@ This package provides libav-based GStreamer plug-ins. %setup -q -n gst-libav-%{version} %patch0 -p1 %patch1 -p1 +%patch2 -p1 +sed -i 's/CodecID/AVCodecID/g' ext/libav/*.h ext/libav/*.c %build @@ -53,6 +56,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/gstreamer-1.0/libgst*.la %changelog +* Thu Aug 8 2013 Hans de Goede - 1.1.3-2 +- Rebuild for ffmpeg-2.0 + * Thu Aug 8 2013 Hans de Goede - 1.1.3-1 - Rebase to 1.1.3 - Switch back to using system ffmpeg From cad6bde79efb01c5cfb261181b4ce84b88b8ce6e Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Tue, 27 Aug 2013 13:08:42 +0000 Subject: [PATCH 009/113] * Tue Aug 27 2013 Hans de Goede - 1.1.3-3 - Rebuild now devel properly points to f20 --- gstreamer1-libav.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index 226e577..1c96bd2 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -1,6 +1,6 @@ Name: gstreamer1-libav Version: 1.1.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GStreamer 1.0 libav-based plug-ins Group: Applications/Multimedia License: LGPLv2+ @@ -56,7 +56,10 @@ rm $RPM_BUILD_ROOT%{_libdir}/gstreamer-1.0/libgst*.la %changelog -* Thu Aug 8 2013 Hans de Goede - 1.1.3-2 +* Tue Aug 27 2013 Hans de Goede - 1.1.3-3 +- Rebuild now devel properly points to f20 + +* Mon Aug 26 2013 Hans de Goede - 1.1.3-2 - Rebuild for ffmpeg-2.0 * Thu Aug 8 2013 Hans de Goede - 1.1.3-1 From 61ac295805d852a1069a0bb37d2aa2a4e316386e Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Mon, 30 Sep 2013 08:40:20 +0000 Subject: [PATCH 010/113] * Mon Sep 30 2013 Nicolas Chauvet - 1.1.3-4 - Rebuilt --- gstreamer1-libav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index 1c96bd2..05ba9e0 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -1,6 +1,6 @@ Name: gstreamer1-libav Version: 1.1.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: GStreamer 1.0 libav-based plug-ins Group: Applications/Multimedia License: LGPLv2+ @@ -56,6 +56,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/gstreamer-1.0/libgst*.la %changelog +* Mon Sep 30 2013 Nicolas Chauvet - 1.1.3-4 +- Rebuilt + * Tue Aug 27 2013 Hans de Goede - 1.1.3-3 - Rebuild now devel properly points to f20 From 4d008fc9172050d6a579c350de610c79f2801adb Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Sun, 13 Oct 2013 10:39:34 +0000 Subject: [PATCH 011/113] * Sun Oct 13 2013 Hans de Goede - 1.2.0-1 - Rebase to 1.2.0 - Upgrade the buildin libav to 9.10 to get all the security fixes from upstream libav - Switch back to included libav copy again, libav and ffmpeg have deviated to much to use a system ffmpeg lib as libav replacement, this fixes a bad memory-leak (rpmfusion#2976) --- .gitignore | 3 ++- gst-libav-1.1.3-comma-in-typename.patch | 12 ----------- gstreamer1-libav.spec | 27 +++++++++++++++---------- sources | 3 ++- 4 files changed, 20 insertions(+), 25 deletions(-) delete mode 100644 gst-libav-1.1.3-comma-in-typename.patch diff --git a/.gitignore b/.gitignore index 5554da2..fa7caf7 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -gst-libav-1.1.3.tar.xz +gst-libav-1.2.0.tar.xz +libav-9.10.tar.xz diff --git a/gst-libav-1.1.3-comma-in-typename.patch b/gst-libav-1.1.3-comma-in-typename.patch deleted file mode 100644 index a267a79..0000000 --- a/gst-libav-1.1.3-comma-in-typename.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up gst-libav-1.1.3/ext/libav/gstavmux.c~ gst-libav-1.1.3/ext/libav/gstavmux.c ---- gst-libav-1.1.3/ext/libav/gstavmux.c~ 2013-07-15 08:50:20.000000000 +0200 -+++ gst-libav-1.1.3/ext/libav/gstavmux.c 2013-08-08 22:00:08.311276449 +0200 -@@ -939,6 +939,8 @@ gst_ffmpegmux_register (GstPlugin * plug - while (*p) { - if (*p == '.') - *p = '_'; -+ if (*p == ',') -+ *p = '_'; - p++; - } - diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index 05ba9e0..5a79c97 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -1,14 +1,14 @@ Name: gstreamer1-libav -Version: 1.1.3 -Release: 4%{?dist} +Version: 1.2.0 +Release: 1%{?dist} Summary: GStreamer 1.0 libav-based plug-ins Group: Applications/Multimedia License: LGPLv2+ URL: http://gstreamer.freedesktop.org/ Source0: http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-%{version}.tar.xz +# We drop in a newer libav to get all the security bugfixes from there! +Source1: http://libav.org/releases/libav-9.10.tar.xz Patch0: gst-ffmpeg-0.10.12-ChangeLog-UTF-8.patch -Patch1: gst-libav-1.1.3-comma-in-typename.patch -Patch2: gst-libav-1.1.3-ffmpeg-2.0.patch BuildRequires: gstreamer1-devel >= 1.0.0 BuildRequires: gstreamer1-plugins-base-devel >= 1.0.0 BuildRequires: orc-devel bzip2-devel zlib-devel ffmpeg-devel @@ -28,20 +28,17 @@ This package provides libav-based GStreamer plug-ins. %prep -%setup -q -n gst-libav-%{version} +%setup -q -n gst-libav-%{version} -a 1 +rm -r gst-libs/ext/libav +mv libav-9.10 gst-libs/ext/libav %patch0 -p1 -%patch1 -p1 -%patch2 -p1 -sed -i 's/CodecID/AVCodecID/g' ext/libav/*.h ext/libav/*.c %build %configure --disable-dependency-tracking --disable-static \ --with-package-name="gst-libav 1.0 rpmfusion rpm" \ --with-package-origin="http://rpmfusion.org/" \ - --with-system-libav -# Keep this around in case we switch back to the built-in libav -# --with-libav-extra-configure="--enable-runtime-cpudetect --arch=%{_target_cpu} --optflags=\\\"\\\$RPM_OPT_FLAGS\\\"" + --with-libav-extra-configure="--enable-runtime-cpudetect --arch=%{_target_cpu} --optflags=\\\"\\\$RPM_OPT_FLAGS\\\"" make %{?_smp_mflags} V=1 @@ -56,6 +53,14 @@ rm $RPM_BUILD_ROOT%{_libdir}/gstreamer-1.0/libgst*.la %changelog +* Sun Oct 13 2013 Hans de Goede - 1.2.0-1 +- Rebase to 1.2.0 +- Upgrade the buildin libav to 9.10 to get all the security fixes from + upstream libav +- Switch back to included libav copy again, libav and ffmpeg have + deviated to much to use a system ffmpeg lib as libav replacement, + this fixes a bad memory-leak (rpmfusion#2976) + * Mon Sep 30 2013 Nicolas Chauvet - 1.1.3-4 - Rebuilt diff --git a/sources b/sources index 354e7ff..b656dcc 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -1bdaa82159f7f0028b15025ea4b0d26c gst-libav-1.1.3.tar.xz +382bc5a99d22a4fbf8e971c42bb72c01 gst-libav-1.2.0.tar.xz +4b49d1d8734815ca095bb0600d41c5cb libav-9.10.tar.xz From b9da90516f44c9b54fb4ad6d1bd1db9ec2eb5356 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Sat, 16 Nov 2013 20:12:18 +0000 Subject: [PATCH 012/113] * Sat Nov 16 2013 Hans de Goede - 1.2.1-1 - Rebase to 1.2.1 --- .gitignore | 2 +- gstreamer1-libav.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index fa7caf7..51048bd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -gst-libav-1.2.0.tar.xz +gst-libav-1.2.1.tar.xz libav-9.10.tar.xz diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index 5a79c97..bd891cf 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -1,5 +1,5 @@ Name: gstreamer1-libav -Version: 1.2.0 +Version: 1.2.1 Release: 1%{?dist} Summary: GStreamer 1.0 libav-based plug-ins Group: Applications/Multimedia @@ -53,6 +53,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/gstreamer-1.0/libgst*.la %changelog +* Sat Nov 16 2013 Hans de Goede - 1.2.1-1 +- Rebase to 1.2.1 + * Sun Oct 13 2013 Hans de Goede - 1.2.0-1 - Rebase to 1.2.0 - Upgrade the buildin libav to 9.10 to get all the security fixes from diff --git a/sources b/sources index b656dcc..642e32a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -382bc5a99d22a4fbf8e971c42bb72c01 gst-libav-1.2.0.tar.xz +4c300da1cf14b4e167d65cd5d8de1ef1 gst-libav-1.2.1.tar.xz 4b49d1d8734815ca095bb0600d41c5cb libav-9.10.tar.xz From 5afbc361986fda1a94aadc49ef938747cafeebfc Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Sun, 2 Mar 2014 07:56:48 +0000 Subject: [PATCH 013/113] * Sat Feb 15 2014 Michael Kuhn - 1.2.3-1 - Update to 1.2.3. - Update libav to 9.11. --- .gitignore | 4 ++-- gstreamer1-libav.spec | 13 ++++++++++--- sources | 4 ++-- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 51048bd..20faf21 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -gst-libav-1.2.1.tar.xz -libav-9.10.tar.xz +gst-libav-1.2.3.tar.xz +libav-9.11.tar.xz diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index bd891cf..60dbfcf 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -1,5 +1,5 @@ Name: gstreamer1-libav -Version: 1.2.1 +Version: 1.2.3 Release: 1%{?dist} Summary: GStreamer 1.0 libav-based plug-ins Group: Applications/Multimedia @@ -7,7 +7,7 @@ License: LGPLv2+ URL: http://gstreamer.freedesktop.org/ Source0: http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-%{version}.tar.xz # We drop in a newer libav to get all the security bugfixes from there! -Source1: http://libav.org/releases/libav-9.10.tar.xz +Source1: http://libav.org/releases/libav-9.11.tar.xz Patch0: gst-ffmpeg-0.10.12-ChangeLog-UTF-8.patch BuildRequires: gstreamer1-devel >= 1.0.0 BuildRequires: gstreamer1-plugins-base-devel >= 1.0.0 @@ -30,7 +30,7 @@ This package provides libav-based GStreamer plug-ins. %prep %setup -q -n gst-libav-%{version} -a 1 rm -r gst-libs/ext/libav -mv libav-9.10 gst-libs/ext/libav +mv libav-9.11 gst-libs/ext/libav %patch0 -p1 @@ -53,6 +53,13 @@ rm $RPM_BUILD_ROOT%{_libdir}/gstreamer-1.0/libgst*.la %changelog +* Sat Feb 15 2014 Michael Kuhn - 1.2.3-1 +- Update to 1.2.3. +- Update libav to 9.11. + +* Sat Jan 04 2014 Michael Kuhn - 1.2.2-1 +- Update to 1.2.2. + * Sat Nov 16 2013 Hans de Goede - 1.2.1-1 - Rebase to 1.2.1 diff --git a/sources b/sources index 642e32a..69e4e82 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -4c300da1cf14b4e167d65cd5d8de1ef1 gst-libav-1.2.1.tar.xz -4b49d1d8734815ca095bb0600d41c5cb libav-9.10.tar.xz +58c7998a054d8d8ca041fa35738f72b6 gst-libav-1.2.3.tar.xz +7052da92d5eda8934874300b314b7ae4 libav-9.11.tar.xz From 813f014aabad92d3a6420433a6694d0d35d3d0d2 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Sun, 15 Jun 2014 10:46:19 +0000 Subject: [PATCH 014/113] * Sun Jun 15 2014 Hans de Goede - 1.2.4-1 - Update to 1.2.4 (rf#3269) - Update libav to 9.13 --- .gitignore | 4 ++-- gstreamer1-libav.spec | 10 +++++++--- sources | 4 ++-- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 20faf21..0752513 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -gst-libav-1.2.3.tar.xz -libav-9.11.tar.xz +gst-libav-1.2.4.tar.xz +libav-9.13.tar.xz diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index 60dbfcf..4af19ed 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -1,5 +1,5 @@ Name: gstreamer1-libav -Version: 1.2.3 +Version: 1.2.4 Release: 1%{?dist} Summary: GStreamer 1.0 libav-based plug-ins Group: Applications/Multimedia @@ -7,7 +7,7 @@ License: LGPLv2+ URL: http://gstreamer.freedesktop.org/ Source0: http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-%{version}.tar.xz # We drop in a newer libav to get all the security bugfixes from there! -Source1: http://libav.org/releases/libav-9.11.tar.xz +Source1: http://libav.org/releases/libav-9.13.tar.xz Patch0: gst-ffmpeg-0.10.12-ChangeLog-UTF-8.patch BuildRequires: gstreamer1-devel >= 1.0.0 BuildRequires: gstreamer1-plugins-base-devel >= 1.0.0 @@ -30,7 +30,7 @@ This package provides libav-based GStreamer plug-ins. %prep %setup -q -n gst-libav-%{version} -a 1 rm -r gst-libs/ext/libav -mv libav-9.11 gst-libs/ext/libav +mv libav-9.13 gst-libs/ext/libav %patch0 -p1 @@ -53,6 +53,10 @@ rm $RPM_BUILD_ROOT%{_libdir}/gstreamer-1.0/libgst*.la %changelog +* Sun Jun 15 2014 Hans de Goede - 1.2.4-1 +- Update to 1.2.4 (rf#3269) +- Update libav to 9.13 + * Sat Feb 15 2014 Michael Kuhn - 1.2.3-1 - Update to 1.2.3. - Update libav to 9.11. diff --git a/sources b/sources index 69e4e82..1d14849 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -58c7998a054d8d8ca041fa35738f72b6 gst-libav-1.2.3.tar.xz -7052da92d5eda8934874300b314b7ae4 libav-9.11.tar.xz +6454f9f22b3aa37694781633e0d20a9c gst-libav-1.2.4.tar.xz +23b9e34bffdaee366710fdf20157a570 libav-9.13.tar.xz From 13b646dafe1b5e28e4b1322065d18e7c1a14f708 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Sat, 30 Aug 2014 11:04:46 +0000 Subject: [PATCH 015/113] * Fri Aug 29 2014 Hans de Goede - 1.4.1-1 - Update to 1.4.1 (rf#3343) - Includes libav 10.4 --- .gitignore | 3 +-- gstreamer1-libav.spec | 37 ++++++++++++++++++++++++++++++------- sources | 3 +-- 3 files changed, 32 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 0752513..d696f38 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -gst-libav-1.2.4.tar.xz -libav-9.13.tar.xz +gst-libav-1.4.1.tar.xz diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index 4af19ed..c4ea0da 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -1,5 +1,5 @@ Name: gstreamer1-libav -Version: 1.2.4 +Version: 1.4.1 Release: 1%{?dist} Summary: GStreamer 1.0 libav-based plug-ins Group: Applications/Multimedia @@ -7,10 +7,10 @@ License: LGPLv2+ URL: http://gstreamer.freedesktop.org/ Source0: http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-%{version}.tar.xz # We drop in a newer libav to get all the security bugfixes from there! -Source1: http://libav.org/releases/libav-9.13.tar.xz +# Source1: http://libav.org/releases/libav-9.13.tar.xz Patch0: gst-ffmpeg-0.10.12-ChangeLog-UTF-8.patch -BuildRequires: gstreamer1-devel >= 1.0.0 -BuildRequires: gstreamer1-plugins-base-devel >= 1.0.0 +BuildRequires: gstreamer1-devel >= 1.4.0 +BuildRequires: gstreamer1-plugins-base-devel >= 1.4.0 BuildRequires: orc-devel bzip2-devel zlib-devel ffmpeg-devel %ifarch %{ix86} x86_64 BuildRequires: yasm @@ -27,10 +27,25 @@ plugins. This package provides libav-based GStreamer plug-ins. +%package devel-docs +Summary: Development documentation for the libav GStreamer plug-in +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +BuildArch: noarch + +%description devel-docs +GStreamer is a streaming media framework, based on graphs of elements which +operate on media data. + +This package contains the development documentation for the libav GStreamer +plug-in. + + %prep -%setup -q -n gst-libav-%{version} -a 1 -rm -r gst-libs/ext/libav -mv libav-9.13 gst-libs/ext/libav +%setup -q -n gst-libav-%{version} +# -a 1 +#rm -r gst-libs/ext/libav +#mv libav-9.13 gst-libs/ext/libav %patch0 -p1 @@ -51,8 +66,16 @@ rm $RPM_BUILD_ROOT%{_libdir}/gstreamer-1.0/libgst*.la %doc AUTHORS COPYING.LIB ChangeLog NEWS README TODO %{_libdir}/gstreamer-1.0/libgstlibav.so +%files devel-docs +# Take the dir and everything below it for proper dir ownership +%doc %{_datadir}/gtk-doc + %changelog +* Fri Aug 29 2014 Hans de Goede - 1.4.1-1 +- Update to 1.4.1 (rf#3343) +- Includes libav 10.4 + * Sun Jun 15 2014 Hans de Goede - 1.2.4-1 - Update to 1.2.4 (rf#3269) - Update libav to 9.13 diff --git a/sources b/sources index 1d14849..2e45ed2 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -6454f9f22b3aa37694781633e0d20a9c gst-libav-1.2.4.tar.xz -23b9e34bffdaee366710fdf20157a570 libav-9.13.tar.xz +ea2d636c24d7c5ae123967ef22e37c07 gst-libav-1.4.1.tar.xz From 5fbcc2f8f89c9590c7afddf2e02dae3aa2825f82 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Wed, 1 Oct 2014 11:34:37 +0000 Subject: [PATCH 016/113] * Wed Oct 1 2014 Hans de Goede - 1.4.3-1 - Update to 1.4.3 - Includes libav 10.5 --- .gitignore | 2 +- gstreamer1-libav.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index d696f38..dd7843d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -gst-libav-1.4.1.tar.xz +gst-libav-1.4.3.tar.xz diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index c4ea0da..7f18d2e 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -1,5 +1,5 @@ Name: gstreamer1-libav -Version: 1.4.1 +Version: 1.4.3 Release: 1%{?dist} Summary: GStreamer 1.0 libav-based plug-ins Group: Applications/Multimedia @@ -72,6 +72,10 @@ rm $RPM_BUILD_ROOT%{_libdir}/gstreamer-1.0/libgst*.la %changelog +* Wed Oct 1 2014 Hans de Goede - 1.4.3-1 +- Update to 1.4.3 +- Includes libav 10.5 + * Fri Aug 29 2014 Hans de Goede - 1.4.1-1 - Update to 1.4.1 (rf#3343) - Includes libav 10.4 diff --git a/sources b/sources index 2e45ed2..f314471 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ea2d636c24d7c5ae123967ef22e37c07 gst-libav-1.4.1.tar.xz +248b6aae752710bbae77af01f74a082d gst-libav-1.4.3.tar.xz From 73a85c37be32d415d3c5f30eada895b89c0d455d Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Sat, 16 May 2015 07:40:24 +0000 Subject: [PATCH 017/113] * Sat May 16 2015 Hans de Goede - 1.4.5-1 - Update to 1.4.5 - Update libav to 10.6 --- .gitignore | 3 ++- gstreamer1-libav.spec | 15 +++++++++------ sources | 3 ++- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index dd7843d..1a6915f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -gst-libav-1.4.3.tar.xz +gst-libav-1.4.5.tar.xz +libav-10.6.tar.xz diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index 7f18d2e..30860e6 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -1,5 +1,5 @@ Name: gstreamer1-libav -Version: 1.4.3 +Version: 1.4.5 Release: 1%{?dist} Summary: GStreamer 1.0 libav-based plug-ins Group: Applications/Multimedia @@ -7,7 +7,7 @@ License: LGPLv2+ URL: http://gstreamer.freedesktop.org/ Source0: http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-%{version}.tar.xz # We drop in a newer libav to get all the security bugfixes from there! -# Source1: http://libav.org/releases/libav-9.13.tar.xz +Source1: http://libav.org/releases/libav-10.6.tar.xz Patch0: gst-ffmpeg-0.10.12-ChangeLog-UTF-8.patch BuildRequires: gstreamer1-devel >= 1.4.0 BuildRequires: gstreamer1-plugins-base-devel >= 1.4.0 @@ -42,10 +42,9 @@ plug-in. %prep -%setup -q -n gst-libav-%{version} -# -a 1 -#rm -r gst-libs/ext/libav -#mv libav-9.13 gst-libs/ext/libav +%setup -q -n gst-libav-%{version} -a 1 +rm -r gst-libs/ext/libav +mv libav-10.6 gst-libs/ext/libav %patch0 -p1 @@ -72,6 +71,10 @@ rm $RPM_BUILD_ROOT%{_libdir}/gstreamer-1.0/libgst*.la %changelog +* Sat May 16 2015 Hans de Goede - 1.4.5-1 +- Update to 1.4.5 +- Update libav to 10.6 + * Wed Oct 1 2014 Hans de Goede - 1.4.3-1 - Update to 1.4.3 - Includes libav 10.5 diff --git a/sources b/sources index f314471..86749eb 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -248b6aae752710bbae77af01f74a082d gst-libav-1.4.3.tar.xz +f4922a46adbcbe7bd01331ff5dc7979d gst-libav-1.4.5.tar.xz +dcdf0e8c2f5fa1fc69d61cd8154cbe46 libav-10.6.tar.xz From 6a3456d3f8f6897ec02f03d8f59575f539dcf9c9 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Sat, 31 Oct 2015 10:55:44 +0100 Subject: [PATCH 018/113] Update to 1.6.1 - Upstream is using ffmpeg instead of libav now, switch to system ffmpeg-libs --- .gitignore | 1 + gst-libav-1.1.3-ffmpeg-2.0.patch | 121 ------------------------------- gstreamer1-libav.spec | 22 +++--- sources | 3 +- 4 files changed, 15 insertions(+), 132 deletions(-) delete mode 100644 gst-libav-1.1.3-ffmpeg-2.0.patch diff --git a/.gitignore b/.gitignore index 1a6915f..a042bc3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ gst-libav-1.4.5.tar.xz libav-10.6.tar.xz +gst-libav-1.6.1.tar.xz diff --git a/gst-libav-1.1.3-ffmpeg-2.0.patch b/gst-libav-1.1.3-ffmpeg-2.0.patch deleted file mode 100644 index 4dd911d..0000000 --- a/gst-libav-1.1.3-ffmpeg-2.0.patch +++ /dev/null @@ -1,121 +0,0 @@ -diff -up gst-libav-1.1.3/ext/libav/gstavauddec.c~ gst-libav-1.1.3/ext/libav/gstavauddec.c ---- gst-libav-1.1.3/ext/libav/gstavauddec.c~ 2013-08-26 14:17:14.000000000 +0200 -+++ gst-libav-1.1.3/ext/libav/gstavauddec.c 2013-08-26 14:31:07.574677693 +0200 -@@ -420,7 +420,7 @@ gst_ffmpegauddec_audio_frame (GstFFMpegA - GstBuffer ** outbuf, GstFlowReturn * ret) - { - gint len = -1; -- gint have_data = AVCODEC_MAX_AUDIO_FRAME_SIZE; -+ gint have_data = 0; - AVPacket packet; - AVFrame frame; - -diff -up gst-libav-1.1.3/ext/libav/gstavaudenc.c~ gst-libav-1.1.3/ext/libav/gstavaudenc.c ---- gst-libav-1.1.3/ext/libav/gstavaudenc.c~ 2013-08-26 14:17:14.000000000 +0200 -+++ gst-libav-1.1.3/ext/libav/gstavaudenc.c 2013-08-26 14:25:51.873605774 +0200 -@@ -266,7 +266,6 @@ gst_ffmpegaudenc_set_format (GstAudioEnc - ffmpegaudenc->context->coder_type = 0; - ffmpegaudenc->context->context_model = 0; - ffmpegaudenc->context->scenechange_threshold = 0; -- ffmpegaudenc->context->inter_threshold = 0; - - /* fetch pix_fmt and so on */ - gst_ffmpeg_audioinfo_to_context (info, ffmpegaudenc->context); -diff -up gst-libav-1.1.3/ext/libav/gstavcfg.c~ gst-libav-1.1.3/ext/libav/gstavcfg.c ---- gst-libav-1.1.3/ext/libav/gstavcfg.c~ 2013-08-26 14:17:14.000000000 +0200 -+++ gst-libav-1.1.3/ext/libav/gstavcfg.c 2013-08-26 14:38:33.160510256 +0200 -@@ -171,13 +171,10 @@ gst_ffmpeg_idct_algo_get_type (void) - {FF_IDCT_INT, "JPEG reference Integer", "int"}, - {FF_IDCT_SIMPLE, "Simple", "simple"}, - {FF_IDCT_SIMPLEMMX, "Simple MMX", "simplemmx"}, -- {FF_IDCT_LIBMPEG2MMX, "LIBMPEG2MMX", "libmpeg2mmx"}, - {FF_IDCT_ARM, "ARM", "arm"}, - {FF_IDCT_ALTIVEC, "ALTIVEC", "altivec"}, - {FF_IDCT_SH4, "SH4", "sh4"}, - {FF_IDCT_SIMPLEARM, "SIMPLEARM", "simplearm"}, -- {FF_IDCT_H264, "H264", "h264"}, -- {FF_IDCT_VP3, "VP3", "vp3"}, - {FF_IDCT_IPP, "IPP", "ipp"}, - {FF_IDCT_XVIDMMX, "XVIDMMX", "xvidmmx"}, - {0, NULL, NULL}, -@@ -274,9 +271,6 @@ gst_ffmpeg_flags_get_type (void) - "global-headers"}, - {CODEC_FLAG_AC_PRED, "H263 Advanced Intra Coding / MPEG4 AC prediction", - "aic"}, -- {CODEC_FLAG_CBP_RD, "Rate Distoration Optimization for CBP", "cbp-rd"}, -- {CODEC_FLAG_QP_RD, "Rate Distoration Optimization for QP selection", -- "qp-rd"}, - {CODEC_FLAG_CLOSED_GOP, "Closed GOP", "closedgop"}, - {0, NULL, NULL}, - }; -@@ -564,18 +558,6 @@ gst_ffmpeg_cfg_init (void) - -100, G_MAXINT, 0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); - gst_ffmpeg_add_pspec (pspec, max_key_interval, FALSE, mpeg, NULL); - -- pspec = g_param_spec_int ("luma-elim-threshold", -- "Luma Elimination Threshold", -- "Luma Single Coefficient Elimination Threshold", -- -99, 99, 0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); -- gst_ffmpeg_add_pspec (pspec, config.luma_elim_threshold, FALSE, mpeg, NULL); -- -- pspec = g_param_spec_int ("chroma-elim-threshold", -- "Chroma Elimination Threshold", -- "Chroma Single Coefficient Elimination Threshold", -- -99, 99, 0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); -- gst_ffmpeg_add_pspec (pspec, config.chroma_elim_threshold, FALSE, mpeg, NULL); -- - pspec = g_param_spec_float ("lumi-masking", "Luminance Masking", - "Luminance Masking", -1.0f, 1.0f, 0.0f, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); -diff -up gst-libav-1.1.3/ext/libav/gstavcodecmap.c~ gst-libav-1.1.3/ext/libav/gstavcodecmap.c ---- gst-libav-1.1.3/ext/libav/gstavcodecmap.c~ 2013-08-26 14:17:14.000000000 +0200 -+++ gst-libav-1.1.3/ext/libav/gstavcodecmap.c 2013-08-26 14:24:04.231311059 +0200 -@@ -788,18 +788,9 @@ gst_ffmpeg_codecid_to_caps (enum AVCodec - break; - } - -- /* FIXME: context->sub_id must be filled in during decoding */ - caps = - gst_ff_vid_caps_new (context, NULL, codec_id, encode, - "video/x-pn-realvideo", "rmversion", G_TYPE_INT, version, NULL); -- if (context) { -- gst_caps_set_simple (caps, "format", G_TYPE_INT, context->sub_id, NULL); -- if (context->extradata_size >= 8) { -- gst_caps_set_simple (caps, -- "subformat", G_TYPE_INT, GST_READ_UINT32_BE (context->extradata), -- NULL); -- } -- } - } - break; - -@@ -2861,18 +2852,6 @@ gst_ffmpeg_caps_with_codecid (enum AVCod - } - break; - -- case AV_CODEC_ID_RV10: -- case AV_CODEC_ID_RV20: -- case AV_CODEC_ID_RV30: -- case AV_CODEC_ID_RV40: -- { -- gint format; -- -- if (gst_structure_get_int (str, "format", &format)) -- context->sub_id = format; -- -- break; -- } - case AV_CODEC_ID_COOK: - case AV_CODEC_ID_RA_288: - case AV_CODEC_ID_RA_144: -diff -up gst-libav-1.1.3/ext/libav/gstavvidenc.c~ gst-libav-1.1.3/ext/libav/gstavvidenc.c ---- gst-libav-1.1.3/ext/libav/gstavvidenc.c~ 2013-08-26 14:17:14.000000000 +0200 -+++ gst-libav-1.1.3/ext/libav/gstavvidenc.c 2013-08-26 14:26:26.319740315 +0200 -@@ -332,7 +332,6 @@ gst_ffmpegvidenc_set_format (GstVideoEnc - ffmpegenc->context->coder_type = 0; - ffmpegenc->context->context_model = 0; - ffmpegenc->context->scenechange_threshold = 0; -- ffmpegenc->context->inter_threshold = 0; - - /* and last but not least the pass; CBR, 2-pass, etc */ - ffmpegenc->context->flags |= ffmpegenc->pass; diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index 30860e6..9e81a93 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -1,16 +1,14 @@ Name: gstreamer1-libav -Version: 1.4.5 +Version: 1.6.1 Release: 1%{?dist} Summary: GStreamer 1.0 libav-based plug-ins Group: Applications/Multimedia License: LGPLv2+ URL: http://gstreamer.freedesktop.org/ Source0: http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-%{version}.tar.xz -# We drop in a newer libav to get all the security bugfixes from there! -Source1: http://libav.org/releases/libav-10.6.tar.xz Patch0: gst-ffmpeg-0.10.12-ChangeLog-UTF-8.patch -BuildRequires: gstreamer1-devel >= 1.4.0 -BuildRequires: gstreamer1-plugins-base-devel >= 1.4.0 +BuildRequires: gstreamer1-devel >= 1.6.0 +BuildRequires: gstreamer1-plugins-base-devel >= 1.6.0 BuildRequires: orc-devel bzip2-devel zlib-devel ffmpeg-devel %ifarch %{ix86} x86_64 BuildRequires: yasm @@ -42,17 +40,19 @@ plug-in. %prep -%setup -q -n gst-libav-%{version} -a 1 -rm -r gst-libs/ext/libav -mv libav-10.6 gst-libs/ext/libav +%setup -q -n gst-libav-%{version} %patch0 -p1 +# hack to allow building against 1.6.0 as 1.6.1 is not yet in the buildroot +sed -i 's/GST_REQ=1.6.1/GST_REQ=1.6.0/' configure +sed -i 's/GST_PBREQ=1.6.1/GST_PBREQ=1.6.0/' configure %build +export CFLAGS="$RPM_OPT_FLAGS -Wno-deprecated-declarations" %configure --disable-dependency-tracking --disable-static \ --with-package-name="gst-libav 1.0 rpmfusion rpm" \ --with-package-origin="http://rpmfusion.org/" \ - --with-libav-extra-configure="--enable-runtime-cpudetect --arch=%{_target_cpu} --optflags=\\\"\\\$RPM_OPT_FLAGS\\\"" + --with-system-libav make %{?_smp_mflags} V=1 @@ -71,6 +71,10 @@ rm $RPM_BUILD_ROOT%{_libdir}/gstreamer-1.0/libgst*.la %changelog +* Sat Oct 31 2015 Hans de Goede - 1.6.1-1 +- Update to 1.6.1 +- Upstream is using ffmpeg instead of libav now, switch to system ffmpeg-libs + * Sat May 16 2015 Hans de Goede - 1.4.5-1 - Update to 1.4.5 - Update libav to 10.6 diff --git a/sources b/sources index 86749eb..d532572 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -f4922a46adbcbe7bd01331ff5dc7979d gst-libav-1.4.5.tar.xz -dcdf0e8c2f5fa1fc69d61cd8154cbe46 libav-10.6.tar.xz +058b22411e1690eee5b71d1ab44eab25 gst-libav-1.6.1.tar.xz From 798e5f7e43165f2b2090111d25f8581bb3c71715 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Thu, 24 Dec 2015 15:15:03 +0100 Subject: [PATCH 019/113] Update to 1.6.2 --- .gitignore | 1 + gstreamer1-libav.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index a042bc3..5a8eb59 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ gst-libav-1.4.5.tar.xz libav-10.6.tar.xz gst-libav-1.6.1.tar.xz +gst-libav-1.6.2.tar.xz diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index 9e81a93..642caff 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -1,5 +1,5 @@ Name: gstreamer1-libav -Version: 1.6.1 +Version: 1.6.2 Release: 1%{?dist} Summary: GStreamer 1.0 libav-based plug-ins Group: Applications/Multimedia @@ -71,6 +71,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/gstreamer-1.0/libgst*.la %changelog +* Thu Dec 24 2015 Hans de Goede - 1.6.2-1 +- Update to 1.6.2 + * Sat Oct 31 2015 Hans de Goede - 1.6.1-1 - Update to 1.6.1 - Upstream is using ffmpeg instead of libav now, switch to system ffmpeg-libs diff --git a/sources b/sources index d532572..f8a81e0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -058b22411e1690eee5b71d1ab44eab25 gst-libav-1.6.1.tar.xz +09644a38827d233f53edeac815dd0ec0 gst-libav-1.6.2.tar.xz From d66ed00e124e1703a6ef07cff91d8d5a9a19cc81 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Tue, 5 Jan 2016 11:39:28 +0100 Subject: [PATCH 020/113] Allow building against older gstreamer-1.6.x --- gstreamer1-libav.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index 642caff..5b9638a 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -42,9 +42,9 @@ plug-in. %prep %setup -q -n gst-libav-%{version} %patch0 -p1 -# hack to allow building against 1.6.0 as 1.6.1 is not yet in the buildroot -sed -i 's/GST_REQ=1.6.1/GST_REQ=1.6.0/' configure -sed -i 's/GST_PBREQ=1.6.1/GST_PBREQ=1.6.0/' configure +# hack to allow building against 1.6.0 as 1.6.2 is not yet in the buildroot +sed -i 's/GST_REQ=1.6.2/GST_REQ=1.6.0/' configure +sed -i 's/GST_PBREQ=1.6.2/GST_PBREQ=1.6.0/' configure %build From 3379f0cab4cff494b515a8466b2194f18130bd61 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Sat, 23 Jan 2016 12:36:29 +0100 Subject: [PATCH 021/113] Update to 1.6.3 --- .gitignore | 1 + gstreamer1-libav.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 5a8eb59..b0f89e0 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ gst-libav-1.4.5.tar.xz libav-10.6.tar.xz gst-libav-1.6.1.tar.xz gst-libav-1.6.2.tar.xz +gst-libav-1.6.3.tar.xz diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index 5b9638a..49eaa52 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -1,5 +1,5 @@ Name: gstreamer1-libav -Version: 1.6.2 +Version: 1.6.3 Release: 1%{?dist} Summary: GStreamer 1.0 libav-based plug-ins Group: Applications/Multimedia @@ -42,9 +42,9 @@ plug-in. %prep %setup -q -n gst-libav-%{version} %patch0 -p1 -# hack to allow building against 1.6.0 as 1.6.2 is not yet in the buildroot -sed -i 's/GST_REQ=1.6.2/GST_REQ=1.6.0/' configure -sed -i 's/GST_PBREQ=1.6.2/GST_PBREQ=1.6.0/' configure +# hack to allow building against 1.6.0 as 1.6.3 is not yet in the buildroot +sed -i 's/GST_REQ=1.6.3/GST_REQ=1.6.0/' configure +sed -i 's/GST_PBREQ=1.6.3/GST_PBREQ=1.6.0/' configure %build @@ -71,6 +71,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/gstreamer-1.0/libgst*.la %changelog +* Sat Jan 23 2016 Hans de Goede - 1.6.3-1 +- Update to 1.6.3 + * Thu Dec 24 2015 Hans de Goede - 1.6.2-1 - Update to 1.6.2 diff --git a/sources b/sources index f8a81e0..f7407d4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -09644a38827d233f53edeac815dd0ec0 gst-libav-1.6.2.tar.xz +cfe9a06913d4fd4067e9e47f6e05fac2 gst-libav-1.6.3.tar.xz From 561d01c2f7ee463ddd604daddeb35bed5a44825f Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Wed, 18 May 2016 11:42:10 +0200 Subject: [PATCH 022/113] Update to 1.8.1 --- .gitignore | 1 + gstreamer1-libav.spec | 11 ++++++----- sources | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index b0f89e0..537c66c 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ libav-10.6.tar.xz gst-libav-1.6.1.tar.xz gst-libav-1.6.2.tar.xz gst-libav-1.6.3.tar.xz +gst-libav-1.8.1.tar.xz diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index 49eaa52..5a8493a 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -1,5 +1,5 @@ Name: gstreamer1-libav -Version: 1.6.3 +Version: 1.8.1 Release: 1%{?dist} Summary: GStreamer 1.0 libav-based plug-ins Group: Applications/Multimedia @@ -42,9 +42,6 @@ plug-in. %prep %setup -q -n gst-libav-%{version} %patch0 -p1 -# hack to allow building against 1.6.0 as 1.6.3 is not yet in the buildroot -sed -i 's/GST_REQ=1.6.3/GST_REQ=1.6.0/' configure -sed -i 's/GST_PBREQ=1.6.3/GST_PBREQ=1.6.0/' configure %build @@ -62,7 +59,8 @@ rm $RPM_BUILD_ROOT%{_libdir}/gstreamer-1.0/libgst*.la %files -%doc AUTHORS COPYING.LIB ChangeLog NEWS README TODO +%doc AUTHORS ChangeLog NEWS README TODO +%license COPYING.LIB %{_libdir}/gstreamer-1.0/libgstlibav.so %files devel-docs @@ -71,6 +69,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/gstreamer-1.0/libgst*.la %changelog +* Wed May 18 2016 Hans de Goede - 1.8.1-1 +- Update to 1.8.1 + * Sat Jan 23 2016 Hans de Goede - 1.6.3-1 - Update to 1.6.3 diff --git a/sources b/sources index f7407d4..81827bc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cfe9a06913d4fd4067e9e47f6e05fac2 gst-libav-1.6.3.tar.xz +85f1a047606ca9e08493d7b6b42df462 gst-libav-1.8.1.tar.xz From a93dbbbbc7e89dc640ca874802d68afb2ff61fec Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Sun, 12 Jun 2016 13:36:30 +0200 Subject: [PATCH 023/113] Update to 1.8.2 --- .gitignore | 1 + gstreamer1-libav.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 537c66c..0f8856c 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ gst-libav-1.6.1.tar.xz gst-libav-1.6.2.tar.xz gst-libav-1.6.3.tar.xz gst-libav-1.8.1.tar.xz +gst-libav-1.8.2.tar.xz diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index 5a8493a..0a3c144 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -1,5 +1,5 @@ Name: gstreamer1-libav -Version: 1.8.1 +Version: 1.8.2 Release: 1%{?dist} Summary: GStreamer 1.0 libav-based plug-ins Group: Applications/Multimedia @@ -69,6 +69,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/gstreamer-1.0/libgst*.la %changelog +* Sun Jun 12 2016 Hans de Goede - 1.8.2-1 +- Update to 1.8.2 + * Wed May 18 2016 Hans de Goede - 1.8.1-1 - Update to 1.8.1 diff --git a/sources b/sources index 81827bc..9136f8f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -85f1a047606ca9e08493d7b6b42df462 gst-libav-1.8.1.tar.xz +95bc3dd0ea2dc664b4f3a96897005013 gst-libav-1.8.2.tar.xz From 961d5d47b50375d93c37fe717d6a5900718e15f2 Mon Sep 17 00:00:00 2001 From: Julian Sikorski Date: Sat, 30 Jul 2016 15:54:44 +0200 Subject: [PATCH 024/113] Rebuilt for ffmpeg-3.1.1 --- gstreamer1-libav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index 0a3c144..aea3514 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -1,6 +1,6 @@ Name: gstreamer1-libav Version: 1.8.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GStreamer 1.0 libav-based plug-ins Group: Applications/Multimedia License: LGPLv2+ @@ -69,6 +69,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/gstreamer-1.0/libgst*.la %changelog +* Sat Jul 30 2016 Julian Sikorski - 1.8.2-2 +- Rebuilt for ffmpeg-3.1.1 + * Sun Jun 12 2016 Hans de Goede - 1.8.2-1 - Update to 1.8.2 From 578ce446d5b5fb5ccf50f9296c90256d0c44eba8 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Fri, 11 Nov 2016 00:09:29 +0000 Subject: [PATCH 025/113] Add patch to ignore VAAPI decoders and VAAPI/nvenc encoders (rfbz#4334) --- gstreamer1-libav.spec | 7 +++++- ignore_vaapi.patch | 53 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 ignore_vaapi.patch diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index aea3514..9910738 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -1,12 +1,13 @@ Name: gstreamer1-libav Version: 1.8.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GStreamer 1.0 libav-based plug-ins Group: Applications/Multimedia License: LGPLv2+ URL: http://gstreamer.freedesktop.org/ Source0: http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-%{version}.tar.xz Patch0: gst-ffmpeg-0.10.12-ChangeLog-UTF-8.patch +Patch1: ignore_vaapi.patch BuildRequires: gstreamer1-devel >= 1.6.0 BuildRequires: gstreamer1-plugins-base-devel >= 1.6.0 BuildRequires: orc-devel bzip2-devel zlib-devel ffmpeg-devel @@ -42,6 +43,7 @@ plug-in. %prep %setup -q -n gst-libav-%{version} %patch0 -p1 +%patch1 -p1 %build @@ -69,6 +71,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/gstreamer-1.0/libgst*.la %changelog +* Fri Nov 11 2016 Leigh Scott - 1.8.2-3 +- Add patch to ignore VAAPI decoders and VAAPI/nvenc encoders + * Sat Jul 30 2016 Julian Sikorski - 1.8.2-2 - Rebuilt for ffmpeg-3.1.1 diff --git a/ignore_vaapi.patch b/ignore_vaapi.patch new file mode 100644 index 0000000..a79c992 --- /dev/null +++ b/ignore_vaapi.patch @@ -0,0 +1,53 @@ +From 8666d9fda0be7f86f548297dc83b09d92824de49 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= +Date: Fri, 22 Jul 2016 14:42:59 +0300 +Subject: libav: Ignore VAAPI decoders and VAAPI/nvenc encoders + +These can show up when having a build against a system version of ffmpeg. + +diff --git a/ext/libav/gstavviddec.c b/ext/libav/gstavviddec.c +index 53391ad..2fdff95 100644 +--- a/ext/libav/gstavviddec.c ++++ b/ext/libav/gstavviddec.c +@@ -2061,6 +2061,13 @@ gst_ffmpegviddec_register (GstPlugin * plugin) + goto next; + } + ++ if (strstr (in_plugin->name, "vaapi")) { ++ GST_DEBUG ++ ("Ignoring VAAPI decoder %s. We can't handle this outside of ffmpeg", ++ in_plugin->name); ++ goto next; ++ } ++ + GST_DEBUG ("Trying plugin %s [%s]", in_plugin->name, in_plugin->long_name); + + /* no codecs for which we're GUARANTEED to have better alternatives */ +diff --git a/ext/libav/gstavvidenc.c b/ext/libav/gstavvidenc.c +index 2d8391b..f22f697 100644 +--- a/ext/libav/gstavvidenc.c ++++ b/ext/libav/gstavvidenc.c +@@ -973,6 +973,20 @@ gst_ffmpegvidenc_register (GstPlugin * plugin) + goto next; + } + ++ if (strstr (in_plugin->name, "vaapi")) { ++ GST_DEBUG ++ ("Ignoring VAAPI encoder %s. We can't handle this outside of ffmpeg", ++ in_plugin->name); ++ goto next; ++ } ++ ++ if (g_str_has_suffix (in_plugin->name, "_nvenc")) { ++ GST_DEBUG ++ ("Ignoring nvenc encoder %s. We can't handle this outside of ffmpeg", ++ in_plugin->name); ++ goto next; ++ } ++ + /* only video encoders */ + if (!av_codec_is_encoder (in_plugin) + || in_plugin->type != AVMEDIA_TYPE_VIDEO) +-- +cgit v0.10.2 + From 00fbe8e093f501ac175568a0d343285e419c37ca Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Fri, 11 Nov 2016 11:50:03 +0000 Subject: [PATCH 026/113] Add patch to disable ffmpeg hardware acceleration for nvenc and qsv (rfbz#4334) --- disable_ffmpeg_hw_acceleration.patch | 39 ++++++++++++++++++++++++++++ gstreamer1-libav.spec | 9 +++++-- 2 files changed, 46 insertions(+), 2 deletions(-) create mode 100644 disable_ffmpeg_hw_acceleration.patch diff --git a/disable_ffmpeg_hw_acceleration.patch b/disable_ffmpeg_hw_acceleration.patch new file mode 100644 index 0000000..62bbeb9 --- /dev/null +++ b/disable_ffmpeg_hw_acceleration.patch @@ -0,0 +1,39 @@ +--- a/ext/libav/gstavviddec.c ++++ b/ext/libav/gstavviddec.c +@@ -2064,6 +2064,13 @@ + if (strstr (in_plugin->name, "vaapi")) { + GST_DEBUG + ("Ignoring VAAPI decoder %s. We can't handle this outside of ffmpeg", ++ in_plugin->name); ++ goto next; ++ } ++ ++ if (g_str_has_suffix (in_plugin->name, "_qsv")) { ++ GST_DEBUG ++ ("Ignoring qsv decoder %s. We can't handle this outside of ffmpeg", + in_plugin->name); + goto next; + } +--- a/ext/libav/gstavvidenc.c ++++ b/ext/libav/gstavvidenc.c +@@ -974,12 +974,19 @@ gst_ffmpegvidenc_register (GstPlugin * p + goto next; + } + +- if (g_str_has_suffix (in_plugin->name, "_nvenc")) { ++ if (strstr (in_plugin->name, "nvenc")) { + GST_DEBUG + ("Ignoring nvenc encoder %s. We can't handle this outside of ffmpeg", + in_plugin->name); + goto next; + } ++ ++ if (g_str_has_suffix (in_plugin->name, "_qsv")) { ++ GST_DEBUG ++ ("Ignoring qsv encoder %s. We can't handle this outside of ffmpeg", ++ in_plugin->name); ++ goto next; ++ } + + /* only video encoders */ + if (!av_codec_is_encoder (in_plugin) diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index 9910738..c5c6166 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -1,6 +1,6 @@ Name: gstreamer1-libav Version: 1.8.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: GStreamer 1.0 libav-based plug-ins Group: Applications/Multimedia License: LGPLv2+ @@ -8,6 +8,7 @@ URL: http://gstreamer.freedesktop.org/ Source0: http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-%{version}.tar.xz Patch0: gst-ffmpeg-0.10.12-ChangeLog-UTF-8.patch Patch1: ignore_vaapi.patch +Patch2: disable_ffmpeg_hw_acceleration.patch BuildRequires: gstreamer1-devel >= 1.6.0 BuildRequires: gstreamer1-plugins-base-devel >= 1.6.0 BuildRequires: orc-devel bzip2-devel zlib-devel ffmpeg-devel @@ -44,6 +45,7 @@ plug-in. %setup -q -n gst-libav-%{version} %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build @@ -71,8 +73,11 @@ rm $RPM_BUILD_ROOT%{_libdir}/gstreamer-1.0/libgst*.la %changelog +* Fri Nov 11 2016 Leigh Scott - 1.8.2-4 +- Add patch to disable ffmpeg hardware acceleration for nvenc and qsv (rfbz#4334) + * Fri Nov 11 2016 Leigh Scott - 1.8.2-3 -- Add patch to ignore VAAPI decoders and VAAPI/nvenc encoders +- Add patch to ignore VAAPI decoders and VAAPI/nvenc encoders (rfbz#4334) * Sat Jul 30 2016 Julian Sikorski - 1.8.2-2 - Rebuilt for ffmpeg-3.1.1 From 94b2020da8543088cb441adfb42054d63c0d97c9 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Fri, 11 Nov 2016 16:04:31 +0100 Subject: [PATCH 027/113] Update to 1.10.0 --- .gitignore | 1 + gstreamer1-libav.spec | 9 +++++++-- sources | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 0f8856c..a9c89dd 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ gst-libav-1.6.2.tar.xz gst-libav-1.6.3.tar.xz gst-libav-1.8.1.tar.xz gst-libav-1.8.2.tar.xz +/gst-libav-1.10.0.tar.xz diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index c5c6166..34d3045 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -1,6 +1,6 @@ Name: gstreamer1-libav -Version: 1.8.2 -Release: 4%{?dist} +Version: 1.10.0 +Release: 1%{?dist} Summary: GStreamer 1.0 libav-based plug-ins Group: Applications/Multimedia License: LGPLv2+ @@ -46,6 +46,8 @@ plug-in. %patch0 -p1 %patch1 -p1 %patch2 -p1 +# Build against 1.9.2 as 1.10.0 is not yet in the stable Fedora repo +sed -i 's/1.10.0/1.9.2/' configure %build @@ -73,6 +75,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/gstreamer-1.0/libgst*.la %changelog +* Fri Nov 11 2016 Hans de Goede - 1.10.0-1 +- Update to 1.10.0 + * Fri Nov 11 2016 Leigh Scott - 1.8.2-4 - Add patch to disable ffmpeg hardware acceleration for nvenc and qsv (rfbz#4334) diff --git a/sources b/sources index 9136f8f..d32f065 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -95bc3dd0ea2dc664b4f3a96897005013 gst-libav-1.8.2.tar.xz +5a91cea1affe136298db4f6185f78f72 gst-libav-1.10.0.tar.xz From 9564445437e981ec08105ee3d555768ce1e3eb32 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Fri, 11 Nov 2016 20:21:05 +0100 Subject: [PATCH 028/113] Drop no longer needed ignore_vaapi.patch --- gstreamer1-libav.spec | 7 +++--- ignore_vaapi.patch | 53 ------------------------------------------- 2 files changed, 4 insertions(+), 56 deletions(-) delete mode 100644 ignore_vaapi.patch diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index 34d3045..cd14cf4 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -1,13 +1,12 @@ Name: gstreamer1-libav Version: 1.10.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GStreamer 1.0 libav-based plug-ins Group: Applications/Multimedia License: LGPLv2+ URL: http://gstreamer.freedesktop.org/ Source0: http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-%{version}.tar.xz Patch0: gst-ffmpeg-0.10.12-ChangeLog-UTF-8.patch -Patch1: ignore_vaapi.patch Patch2: disable_ffmpeg_hw_acceleration.patch BuildRequires: gstreamer1-devel >= 1.6.0 BuildRequires: gstreamer1-plugins-base-devel >= 1.6.0 @@ -44,7 +43,6 @@ plug-in. %prep %setup -q -n gst-libav-%{version} %patch0 -p1 -%patch1 -p1 %patch2 -p1 # Build against 1.9.2 as 1.10.0 is not yet in the stable Fedora repo sed -i 's/1.10.0/1.9.2/' configure @@ -75,6 +73,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/gstreamer-1.0/libgst*.la %changelog +* Fri Nov 11 2016 Hans de Goede - 1.10.0-2 +- Drop no longer needed ignore_vaapi.patch + * Fri Nov 11 2016 Hans de Goede - 1.10.0-1 - Update to 1.10.0 diff --git a/ignore_vaapi.patch b/ignore_vaapi.patch deleted file mode 100644 index a79c992..0000000 --- a/ignore_vaapi.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 8666d9fda0be7f86f548297dc83b09d92824de49 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= -Date: Fri, 22 Jul 2016 14:42:59 +0300 -Subject: libav: Ignore VAAPI decoders and VAAPI/nvenc encoders - -These can show up when having a build against a system version of ffmpeg. - -diff --git a/ext/libav/gstavviddec.c b/ext/libav/gstavviddec.c -index 53391ad..2fdff95 100644 ---- a/ext/libav/gstavviddec.c -+++ b/ext/libav/gstavviddec.c -@@ -2061,6 +2061,13 @@ gst_ffmpegviddec_register (GstPlugin * plugin) - goto next; - } - -+ if (strstr (in_plugin->name, "vaapi")) { -+ GST_DEBUG -+ ("Ignoring VAAPI decoder %s. We can't handle this outside of ffmpeg", -+ in_plugin->name); -+ goto next; -+ } -+ - GST_DEBUG ("Trying plugin %s [%s]", in_plugin->name, in_plugin->long_name); - - /* no codecs for which we're GUARANTEED to have better alternatives */ -diff --git a/ext/libav/gstavvidenc.c b/ext/libav/gstavvidenc.c -index 2d8391b..f22f697 100644 ---- a/ext/libav/gstavvidenc.c -+++ b/ext/libav/gstavvidenc.c -@@ -973,6 +973,20 @@ gst_ffmpegvidenc_register (GstPlugin * plugin) - goto next; - } - -+ if (strstr (in_plugin->name, "vaapi")) { -+ GST_DEBUG -+ ("Ignoring VAAPI encoder %s. We can't handle this outside of ffmpeg", -+ in_plugin->name); -+ goto next; -+ } -+ -+ if (g_str_has_suffix (in_plugin->name, "_nvenc")) { -+ GST_DEBUG -+ ("Ignoring nvenc encoder %s. We can't handle this outside of ffmpeg", -+ in_plugin->name); -+ goto next; -+ } -+ - /* only video encoders */ - if (!av_codec_is_encoder (in_plugin) - || in_plugin->type != AVMEDIA_TYPE_VIDEO) --- -cgit v0.10.2 - From 62588e7c5f0e456b82dd5992e75665f5cf5bf051 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Wed, 30 Nov 2016 11:14:14 +0000 Subject: [PATCH 029/113] Update to 1.10.2 --- .gitignore | 10 ++----- disable_ffmpeg_hw_acceleration.patch | 39 ---------------------------- gstreamer1-libav.spec | 23 +++++++++------- sources | 2 +- 4 files changed, 16 insertions(+), 58 deletions(-) delete mode 100644 disable_ffmpeg_hw_acceleration.patch diff --git a/.gitignore b/.gitignore index a9c89dd..83f93cf 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,2 @@ -gst-libav-1.4.5.tar.xz -libav-10.6.tar.xz -gst-libav-1.6.1.tar.xz -gst-libav-1.6.2.tar.xz -gst-libav-1.6.3.tar.xz -gst-libav-1.8.1.tar.xz -gst-libav-1.8.2.tar.xz -/gst-libav-1.10.0.tar.xz +/gst-libav-*.tar.xz +/gstreamer1-libav-*.src.rpm diff --git a/disable_ffmpeg_hw_acceleration.patch b/disable_ffmpeg_hw_acceleration.patch deleted file mode 100644 index 62bbeb9..0000000 --- a/disable_ffmpeg_hw_acceleration.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- a/ext/libav/gstavviddec.c -+++ b/ext/libav/gstavviddec.c -@@ -2064,6 +2064,13 @@ - if (strstr (in_plugin->name, "vaapi")) { - GST_DEBUG - ("Ignoring VAAPI decoder %s. We can't handle this outside of ffmpeg", -+ in_plugin->name); -+ goto next; -+ } -+ -+ if (g_str_has_suffix (in_plugin->name, "_qsv")) { -+ GST_DEBUG -+ ("Ignoring qsv decoder %s. We can't handle this outside of ffmpeg", - in_plugin->name); - goto next; - } ---- a/ext/libav/gstavvidenc.c -+++ b/ext/libav/gstavvidenc.c -@@ -974,12 +974,19 @@ gst_ffmpegvidenc_register (GstPlugin * p - goto next; - } - -- if (g_str_has_suffix (in_plugin->name, "_nvenc")) { -+ if (strstr (in_plugin->name, "nvenc")) { - GST_DEBUG - ("Ignoring nvenc encoder %s. We can't handle this outside of ffmpeg", - in_plugin->name); - goto next; - } -+ -+ if (g_str_has_suffix (in_plugin->name, "_qsv")) { -+ GST_DEBUG -+ ("Ignoring qsv encoder %s. We can't handle this outside of ffmpeg", -+ in_plugin->name); -+ goto next; -+ } - - /* only video encoders */ - if (!av_codec_is_encoder (in_plugin) diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index cd14cf4..bc5c895 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -1,16 +1,18 @@ Name: gstreamer1-libav -Version: 1.10.0 -Release: 2%{?dist} +Version: 1.10.2 +Release: 1%{?dist} Summary: GStreamer 1.0 libav-based plug-ins Group: Applications/Multimedia License: LGPLv2+ URL: http://gstreamer.freedesktop.org/ Source0: http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-%{version}.tar.xz Patch0: gst-ffmpeg-0.10.12-ChangeLog-UTF-8.patch -Patch2: disable_ffmpeg_hw_acceleration.patch -BuildRequires: gstreamer1-devel >= 1.6.0 -BuildRequires: gstreamer1-plugins-base-devel >= 1.6.0 -BuildRequires: orc-devel bzip2-devel zlib-devel ffmpeg-devel +BuildRequires: gstreamer1-devel >= 1.10.0 +BuildRequires: gstreamer1-plugins-base-devel >= 1.10.0 +BuildRequires: orc-devel +BuildRequires: bzip2-devel +BuildRequires: zlib-devel +BuildRequires: ffmpeg-devel %ifarch %{ix86} x86_64 BuildRequires: yasm %endif @@ -43,14 +45,12 @@ plug-in. %prep %setup -q -n gst-libav-%{version} %patch0 -p1 -%patch2 -p1 -# Build against 1.9.2 as 1.10.0 is not yet in the stable Fedora repo -sed -i 's/1.10.0/1.9.2/' configure %build export CFLAGS="$RPM_OPT_FLAGS -Wno-deprecated-declarations" -%configure --disable-dependency-tracking --disable-static \ +%configure --disable-dependency-tracking \ + --disable-static \ --with-package-name="gst-libav 1.0 rpmfusion rpm" \ --with-package-origin="http://rpmfusion.org/" \ --with-system-libav @@ -73,6 +73,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/gstreamer-1.0/libgst*.la %changelog +* Wed Nov 30 2016 leigh scott - 1.10.2-1 +- Update to 1.10.2 + * Fri Nov 11 2016 Hans de Goede - 1.10.0-2 - Drop no longer needed ignore_vaapi.patch diff --git a/sources b/sources index d32f065..2dbc5bd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5a91cea1affe136298db4f6185f78f72 gst-libav-1.10.0.tar.xz +420d0a32f47ef02cc615f8cf6da1e94d gst-libav-1.10.2.tar.xz From 83d94f2836c68b84fd2b512e42f2af079d5135e6 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Mon, 16 Jan 2017 10:53:20 +0000 Subject: [PATCH 030/113] Update to 1.11.1 --- gstreamer1-libav.spec | 9 ++++++--- sources | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index bc5c895..212c95b 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -1,5 +1,5 @@ Name: gstreamer1-libav -Version: 1.10.2 +Version: 1.11.1 Release: 1%{?dist} Summary: GStreamer 1.0 libav-based plug-ins Group: Applications/Multimedia @@ -7,8 +7,8 @@ License: LGPLv2+ URL: http://gstreamer.freedesktop.org/ Source0: http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-%{version}.tar.xz Patch0: gst-ffmpeg-0.10.12-ChangeLog-UTF-8.patch -BuildRequires: gstreamer1-devel >= 1.10.0 -BuildRequires: gstreamer1-plugins-base-devel >= 1.10.0 +BuildRequires: gstreamer1-devel >= 1.11.1 +BuildRequires: gstreamer1-plugins-base-devel >= 1.11.1 BuildRequires: orc-devel BuildRequires: bzip2-devel BuildRequires: zlib-devel @@ -73,6 +73,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/gstreamer-1.0/libgst*.la %changelog +* Mon Jan 16 2017 Leigh Scott - 1.11.1-1 +- Update to 1.11.1 + * Wed Nov 30 2016 leigh scott - 1.10.2-1 - Update to 1.10.2 diff --git a/sources b/sources index 2dbc5bd..2629570 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -420d0a32f47ef02cc615f8cf6da1e94d gst-libav-1.10.2.tar.xz +68cdc0146aabc482839af434d39add1e gst-libav-1.11.1.tar.xz From 2936413b915268c6b7510eedee12befc42e534a7 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Fri, 3 Feb 2017 09:36:17 +0000 Subject: [PATCH 031/113] update macros --- gstreamer1-libav.spec | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index 212c95b..496eb97 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -43,23 +43,22 @@ plug-in. %prep -%setup -q -n gst-libav-%{version} -%patch0 -p1 +%autosetup -q -n gst-libav-%{version} %build -export CFLAGS="$RPM_OPT_FLAGS -Wno-deprecated-declarations" +export CFLAGS="%{optflags} -Wno-deprecated-declarations" %configure --disable-dependency-tracking \ --disable-static \ --with-package-name="gst-libav 1.0 rpmfusion rpm" \ --with-package-origin="http://rpmfusion.org/" \ --with-system-libav -make %{?_smp_mflags} V=1 +%make_build V=1 %install %make_install V=1 -rm $RPM_BUILD_ROOT%{_libdir}/gstreamer-1.0/libgst*.la +rm %{buildroot}%{_libdir}/gstreamer-1.0/libgst*.la %files From 31aa9b46ee531eb28ebdcd692f95c0e68fca02ce Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Fri, 3 Feb 2017 09:42:43 +0000 Subject: [PATCH 032/113] remove -q from autosetup --- gstreamer1-libav.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index 496eb97..469092b 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -43,7 +43,7 @@ plug-in. %prep -%autosetup -q -n gst-libav-%{version} +%autosetup -n gst-libav-%{version} %build From 959f89e98f581071a3559171bebc30945b1d98d8 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Mon, 27 Feb 2017 16:25:28 +0000 Subject: [PATCH 033/113] Use version macro for build requires --- gstreamer1-libav.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index 469092b..9fc66ba 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -7,8 +7,8 @@ License: LGPLv2+ URL: http://gstreamer.freedesktop.org/ Source0: http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-%{version}.tar.xz Patch0: gst-ffmpeg-0.10.12-ChangeLog-UTF-8.patch -BuildRequires: gstreamer1-devel >= 1.11.1 -BuildRequires: gstreamer1-plugins-base-devel >= 1.11.1 +BuildRequires: gstreamer1-devel >= %{version} +BuildRequires: gstreamer1-plugins-base-devel >= %{version} BuildRequires: orc-devel BuildRequires: bzip2-devel BuildRequires: zlib-devel From 8f717c931fcb6649dcd5748312c97788ce04cc03 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Mon, 27 Feb 2017 16:32:29 +0000 Subject: [PATCH 034/113] Update to 1.11.2 --- gstreamer1-libav.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index 9fc66ba..dd7e8a5 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -1,5 +1,5 @@ Name: gstreamer1-libav -Version: 1.11.1 +Version: 1.11.2 Release: 1%{?dist} Summary: GStreamer 1.0 libav-based plug-ins Group: Applications/Multimedia @@ -72,6 +72,9 @@ rm %{buildroot}%{_libdir}/gstreamer-1.0/libgst*.la %changelog +* Mon Feb 27 2017 Leigh Scott - 1.11.2-1 +- Update to 1.11.2 + * Mon Jan 16 2017 Leigh Scott - 1.11.1-1 - Update to 1.11.1 diff --git a/sources b/sources index 2629570..d42d8f0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -68cdc0146aabc482839af434d39add1e gst-libav-1.11.1.tar.xz +4a79e609b71b01fb0d205c99afefc370 gst-libav-1.11.2.tar.xz From 3560fe70c31588e25183c760c87c34246441e863 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sun, 19 Mar 2017 19:34:15 +0100 Subject: [PATCH 035/113] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- gstreamer1-libav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index dd7e8a5..139678b 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -1,6 +1,6 @@ Name: gstreamer1-libav Version: 1.11.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GStreamer 1.0 libav-based plug-ins Group: Applications/Multimedia License: LGPLv2+ @@ -72,6 +72,9 @@ rm %{buildroot}%{_libdir}/gstreamer-1.0/libgst*.la %changelog +* Sun Mar 19 2017 RPM Fusion Release Engineering - 1.11.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Mon Feb 27 2017 Leigh Scott - 1.11.2-1 - Update to 1.11.2 From 54bb0ba53856e70d03aa33fd58b1959a91e2e34f Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Tue, 18 Apr 2017 09:19:37 +0100 Subject: [PATCH 036/113] Update to 1.11.90 --- gstreamer1-libav.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index 139678b..affcee0 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -1,6 +1,6 @@ Name: gstreamer1-libav -Version: 1.11.2 -Release: 2%{?dist} +Version: 1.11.90 +Release: 1%{?dist} Summary: GStreamer 1.0 libav-based plug-ins Group: Applications/Multimedia License: LGPLv2+ @@ -72,6 +72,9 @@ rm %{buildroot}%{_libdir}/gstreamer-1.0/libgst*.la %changelog +* Tue Apr 18 2017 Leigh Scott - 1.11.90-1 +- Update to 1.11.90 + * Sun Mar 19 2017 RPM Fusion Release Engineering - 1.11.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index d42d8f0..0a3f4b5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4a79e609b71b01fb0d205c99afefc370 gst-libav-1.11.2.tar.xz +ed21736c660a865aee2f234935e9b4de gst-libav-1.11.90.tar.xz From 60759fd868eb69912f71f0d3079f0cc84ff33454 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Sat, 29 Apr 2017 13:53:27 +0100 Subject: [PATCH 037/113] Rebuild for ffmpeg update --- gstreamer1-libav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index affcee0..a658dba 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -1,6 +1,6 @@ Name: gstreamer1-libav Version: 1.11.90 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GStreamer 1.0 libav-based plug-ins Group: Applications/Multimedia License: LGPLv2+ @@ -72,6 +72,9 @@ rm %{buildroot}%{_libdir}/gstreamer-1.0/libgst*.la %changelog +* Sat Apr 29 2017 Leigh Scott - 1.11.90-2 +- Rebuild for ffmpeg update + * Tue Apr 18 2017 Leigh Scott - 1.11.90-1 - Update to 1.11.90 From 57114d997a6735bfc65392aa6120c3c4b393c7f5 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Fri, 12 May 2017 10:25:33 +0100 Subject: [PATCH 038/113] Update to 1.12.0 --- gstreamer1-libav.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index a658dba..99d903d 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -1,6 +1,6 @@ Name: gstreamer1-libav -Version: 1.11.90 -Release: 2%{?dist} +Version: 1.12.0 +Release: 1%{?dist} Summary: GStreamer 1.0 libav-based plug-ins Group: Applications/Multimedia License: LGPLv2+ @@ -72,6 +72,9 @@ rm %{buildroot}%{_libdir}/gstreamer-1.0/libgst*.la %changelog +* Fri May 12 2017 Leigh Scott - 1.12.0-1 +- Update to 1.12.0 + * Sat Apr 29 2017 Leigh Scott - 1.11.90-2 - Rebuild for ffmpeg update diff --git a/sources b/sources index 0a3f4b5..27e19dc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ed21736c660a865aee2f234935e9b4de gst-libav-1.11.90.tar.xz +f9c4593947f8484b237c5d9782939ec3 gst-libav-1.12.0.tar.xz From e586fa5e8facf78f26b500fdee30688fdfc832bc Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Wed, 17 May 2017 17:52:10 +0100 Subject: [PATCH 039/113] Rebuilt for f26 ffmpeg bump --- gstreamer1-libav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index 99d903d..6126af3 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -1,6 +1,6 @@ Name: gstreamer1-libav Version: 1.12.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GStreamer 1.0 libav-based plug-ins Group: Applications/Multimedia License: LGPLv2+ @@ -72,6 +72,9 @@ rm %{buildroot}%{_libdir}/gstreamer-1.0/libgst*.la %changelog +* Wed May 17 2017 Leigh Scott - 1.12.0-2 +- Rebuilt for f26 ffmpeg bump + * Fri May 12 2017 Leigh Scott - 1.12.0-1 - Update to 1.12.0 From 03d0a4f26694b7d9746d7838cc5559e25cedf732 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Fri, 23 Jun 2017 16:08:59 +0100 Subject: [PATCH 040/113] Update to 1.12.1 --- gstreamer1-libav.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index 6126af3..5eb052a 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -1,6 +1,6 @@ Name: gstreamer1-libav -Version: 1.12.0 -Release: 2%{?dist} +Version: 1.12.1 +Release: 1%{?dist} Summary: GStreamer 1.0 libav-based plug-ins Group: Applications/Multimedia License: LGPLv2+ @@ -72,6 +72,9 @@ rm %{buildroot}%{_libdir}/gstreamer-1.0/libgst*.la %changelog +* Fri Jun 23 2017 Leigh Scott - 1.12.1-1 +- Update to 1.12.1 + * Wed May 17 2017 Leigh Scott - 1.12.0-2 - Rebuilt for f26 ffmpeg bump diff --git a/sources b/sources index 27e19dc..6a2b0e0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f9c4593947f8484b237c5d9782939ec3 gst-libav-1.12.0.tar.xz +b34c46d1af8a1067543c45209d711b57 gst-libav-1.12.1.tar.xz From 95358e1f9f76e5bfb533ddbc6b8143c4a6143f45 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Tue, 18 Jul 2017 15:56:20 +0100 Subject: [PATCH 041/113] Update to 1.12.2 --- gstreamer1-libav.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index 5eb052a..b2d7087 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -1,5 +1,5 @@ Name: gstreamer1-libav -Version: 1.12.1 +Version: 1.12.2 Release: 1%{?dist} Summary: GStreamer 1.0 libav-based plug-ins Group: Applications/Multimedia @@ -72,6 +72,9 @@ rm %{buildroot}%{_libdir}/gstreamer-1.0/libgst*.la %changelog +* Tue Jul 18 2017 Leigh Scott - 1.12.2-1 +- Update to 1.12.2 + * Fri Jun 23 2017 Leigh Scott - 1.12.1-1 - Update to 1.12.1 diff --git a/sources b/sources index 6a2b0e0..ef93c55 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b34c46d1af8a1067543c45209d711b57 gst-libav-1.12.1.tar.xz +8788aecc032a287227b4bd239d1b998a gst-libav-1.12.2.tar.xz From 703d6ac3fd794181abb822fb5b035f49af60274e Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Thu, 31 Aug 2017 15:56:47 +0200 Subject: [PATCH 042/113] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- gstreamer1-libav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index b2d7087..6751184 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -1,6 +1,6 @@ Name: gstreamer1-libav Version: 1.12.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GStreamer 1.0 libav-based plug-ins Group: Applications/Multimedia License: LGPLv2+ @@ -72,6 +72,9 @@ rm %{buildroot}%{_libdir}/gstreamer-1.0/libgst*.la %changelog +* Thu Aug 31 2017 RPM Fusion Release Engineering - 1.12.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Tue Jul 18 2017 Leigh Scott - 1.12.2-1 - Update to 1.12.2 From 2b98cb96b1dea1efa1f4beab059a975ca169a2df Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Wed, 20 Sep 2017 06:47:38 +0100 Subject: [PATCH 043/113] Update to 1.12.3 --- gstreamer1-libav.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index 6751184..27bdfd0 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -1,6 +1,6 @@ Name: gstreamer1-libav -Version: 1.12.2 -Release: 2%{?dist} +Version: 1.12.3 +Release: 1%{?dist} Summary: GStreamer 1.0 libav-based plug-ins Group: Applications/Multimedia License: LGPLv2+ @@ -72,6 +72,9 @@ rm %{buildroot}%{_libdir}/gstreamer-1.0/libgst*.la %changelog +* Wed Sep 20 2017 Leigh Scott - 1.12.3-1 +- Update to 1.12.3 + * Thu Aug 31 2017 RPM Fusion Release Engineering - 1.12.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild diff --git a/sources b/sources index ef93c55..e247d09 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8788aecc032a287227b4bd239d1b998a gst-libav-1.12.2.tar.xz +81f62d58279108698b321209fc6696ce gst-libav-1.12.3.tar.xz From ead8c83b09e32fb9d046a3663196fea73e7c7f9b Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Mon, 16 Oct 2017 20:15:31 +0100 Subject: [PATCH 044/113] Rebuild for ffmpeg update --- gstreamer1-libav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index 27bdfd0..49efb9e 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -1,6 +1,6 @@ Name: gstreamer1-libav Version: 1.12.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GStreamer 1.0 libav-based plug-ins Group: Applications/Multimedia License: LGPLv2+ @@ -72,6 +72,9 @@ rm %{buildroot}%{_libdir}/gstreamer-1.0/libgst*.la %changelog +* Mon Oct 16 2017 Leigh Scott - 1.12.3-2 +- Rebuild for ffmpeg update + * Wed Sep 20 2017 Leigh Scott - 1.12.3-1 - Update to 1.12.3 From 419d0a80217426c99ec26d8c4949b71f5adedf55 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Sun, 19 Nov 2017 10:02:25 +0000 Subject: [PATCH 045/113] Temporary patch for FFMpeg 3.4 APIs. --- gstreamer1-libav-temp-ffmpeg-3.4-api.patch | 25 ++++++++++++++++++++++ gstreamer1-libav.spec | 10 +++++++-- 2 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 gstreamer1-libav-temp-ffmpeg-3.4-api.patch diff --git a/gstreamer1-libav-temp-ffmpeg-3.4-api.patch b/gstreamer1-libav-temp-ffmpeg-3.4-api.patch new file mode 100644 index 0000000..9558713 --- /dev/null +++ b/gstreamer1-libav-temp-ffmpeg-3.4-api.patch @@ -0,0 +1,25 @@ +--- gst-libav-1.12.3.orig/ext/libav/gstavviddec.c 2017-08-10 17:56:34.000000000 +0200 ++++ gst-libav-1.12.3.orig/ext/libav/gstavviddec.c 2017-11-04 21:48:00.784354386 +0100 +@@ -1525,8 +1525,20 @@ + * See https://bugzilla.gnome.org/show_bug.cgi?id=726020 + */ + GST_VIDEO_DECODER_STREAM_UNLOCK (ffmpegdec); +- len = avcodec_decode_video2 (ffmpegdec->context, +- ffmpegdec->picture, have_data, &packet); ++ *have_data = 0; ++ if (size > 0) { ++ len = avcodec_send_packet(ffmpegdec->context, &packet); ++ if (len == AVERROR(EAGAIN)) { ++ len = 0; ++ } else { ++ len = size; ++ } ++ if (len >= 0) { ++ int result = avcodec_receive_frame(ffmpegdec->context, ffmpegdec->picture); ++ if (result == 0) ++ *have_data = 1; ++ } ++ } + GST_VIDEO_DECODER_STREAM_LOCK (ffmpegdec); + + GST_DEBUG_OBJECT (ffmpegdec, "after decode: len %d, have_data %d", diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index 49efb9e..fe27d80 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -1,12 +1,15 @@ Name: gstreamer1-libav Version: 1.12.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GStreamer 1.0 libav-based plug-ins Group: Applications/Multimedia License: LGPLv2+ URL: http://gstreamer.freedesktop.org/ Source0: http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-%{version}.tar.xz Patch0: gst-ffmpeg-0.10.12-ChangeLog-UTF-8.patch +%if 0%{?fedora} > 27 || 0%{?rhel} > 8 +Patch1: %{name}-temp-ffmpeg-3.4-api.patch +%endif BuildRequires: gstreamer1-devel >= %{version} BuildRequires: gstreamer1-plugins-base-devel >= %{version} BuildRequires: orc-devel @@ -43,7 +46,7 @@ plug-in. %prep -%autosetup -n gst-libav-%{version} +%autosetup -p1 -n gst-libav-%{version} %build @@ -72,6 +75,9 @@ rm %{buildroot}%{_libdir}/gstreamer-1.0/libgst*.la %changelog +* Sat Nov 18 2017 Simone Caronni - 1.12.3-3 +- Temporary patch for FFMpeg 3.4 APIs. + * Mon Oct 16 2017 Leigh Scott - 1.12.3-2 - Rebuild for ffmpeg update From b5e9596926bac9898051822c091db5769d4dca8e Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Mon, 11 Dec 2017 11:36:32 +0000 Subject: [PATCH 046/113] Update to 1.12.4 --- gstreamer1-libav-temp-ffmpeg-3.4-api.patch | 25 ---------------------- gstreamer1-libav.spec | 11 +++++----- sources | 2 +- 3 files changed, 7 insertions(+), 31 deletions(-) delete mode 100644 gstreamer1-libav-temp-ffmpeg-3.4-api.patch diff --git a/gstreamer1-libav-temp-ffmpeg-3.4-api.patch b/gstreamer1-libav-temp-ffmpeg-3.4-api.patch deleted file mode 100644 index 9558713..0000000 --- a/gstreamer1-libav-temp-ffmpeg-3.4-api.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- gst-libav-1.12.3.orig/ext/libav/gstavviddec.c 2017-08-10 17:56:34.000000000 +0200 -+++ gst-libav-1.12.3.orig/ext/libav/gstavviddec.c 2017-11-04 21:48:00.784354386 +0100 -@@ -1525,8 +1525,20 @@ - * See https://bugzilla.gnome.org/show_bug.cgi?id=726020 - */ - GST_VIDEO_DECODER_STREAM_UNLOCK (ffmpegdec); -- len = avcodec_decode_video2 (ffmpegdec->context, -- ffmpegdec->picture, have_data, &packet); -+ *have_data = 0; -+ if (size > 0) { -+ len = avcodec_send_packet(ffmpegdec->context, &packet); -+ if (len == AVERROR(EAGAIN)) { -+ len = 0; -+ } else { -+ len = size; -+ } -+ if (len >= 0) { -+ int result = avcodec_receive_frame(ffmpegdec->context, ffmpegdec->picture); -+ if (result == 0) -+ *have_data = 1; -+ } -+ } - GST_VIDEO_DECODER_STREAM_LOCK (ffmpegdec); - - GST_DEBUG_OBJECT (ffmpegdec, "after decode: len %d, have_data %d", diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index fe27d80..df992a8 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -1,15 +1,12 @@ Name: gstreamer1-libav -Version: 1.12.3 -Release: 3%{?dist} +Version: 1.12.4 +Release: 1%{?dist} Summary: GStreamer 1.0 libav-based plug-ins Group: Applications/Multimedia License: LGPLv2+ URL: http://gstreamer.freedesktop.org/ Source0: http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-%{version}.tar.xz Patch0: gst-ffmpeg-0.10.12-ChangeLog-UTF-8.patch -%if 0%{?fedora} > 27 || 0%{?rhel} > 8 -Patch1: %{name}-temp-ffmpeg-3.4-api.patch -%endif BuildRequires: gstreamer1-devel >= %{version} BuildRequires: gstreamer1-plugins-base-devel >= %{version} BuildRequires: orc-devel @@ -75,6 +72,10 @@ rm %{buildroot}%{_libdir}/gstreamer-1.0/libgst*.la %changelog +* Mon Dec 11 2017 Leigh Scott - 1.12.4-1 +- Update to 1.12.4 +- Remove patch for FFMpeg 3.4 APIs (fixed in ffmpeg-3.4.1) + * Sat Nov 18 2017 Simone Caronni - 1.12.3-3 - Temporary patch for FFMpeg 3.4 APIs. diff --git a/sources b/sources index e247d09..caf32b2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -81f62d58279108698b321209fc6696ce gst-libav-1.12.3.tar.xz +8a851bf2e475e90a3fdac9506e3e4dbd gst-libav-1.12.4.tar.xz From 9891d33643bb37df98a0bba7a1facec89c272569 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Thu, 18 Jan 2018 11:18:37 +0000 Subject: [PATCH 047/113] Rebuilt for ffmpeg-3.5 git --- gstreamer1-libav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index df992a8..efddd7f 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -1,6 +1,6 @@ Name: gstreamer1-libav Version: 1.12.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GStreamer 1.0 libav-based plug-ins Group: Applications/Multimedia License: LGPLv2+ @@ -72,6 +72,9 @@ rm %{buildroot}%{_libdir}/gstreamer-1.0/libgst*.la %changelog +* Thu Jan 18 2018 Leigh Scott - 1.12.4-2 +- Rebuilt for ffmpeg-3.5 git + * Mon Dec 11 2017 Leigh Scott - 1.12.4-1 - Update to 1.12.4 - Remove patch for FFMpeg 3.4 APIs (fixed in ffmpeg-3.4.1) From d075c636c635a05e8a952e854288705d58de384f Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Fri, 19 Jan 2018 09:29:43 +0000 Subject: [PATCH 048/113] Use bundled libav for F28 --- gstreamer1-libav.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index efddd7f..3ed73f4 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -1,6 +1,6 @@ Name: gstreamer1-libav Version: 1.12.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GStreamer 1.0 libav-based plug-ins Group: Applications/Multimedia License: LGPLv2+ @@ -12,7 +12,9 @@ BuildRequires: gstreamer1-plugins-base-devel >= %{version} BuildRequires: orc-devel BuildRequires: bzip2-devel BuildRequires: zlib-devel +%if 0%{?fedora} <= 27 BuildRequires: ffmpeg-devel +%endif %ifarch %{ix86} x86_64 BuildRequires: yasm %endif @@ -52,7 +54,10 @@ export CFLAGS="%{optflags} -Wno-deprecated-declarations" --disable-static \ --with-package-name="gst-libav 1.0 rpmfusion rpm" \ --with-package-origin="http://rpmfusion.org/" \ +%if 0%{?fedora} <= 27 --with-system-libav +%endif + %make_build V=1 @@ -72,6 +77,9 @@ rm %{buildroot}%{_libdir}/gstreamer-1.0/libgst*.la %changelog +* Fri Jan 19 2018 Leigh Scott - 1.12.4-3 +- Use bundled libav for F28 + * Thu Jan 18 2018 Leigh Scott - 1.12.4-2 - Rebuilt for ffmpeg-3.5 git From 24e361fcff06e1ae9c0dc96182d75418c2aa936c Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 28 Feb 2018 15:37:28 -0600 Subject: [PATCH 049/113] 1.13.1 --- gstreamer1-libav.spec | 27 +++++++++++++++------------ sources | 2 +- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index 3ed73f4..d5511df 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -1,20 +1,20 @@ Name: gstreamer1-libav -Version: 1.12.4 -Release: 3%{?dist} +Version: 1.13.1 +Release: 1%{?dist} Summary: GStreamer 1.0 libav-based plug-ins -Group: Applications/Multimedia License: LGPLv2+ URL: http://gstreamer.freedesktop.org/ Source0: http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-%{version}.tar.xz + Patch0: gst-ffmpeg-0.10.12-ChangeLog-UTF-8.patch + BuildRequires: gstreamer1-devel >= %{version} BuildRequires: gstreamer1-plugins-base-devel >= %{version} BuildRequires: orc-devel BuildRequires: bzip2-devel BuildRequires: zlib-devel -%if 0%{?fedora} <= 27 BuildRequires: ffmpeg-devel -%endif + %ifarch %{ix86} x86_64 BuildRequires: yasm %endif @@ -32,7 +32,6 @@ This package provides libav-based GStreamer plug-ins. %package devel-docs Summary: Development documentation for the libav GStreamer plug-in -Group: Development/Libraries Requires: %{name} = %{version}-%{release} BuildArch: noarch @@ -49,21 +48,22 @@ plug-in. %build -export CFLAGS="%{optflags} -Wno-deprecated-declarations" -%configure --disable-dependency-tracking \ +#export CFLAGS="%{optflags} -Wno-deprecated-declarations" +%configure \ + --disable-silent-rules --disable-fatal-warnings \ + --disable-dependency-tracking \ --disable-static \ --with-package-name="gst-libav 1.0 rpmfusion rpm" \ - --with-package-origin="http://rpmfusion.org/" \ -%if 0%{?fedora} <= 27 + --with-package-origin="http://rpmfusion.org/" \ --with-system-libav -%endif %make_build V=1 %install %make_install V=1 -rm %{buildroot}%{_libdir}/gstreamer-1.0/libgst*.la + +rm -fv %{buildroot}%{_libdir}/gstreamer-1.0/libgst*.la %files @@ -77,6 +77,9 @@ rm %{buildroot}%{_libdir}/gstreamer-1.0/libgst*.la %changelog +* Wed Feb 28 2018 Rex Dieter - 1.13.1-1 +- 1.13.1 + * Fri Jan 19 2018 Leigh Scott - 1.12.4-3 - Use bundled libav for F28 diff --git a/sources b/sources index caf32b2..83c421f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8a851bf2e475e90a3fdac9506e3e4dbd gst-libav-1.12.4.tar.xz +3bdc63bc0114a124cbcf48c97c935d30 gst-libav-1.13.1.tar.xz From 75da098f014dd1f181e2dbfc85710441876149fd Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Sun, 4 Mar 2018 09:26:02 +0000 Subject: [PATCH 050/113] Use bundled libav for F28 as it doesn't build with ffmpeg git --- gstreamer1-libav.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index d5511df..428ef6e 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -1,6 +1,6 @@ Name: gstreamer1-libav Version: 1.13.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GStreamer 1.0 libav-based plug-ins License: LGPLv2+ URL: http://gstreamer.freedesktop.org/ @@ -13,7 +13,9 @@ BuildRequires: gstreamer1-plugins-base-devel >= %{version} BuildRequires: orc-devel BuildRequires: bzip2-devel BuildRequires: zlib-devel +%if 0%{?fedora} <= 27 BuildRequires: ffmpeg-devel +%endif %ifarch %{ix86} x86_64 BuildRequires: yasm @@ -55,7 +57,9 @@ plug-in. --disable-static \ --with-package-name="gst-libav 1.0 rpmfusion rpm" \ --with-package-origin="http://rpmfusion.org/" \ +%if 0%{?fedora} <= 27 --with-system-libav +%endif %make_build V=1 @@ -77,6 +81,9 @@ rm -fv %{buildroot}%{_libdir}/gstreamer-1.0/libgst*.la %changelog +* Sun Mar 04 2018 Leigh Scott - 1.13.1-2 +- Use bundled libav for F28 as it doesn't build with ffmpeg git + * Wed Feb 28 2018 Rex Dieter - 1.13.1-1 - 1.13.1 From 9beb7fb4ceb4569fe06d51ac0ee7b9927717c89d Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 22 Mar 2018 10:05:00 -0500 Subject: [PATCH 051/113] Update to 1.14.0 --- gstreamer1-libav.spec | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index 428ef6e..9058592 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -1,6 +1,6 @@ Name: gstreamer1-libav -Version: 1.13.1 -Release: 2%{?dist} +Version: 1.14.0 +Release: 1%{?dist} Summary: GStreamer 1.0 libav-based plug-ins License: LGPLv2+ URL: http://gstreamer.freedesktop.org/ @@ -13,7 +13,9 @@ BuildRequires: gstreamer1-plugins-base-devel >= %{version} BuildRequires: orc-devel BuildRequires: bzip2-devel BuildRequires: zlib-devel -%if 0%{?fedora} <= 27 +## Use bundled libav as it doesn't build with F28+ ffmpeg git +%if 0%{?fedora} < 28 +%global with_system_libav --with-system-libav BuildRequires: ffmpeg-devel %endif @@ -50,16 +52,13 @@ plug-in. %build -#export CFLAGS="%{optflags} -Wno-deprecated-declarations" %configure \ --disable-silent-rules --disable-fatal-warnings \ --disable-dependency-tracking \ --disable-static \ --with-package-name="gst-libav 1.0 rpmfusion rpm" \ --with-package-origin="http://rpmfusion.org/" \ -%if 0%{?fedora} <= 27 - --with-system-libav -%endif + %{?_with_system_libav} %make_build V=1 @@ -81,6 +80,9 @@ rm -fv %{buildroot}%{_libdir}/gstreamer-1.0/libgst*.la %changelog +* Thu Mar 22 2018 Rex Dieter - 1.14.0-1 +- Update to 1.14.0 + * Sun Mar 04 2018 Leigh Scott - 1.13.1-2 - Use bundled libav for F28 as it doesn't build with ffmpeg git From 4a7ba2dc7a1a69a546673c5ca7ee0d2b112569ed Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 22 Mar 2018 10:09:41 -0500 Subject: [PATCH 052/113] new-sources --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index 83c421f..57e7110 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3bdc63bc0114a124cbcf48c97c935d30 gst-libav-1.13.1.tar.xz +943045b9e937ffc5c6cfa0bd5c44230d gst-libav-1.14.0.tar.xz From 0037cbe1947a788e13a3da1c507061b02d6c330c Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 31 May 2018 08:10:59 -0500 Subject: [PATCH 053/113] 1.14.1 --- gstreamer1-libav.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index 9058592..40208af 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -1,5 +1,5 @@ Name: gstreamer1-libav -Version: 1.14.0 +Version: 1.14.1 Release: 1%{?dist} Summary: GStreamer 1.0 libav-based plug-ins License: LGPLv2+ @@ -80,6 +80,9 @@ rm -fv %{buildroot}%{_libdir}/gstreamer-1.0/libgst*.la %changelog +* Thu May 31 2018 Rex Dieter - 1.14.1-1 +- 1.14.1 + * Thu Mar 22 2018 Rex Dieter - 1.14.0-1 - Update to 1.14.0 diff --git a/sources b/sources index 57e7110..bc401ac 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -943045b9e937ffc5c6cfa0bd5c44230d gst-libav-1.14.0.tar.xz +d57b0052f6eccb8e6762def05995133c gst-libav-1.14.1.tar.xz From a8ffa2efac5d46ccf08f97e2e28c8dc338a473c7 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Thu, 26 Jul 2018 22:13:17 +0100 Subject: [PATCH 054/113] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: leigh123linux --- gstreamer1-libav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index 40208af..c8ded49 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -1,6 +1,6 @@ Name: gstreamer1-libav Version: 1.14.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GStreamer 1.0 libav-based plug-ins License: LGPLv2+ URL: http://gstreamer.freedesktop.org/ @@ -80,6 +80,9 @@ rm -fv %{buildroot}%{_libdir}/gstreamer-1.0/libgst*.la %changelog +* Thu Jul 26 2018 RPM Fusion Release Engineering - 1.14.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Thu May 31 2018 Rex Dieter - 1.14.1-1 - 1.14.1 From 7463e768ac2bb8a4a0f1b649d4382a4d8d1aff06 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 18 Aug 2018 08:45:51 -0500 Subject: [PATCH 055/113] 1.14.2 --- gstreamer1-libav.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index c8ded49..6bf38c5 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -1,6 +1,6 @@ Name: gstreamer1-libav -Version: 1.14.1 -Release: 2%{?dist} +Version: 1.14.2 +Release: 1%{?dist} Summary: GStreamer 1.0 libav-based plug-ins License: LGPLv2+ URL: http://gstreamer.freedesktop.org/ @@ -80,6 +80,9 @@ rm -fv %{buildroot}%{_libdir}/gstreamer-1.0/libgst*.la %changelog +* Sat Aug 18 2018 Rex Dieter - 1.14.2-1 +- 1.14.2 + * Thu Jul 26 2018 RPM Fusion Release Engineering - 1.14.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index bc401ac..a7bc8bb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d57b0052f6eccb8e6762def05995133c gst-libav-1.14.1.tar.xz +da3d4655268bc6766a261065ca737590 gst-libav-1.14.2.tar.xz From afb97d9767ef4d8d553cbf801dedf9ecb6d52d71 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Tue, 18 Sep 2018 11:10:15 +0100 Subject: [PATCH 056/113] 1.14.3 --- gstreamer1-libav.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index 6bf38c5..a4502c0 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -1,5 +1,5 @@ Name: gstreamer1-libav -Version: 1.14.2 +Version: 1.14.3 Release: 1%{?dist} Summary: GStreamer 1.0 libav-based plug-ins License: LGPLv2+ @@ -80,6 +80,9 @@ rm -fv %{buildroot}%{_libdir}/gstreamer-1.0/libgst*.la %changelog +* Tue Sep 18 2018 Leigh Scott - 1.14.3-1 +- 1.14.3 + * Sat Aug 18 2018 Rex Dieter - 1.14.2-1 - 1.14.2 diff --git a/sources b/sources index a7bc8bb..3a22b13 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -da3d4655268bc6766a261065ca737590 gst-libav-1.14.2.tar.xz +e4a2ad307f101b53c7d417d4d0b36955 gst-libav-1.14.3.tar.xz From 40fed44a1400f6dae6e4d4d512da371b6018a313 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Tue, 18 Sep 2018 11:26:52 +0100 Subject: [PATCH 057/113] Add BuildRequires: gcc --- gstreamer1-libav.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index a4502c0..da4f94a 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -8,6 +8,7 @@ Source0: http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-%{versi Patch0: gst-ffmpeg-0.10.12-ChangeLog-UTF-8.patch +BuildRequires: gcc BuildRequires: gstreamer1-devel >= %{version} BuildRequires: gstreamer1-plugins-base-devel >= %{version} BuildRequires: orc-devel From 9e5537dce09866944671c3dc964574a20f521d60 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 9 Oct 2018 15:15:27 -0500 Subject: [PATCH 058/113] 1.14.4 --- gstreamer1-libav.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index da4f94a..c378a1e 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -1,5 +1,5 @@ Name: gstreamer1-libav -Version: 1.14.3 +Version: 1.14.4 Release: 1%{?dist} Summary: GStreamer 1.0 libav-based plug-ins License: LGPLv2+ @@ -81,6 +81,9 @@ rm -fv %{buildroot}%{_libdir}/gstreamer-1.0/libgst*.la %changelog +* Tue Oct 09 2018 Rex Dieter - 1.14.4-1 +- 1.14.4 + * Tue Sep 18 2018 Leigh Scott - 1.14.3-1 - 1.14.3 diff --git a/sources b/sources index 3a22b13..ea65ccb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e4a2ad307f101b53c7d417d4d0b36955 gst-libav-1.14.3.tar.xz +58342db11dbb201a66a62577dcf7bab5 gst-libav-1.14.4.tar.xz From 1b944a0f841cd7099a82a91df1ca718a52b9fe01 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Sat, 9 Feb 2019 08:34:05 +0000 Subject: [PATCH 059/113] update to 1.15.1 and switch back to system ffmpeg --- gstreamer1-libav.spec | 11 +++++------ sources | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index c378a1e..45fa1f1 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -1,5 +1,5 @@ Name: gstreamer1-libav -Version: 1.14.4 +Version: 1.15.1 Release: 1%{?dist} Summary: GStreamer 1.0 libav-based plug-ins License: LGPLv2+ @@ -14,11 +14,7 @@ BuildRequires: gstreamer1-plugins-base-devel >= %{version} BuildRequires: orc-devel BuildRequires: bzip2-devel BuildRequires: zlib-devel -## Use bundled libav as it doesn't build with F28+ ffmpeg git -%if 0%{?fedora} < 28 -%global with_system_libav --with-system-libav BuildRequires: ffmpeg-devel -%endif %ifarch %{ix86} x86_64 BuildRequires: yasm @@ -59,7 +55,7 @@ plug-in. --disable-static \ --with-package-name="gst-libav 1.0 rpmfusion rpm" \ --with-package-origin="http://rpmfusion.org/" \ - %{?_with_system_libav} + --with-system-libav %make_build V=1 @@ -81,6 +77,9 @@ rm -fv %{buildroot}%{_libdir}/gstreamer-1.0/libgst*.la %changelog +* Sat Feb 09 2019 Leigh Scott - 1.15.1-1 +- 1.15.1 + * Tue Oct 09 2018 Rex Dieter - 1.14.4-1 - 1.14.4 diff --git a/sources b/sources index ea65ccb..143ef33 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -58342db11dbb201a66a62577dcf7bab5 gst-libav-1.14.4.tar.xz +f8aaeed8baeae147ea4178f7611db193 gst-libav-1.15.1.tar.xz From abca2cb7328405bb79cc5fed7abb1a82962953dc Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Mon, 4 Mar 2019 11:39:34 +0000 Subject: [PATCH 060/113] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Leigh Scott --- gstreamer1-libav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index 45fa1f1..64eea76 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -1,6 +1,6 @@ Name: gstreamer1-libav Version: 1.15.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GStreamer 1.0 libav-based plug-ins License: LGPLv2+ URL: http://gstreamer.freedesktop.org/ @@ -77,6 +77,9 @@ rm -fv %{buildroot}%{_libdir}/gstreamer-1.0/libgst*.la %changelog +* Mon Mar 04 2019 RPM Fusion Release Engineering - 1.15.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sat Feb 09 2019 Leigh Scott - 1.15.1-1 - 1.15.1 From 72ce57cd882fb3bc2912cc7a82fd3a571ad3d113 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Tue, 19 Mar 2019 18:15:00 +0000 Subject: [PATCH 061/113] 1.15.2 --- gstreamer1-libav.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index 64eea76..cad2d05 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -1,6 +1,6 @@ Name: gstreamer1-libav -Version: 1.15.1 -Release: 2%{?dist} +Version: 1.15.2 +Release: 1%{?dist} Summary: GStreamer 1.0 libav-based plug-ins License: LGPLv2+ URL: http://gstreamer.freedesktop.org/ @@ -77,6 +77,9 @@ rm -fv %{buildroot}%{_libdir}/gstreamer-1.0/libgst*.la %changelog +* Tue Mar 19 2019 Leigh Scott - 1.15.2-1 +- 1.15.2 + * Mon Mar 04 2019 RPM Fusion Release Engineering - 1.15.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index 143ef33..95e15ea 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f8aaeed8baeae147ea4178f7611db193 gst-libav-1.15.1.tar.xz +0c8a2d43c30d02ba3bc87878a1aa610b gst-libav-1.15.2.tar.xz From 5195e91fadd0fda3eba0e56b77a870b333c82178 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Wed, 24 Apr 2019 17:38:49 +0100 Subject: [PATCH 062/113] 1.16.0 --- gstreamer1-libav.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index cad2d05..9f2a493 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -1,5 +1,5 @@ Name: gstreamer1-libav -Version: 1.15.2 +Version: 1.16.0 Release: 1%{?dist} Summary: GStreamer 1.0 libav-based plug-ins License: LGPLv2+ @@ -77,6 +77,9 @@ rm -fv %{buildroot}%{_libdir}/gstreamer-1.0/libgst*.la %changelog +* Wed Apr 24 2019 Leigh Scott - 1.16.0-1 +- 1.16.0 + * Tue Mar 19 2019 Leigh Scott - 1.15.2-1 - 1.15.2 diff --git a/sources b/sources index 95e15ea..03673b6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0c8a2d43c30d02ba3bc87878a1aa610b gst-libav-1.15.2.tar.xz +e3a201a45985ddc1327cd496046ca818 gst-libav-1.16.0.tar.xz From 1bb5752969bbe079e359ef02dae46d31cd43bbeb Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Wed, 7 Aug 2019 14:00:38 +0100 Subject: [PATCH 063/113] Rebuild for new ffmpeg version --- gstreamer1-libav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index 9f2a493..31ffb89 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -1,6 +1,6 @@ Name: gstreamer1-libav Version: 1.16.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GStreamer 1.0 libav-based plug-ins License: LGPLv2+ URL: http://gstreamer.freedesktop.org/ @@ -77,6 +77,9 @@ rm -fv %{buildroot}%{_libdir}/gstreamer-1.0/libgst*.la %changelog +* Wed Aug 07 2019 Leigh Scott - 1.16.0-2 +- Rebuild for new ffmpeg version + * Wed Apr 24 2019 Leigh Scott - 1.16.0-1 - 1.16.0 From 2b921d3e295fa6d3a329a43887b46c420f3a9bea Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Wed, 25 Sep 2019 09:37:23 +0100 Subject: [PATCH 064/113] 1.16.1 --- gstreamer1-libav.spec | 11 +++++++---- sources | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index 31ffb89..8672279 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -1,10 +1,10 @@ Name: gstreamer1-libav -Version: 1.16.0 -Release: 2%{?dist} +Version: 1.16.1 +Release: 1%{?dist} Summary: GStreamer 1.0 libav-based plug-ins License: LGPLv2+ -URL: http://gstreamer.freedesktop.org/ -Source0: http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-%{version}.tar.xz +URL: https://gstreamer.freedesktop.org/ +Source0: %{url}/src/gst-libav/gst-libav-%{version}.tar.xz Patch0: gst-ffmpeg-0.10.12-ChangeLog-UTF-8.patch @@ -77,6 +77,9 @@ rm -fv %{buildroot}%{_libdir}/gstreamer-1.0/libgst*.la %changelog +* Wed Sep 25 2019 Leigh Scott - 1.16.1-1 +- 1.16.1 + * Wed Aug 07 2019 Leigh Scott - 1.16.0-2 - Rebuild for new ffmpeg version diff --git a/sources b/sources index 03673b6..606bd65 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e3a201a45985ddc1327cd496046ca818 gst-libav-1.16.0.tar.xz +SHA512 (gst-libav-1.16.1.tar.xz) = 4b5a56ffc8f1ed6fcc59e69504ee45e2738b80cbcbd9e3f8dc4ff0c14a822ab5b6baa048dd408016fddba7f1da410790e854f7b8d6a58d2ae10a755e141a6d70 From b3c1470fc981d8f9b45999565de495c13495ad64 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Sat, 1 Feb 2020 10:21:26 +0000 Subject: [PATCH 065/113] 1.16.2 --- gstreamer1-libav.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index 8672279..31ec28e 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -1,5 +1,5 @@ Name: gstreamer1-libav -Version: 1.16.1 +Version: 1.16.2 Release: 1%{?dist} Summary: GStreamer 1.0 libav-based plug-ins License: LGPLv2+ @@ -77,6 +77,9 @@ rm -fv %{buildroot}%{_libdir}/gstreamer-1.0/libgst*.la %changelog +* Sat Feb 01 2020 Leigh Scott - 1.16.2-1 +- 1.16.2 + * Wed Sep 25 2019 Leigh Scott - 1.16.1-1 - 1.16.1 diff --git a/sources b/sources index 606bd65..c4a5006 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gst-libav-1.16.1.tar.xz) = 4b5a56ffc8f1ed6fcc59e69504ee45e2738b80cbcbd9e3f8dc4ff0c14a822ab5b6baa048dd408016fddba7f1da410790e854f7b8d6a58d2ae10a755e141a6d70 +SHA512 (gst-libav-1.16.2.tar.xz) = 10817dec823b8ca84372d16e36c4ee11ab7a96a9168418f4c0bd0909fbda0ff45426bd3f754d7d491d4b07a51ec7eaa8e065e7e5c1daa120828c35a68adb312d From 361b87982e94a42febf1a99eb65e72796b242228 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Tue, 4 Feb 2020 19:29:39 +0000 Subject: [PATCH 066/113] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: leigh123linux --- gstreamer1-libav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index 31ec28e..d171ecd 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -1,6 +1,6 @@ Name: gstreamer1-libav Version: 1.16.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GStreamer 1.0 libav-based plug-ins License: LGPLv2+ URL: https://gstreamer.freedesktop.org/ @@ -77,6 +77,9 @@ rm -fv %{buildroot}%{_libdir}/gstreamer-1.0/libgst*.la %changelog +* Tue Feb 04 2020 RPM Fusion Release Engineering - 1.16.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Sat Feb 01 2020 Leigh Scott - 1.16.2-1 - 1.16.2 From 5c3358fe4f2add8f21c6430c932ee038e862917c Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Thu, 12 Mar 2020 17:49:58 +0000 Subject: [PATCH 067/113] Rebuilt for i686 --- gstreamer1-libav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index d171ecd..77a70a3 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -1,6 +1,6 @@ Name: gstreamer1-libav Version: 1.16.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GStreamer 1.0 libav-based plug-ins License: LGPLv2+ URL: https://gstreamer.freedesktop.org/ @@ -77,6 +77,9 @@ rm -fv %{buildroot}%{_libdir}/gstreamer-1.0/libgst*.la %changelog +* Thu Mar 12 2020 Leigh Scott - 1.16.2-3 +- Rebuilt for i686 + * Tue Feb 04 2020 RPM Fusion Release Engineering - 1.16.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 7a00c5c0093d77224b0b6834978b171cd1e9fb20 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Mon, 22 Jun 2020 15:59:54 +0100 Subject: [PATCH 068/113] 1.17.1 --- gstreamer1-libav.spec | 41 ++++++++++++++++++++--------------------- sources | 2 +- 2 files changed, 21 insertions(+), 22 deletions(-) diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index 77a70a3..140d7bb 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -1,14 +1,13 @@ Name: gstreamer1-libav -Version: 1.16.2 -Release: 3%{?dist} +Version: 1.17.1 +Release: 1%{?dist} Summary: GStreamer 1.0 libav-based plug-ins License: LGPLv2+ URL: https://gstreamer.freedesktop.org/ Source0: %{url}/src/gst-libav/gst-libav-%{version}.tar.xz -Patch0: gst-ffmpeg-0.10.12-ChangeLog-UTF-8.patch - -BuildRequires: gcc +BuildRequires: gcc-c++ +BuildRequires: meson BuildRequires: gstreamer1-devel >= %{version} BuildRequires: gstreamer1-plugins-base-devel >= %{version} BuildRequires: orc-devel @@ -30,7 +29,8 @@ plugins. This package provides libav-based GStreamer plug-ins. - +%if 0 +# gstreamer1 uses hotdoc which isn't provided yet %package devel-docs Summary: Development documentation for the libav GStreamer plug-in Requires: %{name} = %{version}-%{release} @@ -42,6 +42,7 @@ operate on media data. This package contains the development documentation for the libav GStreamer plug-in. +%endif %prep @@ -49,34 +50,32 @@ plug-in. %build -%configure \ - --disable-silent-rules --disable-fatal-warnings \ - --disable-dependency-tracking \ - --disable-static \ - --with-package-name="gst-libav 1.0 rpmfusion rpm" \ - --with-package-origin="http://rpmfusion.org/" \ - --with-system-libav - -%make_build V=1 +%meson \ + -D package-name='gst-libav 1.0 rpmfusion rpm' \ + -D package-origin='http://rpmfusion.org/' \ + -D doc=disabled +%meson_build %install -%make_install V=1 - -rm -fv %{buildroot}%{_libdir}/gstreamer-1.0/libgst*.la +%meson_install %files -%doc AUTHORS ChangeLog NEWS README TODO -%license COPYING.LIB +%doc AUTHORS ChangeLog NEWS README.md +%license COPYING %{_libdir}/gstreamer-1.0/libgstlibav.so +%if 0 %files devel-docs # Take the dir and everything below it for proper dir ownership %doc %{_datadir}/gtk-doc - +%endif %changelog +* Mon Jun 22 2020 Leigh Scott - 1.17.1-1 +- 1.17.1 + * Thu Mar 12 2020 Leigh Scott - 1.16.2-3 - Rebuilt for i686 diff --git a/sources b/sources index c4a5006..72ee460 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gst-libav-1.16.2.tar.xz) = 10817dec823b8ca84372d16e36c4ee11ab7a96a9168418f4c0bd0909fbda0ff45426bd3f754d7d491d4b07a51ec7eaa8e065e7e5c1daa120828c35a68adb312d +SHA512 (gst-libav-1.17.1.tar.xz) = 74789d6f5e008d73fef563f18d5f065fcf88cd372ed19b1036ebe351d5d3bb316e26b9131ecc97d84db330e44942fd9d2800b40915bc1bc4541e6d31c8ce27b0 From 6483c235ab4e0a355a6a9064084541c69d3b12f9 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Wed, 8 Jul 2020 10:01:13 +0100 Subject: [PATCH 069/113] 1.17.2 --- gstreamer1-libav.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index 140d7bb..dd031c8 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -1,5 +1,5 @@ Name: gstreamer1-libav -Version: 1.17.1 +Version: 1.17.2 Release: 1%{?dist} Summary: GStreamer 1.0 libav-based plug-ins License: LGPLv2+ @@ -73,6 +73,9 @@ plug-in. %endif %changelog +* Wed Jul 08 2020 Leigh Scott - 1.17.2-1 +- 1.17.2 + * Mon Jun 22 2020 Leigh Scott - 1.17.1-1 - 1.17.1 diff --git a/sources b/sources index 72ee460..075a7e3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gst-libav-1.17.1.tar.xz) = 74789d6f5e008d73fef563f18d5f065fcf88cd372ed19b1036ebe351d5d3bb316e26b9131ecc97d84db330e44942fd9d2800b40915bc1bc4541e6d31c8ce27b0 +SHA512 (gst-libav-1.17.2.tar.xz) = 1bd82e94953575a2a101abfee226c298a7426bbb4a43147f70118f724f1c36fbcb3238541d5d22bb9cb4e01ef864496a1f30902c8fa5c4b58e9a74012e5e4b0e From d8995bba3be2521e950665fa982c28b229ac8000 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Tue, 18 Aug 2020 09:20:41 +0100 Subject: [PATCH 070/113] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Leigh Scott --- gstreamer1-libav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index dd031c8..2d1ebd5 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -1,6 +1,6 @@ Name: gstreamer1-libav Version: 1.17.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GStreamer 1.0 libav-based plug-ins License: LGPLv2+ URL: https://gstreamer.freedesktop.org/ @@ -73,6 +73,9 @@ plug-in. %endif %changelog +* Tue Aug 18 2020 RPM Fusion Release Engineering - 1.17.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed Jul 08 2020 Leigh Scott - 1.17.2-1 - 1.17.2 From ce392aeb93a37f4016eb1f11626c43c94633e7bf Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Sun, 23 Aug 2020 14:24:12 +0100 Subject: [PATCH 071/113] 1.17.90 --- gstreamer1-libav.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index 2d1ebd5..1c4ebe6 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -1,6 +1,6 @@ Name: gstreamer1-libav -Version: 1.17.2 -Release: 2%{?dist} +Version: 1.17.90 +Release: 1%{?dist} Summary: GStreamer 1.0 libav-based plug-ins License: LGPLv2+ URL: https://gstreamer.freedesktop.org/ @@ -73,6 +73,9 @@ plug-in. %endif %changelog +* Sun Aug 23 2020 Leigh Scott - 1.17.90-1 +- 1.17.90 + * Tue Aug 18 2020 RPM Fusion Release Engineering - 1.17.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 075a7e3..8579689 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gst-libav-1.17.2.tar.xz) = 1bd82e94953575a2a101abfee226c298a7426bbb4a43147f70118f724f1c36fbcb3238541d5d22bb9cb4e01ef864496a1f30902c8fa5c4b58e9a74012e5e4b0e +SHA512 (gst-libav-1.17.90.tar.xz) = 2287134fde9ae6ef4ae6947c33965f4045d10568c43839c758ae380ac739fb787dd1ad40b422f34b74a714fb63aff9fc5f0cb4eccfddba2bb72f30c6300bf719 From 279564152a4d5d9f549060fcde3d097bb19a1b2f Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Mon, 24 Aug 2020 10:13:13 +0100 Subject: [PATCH 072/113] Remove build requires yasm --- gstreamer1-libav.spec | 4 ---- 1 file changed, 4 deletions(-) diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index 1c4ebe6..cc6cbae 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -15,10 +15,6 @@ BuildRequires: bzip2-devel BuildRequires: zlib-devel BuildRequires: ffmpeg-devel -%ifarch %{ix86} x86_64 -BuildRequires: yasm -%endif - %description GStreamer is a streaming media framework, based on graphs of filters which operate on media data. Applications using this library can do anything From 90b15ea177c92caad5e88b7d03cfcd93c4cfa990 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Wed, 9 Sep 2020 19:10:57 +0100 Subject: [PATCH 073/113] 1.18.0 --- gstreamer1-libav.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index cc6cbae..addd088 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -1,5 +1,5 @@ Name: gstreamer1-libav -Version: 1.17.90 +Version: 1.18.0 Release: 1%{?dist} Summary: GStreamer 1.0 libav-based plug-ins License: LGPLv2+ @@ -69,6 +69,9 @@ plug-in. %endif %changelog +* Wed Sep 9 2020 Leigh Scott - 1.18.0-1 +- 1.18.0 + * Sun Aug 23 2020 Leigh Scott - 1.17.90-1 - 1.17.90 diff --git a/sources b/sources index 8579689..58079e6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gst-libav-1.17.90.tar.xz) = 2287134fde9ae6ef4ae6947c33965f4045d10568c43839c758ae380ac739fb787dd1ad40b422f34b74a714fb63aff9fc5f0cb4eccfddba2bb72f30c6300bf719 +SHA512 (gst-libav-1.18.0.tar.xz) = f2740cc75059bc8d816ca92a2881e7e6d4d235bb0ae55bb51a6a7b8ecca84144524ba5fc79849d79f5d3f251265b75dc019a0bbe5ee008456f81348a9b488066 From e32edc99c4d9a3d1ea545335cb8d4ec29f5dfe7a Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Sun, 1 Nov 2020 23:33:32 +0000 Subject: [PATCH 074/113] 1.18.1 --- gstreamer1-libav.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index addd088..1eb5d97 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -1,5 +1,5 @@ Name: gstreamer1-libav -Version: 1.18.0 +Version: 1.18.1 Release: 1%{?dist} Summary: GStreamer 1.0 libav-based plug-ins License: LGPLv2+ @@ -69,6 +69,9 @@ plug-in. %endif %changelog +* Sun Nov 1 2020 Leigh Scott - 1.18.1-1 +- 1.18.1 + * Wed Sep 9 2020 Leigh Scott - 1.18.0-1 - 1.18.0 diff --git a/sources b/sources index 58079e6..0909e7d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gst-libav-1.18.0.tar.xz) = f2740cc75059bc8d816ca92a2881e7e6d4d235bb0ae55bb51a6a7b8ecca84144524ba5fc79849d79f5d3f251265b75dc019a0bbe5ee008456f81348a9b488066 +SHA512 (gst-libav-1.18.1.tar.xz) = 1e0961c86456e43a14c8f5656562f3c910b6c52a8280e67042cc6d33498d28c97f2f650beb530dd3b23946dccb62b89587eca38e10f0d6e15645aee8d193046a From 2efa58f6d06cb7af7417fb63286387fee05da911 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Sun, 13 Dec 2020 10:31:52 +0000 Subject: [PATCH 075/113] 1.18.2 --- gstreamer1-libav.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index 1eb5d97..ca1b084 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -1,5 +1,5 @@ Name: gstreamer1-libav -Version: 1.18.1 +Version: 1.18.2 Release: 1%{?dist} Summary: GStreamer 1.0 libav-based plug-ins License: LGPLv2+ @@ -69,6 +69,9 @@ plug-in. %endif %changelog +* Sun Dec 13 2020 Leigh Scott - 1.18.2-1 +- 1.18.2 + * Sun Nov 1 2020 Leigh Scott - 1.18.1-1 - 1.18.1 diff --git a/sources b/sources index 0909e7d..df112a3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gst-libav-1.18.1.tar.xz) = 1e0961c86456e43a14c8f5656562f3c910b6c52a8280e67042cc6d33498d28c97f2f650beb530dd3b23946dccb62b89587eca38e10f0d6e15645aee8d193046a +SHA512 (gst-libav-1.18.2.tar.xz) = ad57fd08c87ecbc64adc3f904f66e2454abe9e6a2a53fbb0bab73a972a072c649d060fb0f1186e204bd5978587b0d7afe6c1b9d049b23d976b4250757097507e From 90385a94d5638213c39ba70ef6f5de7aedbeb5ba Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Thu, 31 Dec 2020 20:57:30 +0000 Subject: [PATCH 076/113] Rebuilt for new ffmpeg snapshot --- gstreamer1-libav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index ca1b084..00e5dd3 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -1,6 +1,6 @@ Name: gstreamer1-libav Version: 1.18.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GStreamer 1.0 libav-based plug-ins License: LGPLv2+ URL: https://gstreamer.freedesktop.org/ @@ -69,6 +69,9 @@ plug-in. %endif %changelog +* Thu Dec 31 2020 Leigh Scott - 1.18.2-2 +- Rebuilt for new ffmpeg snapshot + * Sun Dec 13 2020 Leigh Scott - 1.18.2-1 - 1.18.2 From 149bc9efc2b1b32cd08eea372ef8b098691be9bb Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Thu, 31 Dec 2020 21:31:27 +0000 Subject: [PATCH 077/113] Use builtin libav --- gstreamer1-libav.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index 00e5dd3..fcd5e8a 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -1,3 +1,5 @@ +%global builtin_libav 1 + Name: gstreamer1-libav Version: 1.18.2 Release: 2%{?dist} @@ -13,7 +15,7 @@ BuildRequires: gstreamer1-plugins-base-devel >= %{version} BuildRequires: orc-devel BuildRequires: bzip2-devel BuildRequires: zlib-devel -BuildRequires: ffmpeg-devel +%{!?builtin_libav:BuildRequires: ffmpeg-devel} %description GStreamer is a streaming media framework, based on graphs of filters which From 747c96a94e4e2cd974fcfd91ed539cf463d92ac0 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Thu, 31 Dec 2020 21:44:05 +0000 Subject: [PATCH 078/113] Revert "Use builtin libav" This reverts commit 149bc9efc2b1b32cd08eea372ef8b098691be9bb. --- gstreamer1-libav.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index fcd5e8a..00e5dd3 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -1,5 +1,3 @@ -%global builtin_libav 1 - Name: gstreamer1-libav Version: 1.18.2 Release: 2%{?dist} @@ -15,7 +13,7 @@ BuildRequires: gstreamer1-plugins-base-devel >= %{version} BuildRequires: orc-devel BuildRequires: bzip2-devel BuildRequires: zlib-devel -%{!?builtin_libav:BuildRequires: ffmpeg-devel} +BuildRequires: ffmpeg-devel %description GStreamer is a streaming media framework, based on graphs of filters which From 2ec5fa999a950ac622d90596b473afef84315fb5 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Wed, 3 Feb 2021 11:40:00 +0000 Subject: [PATCH 079/113] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Leigh Scott --- gstreamer1-libav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index 00e5dd3..b371396 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -1,6 +1,6 @@ Name: gstreamer1-libav Version: 1.18.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GStreamer 1.0 libav-based plug-ins License: LGPLv2+ URL: https://gstreamer.freedesktop.org/ @@ -69,6 +69,9 @@ plug-in. %endif %changelog +* Wed Feb 03 2021 RPM Fusion Release Engineering - 1.18.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Thu Dec 31 2020 Leigh Scott - 1.18.2-2 - Rebuilt for new ffmpeg snapshot From 787f45edf6bf31de4e04b24cd148af9ac26f0f66 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Sun, 28 Feb 2021 13:55:38 +0000 Subject: [PATCH 080/113] Add patch for ffmpeg-4.4 --- gstreamer1-libav-ffmpeg44-fix.patch | 223 ++++++++++++++++++++++++++++ gstreamer1-libav.spec | 6 +- 2 files changed, 228 insertions(+), 1 deletion(-) create mode 100644 gstreamer1-libav-ffmpeg44-fix.patch diff --git a/gstreamer1-libav-ffmpeg44-fix.patch b/gstreamer1-libav-ffmpeg44-fix.patch new file mode 100644 index 0000000..310a4d4 --- /dev/null +++ b/gstreamer1-libav-ffmpeg44-fix.patch @@ -0,0 +1,223 @@ +--- gst-libav-1.18.2.old/ext/libav/gstavdemux.c 2021-02-26 16:47:35.842537392 -0800 ++++ gst-libav-1.18.2.new/ext/libav/gstavdemux.c 2021-02-26 16:47:55.137537967 -0800 +@@ -41,6 +41,211 @@ + typedef struct _GstFFMpegDemux GstFFMpegDemux; + typedef struct _GstFFStream GstFFStream; + ++typedef struct FFFrac { ++ int64_t val, num, den; ++} FFFrac; ++ ++struct AVStreamInternal { ++ /** ++ * Set to 1 if the codec allows reordering, so pts can be different ++ * from dts. ++ */ ++ int reorder; ++ ++ /** ++ * bitstream filter to run on stream ++ * - encoding: Set by muxer using ff_stream_add_bitstream_filter ++ * - decoding: unused ++ */ ++ AVBSFContext *bsfc; ++ ++ /** ++ * Whether or not check_bitstream should still be run on each packet ++ */ ++ int bitstream_checked; ++ ++ /** ++ * The codec context used by avformat_find_stream_info, the parser, etc. ++ */ ++ AVCodecContext *avctx; ++ /** ++ * 1 if avctx has been initialized with the values from the codec parameters ++ */ ++ int avctx_inited; ++ ++ enum AVCodecID orig_codec_id; ++ ++ /* the context for extracting extradata in find_stream_info() ++ * inited=1/bsf=NULL signals that extracting is not possible (codec not ++ * supported) */ ++ struct { ++ AVBSFContext *bsf; ++ AVPacket *pkt; ++ int inited; ++ } extract_extradata; ++ ++ /** ++ * Whether the internal avctx needs to be updated from codecpar (after a late change to codecpar) ++ */ ++ int need_context_update; ++ ++ int is_intra_only; ++ ++ FFFrac *priv_pts; ++ ++#define MAX_STD_TIMEBASES (30*12+30+3+6) ++ /** ++ * Stream information used internally by avformat_find_stream_info() ++ */ ++ struct { ++ int64_t last_dts; ++ int64_t duration_gcd; ++ int duration_count; ++ int64_t rfps_duration_sum; ++ double (*duration_error)[2][MAX_STD_TIMEBASES]; ++ int64_t codec_info_duration; ++ int64_t codec_info_duration_fields; ++ int frame_delay_evidence; ++ ++ /** ++ * 0 -> decoder has not been searched for yet. ++ * >0 -> decoder found ++ * <0 -> decoder with codec_id == -found_decoder has not been found ++ */ ++ int found_decoder; ++ ++ int64_t last_duration; ++ ++ /** ++ * Those are used for average framerate estimation. ++ */ ++ int64_t fps_first_dts; ++ int fps_first_dts_idx; ++ int64_t fps_last_dts; ++ int fps_last_dts_idx; ++ ++ } *info; ++ ++ AVIndexEntry *index_entries; /**< Only used if the format does not ++ support seeking natively. */ ++ int nb_index_entries; ++ unsigned int index_entries_allocated_size; ++ ++ int64_t interleaver_chunk_size; ++ int64_t interleaver_chunk_duration; ++ ++ /** ++ * stream probing state ++ * -1 -> probing finished ++ * 0 -> no probing requested ++ * rest -> perform probing with request_probe being the minimum score to accept. ++ */ ++ int request_probe; ++ /** ++ * Indicates that everything up to the next keyframe ++ * should be discarded. ++ */ ++ int skip_to_keyframe; ++ ++ /** ++ * Number of samples to skip at the start of the frame decoded from the next packet. ++ */ ++ int skip_samples; ++ ++ /** ++ * If not 0, the number of samples that should be skipped from the start of ++ * the stream (the samples are removed from packets with pts==0, which also ++ * assumes negative timestamps do not happen). ++ * Intended for use with formats such as mp3 with ad-hoc gapless audio ++ * support. ++ */ ++ int64_t start_skip_samples; ++ ++ /** ++ * If not 0, the first audio sample that should be discarded from the stream. ++ * This is broken by design (needs global sample count), but can't be ++ * avoided for broken by design formats such as mp3 with ad-hoc gapless ++ * audio support. ++ */ ++ int64_t first_discard_sample; ++ ++ /** ++ * The sample after last sample that is intended to be discarded after ++ * first_discard_sample. Works on frame boundaries only. Used to prevent ++ * early EOF if the gapless info is broken (considered concatenated mp3s). ++ */ ++ int64_t last_discard_sample; ++ ++ /** ++ * Number of internally decoded frames, used internally in libavformat, do not access ++ * its lifetime differs from info which is why it is not in that structure. ++ */ ++ int nb_decoded_frames; ++ ++ /** ++ * Timestamp offset added to timestamps before muxing ++ */ ++ int64_t mux_ts_offset; ++ ++ /** ++ * Internal data to check for wrapping of the time stamp ++ */ ++ int64_t pts_wrap_reference; ++ ++ /** ++ * Options for behavior, when a wrap is detected. ++ * ++ * Defined by AV_PTS_WRAP_ values. ++ * ++ * If correction is enabled, there are two possibilities: ++ * If the first time stamp is near the wrap point, the wrap offset ++ * will be subtracted, which will create negative time stamps. ++ * Otherwise the offset will be added. ++ */ ++ int pts_wrap_behavior; ++ ++ /** ++ * Internal data to prevent doing update_initial_durations() twice ++ */ ++ int update_initial_durations_done; ++ ++#define MAX_REORDER_DELAY 16 ++ ++ /** ++ * Internal data to generate dts from pts ++ */ ++ int64_t pts_reorder_error[MAX_REORDER_DELAY+1]; ++ uint8_t pts_reorder_error_count[MAX_REORDER_DELAY+1]; ++ ++ int64_t pts_buffer[MAX_REORDER_DELAY+1]; ++ ++ /** ++ * Internal data to analyze DTS and detect faulty mpeg streams ++ */ ++ int64_t last_dts_for_order_check; ++ uint8_t dts_ordered; ++ uint8_t dts_misordered; ++ ++ /** ++ * Internal data to inject global side data ++ */ ++ int inject_global_side_data; ++ ++ /** ++ * display aspect ratio (0 if unknown) ++ * - encoding: unused ++ * - decoding: Set by libavformat to calculate sample_aspect_ratio internally ++ */ ++ AVRational display_aspect_ratio; ++ ++ AVProbeData probe_data; ++ ++ /** ++ * last packet in packet_buffer for this stream when muxing. ++ */ ++ struct AVPacketList *last_in_packet_buffer; ++}; ++ + struct _GstFFStream + { + GstPad *pad; +@@ -483,7 +688,7 @@ gst_ffmpegdemux_do_seek (GstFFMpegDemux + GST_LOG_OBJECT (demux, "keyframeidx: %d", keyframeidx); + + if (keyframeidx >= 0) { +- fftarget = stream->index_entries[keyframeidx].timestamp; ++ fftarget = stream->internal->index_entries[keyframeidx].timestamp; + target = gst_ffmpeg_time_ff_to_gst (fftarget, stream->time_base); + + GST_LOG_OBJECT (demux, diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index b371396..7fec0ce 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -1,10 +1,11 @@ Name: gstreamer1-libav Version: 1.18.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: GStreamer 1.0 libav-based plug-ins License: LGPLv2+ URL: https://gstreamer.freedesktop.org/ Source0: %{url}/src/gst-libav/gst-libav-%{version}.tar.xz +Patch0: https://gitlab.freedesktop.org/gstreamer/gst-libav/uploads/1340cbe52e8384f4aa92b147b804f64f/gstreamer1-libav-ffmpeg44-fix.patch BuildRequires: gcc-c++ BuildRequires: meson @@ -69,6 +70,9 @@ plug-in. %endif %changelog +* Sun Feb 28 2021 Leigh Scott - 1.18.2-4 +- Add patch for ffmpeg-4.4 + * Wed Feb 03 2021 RPM Fusion Release Engineering - 1.18.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From bc228266666f17bd1a1fc568bcf5eb32eb276e88 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Wed, 17 Mar 2021 16:42:23 +0000 Subject: [PATCH 081/113] 1.18.4 --- gstreamer1-libav.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index 7fec0ce..6e41719 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -1,6 +1,6 @@ Name: gstreamer1-libav -Version: 1.18.2 -Release: 4%{?dist} +Version: 1.18.4 +Release: 1%{?dist} Summary: GStreamer 1.0 libav-based plug-ins License: LGPLv2+ URL: https://gstreamer.freedesktop.org/ @@ -70,6 +70,9 @@ plug-in. %endif %changelog +* Wed Mar 17 2021 Leigh Scott - 1.18.4-1 +- 1.18.4 + * Sun Feb 28 2021 Leigh Scott - 1.18.2-4 - Add patch for ffmpeg-4.4 diff --git a/sources b/sources index df112a3..89920bc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gst-libav-1.18.2.tar.xz) = ad57fd08c87ecbc64adc3f904f66e2454abe9e6a2a53fbb0bab73a972a072c649d060fb0f1186e204bd5978587b0d7afe6c1b9d049b23d976b4250757097507e +SHA512 (gst-libav-1.18.4.tar.xz) = 4eb10af6698f724bbc8d5b7b215e7349e6ff3b52e24b3987ee4077db1ae27ae0d6f25309adc50f0fccdf5af4d617634a7339ad1e5466a737c40a25c52c0d023f From b3df946314e0970fdfc976f11e4570d2915ea8c7 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Wed, 24 Mar 2021 06:32:49 +0000 Subject: [PATCH 082/113] Drop patch --- gstreamer1-libav-ffmpeg44-fix.patch | 223 ---------------------------- gstreamer1-libav.spec | 6 +- 2 files changed, 4 insertions(+), 225 deletions(-) delete mode 100644 gstreamer1-libav-ffmpeg44-fix.patch diff --git a/gstreamer1-libav-ffmpeg44-fix.patch b/gstreamer1-libav-ffmpeg44-fix.patch deleted file mode 100644 index 310a4d4..0000000 --- a/gstreamer1-libav-ffmpeg44-fix.patch +++ /dev/null @@ -1,223 +0,0 @@ ---- gst-libav-1.18.2.old/ext/libav/gstavdemux.c 2021-02-26 16:47:35.842537392 -0800 -+++ gst-libav-1.18.2.new/ext/libav/gstavdemux.c 2021-02-26 16:47:55.137537967 -0800 -@@ -41,6 +41,211 @@ - typedef struct _GstFFMpegDemux GstFFMpegDemux; - typedef struct _GstFFStream GstFFStream; - -+typedef struct FFFrac { -+ int64_t val, num, den; -+} FFFrac; -+ -+struct AVStreamInternal { -+ /** -+ * Set to 1 if the codec allows reordering, so pts can be different -+ * from dts. -+ */ -+ int reorder; -+ -+ /** -+ * bitstream filter to run on stream -+ * - encoding: Set by muxer using ff_stream_add_bitstream_filter -+ * - decoding: unused -+ */ -+ AVBSFContext *bsfc; -+ -+ /** -+ * Whether or not check_bitstream should still be run on each packet -+ */ -+ int bitstream_checked; -+ -+ /** -+ * The codec context used by avformat_find_stream_info, the parser, etc. -+ */ -+ AVCodecContext *avctx; -+ /** -+ * 1 if avctx has been initialized with the values from the codec parameters -+ */ -+ int avctx_inited; -+ -+ enum AVCodecID orig_codec_id; -+ -+ /* the context for extracting extradata in find_stream_info() -+ * inited=1/bsf=NULL signals that extracting is not possible (codec not -+ * supported) */ -+ struct { -+ AVBSFContext *bsf; -+ AVPacket *pkt; -+ int inited; -+ } extract_extradata; -+ -+ /** -+ * Whether the internal avctx needs to be updated from codecpar (after a late change to codecpar) -+ */ -+ int need_context_update; -+ -+ int is_intra_only; -+ -+ FFFrac *priv_pts; -+ -+#define MAX_STD_TIMEBASES (30*12+30+3+6) -+ /** -+ * Stream information used internally by avformat_find_stream_info() -+ */ -+ struct { -+ int64_t last_dts; -+ int64_t duration_gcd; -+ int duration_count; -+ int64_t rfps_duration_sum; -+ double (*duration_error)[2][MAX_STD_TIMEBASES]; -+ int64_t codec_info_duration; -+ int64_t codec_info_duration_fields; -+ int frame_delay_evidence; -+ -+ /** -+ * 0 -> decoder has not been searched for yet. -+ * >0 -> decoder found -+ * <0 -> decoder with codec_id == -found_decoder has not been found -+ */ -+ int found_decoder; -+ -+ int64_t last_duration; -+ -+ /** -+ * Those are used for average framerate estimation. -+ */ -+ int64_t fps_first_dts; -+ int fps_first_dts_idx; -+ int64_t fps_last_dts; -+ int fps_last_dts_idx; -+ -+ } *info; -+ -+ AVIndexEntry *index_entries; /**< Only used if the format does not -+ support seeking natively. */ -+ int nb_index_entries; -+ unsigned int index_entries_allocated_size; -+ -+ int64_t interleaver_chunk_size; -+ int64_t interleaver_chunk_duration; -+ -+ /** -+ * stream probing state -+ * -1 -> probing finished -+ * 0 -> no probing requested -+ * rest -> perform probing with request_probe being the minimum score to accept. -+ */ -+ int request_probe; -+ /** -+ * Indicates that everything up to the next keyframe -+ * should be discarded. -+ */ -+ int skip_to_keyframe; -+ -+ /** -+ * Number of samples to skip at the start of the frame decoded from the next packet. -+ */ -+ int skip_samples; -+ -+ /** -+ * If not 0, the number of samples that should be skipped from the start of -+ * the stream (the samples are removed from packets with pts==0, which also -+ * assumes negative timestamps do not happen). -+ * Intended for use with formats such as mp3 with ad-hoc gapless audio -+ * support. -+ */ -+ int64_t start_skip_samples; -+ -+ /** -+ * If not 0, the first audio sample that should be discarded from the stream. -+ * This is broken by design (needs global sample count), but can't be -+ * avoided for broken by design formats such as mp3 with ad-hoc gapless -+ * audio support. -+ */ -+ int64_t first_discard_sample; -+ -+ /** -+ * The sample after last sample that is intended to be discarded after -+ * first_discard_sample. Works on frame boundaries only. Used to prevent -+ * early EOF if the gapless info is broken (considered concatenated mp3s). -+ */ -+ int64_t last_discard_sample; -+ -+ /** -+ * Number of internally decoded frames, used internally in libavformat, do not access -+ * its lifetime differs from info which is why it is not in that structure. -+ */ -+ int nb_decoded_frames; -+ -+ /** -+ * Timestamp offset added to timestamps before muxing -+ */ -+ int64_t mux_ts_offset; -+ -+ /** -+ * Internal data to check for wrapping of the time stamp -+ */ -+ int64_t pts_wrap_reference; -+ -+ /** -+ * Options for behavior, when a wrap is detected. -+ * -+ * Defined by AV_PTS_WRAP_ values. -+ * -+ * If correction is enabled, there are two possibilities: -+ * If the first time stamp is near the wrap point, the wrap offset -+ * will be subtracted, which will create negative time stamps. -+ * Otherwise the offset will be added. -+ */ -+ int pts_wrap_behavior; -+ -+ /** -+ * Internal data to prevent doing update_initial_durations() twice -+ */ -+ int update_initial_durations_done; -+ -+#define MAX_REORDER_DELAY 16 -+ -+ /** -+ * Internal data to generate dts from pts -+ */ -+ int64_t pts_reorder_error[MAX_REORDER_DELAY+1]; -+ uint8_t pts_reorder_error_count[MAX_REORDER_DELAY+1]; -+ -+ int64_t pts_buffer[MAX_REORDER_DELAY+1]; -+ -+ /** -+ * Internal data to analyze DTS and detect faulty mpeg streams -+ */ -+ int64_t last_dts_for_order_check; -+ uint8_t dts_ordered; -+ uint8_t dts_misordered; -+ -+ /** -+ * Internal data to inject global side data -+ */ -+ int inject_global_side_data; -+ -+ /** -+ * display aspect ratio (0 if unknown) -+ * - encoding: unused -+ * - decoding: Set by libavformat to calculate sample_aspect_ratio internally -+ */ -+ AVRational display_aspect_ratio; -+ -+ AVProbeData probe_data; -+ -+ /** -+ * last packet in packet_buffer for this stream when muxing. -+ */ -+ struct AVPacketList *last_in_packet_buffer; -+}; -+ - struct _GstFFStream - { - GstPad *pad; -@@ -483,7 +688,7 @@ gst_ffmpegdemux_do_seek (GstFFMpegDemux - GST_LOG_OBJECT (demux, "keyframeidx: %d", keyframeidx); - - if (keyframeidx >= 0) { -- fftarget = stream->index_entries[keyframeidx].timestamp; -+ fftarget = stream->internal->index_entries[keyframeidx].timestamp; - target = gst_ffmpeg_time_ff_to_gst (fftarget, stream->time_base); - - GST_LOG_OBJECT (demux, diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index 6e41719..a8e850a 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -1,11 +1,10 @@ Name: gstreamer1-libav Version: 1.18.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GStreamer 1.0 libav-based plug-ins License: LGPLv2+ URL: https://gstreamer.freedesktop.org/ Source0: %{url}/src/gst-libav/gst-libav-%{version}.tar.xz -Patch0: https://gitlab.freedesktop.org/gstreamer/gst-libav/uploads/1340cbe52e8384f4aa92b147b804f64f/gstreamer1-libav-ffmpeg44-fix.patch BuildRequires: gcc-c++ BuildRequires: meson @@ -70,6 +69,9 @@ plug-in. %endif %changelog +* Wed Mar 24 2021 Leigh Scott - 1.18.4-2 +- Drop patch + * Wed Mar 17 2021 Leigh Scott - 1.18.4-1 - 1.18.4 From 3d05a5880f95e217197e4988c36fe57af1e4884a Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Tue, 8 Jun 2021 12:47:19 +0100 Subject: [PATCH 083/113] Update --- gstreamer1-libav.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index a8e850a..bbb80a1 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -1,6 +1,6 @@ Name: gstreamer1-libav -Version: 1.18.4 -Release: 2%{?dist} +Version: 1.19.1 +Release: 1%{?dist} Summary: GStreamer 1.0 libav-based plug-ins License: LGPLv2+ URL: https://gstreamer.freedesktop.org/ @@ -69,6 +69,9 @@ plug-in. %endif %changelog +* Tue Jun 08 2021 Leigh Scott - 1.19.1-1 +- Update + * Wed Mar 24 2021 Leigh Scott - 1.18.4-2 - Drop patch diff --git a/sources b/sources index 89920bc..1b47723 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gst-libav-1.18.4.tar.xz) = 4eb10af6698f724bbc8d5b7b215e7349e6ff3b52e24b3987ee4077db1ae27ae0d6f25309adc50f0fccdf5af4d617634a7339ad1e5466a737c40a25c52c0d023f +SHA512 (gst-libav-1.19.1.tar.xz) = 37541e5de9621bbc68e3d56504bd9ebe1ba286c7f22720478a3e6d8bd9d69a8722c050d05e54aaee18a83685c867d7673a9c17d81f6e208628bd948775d92db0 From 9c1374e366d9fcd99ddf2b70c6b0ab0a702cf5db Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Fri, 25 Jun 2021 16:19:39 +0100 Subject: [PATCH 084/113] Add epoch --- gstreamer1-libav.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index bbb80a1..6a781af 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -1,4 +1,5 @@ Name: gstreamer1-libav +Epoch: 1 Version: 1.19.1 Release: 1%{?dist} Summary: GStreamer 1.0 libav-based plug-ins From afa839bf27c5422a0c2da83f94c0626b80df2587 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Mon, 2 Aug 2021 15:09:45 +0100 Subject: [PATCH 085/113] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Leigh Scott --- gstreamer1-libav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index 6a781af..07cee82 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -1,7 +1,7 @@ Name: gstreamer1-libav Epoch: 1 Version: 1.19.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GStreamer 1.0 libav-based plug-ins License: LGPLv2+ URL: https://gstreamer.freedesktop.org/ @@ -70,6 +70,9 @@ plug-in. %endif %changelog +* Mon Aug 02 2021 RPM Fusion Release Engineering - 1:1.19.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jun 08 2021 Leigh Scott - 1.19.1-1 - Update From 72f5ba7bfc96f428cd29e4446f1f23bd8ddd268c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Sat, 9 Oct 2021 15:26:51 +0100 Subject: [PATCH 086/113] gstreamer1.prov is broken and hangs, workarround it --- gstreamer1-libav.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index 07cee82..e8941b1 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -1,3 +1,6 @@ +# gstreamer1.prov is broken and hangs, workarround it +%global __gstreamer1_provides %{nil} + Name: gstreamer1-libav Epoch: 1 Version: 1.19.1 @@ -72,6 +75,7 @@ plug-in. %changelog * Mon Aug 02 2021 RPM Fusion Release Engineering - 1:1.19.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild +- gstreamer1.prov is broken and hangs, workarround it * Tue Jun 08 2021 Leigh Scott - 1.19.1-1 - Update From df731cde6f4a5548246d422b0c6aba6bc0215e50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Sat, 9 Oct 2021 21:02:40 +0100 Subject: [PATCH 087/113] Update gstreamer1-libav to 1.19.2 --- gstreamer1-libav.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index e8941b1..59a7c27 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -3,8 +3,8 @@ Name: gstreamer1-libav Epoch: 1 -Version: 1.19.1 -Release: 2%{?dist} +Version: 1.19.2 +Release: 1%{?dist} Summary: GStreamer 1.0 libav-based plug-ins License: LGPLv2+ URL: https://gstreamer.freedesktop.org/ @@ -73,6 +73,9 @@ plug-in. %endif %changelog +* Sat Oct 09 2021 Sérgio Basto - 1:1.19.2-1 +- Update gstreamer1-libav to 1.19.2 + * Mon Aug 02 2021 RPM Fusion Release Engineering - 1:1.19.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - gstreamer1.prov is broken and hangs, workarround it From 388bae92a5c8d9da428f2297e4fa776178c9c342 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Sat, 9 Oct 2021 21:13:53 +0100 Subject: [PATCH 088/113] rfpkg new-sources seems that sometimes fails --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index 1b47723..6805f84 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gst-libav-1.19.1.tar.xz) = 37541e5de9621bbc68e3d56504bd9ebe1ba286c7f22720478a3e6d8bd9d69a8722c050d05e54aaee18a83685c867d7673a9c17d81f6e208628bd948775d92db0 +SHA512 (gst-libav-1.19.2.tar.xz) = e10e0e21aea655c500ef1266eee0410e3777e3a4aa0b85c75bc127345ddd62224dd07f063d30a06d64bf60e66508e9aca361665777935ca999d28c1c8d0eba36 From 3c02c2c2f273c04038f37f6f52a0f0ea989f6ce6 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Thu, 11 Nov 2021 16:07:43 +0000 Subject: [PATCH 089/113] Rebuilt for new ffmpeg snapshot Signed-off-by: Leigh Scott --- gstreamer1-libav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index 59a7c27..6b793e8 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -4,7 +4,7 @@ Name: gstreamer1-libav Epoch: 1 Version: 1.19.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GStreamer 1.0 libav-based plug-ins License: LGPLv2+ URL: https://gstreamer.freedesktop.org/ @@ -73,6 +73,9 @@ plug-in. %endif %changelog +* Thu Nov 11 2021 Leigh Scott - 1:1.19.2-2 +- Rebuilt for new ffmpeg snapshot + * Sat Oct 09 2021 Sérgio Basto - 1:1.19.2-1 - Update gstreamer1-libav to 1.19.2 From 9007d97f0f298ee9040d8ee489ca2b4a14e84640 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Sat, 13 Nov 2021 19:25:30 +0000 Subject: [PATCH 090/113] fix --- 139.patch | 229 ++++++++++++++++++++++++++++++++++++++++++ gstreamer1-libav.spec | 7 +- 2 files changed, 234 insertions(+), 2 deletions(-) create mode 100644 139.patch diff --git a/139.patch b/139.patch new file mode 100644 index 0000000..a3191e2 --- /dev/null +++ b/139.patch @@ -0,0 +1,229 @@ +From 42587384662d31d76b3fe953853ef2b59928df8f Mon Sep 17 00:00:00 2001 +From: "bradley.jarvis" +Date: Wed, 11 Aug 2021 21:21:33 +1000 +Subject: [PATCH] Fix ffmpeg deprecated avcodec_get_context_defaults + +Fix build against latest ffmpeg after removal of deprecated avcodec_get_context_defaults() + +Resolves issue #97 + +Part-of: +--- + ext/libav/gstavauddec.c | 16 ++++------------ + ext/libav/gstavaudenc.c | 25 +++++++++---------------- + ext/libav/gstavviddec.c | 16 ++++------------ + ext/libav/gstavvidenc.c | 14 +++++--------- + 4 files changed, 22 insertions(+), 49 deletions(-) + +diff --git a/ext/libav/gstavauddec.c b/ext/libav/gstavauddec.c +index baf7aa5..4ce6a1f 100644 +--- a/ext/libav/gstavauddec.c ++++ b/ext/libav/gstavauddec.c +@@ -169,11 +169,7 @@ gst_ffmpegauddec_finalize (GObject * object) + + av_frame_free (&ffmpegdec->frame); + +- if (ffmpegdec->context != NULL) { +- gst_ffmpeg_avcodec_close (ffmpegdec->context); +- av_free (ffmpegdec->context); +- ffmpegdec->context = NULL; +- } ++ avcodec_free_context (&ffmpegdec->context); + + G_OBJECT_CLASS (parent_class)->finalize (object); + } +@@ -193,14 +189,10 @@ gst_ffmpegauddec_close (GstFFMpegAudDec * ffmpegdec, gboolean reset) + gst_ffmpeg_avcodec_close (ffmpegdec->context); + ffmpegdec->opened = FALSE; + +- if (ffmpegdec->context->extradata) { +- av_free (ffmpegdec->context->extradata); +- ffmpegdec->context->extradata = NULL; +- } ++ av_freep (&ffmpegdec->context->extradata); + + if (reset) { +- if (avcodec_get_context_defaults3 (ffmpegdec->context, +- oclass->in_plugin) < 0) { ++ if (gst_ffmpeg_avcodec_open (ffmpegdec->context, oclass->in_plugin) < 0) { + GST_DEBUG_OBJECT (ffmpegdec, "Failed to set context defaults"); + return FALSE; + } +@@ -220,7 +212,7 @@ gst_ffmpegauddec_start (GstAudioDecoder * decoder) + + GST_OBJECT_LOCK (ffmpegdec); + gst_ffmpeg_avcodec_close (ffmpegdec->context); +- if (avcodec_get_context_defaults3 (ffmpegdec->context, oclass->in_plugin) < 0) { ++ if (gst_ffmpeg_avcodec_open (ffmpegdec->context, oclass->in_plugin) < 0) { + GST_DEBUG_OBJECT (ffmpegdec, "Failed to set context defaults"); + GST_OBJECT_UNLOCK (ffmpegdec); + return FALSE; +diff --git a/ext/libav/gstavaudenc.c b/ext/libav/gstavaudenc.c +index 3ff6432..87edaeb 100644 +--- a/ext/libav/gstavaudenc.c ++++ b/ext/libav/gstavaudenc.c +@@ -175,10 +175,8 @@ gst_ffmpegaudenc_finalize (GObject * object) + + /* clean up remaining allocated data */ + av_frame_free (&ffmpegaudenc->frame); +- gst_ffmpeg_avcodec_close (ffmpegaudenc->context); +- gst_ffmpeg_avcodec_close (ffmpegaudenc->refcontext); +- av_free (ffmpegaudenc->context); +- av_free (ffmpegaudenc->refcontext); ++ avcodec_free_context (&ffmpegaudenc->context); ++ avcodec_free_context (&ffmpegaudenc->refcontext); + + G_OBJECT_CLASS (parent_class)->finalize (object); + } +@@ -194,8 +192,7 @@ gst_ffmpegaudenc_start (GstAudioEncoder * encoder) + ffmpegaudenc->need_reopen = FALSE; + + gst_ffmpeg_avcodec_close (ffmpegaudenc->context); +- if (avcodec_get_context_defaults3 (ffmpegaudenc->context, +- oclass->in_plugin) < 0) { ++ if (gst_ffmpeg_avcodec_open (ffmpegaudenc->context, oclass->in_plugin) < 0) { + GST_DEBUG_OBJECT (ffmpegaudenc, "Failed to set context defaults"); + return FALSE; + } +@@ -243,8 +240,7 @@ gst_ffmpegaudenc_set_format (GstAudioEncoder * encoder, GstAudioInfo * info) + if (ffmpegaudenc->opened) { + gst_ffmpeg_avcodec_close (ffmpegaudenc->context); + ffmpegaudenc->opened = FALSE; +- if (avcodec_get_context_defaults3 (ffmpegaudenc->context, +- oclass->in_plugin) < 0) { ++ if (gst_ffmpeg_avcodec_open (ffmpegaudenc->context, oclass->in_plugin) < 0) { + GST_DEBUG_OBJECT (ffmpegaudenc, "Failed to set context defaults"); + return FALSE; + } +@@ -289,8 +285,7 @@ gst_ffmpegaudenc_set_format (GstAudioEncoder * encoder, GstAudioInfo * info) + gst_ffmpeg_avcodec_close (ffmpegaudenc->context); + GST_DEBUG_OBJECT (ffmpegaudenc, "avenc_%s: Failed to open FFMPEG codec", + oclass->in_plugin->name); +- if (avcodec_get_context_defaults3 (ffmpegaudenc->context, +- oclass->in_plugin) < 0) ++ if (gst_ffmpeg_avcodec_open (ffmpegaudenc->context, oclass->in_plugin) < 0) + GST_DEBUG_OBJECT (ffmpegaudenc, "Failed to set context defaults"); + + if ((oclass->in_plugin->capabilities & AV_CODEC_CAP_EXPERIMENTAL) && +@@ -314,8 +309,7 @@ gst_ffmpegaudenc_set_format (GstAudioEncoder * encoder, GstAudioInfo * info) + gst_caps_unref (allowed_caps); + gst_ffmpeg_avcodec_close (ffmpegaudenc->context); + GST_DEBUG ("Unsupported codec - no caps found"); +- if (avcodec_get_context_defaults3 (ffmpegaudenc->context, +- oclass->in_plugin) < 0) ++ if (gst_ffmpeg_avcodec_open (ffmpegaudenc->context, oclass->in_plugin) < 0) + GST_DEBUG_OBJECT (ffmpegaudenc, "Failed to set context defaults"); + return FALSE; + } +@@ -333,8 +327,7 @@ gst_ffmpegaudenc_set_format (GstAudioEncoder * encoder, GstAudioInfo * info) + icaps)) { + gst_ffmpeg_avcodec_close (ffmpegaudenc->context); + gst_caps_unref (icaps); +- if (avcodec_get_context_defaults3 (ffmpegaudenc->context, +- oclass->in_plugin) < 0) ++ if (gst_ffmpeg_avcodec_open (ffmpegaudenc->context, oclass->in_plugin) < 0) + GST_DEBUG_OBJECT (ffmpegaudenc, "Failed to set context defaults"); + return FALSE; + } +@@ -403,8 +396,8 @@ buffer_info_free (void *opaque, guint8 * data) + gst_buffer_unmap (info->buffer, &info->map); + gst_buffer_unref (info->buffer); + } else { +- av_free (info->ext_data); +- av_free (info->ext_data_array); ++ av_freep (&info->ext_data); ++ av_freep (&info->ext_data_array); + } + g_slice_free (BufferInfo, info); + } +diff --git a/ext/libav/gstavviddec.c b/ext/libav/gstavviddec.c +index a14b6df..c8f7a7d 100644 +--- a/ext/libav/gstavviddec.c ++++ b/ext/libav/gstavviddec.c +@@ -341,11 +341,7 @@ gst_ffmpegviddec_finalize (GObject * object) + + av_frame_free (&ffmpegdec->picture); + +- if (ffmpegdec->context != NULL) { +- gst_ffmpeg_avcodec_close (ffmpegdec->context); +- av_free (ffmpegdec->context); +- ffmpegdec->context = NULL; +- } ++ avcodec_free_context (&ffmpegdec->context); + + G_OBJECT_CLASS (parent_class)->finalize (object); + } +@@ -395,13 +391,9 @@ gst_ffmpegviddec_close (GstFFMpegVidDec * ffmpegdec, gboolean reset) + + gst_buffer_replace (&ffmpegdec->palette, NULL); + +- if (ffmpegdec->context->extradata) { +- av_free (ffmpegdec->context->extradata); +- ffmpegdec->context->extradata = NULL; +- } ++ av_freep (&ffmpegdec->context->extradata); + if (reset) { +- if (avcodec_get_context_defaults3 (ffmpegdec->context, +- oclass->in_plugin) < 0) { ++ if (gst_ffmpeg_avcodec_open (ffmpegdec->context, oclass->in_plugin) < 0) { + GST_DEBUG_OBJECT (ffmpegdec, "Failed to set context defaults"); + return FALSE; + } +@@ -2087,7 +2079,7 @@ gst_ffmpegviddec_start (GstVideoDecoder * decoder) + + GST_OBJECT_LOCK (ffmpegdec); + gst_ffmpeg_avcodec_close (ffmpegdec->context); +- if (avcodec_get_context_defaults3 (ffmpegdec->context, oclass->in_plugin) < 0) { ++ if (gst_ffmpeg_avcodec_open (ffmpegdec->context, oclass->in_plugin) < 0) { + GST_DEBUG_OBJECT (ffmpegdec, "Failed to set context defaults"); + GST_OBJECT_UNLOCK (ffmpegdec); + return FALSE; +diff --git a/ext/libav/gstavvidenc.c b/ext/libav/gstavvidenc.c +index 0468d88..b17ff68 100644 +--- a/ext/libav/gstavvidenc.c ++++ b/ext/libav/gstavvidenc.c +@@ -222,10 +222,8 @@ gst_ffmpegvidenc_finalize (GObject * object) + + /* clean up remaining allocated data */ + av_frame_free (&ffmpegenc->picture); +- gst_ffmpeg_avcodec_close (ffmpegenc->context); +- gst_ffmpeg_avcodec_close (ffmpegenc->refcontext); +- av_free (ffmpegenc->context); +- av_free (ffmpegenc->refcontext); ++ avcodec_free_context (&ffmpegenc->context); ++ avcodec_free_context (&ffmpegenc->refcontext); + + G_OBJECT_CLASS (parent_class)->finalize (object); + } +@@ -249,8 +247,7 @@ gst_ffmpegvidenc_set_format (GstVideoEncoder * encoder, + if (ffmpegenc->opened) { + gst_ffmpeg_avcodec_close (ffmpegenc->context); + ffmpegenc->opened = FALSE; +- if (avcodec_get_context_defaults3 (ffmpegenc->context, +- oclass->in_plugin) < 0) { ++ if (gst_ffmpeg_avcodec_open (ffmpegenc->context, oclass->in_plugin) < 0) { + GST_DEBUG_OBJECT (ffmpegenc, "Failed to set context defaults"); + return FALSE; + } +@@ -455,8 +452,7 @@ bad_input_fmt: + close_codec: + { + gst_ffmpeg_avcodec_close (ffmpegenc->context); +- if (avcodec_get_context_defaults3 (ffmpegenc->context, +- oclass->in_plugin) < 0) ++ if (gst_ffmpeg_avcodec_open (ffmpegenc->context, oclass->in_plugin) < 0) + GST_DEBUG_OBJECT (ffmpegenc, "Failed to set context defaults"); + goto cleanup_stats_in; + } +@@ -897,7 +893,7 @@ gst_ffmpegvidenc_start (GstVideoEncoder * encoder) + + /* close old session */ + gst_ffmpeg_avcodec_close (ffmpegenc->context); +- if (avcodec_get_context_defaults3 (ffmpegenc->context, oclass->in_plugin) < 0) { ++ if (gst_ffmpeg_avcodec_open (ffmpegenc->context, oclass->in_plugin) < 0) { + GST_DEBUG_OBJECT (ffmpegenc, "Failed to set context defaults"); + return FALSE; + } +-- +GitLab + diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index 6b793e8..65e92b0 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -9,6 +9,7 @@ Summary: GStreamer 1.0 libav-based plug-ins License: LGPLv2+ URL: https://gstreamer.freedesktop.org/ Source0: %{url}/src/gst-libav/gst-libav-%{version}.tar.xz +Patch0: https://gitlab.freedesktop.org/gstreamer/gst-libav/-/merge_requests/139.patch BuildRequires: gcc-c++ BuildRequires: meson @@ -46,8 +47,10 @@ plug-in. %prep -%autosetup -p1 -n gst-libav-%{version} - +%setup -n gst-libav-%{version} +%if 0%{?fedora} >= 36 +%patch0 -p1 -b ffmpeg45 +%endif %build %meson \ From c8051ec0744a269b39c2f2ac7b1c82953cdf2e2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Mon, 15 Nov 2021 12:01:23 +0000 Subject: [PATCH 091/113] Update gstreamer1-libav to 1.19.3 --- gstreamer1-libav.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index 65e92b0..cd8737f 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -3,8 +3,8 @@ Name: gstreamer1-libav Epoch: 1 -Version: 1.19.2 -Release: 2%{?dist} +Version: 1.19.3 +Release: 1%{?dist} Summary: GStreamer 1.0 libav-based plug-ins License: LGPLv2+ URL: https://gstreamer.freedesktop.org/ @@ -76,6 +76,9 @@ plug-in. %endif %changelog +* Mon Nov 15 2021 Sérgio Basto - 1:1.19.3-1 +- Update gstreamer1-libav to 1.19.3 + * Thu Nov 11 2021 Leigh Scott - 1:1.19.2-2 - Rebuilt for new ffmpeg snapshot From 21017ef4a2797f85fc71a5b94e6b2f57ec89abd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Mon, 15 Nov 2021 15:42:25 +0000 Subject: [PATCH 092/113] update sources --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index 6805f84..bfda06d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gst-libav-1.19.2.tar.xz) = e10e0e21aea655c500ef1266eee0410e3777e3a4aa0b85c75bc127345ddd62224dd07f063d30a06d64bf60e66508e9aca361665777935ca999d28c1c8d0eba36 +SHA512 (gst-libav-1.19.3.tar.xz) = 371296afe14b5f1fecc30c736b3aa0b2cd0d7bfd5bf28a343d6255cbfd9a65239e56b462878b9421566a791fda84a29171f036e8026a384dc7482f5bc2134153 From 92784180e4901e9330b269db1cea03ca7c349cd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Mon, 15 Nov 2021 16:40:07 +0000 Subject: [PATCH 093/113] Rebuilt for new ffmpeg snapshot --- gstreamer1-libav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index cd8737f..b614ceb 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -4,7 +4,7 @@ Name: gstreamer1-libav Epoch: 1 Version: 1.19.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GStreamer 1.0 libav-based plug-ins License: LGPLv2+ URL: https://gstreamer.freedesktop.org/ @@ -76,6 +76,9 @@ plug-in. %endif %changelog +* Mon Nov 15 2021 Sérgio Basto - 1:1.19.3-2 +- Rebuilt for new ffmpeg snapshot + * Mon Nov 15 2021 Sérgio Basto - 1:1.19.3-1 - Update gstreamer1-libav to 1.19.3 From f21eb5deda34a7585d7f7f6716ee96eda846f237 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Sun, 6 Feb 2022 17:28:14 +0000 Subject: [PATCH 094/113] Update gstreamer1-libav to 1.20.0 --- gstreamer1-libav.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index b614ceb..9531894 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -3,8 +3,8 @@ Name: gstreamer1-libav Epoch: 1 -Version: 1.19.3 -Release: 2%{?dist} +Version: 1.20.0 +Release: 1%{?dist} Summary: GStreamer 1.0 libav-based plug-ins License: LGPLv2+ URL: https://gstreamer.freedesktop.org/ @@ -48,9 +48,6 @@ plug-in. %prep %setup -n gst-libav-%{version} -%if 0%{?fedora} >= 36 -%patch0 -p1 -b ffmpeg45 -%endif %build %meson \ @@ -76,6 +73,9 @@ plug-in. %endif %changelog +* Sun Feb 06 2022 Sérgio Basto - 1:1.20.0-1 +- Update gstreamer1-libav to 1.20.0 + * Mon Nov 15 2021 Sérgio Basto - 1:1.19.3-2 - Rebuilt for new ffmpeg snapshot From 523d3fd577a0570b433091264614db66af5099b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Sun, 6 Feb 2022 17:36:22 +0000 Subject: [PATCH 095/113] fix file sources --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index bfda06d..cac9416 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gst-libav-1.19.3.tar.xz) = 371296afe14b5f1fecc30c736b3aa0b2cd0d7bfd5bf28a343d6255cbfd9a65239e56b462878b9421566a791fda84a29171f036e8026a384dc7482f5bc2134153 +SHA512 (gst-libav-1.20.0.tar.xz) = 51cedfc3489915507d7640220aafe4f71ef3bbe5e7de9aa18187f211275a29917a893ee0375a89f256bda6c63e5103e1c4614f3e236ffe46e550ce518c9e7109 From c8387c439dbc15420ce4e91ae880257b0b8a1c35 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Sun, 3 Jul 2022 11:31:00 +0100 Subject: [PATCH 096/113] Revert "fix file sources" This reverts commit 523d3fd577a0570b433091264614db66af5099b2. --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index cac9416..bfda06d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gst-libav-1.20.0.tar.xz) = 51cedfc3489915507d7640220aafe4f71ef3bbe5e7de9aa18187f211275a29917a893ee0375a89f256bda6c63e5103e1c4614f3e236ffe46e550ce518c9e7109 +SHA512 (gst-libav-1.19.3.tar.xz) = 371296afe14b5f1fecc30c736b3aa0b2cd0d7bfd5bf28a343d6255cbfd9a65239e56b462878b9421566a791fda84a29171f036e8026a384dc7482f5bc2134153 From a0255674b813c267533175fc73db973a359ef503 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Sun, 3 Jul 2022 11:32:06 +0100 Subject: [PATCH 097/113] Revert "Update gstreamer1-libav to 1.20.0" This reverts commit f21eb5deda34a7585d7f7f6716ee96eda846f237. --- gstreamer1-libav.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index 9531894..b614ceb 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -3,8 +3,8 @@ Name: gstreamer1-libav Epoch: 1 -Version: 1.20.0 -Release: 1%{?dist} +Version: 1.19.3 +Release: 2%{?dist} Summary: GStreamer 1.0 libav-based plug-ins License: LGPLv2+ URL: https://gstreamer.freedesktop.org/ @@ -48,6 +48,9 @@ plug-in. %prep %setup -n gst-libav-%{version} +%if 0%{?fedora} >= 36 +%patch0 -p1 -b ffmpeg45 +%endif %build %meson \ @@ -73,9 +76,6 @@ plug-in. %endif %changelog -* Sun Feb 06 2022 Sérgio Basto - 1:1.20.0-1 -- Update gstreamer1-libav to 1.20.0 - * Mon Nov 15 2021 Sérgio Basto - 1:1.19.3-2 - Rebuilt for new ffmpeg snapshot From e421271d70913172d107ac79b3868429b782758b Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Sun, 3 Jul 2022 11:32:11 +0100 Subject: [PATCH 098/113] Revert "Rebuilt for new ffmpeg snapshot" This reverts commit 92784180e4901e9330b269db1cea03ca7c349cd7. --- gstreamer1-libav.spec | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index b614ceb..cd8737f 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -4,7 +4,7 @@ Name: gstreamer1-libav Epoch: 1 Version: 1.19.3 -Release: 2%{?dist} +Release: 1%{?dist} Summary: GStreamer 1.0 libav-based plug-ins License: LGPLv2+ URL: https://gstreamer.freedesktop.org/ @@ -76,9 +76,6 @@ plug-in. %endif %changelog -* Mon Nov 15 2021 Sérgio Basto - 1:1.19.3-2 -- Rebuilt for new ffmpeg snapshot - * Mon Nov 15 2021 Sérgio Basto - 1:1.19.3-1 - Update gstreamer1-libav to 1.19.3 From c3a1ecb6a65552312e6556b02aedfae058286727 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Sun, 3 Jul 2022 11:32:11 +0100 Subject: [PATCH 099/113] Revert "update sources" This reverts commit 21017ef4a2797f85fc71a5b94e6b2f57ec89abd9. --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index bfda06d..6805f84 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gst-libav-1.19.3.tar.xz) = 371296afe14b5f1fecc30c736b3aa0b2cd0d7bfd5bf28a343d6255cbfd9a65239e56b462878b9421566a791fda84a29171f036e8026a384dc7482f5bc2134153 +SHA512 (gst-libav-1.19.2.tar.xz) = e10e0e21aea655c500ef1266eee0410e3777e3a4aa0b85c75bc127345ddd62224dd07f063d30a06d64bf60e66508e9aca361665777935ca999d28c1c8d0eba36 From 52373cfa4a90a24e31c8bcd694d8fb01e3fd999b Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Sun, 3 Jul 2022 11:32:12 +0100 Subject: [PATCH 100/113] Revert "Update gstreamer1-libav to 1.19.3" This reverts commit c8051ec0744a269b39c2f2ac7b1c82953cdf2e2c. --- gstreamer1-libav.spec | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index cd8737f..65e92b0 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -3,8 +3,8 @@ Name: gstreamer1-libav Epoch: 1 -Version: 1.19.3 -Release: 1%{?dist} +Version: 1.19.2 +Release: 2%{?dist} Summary: GStreamer 1.0 libav-based plug-ins License: LGPLv2+ URL: https://gstreamer.freedesktop.org/ @@ -76,9 +76,6 @@ plug-in. %endif %changelog -* Mon Nov 15 2021 Sérgio Basto - 1:1.19.3-1 -- Update gstreamer1-libav to 1.19.3 - * Thu Nov 11 2021 Leigh Scott - 1:1.19.2-2 - Rebuilt for new ffmpeg snapshot From 9f0e7415e3d6cd9b44958fbb69350726ee28cb49 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Sun, 3 Jul 2022 11:32:12 +0100 Subject: [PATCH 101/113] Revert "fix" This reverts commit 9007d97f0f298ee9040d8ee489ca2b4a14e84640. --- 139.patch | 229 ------------------------------------------ gstreamer1-libav.spec | 7 +- 2 files changed, 2 insertions(+), 234 deletions(-) delete mode 100644 139.patch diff --git a/139.patch b/139.patch deleted file mode 100644 index a3191e2..0000000 --- a/139.patch +++ /dev/null @@ -1,229 +0,0 @@ -From 42587384662d31d76b3fe953853ef2b59928df8f Mon Sep 17 00:00:00 2001 -From: "bradley.jarvis" -Date: Wed, 11 Aug 2021 21:21:33 +1000 -Subject: [PATCH] Fix ffmpeg deprecated avcodec_get_context_defaults - -Fix build against latest ffmpeg after removal of deprecated avcodec_get_context_defaults() - -Resolves issue #97 - -Part-of: ---- - ext/libav/gstavauddec.c | 16 ++++------------ - ext/libav/gstavaudenc.c | 25 +++++++++---------------- - ext/libav/gstavviddec.c | 16 ++++------------ - ext/libav/gstavvidenc.c | 14 +++++--------- - 4 files changed, 22 insertions(+), 49 deletions(-) - -diff --git a/ext/libav/gstavauddec.c b/ext/libav/gstavauddec.c -index baf7aa5..4ce6a1f 100644 ---- a/ext/libav/gstavauddec.c -+++ b/ext/libav/gstavauddec.c -@@ -169,11 +169,7 @@ gst_ffmpegauddec_finalize (GObject * object) - - av_frame_free (&ffmpegdec->frame); - -- if (ffmpegdec->context != NULL) { -- gst_ffmpeg_avcodec_close (ffmpegdec->context); -- av_free (ffmpegdec->context); -- ffmpegdec->context = NULL; -- } -+ avcodec_free_context (&ffmpegdec->context); - - G_OBJECT_CLASS (parent_class)->finalize (object); - } -@@ -193,14 +189,10 @@ gst_ffmpegauddec_close (GstFFMpegAudDec * ffmpegdec, gboolean reset) - gst_ffmpeg_avcodec_close (ffmpegdec->context); - ffmpegdec->opened = FALSE; - -- if (ffmpegdec->context->extradata) { -- av_free (ffmpegdec->context->extradata); -- ffmpegdec->context->extradata = NULL; -- } -+ av_freep (&ffmpegdec->context->extradata); - - if (reset) { -- if (avcodec_get_context_defaults3 (ffmpegdec->context, -- oclass->in_plugin) < 0) { -+ if (gst_ffmpeg_avcodec_open (ffmpegdec->context, oclass->in_plugin) < 0) { - GST_DEBUG_OBJECT (ffmpegdec, "Failed to set context defaults"); - return FALSE; - } -@@ -220,7 +212,7 @@ gst_ffmpegauddec_start (GstAudioDecoder * decoder) - - GST_OBJECT_LOCK (ffmpegdec); - gst_ffmpeg_avcodec_close (ffmpegdec->context); -- if (avcodec_get_context_defaults3 (ffmpegdec->context, oclass->in_plugin) < 0) { -+ if (gst_ffmpeg_avcodec_open (ffmpegdec->context, oclass->in_plugin) < 0) { - GST_DEBUG_OBJECT (ffmpegdec, "Failed to set context defaults"); - GST_OBJECT_UNLOCK (ffmpegdec); - return FALSE; -diff --git a/ext/libav/gstavaudenc.c b/ext/libav/gstavaudenc.c -index 3ff6432..87edaeb 100644 ---- a/ext/libav/gstavaudenc.c -+++ b/ext/libav/gstavaudenc.c -@@ -175,10 +175,8 @@ gst_ffmpegaudenc_finalize (GObject * object) - - /* clean up remaining allocated data */ - av_frame_free (&ffmpegaudenc->frame); -- gst_ffmpeg_avcodec_close (ffmpegaudenc->context); -- gst_ffmpeg_avcodec_close (ffmpegaudenc->refcontext); -- av_free (ffmpegaudenc->context); -- av_free (ffmpegaudenc->refcontext); -+ avcodec_free_context (&ffmpegaudenc->context); -+ avcodec_free_context (&ffmpegaudenc->refcontext); - - G_OBJECT_CLASS (parent_class)->finalize (object); - } -@@ -194,8 +192,7 @@ gst_ffmpegaudenc_start (GstAudioEncoder * encoder) - ffmpegaudenc->need_reopen = FALSE; - - gst_ffmpeg_avcodec_close (ffmpegaudenc->context); -- if (avcodec_get_context_defaults3 (ffmpegaudenc->context, -- oclass->in_plugin) < 0) { -+ if (gst_ffmpeg_avcodec_open (ffmpegaudenc->context, oclass->in_plugin) < 0) { - GST_DEBUG_OBJECT (ffmpegaudenc, "Failed to set context defaults"); - return FALSE; - } -@@ -243,8 +240,7 @@ gst_ffmpegaudenc_set_format (GstAudioEncoder * encoder, GstAudioInfo * info) - if (ffmpegaudenc->opened) { - gst_ffmpeg_avcodec_close (ffmpegaudenc->context); - ffmpegaudenc->opened = FALSE; -- if (avcodec_get_context_defaults3 (ffmpegaudenc->context, -- oclass->in_plugin) < 0) { -+ if (gst_ffmpeg_avcodec_open (ffmpegaudenc->context, oclass->in_plugin) < 0) { - GST_DEBUG_OBJECT (ffmpegaudenc, "Failed to set context defaults"); - return FALSE; - } -@@ -289,8 +285,7 @@ gst_ffmpegaudenc_set_format (GstAudioEncoder * encoder, GstAudioInfo * info) - gst_ffmpeg_avcodec_close (ffmpegaudenc->context); - GST_DEBUG_OBJECT (ffmpegaudenc, "avenc_%s: Failed to open FFMPEG codec", - oclass->in_plugin->name); -- if (avcodec_get_context_defaults3 (ffmpegaudenc->context, -- oclass->in_plugin) < 0) -+ if (gst_ffmpeg_avcodec_open (ffmpegaudenc->context, oclass->in_plugin) < 0) - GST_DEBUG_OBJECT (ffmpegaudenc, "Failed to set context defaults"); - - if ((oclass->in_plugin->capabilities & AV_CODEC_CAP_EXPERIMENTAL) && -@@ -314,8 +309,7 @@ gst_ffmpegaudenc_set_format (GstAudioEncoder * encoder, GstAudioInfo * info) - gst_caps_unref (allowed_caps); - gst_ffmpeg_avcodec_close (ffmpegaudenc->context); - GST_DEBUG ("Unsupported codec - no caps found"); -- if (avcodec_get_context_defaults3 (ffmpegaudenc->context, -- oclass->in_plugin) < 0) -+ if (gst_ffmpeg_avcodec_open (ffmpegaudenc->context, oclass->in_plugin) < 0) - GST_DEBUG_OBJECT (ffmpegaudenc, "Failed to set context defaults"); - return FALSE; - } -@@ -333,8 +327,7 @@ gst_ffmpegaudenc_set_format (GstAudioEncoder * encoder, GstAudioInfo * info) - icaps)) { - gst_ffmpeg_avcodec_close (ffmpegaudenc->context); - gst_caps_unref (icaps); -- if (avcodec_get_context_defaults3 (ffmpegaudenc->context, -- oclass->in_plugin) < 0) -+ if (gst_ffmpeg_avcodec_open (ffmpegaudenc->context, oclass->in_plugin) < 0) - GST_DEBUG_OBJECT (ffmpegaudenc, "Failed to set context defaults"); - return FALSE; - } -@@ -403,8 +396,8 @@ buffer_info_free (void *opaque, guint8 * data) - gst_buffer_unmap (info->buffer, &info->map); - gst_buffer_unref (info->buffer); - } else { -- av_free (info->ext_data); -- av_free (info->ext_data_array); -+ av_freep (&info->ext_data); -+ av_freep (&info->ext_data_array); - } - g_slice_free (BufferInfo, info); - } -diff --git a/ext/libav/gstavviddec.c b/ext/libav/gstavviddec.c -index a14b6df..c8f7a7d 100644 ---- a/ext/libav/gstavviddec.c -+++ b/ext/libav/gstavviddec.c -@@ -341,11 +341,7 @@ gst_ffmpegviddec_finalize (GObject * object) - - av_frame_free (&ffmpegdec->picture); - -- if (ffmpegdec->context != NULL) { -- gst_ffmpeg_avcodec_close (ffmpegdec->context); -- av_free (ffmpegdec->context); -- ffmpegdec->context = NULL; -- } -+ avcodec_free_context (&ffmpegdec->context); - - G_OBJECT_CLASS (parent_class)->finalize (object); - } -@@ -395,13 +391,9 @@ gst_ffmpegviddec_close (GstFFMpegVidDec * ffmpegdec, gboolean reset) - - gst_buffer_replace (&ffmpegdec->palette, NULL); - -- if (ffmpegdec->context->extradata) { -- av_free (ffmpegdec->context->extradata); -- ffmpegdec->context->extradata = NULL; -- } -+ av_freep (&ffmpegdec->context->extradata); - if (reset) { -- if (avcodec_get_context_defaults3 (ffmpegdec->context, -- oclass->in_plugin) < 0) { -+ if (gst_ffmpeg_avcodec_open (ffmpegdec->context, oclass->in_plugin) < 0) { - GST_DEBUG_OBJECT (ffmpegdec, "Failed to set context defaults"); - return FALSE; - } -@@ -2087,7 +2079,7 @@ gst_ffmpegviddec_start (GstVideoDecoder * decoder) - - GST_OBJECT_LOCK (ffmpegdec); - gst_ffmpeg_avcodec_close (ffmpegdec->context); -- if (avcodec_get_context_defaults3 (ffmpegdec->context, oclass->in_plugin) < 0) { -+ if (gst_ffmpeg_avcodec_open (ffmpegdec->context, oclass->in_plugin) < 0) { - GST_DEBUG_OBJECT (ffmpegdec, "Failed to set context defaults"); - GST_OBJECT_UNLOCK (ffmpegdec); - return FALSE; -diff --git a/ext/libav/gstavvidenc.c b/ext/libav/gstavvidenc.c -index 0468d88..b17ff68 100644 ---- a/ext/libav/gstavvidenc.c -+++ b/ext/libav/gstavvidenc.c -@@ -222,10 +222,8 @@ gst_ffmpegvidenc_finalize (GObject * object) - - /* clean up remaining allocated data */ - av_frame_free (&ffmpegenc->picture); -- gst_ffmpeg_avcodec_close (ffmpegenc->context); -- gst_ffmpeg_avcodec_close (ffmpegenc->refcontext); -- av_free (ffmpegenc->context); -- av_free (ffmpegenc->refcontext); -+ avcodec_free_context (&ffmpegenc->context); -+ avcodec_free_context (&ffmpegenc->refcontext); - - G_OBJECT_CLASS (parent_class)->finalize (object); - } -@@ -249,8 +247,7 @@ gst_ffmpegvidenc_set_format (GstVideoEncoder * encoder, - if (ffmpegenc->opened) { - gst_ffmpeg_avcodec_close (ffmpegenc->context); - ffmpegenc->opened = FALSE; -- if (avcodec_get_context_defaults3 (ffmpegenc->context, -- oclass->in_plugin) < 0) { -+ if (gst_ffmpeg_avcodec_open (ffmpegenc->context, oclass->in_plugin) < 0) { - GST_DEBUG_OBJECT (ffmpegenc, "Failed to set context defaults"); - return FALSE; - } -@@ -455,8 +452,7 @@ bad_input_fmt: - close_codec: - { - gst_ffmpeg_avcodec_close (ffmpegenc->context); -- if (avcodec_get_context_defaults3 (ffmpegenc->context, -- oclass->in_plugin) < 0) -+ if (gst_ffmpeg_avcodec_open (ffmpegenc->context, oclass->in_plugin) < 0) - GST_DEBUG_OBJECT (ffmpegenc, "Failed to set context defaults"); - goto cleanup_stats_in; - } -@@ -897,7 +893,7 @@ gst_ffmpegvidenc_start (GstVideoEncoder * encoder) - - /* close old session */ - gst_ffmpeg_avcodec_close (ffmpegenc->context); -- if (avcodec_get_context_defaults3 (ffmpegenc->context, oclass->in_plugin) < 0) { -+ if (gst_ffmpeg_avcodec_open (ffmpegenc->context, oclass->in_plugin) < 0) { - GST_DEBUG_OBJECT (ffmpegenc, "Failed to set context defaults"); - return FALSE; - } --- -GitLab - diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index 65e92b0..6b793e8 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -9,7 +9,6 @@ Summary: GStreamer 1.0 libav-based plug-ins License: LGPLv2+ URL: https://gstreamer.freedesktop.org/ Source0: %{url}/src/gst-libav/gst-libav-%{version}.tar.xz -Patch0: https://gitlab.freedesktop.org/gstreamer/gst-libav/-/merge_requests/139.patch BuildRequires: gcc-c++ BuildRequires: meson @@ -47,10 +46,8 @@ plug-in. %prep -%setup -n gst-libav-%{version} -%if 0%{?fedora} >= 36 -%patch0 -p1 -b ffmpeg45 -%endif +%autosetup -p1 -n gst-libav-%{version} + %build %meson \ From e2719ce54d241f6566066cebfd562f8e896f8292 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Sun, 3 Jul 2022 11:32:13 +0100 Subject: [PATCH 102/113] Revert "Rebuilt for new ffmpeg snapshot" This reverts commit 3c02c2c2f273c04038f37f6f52a0f0ea989f6ce6. --- gstreamer1-libav.spec | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index 6b793e8..59a7c27 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -4,7 +4,7 @@ Name: gstreamer1-libav Epoch: 1 Version: 1.19.2 -Release: 2%{?dist} +Release: 1%{?dist} Summary: GStreamer 1.0 libav-based plug-ins License: LGPLv2+ URL: https://gstreamer.freedesktop.org/ @@ -73,9 +73,6 @@ plug-in. %endif %changelog -* Thu Nov 11 2021 Leigh Scott - 1:1.19.2-2 -- Rebuilt for new ffmpeg snapshot - * Sat Oct 09 2021 Sérgio Basto - 1:1.19.2-1 - Update gstreamer1-libav to 1.19.2 From 6ed1aff00aa7b9f65d1ff633943d02f40921fd01 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Sun, 3 Jul 2022 11:32:13 +0100 Subject: [PATCH 103/113] Revert "rfpkg new-sources seems that sometimes fails" This reverts commit 388bae92a5c8d9da428f2297e4fa776178c9c342. --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index 6805f84..1b47723 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gst-libav-1.19.2.tar.xz) = e10e0e21aea655c500ef1266eee0410e3777e3a4aa0b85c75bc127345ddd62224dd07f063d30a06d64bf60e66508e9aca361665777935ca999d28c1c8d0eba36 +SHA512 (gst-libav-1.19.1.tar.xz) = 37541e5de9621bbc68e3d56504bd9ebe1ba286c7f22720478a3e6d8bd9d69a8722c050d05e54aaee18a83685c867d7673a9c17d81f6e208628bd948775d92db0 From a214ff411d7ac2233e85cf9d75af48850681b06d Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Sun, 3 Jul 2022 11:32:13 +0100 Subject: [PATCH 104/113] Revert "Update gstreamer1-libav to 1.19.2" This reverts commit df731cde6f4a5548246d422b0c6aba6bc0215e50. --- gstreamer1-libav.spec | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index 59a7c27..e8941b1 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -3,8 +3,8 @@ Name: gstreamer1-libav Epoch: 1 -Version: 1.19.2 -Release: 1%{?dist} +Version: 1.19.1 +Release: 2%{?dist} Summary: GStreamer 1.0 libav-based plug-ins License: LGPLv2+ URL: https://gstreamer.freedesktop.org/ @@ -73,9 +73,6 @@ plug-in. %endif %changelog -* Sat Oct 09 2021 Sérgio Basto - 1:1.19.2-1 -- Update gstreamer1-libav to 1.19.2 - * Mon Aug 02 2021 RPM Fusion Release Engineering - 1:1.19.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - gstreamer1.prov is broken and hangs, workarround it From ebbf3b26650d1322437fec4759dbbca1a4e70246 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Sun, 3 Jul 2022 11:32:13 +0100 Subject: [PATCH 105/113] Revert "gstreamer1.prov is broken and hangs, workarround it" This reverts commit 72f5ba7bfc96f428cd29e4446f1f23bd8ddd268c. --- gstreamer1-libav.spec | 4 ---- 1 file changed, 4 deletions(-) diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index e8941b1..07cee82 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -1,6 +1,3 @@ -# gstreamer1.prov is broken and hangs, workarround it -%global __gstreamer1_provides %{nil} - Name: gstreamer1-libav Epoch: 1 Version: 1.19.1 @@ -75,7 +72,6 @@ plug-in. %changelog * Mon Aug 02 2021 RPM Fusion Release Engineering - 1:1.19.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild -- gstreamer1.prov is broken and hangs, workarround it * Tue Jun 08 2021 Leigh Scott - 1.19.1-1 - Update From bc626584607c18cbea89a78337a0bf20eeca6c72 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Sun, 3 Jul 2022 11:32:13 +0100 Subject: [PATCH 106/113] Revert "- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild" This reverts commit afa839bf27c5422a0c2da83f94c0626b80df2587. --- gstreamer1-libav.spec | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index 07cee82..6a781af 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -1,7 +1,7 @@ Name: gstreamer1-libav Epoch: 1 Version: 1.19.1 -Release: 2%{?dist} +Release: 1%{?dist} Summary: GStreamer 1.0 libav-based plug-ins License: LGPLv2+ URL: https://gstreamer.freedesktop.org/ @@ -70,9 +70,6 @@ plug-in. %endif %changelog -* Mon Aug 02 2021 RPM Fusion Release Engineering - 1:1.19.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - * Tue Jun 08 2021 Leigh Scott - 1.19.1-1 - Update From 848f9235c9ea5618d2041bf70c25387b4315eb9d Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Sun, 3 Jul 2022 11:32:13 +0100 Subject: [PATCH 107/113] Revert "Add epoch" This reverts commit 9c1374e366d9fcd99ddf2b70c6b0ab0a702cf5db. --- gstreamer1-libav.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index 6a781af..bbb80a1 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -1,5 +1,4 @@ Name: gstreamer1-libav -Epoch: 1 Version: 1.19.1 Release: 1%{?dist} Summary: GStreamer 1.0 libav-based plug-ins From d8df2027aaf15ce4a4f65621646e553e92d6df16 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Sun, 3 Jul 2022 11:32:14 +0100 Subject: [PATCH 108/113] Revert "Update" This reverts commit 3d05a5880f95e217197e4988c36fe57af1e4884a. --- gstreamer1-libav.spec | 7 ++----- sources | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index bbb80a1..a8e850a 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -1,6 +1,6 @@ Name: gstreamer1-libav -Version: 1.19.1 -Release: 1%{?dist} +Version: 1.18.4 +Release: 2%{?dist} Summary: GStreamer 1.0 libav-based plug-ins License: LGPLv2+ URL: https://gstreamer.freedesktop.org/ @@ -69,9 +69,6 @@ plug-in. %endif %changelog -* Tue Jun 08 2021 Leigh Scott - 1.19.1-1 -- Update - * Wed Mar 24 2021 Leigh Scott - 1.18.4-2 - Drop patch diff --git a/sources b/sources index 1b47723..89920bc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gst-libav-1.19.1.tar.xz) = 37541e5de9621bbc68e3d56504bd9ebe1ba286c7f22720478a3e6d8bd9d69a8722c050d05e54aaee18a83685c867d7673a9c17d81f6e208628bd948775d92db0 +SHA512 (gst-libav-1.18.4.tar.xz) = 4eb10af6698f724bbc8d5b7b215e7349e6ff3b52e24b3987ee4077db1ae27ae0d6f25309adc50f0fccdf5af4d617634a7339ad1e5466a737c40a25c52c0d023f From da95ca5c9f13c2bc6e3d2f5ffae8078b9660bbda Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Sun, 3 Jul 2022 11:32:14 +0100 Subject: [PATCH 109/113] Revert "Drop patch" This reverts commit b3df946314e0970fdfc976f11e4570d2915ea8c7. --- gstreamer1-libav-ffmpeg44-fix.patch | 223 ++++++++++++++++++++++++++++ gstreamer1-libav.spec | 6 +- 2 files changed, 225 insertions(+), 4 deletions(-) create mode 100644 gstreamer1-libav-ffmpeg44-fix.patch diff --git a/gstreamer1-libav-ffmpeg44-fix.patch b/gstreamer1-libav-ffmpeg44-fix.patch new file mode 100644 index 0000000..310a4d4 --- /dev/null +++ b/gstreamer1-libav-ffmpeg44-fix.patch @@ -0,0 +1,223 @@ +--- gst-libav-1.18.2.old/ext/libav/gstavdemux.c 2021-02-26 16:47:35.842537392 -0800 ++++ gst-libav-1.18.2.new/ext/libav/gstavdemux.c 2021-02-26 16:47:55.137537967 -0800 +@@ -41,6 +41,211 @@ + typedef struct _GstFFMpegDemux GstFFMpegDemux; + typedef struct _GstFFStream GstFFStream; + ++typedef struct FFFrac { ++ int64_t val, num, den; ++} FFFrac; ++ ++struct AVStreamInternal { ++ /** ++ * Set to 1 if the codec allows reordering, so pts can be different ++ * from dts. ++ */ ++ int reorder; ++ ++ /** ++ * bitstream filter to run on stream ++ * - encoding: Set by muxer using ff_stream_add_bitstream_filter ++ * - decoding: unused ++ */ ++ AVBSFContext *bsfc; ++ ++ /** ++ * Whether or not check_bitstream should still be run on each packet ++ */ ++ int bitstream_checked; ++ ++ /** ++ * The codec context used by avformat_find_stream_info, the parser, etc. ++ */ ++ AVCodecContext *avctx; ++ /** ++ * 1 if avctx has been initialized with the values from the codec parameters ++ */ ++ int avctx_inited; ++ ++ enum AVCodecID orig_codec_id; ++ ++ /* the context for extracting extradata in find_stream_info() ++ * inited=1/bsf=NULL signals that extracting is not possible (codec not ++ * supported) */ ++ struct { ++ AVBSFContext *bsf; ++ AVPacket *pkt; ++ int inited; ++ } extract_extradata; ++ ++ /** ++ * Whether the internal avctx needs to be updated from codecpar (after a late change to codecpar) ++ */ ++ int need_context_update; ++ ++ int is_intra_only; ++ ++ FFFrac *priv_pts; ++ ++#define MAX_STD_TIMEBASES (30*12+30+3+6) ++ /** ++ * Stream information used internally by avformat_find_stream_info() ++ */ ++ struct { ++ int64_t last_dts; ++ int64_t duration_gcd; ++ int duration_count; ++ int64_t rfps_duration_sum; ++ double (*duration_error)[2][MAX_STD_TIMEBASES]; ++ int64_t codec_info_duration; ++ int64_t codec_info_duration_fields; ++ int frame_delay_evidence; ++ ++ /** ++ * 0 -> decoder has not been searched for yet. ++ * >0 -> decoder found ++ * <0 -> decoder with codec_id == -found_decoder has not been found ++ */ ++ int found_decoder; ++ ++ int64_t last_duration; ++ ++ /** ++ * Those are used for average framerate estimation. ++ */ ++ int64_t fps_first_dts; ++ int fps_first_dts_idx; ++ int64_t fps_last_dts; ++ int fps_last_dts_idx; ++ ++ } *info; ++ ++ AVIndexEntry *index_entries; /**< Only used if the format does not ++ support seeking natively. */ ++ int nb_index_entries; ++ unsigned int index_entries_allocated_size; ++ ++ int64_t interleaver_chunk_size; ++ int64_t interleaver_chunk_duration; ++ ++ /** ++ * stream probing state ++ * -1 -> probing finished ++ * 0 -> no probing requested ++ * rest -> perform probing with request_probe being the minimum score to accept. ++ */ ++ int request_probe; ++ /** ++ * Indicates that everything up to the next keyframe ++ * should be discarded. ++ */ ++ int skip_to_keyframe; ++ ++ /** ++ * Number of samples to skip at the start of the frame decoded from the next packet. ++ */ ++ int skip_samples; ++ ++ /** ++ * If not 0, the number of samples that should be skipped from the start of ++ * the stream (the samples are removed from packets with pts==0, which also ++ * assumes negative timestamps do not happen). ++ * Intended for use with formats such as mp3 with ad-hoc gapless audio ++ * support. ++ */ ++ int64_t start_skip_samples; ++ ++ /** ++ * If not 0, the first audio sample that should be discarded from the stream. ++ * This is broken by design (needs global sample count), but can't be ++ * avoided for broken by design formats such as mp3 with ad-hoc gapless ++ * audio support. ++ */ ++ int64_t first_discard_sample; ++ ++ /** ++ * The sample after last sample that is intended to be discarded after ++ * first_discard_sample. Works on frame boundaries only. Used to prevent ++ * early EOF if the gapless info is broken (considered concatenated mp3s). ++ */ ++ int64_t last_discard_sample; ++ ++ /** ++ * Number of internally decoded frames, used internally in libavformat, do not access ++ * its lifetime differs from info which is why it is not in that structure. ++ */ ++ int nb_decoded_frames; ++ ++ /** ++ * Timestamp offset added to timestamps before muxing ++ */ ++ int64_t mux_ts_offset; ++ ++ /** ++ * Internal data to check for wrapping of the time stamp ++ */ ++ int64_t pts_wrap_reference; ++ ++ /** ++ * Options for behavior, when a wrap is detected. ++ * ++ * Defined by AV_PTS_WRAP_ values. ++ * ++ * If correction is enabled, there are two possibilities: ++ * If the first time stamp is near the wrap point, the wrap offset ++ * will be subtracted, which will create negative time stamps. ++ * Otherwise the offset will be added. ++ */ ++ int pts_wrap_behavior; ++ ++ /** ++ * Internal data to prevent doing update_initial_durations() twice ++ */ ++ int update_initial_durations_done; ++ ++#define MAX_REORDER_DELAY 16 ++ ++ /** ++ * Internal data to generate dts from pts ++ */ ++ int64_t pts_reorder_error[MAX_REORDER_DELAY+1]; ++ uint8_t pts_reorder_error_count[MAX_REORDER_DELAY+1]; ++ ++ int64_t pts_buffer[MAX_REORDER_DELAY+1]; ++ ++ /** ++ * Internal data to analyze DTS and detect faulty mpeg streams ++ */ ++ int64_t last_dts_for_order_check; ++ uint8_t dts_ordered; ++ uint8_t dts_misordered; ++ ++ /** ++ * Internal data to inject global side data ++ */ ++ int inject_global_side_data; ++ ++ /** ++ * display aspect ratio (0 if unknown) ++ * - encoding: unused ++ * - decoding: Set by libavformat to calculate sample_aspect_ratio internally ++ */ ++ AVRational display_aspect_ratio; ++ ++ AVProbeData probe_data; ++ ++ /** ++ * last packet in packet_buffer for this stream when muxing. ++ */ ++ struct AVPacketList *last_in_packet_buffer; ++}; ++ + struct _GstFFStream + { + GstPad *pad; +@@ -483,7 +688,7 @@ gst_ffmpegdemux_do_seek (GstFFMpegDemux + GST_LOG_OBJECT (demux, "keyframeidx: %d", keyframeidx); + + if (keyframeidx >= 0) { +- fftarget = stream->index_entries[keyframeidx].timestamp; ++ fftarget = stream->internal->index_entries[keyframeidx].timestamp; + target = gst_ffmpeg_time_ff_to_gst (fftarget, stream->time_base); + + GST_LOG_OBJECT (demux, diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index a8e850a..6e41719 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -1,10 +1,11 @@ Name: gstreamer1-libav Version: 1.18.4 -Release: 2%{?dist} +Release: 1%{?dist} Summary: GStreamer 1.0 libav-based plug-ins License: LGPLv2+ URL: https://gstreamer.freedesktop.org/ Source0: %{url}/src/gst-libav/gst-libav-%{version}.tar.xz +Patch0: https://gitlab.freedesktop.org/gstreamer/gst-libav/uploads/1340cbe52e8384f4aa92b147b804f64f/gstreamer1-libav-ffmpeg44-fix.patch BuildRequires: gcc-c++ BuildRequires: meson @@ -69,9 +70,6 @@ plug-in. %endif %changelog -* Wed Mar 24 2021 Leigh Scott - 1.18.4-2 -- Drop patch - * Wed Mar 17 2021 Leigh Scott - 1.18.4-1 - 1.18.4 From 0afc233144a1c67d57a32ce838ecb40ac85a5968 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Sun, 3 Jul 2022 11:32:14 +0100 Subject: [PATCH 110/113] Revert "1.18.4" This reverts commit bc228266666f17bd1a1fc568bcf5eb32eb276e88. --- gstreamer1-libav.spec | 7 ++----- sources | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index 6e41719..7fec0ce 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -1,6 +1,6 @@ Name: gstreamer1-libav -Version: 1.18.4 -Release: 1%{?dist} +Version: 1.18.2 +Release: 4%{?dist} Summary: GStreamer 1.0 libav-based plug-ins License: LGPLv2+ URL: https://gstreamer.freedesktop.org/ @@ -70,9 +70,6 @@ plug-in. %endif %changelog -* Wed Mar 17 2021 Leigh Scott - 1.18.4-1 -- 1.18.4 - * Sun Feb 28 2021 Leigh Scott - 1.18.2-4 - Add patch for ffmpeg-4.4 diff --git a/sources b/sources index 89920bc..df112a3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gst-libav-1.18.4.tar.xz) = 4eb10af6698f724bbc8d5b7b215e7349e6ff3b52e24b3987ee4077db1ae27ae0d6f25309adc50f0fccdf5af4d617634a7339ad1e5466a737c40a25c52c0d023f +SHA512 (gst-libav-1.18.2.tar.xz) = ad57fd08c87ecbc64adc3f904f66e2454abe9e6a2a53fbb0bab73a972a072c649d060fb0f1186e204bd5978587b0d7afe6c1b9d049b23d976b4250757097507e From 85734a4e87cf9143cacc06fa51ddf5eb2fc55495 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Sun, 3 Jul 2022 11:38:55 +0100 Subject: [PATCH 111/113] Revert "Revert "1.18.4"" This reverts commit 0afc233144a1c67d57a32ce838ecb40ac85a5968. --- gstreamer1-libav.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index 7fec0ce..6e41719 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -1,6 +1,6 @@ Name: gstreamer1-libav -Version: 1.18.2 -Release: 4%{?dist} +Version: 1.18.4 +Release: 1%{?dist} Summary: GStreamer 1.0 libav-based plug-ins License: LGPLv2+ URL: https://gstreamer.freedesktop.org/ @@ -70,6 +70,9 @@ plug-in. %endif %changelog +* Wed Mar 17 2021 Leigh Scott - 1.18.4-1 +- 1.18.4 + * Sun Feb 28 2021 Leigh Scott - 1.18.2-4 - Add patch for ffmpeg-4.4 diff --git a/sources b/sources index df112a3..89920bc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gst-libav-1.18.2.tar.xz) = ad57fd08c87ecbc64adc3f904f66e2454abe9e6a2a53fbb0bab73a972a072c649d060fb0f1186e204bd5978587b0d7afe6c1b9d049b23d976b4250757097507e +SHA512 (gst-libav-1.18.4.tar.xz) = 4eb10af6698f724bbc8d5b7b215e7349e6ff3b52e24b3987ee4077db1ae27ae0d6f25309adc50f0fccdf5af4d617634a7339ad1e5466a737c40a25c52c0d023f From d155d1b837667d1b54152303335563b31c761ad0 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Sun, 3 Jul 2022 12:01:42 +0100 Subject: [PATCH 112/113] Use compat-ffmpeg4 --- gstreamer1-libav.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index 6e41719..953bad0 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -14,7 +14,7 @@ BuildRequires: gstreamer1-plugins-base-devel >= %{version} BuildRequires: orc-devel BuildRequires: bzip2-devel BuildRequires: zlib-devel -BuildRequires: ffmpeg-devel +BuildRequires: compat-ffmpeg4-devel %description GStreamer is a streaming media framework, based on graphs of filters which @@ -47,6 +47,7 @@ plug-in. %build +export PKG_CONFIG_PATH="%{_libdir}/compat-ffmpeg4/pkgconfig" %meson \ -D package-name='gst-libav 1.0 rpmfusion rpm' \ -D package-origin='http://rpmfusion.org/' \ From a28028bc4e6dbd49023cb3195b9f3fdff7c8d64d Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Mon, 5 Sep 2022 16:50:25 +0100 Subject: [PATCH 113/113] Rebuild for ffmpeg --- gstreamer1-libav.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec index 953bad0..775b9da 100644 --- a/gstreamer1-libav.spec +++ b/gstreamer1-libav.spec @@ -1,6 +1,6 @@ Name: gstreamer1-libav Version: 1.18.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GStreamer 1.0 libav-based plug-ins License: LGPLv2+ URL: https://gstreamer.freedesktop.org/ @@ -71,6 +71,9 @@ export PKG_CONFIG_PATH="%{_libdir}/compat-ffmpeg4/pkgconfig" %endif %changelog +* Mon Sep 05 2022 Leigh Scott - 1.18.4-2 +- Rebuild for ffmpeg + * Wed Mar 17 2021 Leigh Scott - 1.18.4-1 - 1.18.4