commit 3698c3e448f22c02bb0766c2c86419eb7e78e6d8 Author: Martin Gansser <mgansser(a)alice.de&gt; Date: Fri Mar 24 23:15:40 2017 +0100 Update to 4.1 Remove %{name}-4.0.9-ffmpeg_3.0.patch Add %{name}-4.1-ffmpeg_3.0.patch .gitignore | 1 + sources | 2 +- ...peg_3.0.patch => tvheadend-4.1-ffmpeg_3.0.patch | 26 ++++++++++++---------- tvheadend.spec | 18 +++++++++------ 4 files changed, 27 insertions(+), 20 deletions(-) --- diff --git a/.gitignore b/.gitignore index 1fa2f2c..65ae412 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /tvheadend-4.0.9.tar.gz +/tvheadend-4.1.tar.gz diff --git a/sources b/sources index be67fa0..769856b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -afe45a345151e7ce31db673e0c738e6e tvheadend-4.0.9.tar.gz +d73362985dffdadb5794d306147db58c tvheadend-4.1.tar.gz diff --git a/tvheadend-4.0.9-ffmpeg_3.0.patch b/tvheadend-4.1-ffmpeg_3.0.patch similarity index 99% rename from tvheadend-4.0.9-ffmpeg_3.0.patch rename to tvheadend-4.1-ffmpeg_3.0.patch index a5c2861..f28577c 100644 --- a/tvheadend-4.0.9-ffmpeg_3.0.patch +++ b/tvheadend-4.1-ffmpeg_3.0.patch @@ -395,27 +395,29 @@ diff -up ./src/plumbing/transcoding.c.orig ./src/plumbing/transcoding.c if(opts) av_dict_free(&opts); -@@ -1548,15 +1637,17 @@ transcoder_destroy_video(transcoder_t *t +@@ -1614,16 +1614,19 @@ transcoder_destroy_video(transcoder_t *t + av_free(vs->vid_octx); + } + ++ if (vs->flt_graph) { ++ avfilter_graph_free(&vs->flt_graph); ++ vs->flt_graph = NULL; ++ } ++ if(vs->vid_dec_frame) av_free(vs->vid_dec_frame); - + - if(vs->vid_scaler) - sws_freeContext(vs->vid_scaler); - if(vs->vid_enc_frame) av_free(vs->vid_enc_frame); - - if (vs->vid_first_pkt) - pkt_ref_dec(vs->vid_first_pkt); - -+ if (vs->flt_graph) { -+ avfilter_graph_free(&vs->flt_graph); -+ vs->flt_graph = NULL; -+ } -+ + free(ts); ++ } - + + @@ -1603,11 +1694,13 @@ transcoder_init_video(transcoder_t *t, s vs->vid_ictx->thread_count = vs->vid_octx->thread_count = transcoder_thread_count(t, sct); diff --git a/tvheadend.spec b/tvheadend.spec index a1cc391..3371358 100644 --- a/tvheadend.spec +++ b/tvheadend.spec @@ -2,8 +2,8 @@ %global tvheadend_group video Name: tvheadend -Version: 4.0.9 -Release: 4%{?dist} +Version: 4.1 +Release: 1%{?dist} Summary: TV streaming server and digital video recorder Group: Applications/Multimedia @@ -17,7 +17,8 @@ Patch0: %{name}-4.0.9-build.patch # - 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 +###Patch1: %{name}-4.0.9-ffmpeg_3.0.patch +Patch1: %{name}-4.1-ffmpeg_3.0.patch # Use system queue.h header Patch2: %{name}-4.0.9-use_system_queue.patch # Fix build with hdhomerun @@ -75,14 +76,15 @@ MPEG-TS stream generated by ffmpeg/libav from a V4L device. %if 0%{?fedora} >= 24 %patch1 -p0 -b .ffmpeg_3.0 %endif -%patch2 -p0 -b .use_system_queue +#%patch2 -p0 -b .use_system_queue %patch3 -p0 -b .hdhomerun %patch4 -p0 -b .dtv_scan_tables %patch5 -p0 -b .service %patch6 -p0 -b .crypto_policies # Delete bundled system headers -rm -r vendor/{dvb-api,include}/ +#rm -r vendor/{dvb-api,include}/ +rm -r vendor/dvb-api/ %build @@ -143,8 +145,10 @@ exit 0 %changelog -* Mon Mar 20 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org&gt; - 4.0.9-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild +* Fri Mar 24 2017 Martin Gansser <martinkg(a)fedoraproject.org&gt; - 4.1-1 +- Update to 4.1 +- Remove %%{name}-4.0.9-ffmpeg_3.0.patch +- Add %%{name}-4.1-ffmpeg_3.0.patch * Tue Aug 09 2016 Mohamed El Morabity <melmorabity(a)fedoraproject.org&gt; - 4.0.9-3 - Merge all FFmpeg patches into a single one