commit bb4e188bcbfd5a849cb1242ebe8df07422077260 Author: Mohamed El Morabity <melmorabity(a)fedoraproject.org&gt; Date: Tue Aug 9 15:11:55 2016 +0200 Merge all FFmpeg patches tvheadend-4.0.9-ffmpeg_3.0.patch | 24 ++++++++++++++---------- tvheadend-4.0.9-ffmpeg_3.1.patch | 20 -------------------- tvheadend.spec | 13 +++++-------- 3 files changed, 19 insertions(+), 38 deletions(-) --- diff --git a/tvheadend-4.0.9-ffmpeg_3.0.patch b/tvheadend-4.0.9-ffmpeg_3.0.patch index f127b0e..a5c2861 100644 --- a/tvheadend-4.0.9-ffmpeg_3.0.patch +++ b/tvheadend-4.0.9-ffmpeg_3.0.patch @@ -1,6 +1,6 @@ diff -up ./configure.orig ./configure --- ./configure.orig 2016-03-14 10:10:57.000000000 +0100 -+++ ./configure 2016-07-05 00:18:31.023320750 +0200 ++++ ./configure 2016-08-09 13:20:27.159342444 +0200 @@ -395,7 +395,7 @@ else has_libav=false fi @@ -21,7 +21,7 @@ diff -up ./configure.orig ./configure diff -up ./src/libav.c.orig ./src/libav.c --- ./src/libav.c.orig 2016-03-14 10:10:57.000000000 +0100 -+++ ./src/libav.c 2016-07-05 00:19:19.154076349 +0200 ++++ ./src/libav.c 2016-08-09 13:20:27.159342444 +0200 @@ -186,4 +186,5 @@ libav_init(void) av_log_set_callback(libav_log_callback); av_log_set_level(AV_LOG_VERBOSE); @@ -30,7 +30,7 @@ diff -up ./src/libav.c.orig ./src/libav.c } diff -up ./src/libav.h.orig ./src/libav.h --- ./src/libav.h.orig 2016-03-14 10:10:57.000000000 +0100 -+++ ./src/libav.h 2016-07-05 00:21:52.805103748 +0200 ++++ ./src/libav.h 2016-08-09 13:20:27.159342444 +0200 @@ -21,6 +21,7 @@ @@ -40,8 +40,8 @@ diff -up ./src/libav.h.orig ./src/libav.h /* diff -up ./src/plumbing/transcoding.c.orig ./src/plumbing/transcoding.c ---- ./src/plumbing/transcoding.c.orig 2016-03-14 10:10:57.000000000 +0100 -+++ ./src/plumbing/transcoding.c 2016-07-05 00:33:28.319065719 +0200 +--- ./src/plumbing/transcoding.c.orig 2016-08-09 13:20:21.782349916 +0200 ++++ ./src/plumbing/transcoding.c 2016-08-09 13:20:28.686340322 +0200 @@ -19,12 +19,14 @@ #include <unistd.h> #include <libavformat/avformat.h> @@ -199,19 +199,23 @@ diff -up ./src/plumbing/transcoding.c.orig ./src/plumbing/transcoding.c /** * */ -@@ -592,10 +716,10 @@ transcoder_stream_audio(transcoder_t *t, +@@ -592,12 +716,12 @@ transcoder_stream_audio(transcoder_t *t, // Convert audio tvhtrace("transcode", "%04X: converting audio", shortid(t)); - tvhtrace("transcode", "%04X: IN : channels=%d, layout=%" PRIi64 ", rate=%d, fmt=%d, bitrate=%d", -+ tvhtrace("transcode", "%04X: IN : channels=%d, layout=%" PRIi64 ", rate=%d, fmt=%d, bitrate=%ld", ++ tvhtrace("transcode", "%04X: IN : channels=%d, layout=%" PRIi64 ", rate=%d, fmt=%d, bitrate=%"PRId64, shortid(t), ictx->channels, ictx->channel_layout, ictx->sample_rate, - ictx->sample_fmt, ictx->bit_rate); +- ictx->sample_fmt, ictx->bit_rate); - tvhtrace("transcode", "%04X: OUT: channels=%d, layout=%" PRIi64 ", rate=%d, fmt=%d, bitrate=%d", -+ tvhtrace("transcode", "%04X: OUT: channels=%d, layout=%" PRIi64 ", rate=%d, fmt=%d, bitrate=%ld", ++ ictx->sample_fmt, (int64_t)ictx->bit_rate); ++ tvhtrace("transcode", "%04X: OUT: channels=%d, layout=%" PRIi64 ", rate=%d, fmt=%d, bitrate=%"PRId64, shortid(t), octx->channels, octx->channel_layout, octx->sample_rate, - octx->sample_fmt, octx->bit_rate); +- octx->sample_fmt, octx->bit_rate); ++ octx->sample_fmt, (int64_t)octx->bit_rate); + if (transcode_opt_set_int(t, ts, as->resample_context, + "in_channel_layout", ictx->channel_layout, 1)) @@ -962,9 +1086,7 @@ transcoder_stream_video(transcoder_t *t, AVCodecContext *ictx, *octx; AVDictionary *opts; diff --git a/tvheadend.spec b/tvheadend.spec index e3fec82..d21968f 100644 --- a/tvheadend.spec +++ b/tvheadend.spec @@ -3,7 +3,7 @@ Name: tvheadend Version: 4.0.9 -Release: 2%{?dist} +Release: 3%{?dist} Summary: TV streaming server and digital video recorder Group: Applications/Multimedia @@ -16,6 +16,7 @@ Patch0: %{name}-4.0.9-build.patch # - https://github.com/tvheadend/tvheadend/commit/ea02889 # - https://github.com/tvheadend/tvheadend/commit/c63371c # - https://github.com/tvheadend/tvheadend/commit/3cbee55 +# - https://github.com/tvheadend/tvheadend/commit/374ab83 Patch1: %{name}-4.0.9-ffmpeg_3.0.patch # Use system queue.h header Patch2: %{name}-4.0.9-use_system_queue.patch @@ -31,9 +32,6 @@ Patch5: %{name}-4.0.9-service.patch # Enforcing system crypto policies, see # https://fedoraproject.org/wiki/Packaging:CryptoPolicies Patch6: %{name}-4.0.9-crypto_policies.patch -# Fix build with FFmpeg >= 3.1, based on -# https://github.com/tvheadend/tvheadend/commit/374ab83 -Patch7: %{name}-4.0.9-ffmpeg_3.1.patch BuildRequires: bzip2 BuildRequires: gcc @@ -82,10 +80,6 @@ MPEG-TS stream generated by ffmpeg/libav from a V4L device. %patch4 -p0 -b .dtv_scan_tables %patch5 -p0 -b .service %patch6 -p0 -b .crypto_policies -# RPM Fusion provides FFMpeg 3.1 for Fedora >= 25 -%if 0%{?fedora} >= 25 -%patch7 -p0 -b .ffmpeg_3.1 -%endif # Delete bundled system headers rm -r vendor/{dvb-api,include}/ @@ -149,6 +143,9 @@ exit 0 %changelog +* Tue Aug 09 2016 Mohamed El Morabity <melmorabity(a)fedoraproject.org&gt; - 4.0.9-3 +- Merge all FFmpeg patches into a single one + * Tue Aug 09 2016 Mohamed El Morabity <melmorabity(a)fedoraproject.org&gt; - 4.0.9-2 - Fix build with FFmpeg 3.1