commit 4a531c782ccf17d673b9e9da81baeaa1a730017c Author: Martin Gansser <mgansser(a)online.de&gt; Date: Mon May 27 15:59:27 2019 +0200 Update to 2:3.1 Add epoch to allow update .gitignore | 1 + dvdstyler.spec | 27 +++++++++++++++++++-------- ffmpeg35_buildfix.patch | 22 +++++++++++----------- sources | 2 +- 4 files changed, 32 insertions(+), 20 deletions(-) --- diff --git a/.gitignore b/.gitignore index b9718e8..8f36047 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ DVDStyler-2.9.6.tar.bz2 /dvdstyler-e4c6466.tar.bz2 /dvdstyler-e4968db.tar.bz2 /dvdstyler-1c9ce4c.tar.bz2 +/DVDStyler-3.1.tar.bz2 diff --git a/dvdstyler.spec b/dvdstyler.spec index a6f5b21..f70ca9a 100644 --- a/dvdstyler.spec +++ b/dvdstyler.spec @@ -1,5 +1,5 @@ #For git snapshots, set to 0 to use release instead: -%global usesnapshot 1 +%global usesnapshot 0 %if 0%{?usesnapshot} %global commit0 1c9ce4ca75ca5819e50f0728beb0b65959821940 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) @@ -8,12 +8,16 @@ %global prerel_real .beta3 %global prerel b2 -%global wxsvg_ver 1.5.16 +%global wxsvg_ver 1.5.17 Name: dvdstyler -Epoch: 1 +Epoch: 2 Version: 3.1 -Release: 6.beta3%{?snapshottag}%{?dist} +%if 0%{?usesnapshot} +Release: 6.beta4%{?snapshottag}%{?dist} +%else +Release: 1%{?dist} +%endif Summary: Cross-platform DVD authoring application License: GPLv2+ URL: http://www.dvdstyler.de/ @@ -31,7 +35,7 @@ URL: http://www.dvdstyler.de/ %if 0%{?usesnapshot} Source0: %{name}-%{shortcommit0}.tar.bz2 %else -Source0: http://downloads.sourceforge.net/dvdstyler/DVDStyler-%%{version}%{?prerel... +Source0: http://downloads.sourceforge.net/dvdstyler/DVDStyler-%{version}.tar.bz2 %endif Patch1: dvdstyler-wxwin.m4.patch @@ -79,8 +83,11 @@ create navigational DVD menus similar to those found on most commercial DVDs. %prep -#%setup -q -n DVDStyler-%{version}%{?prerel} +%if 0%{?usesnapshot} %setup -q -n %{name} +%else +%setup -q -n DVDStyler-%{version} +%endif %patch1 -p1 #%patch2 -p1 #{__sed} -i 's|_T("xine \\"dvd:/$DIR\\"");|_T("totem \\"dvd://$DIR\\"");|' src/Config.h @@ -132,8 +139,12 @@ desktop-file-install \ %{_mandir}/*/*.gz %changelog -* Tue Apr 16 2019 Martin Gansser <martinkg(a)fedoraproject.org&gt; - 1:3.1-6.beta3.git1c9ce4c -- Update to 1:3.1-6.beta3.git1c9ce4c +* Mon May 27 2019 Martin Gansser <martinkg(a)fedoraproject.org&gt; - 2:3.1-1 +- Update to 2:3.1 +- Add epoch to allow update + +* Tue Apr 16 2019 Martin Gansser <martinkg(a)fedoraproject.org&gt; - 1:3.1-6.beta4.git1c9ce4c +- Update to 1:3.1-6.beta4.git1c9ce4c * Fri Apr 12 2019 Martin Gansser <martinkg(a)fedoraproject.org&gt; - 1:3.1-5.beta3.gite4968db - Update to 1:3.1-5.beta3.gite4968db diff --git a/ffmpeg35_buildfix.patch b/ffmpeg35_buildfix.patch index 1ca0e8e..d52a835 100644 --- a/ffmpeg35_buildfix.patch +++ b/ffmpeg35_buildfix.patch @@ -1,12 +1,12 @@ ---- a/src/mediaenc_ffmpeg.cpp -+++ b/src/mediaenc_ffmpeg.cpp -@@ -223,7 +223,7 @@ - c->time_base = (AVRational){ 1, c->sample_rate }; - // some formats want stream headers to be separate - if(m_outputCtx->oformat->flags & AVFMT_GLOBALHEADER) -- c->flags |= CODEC_FLAG_GLOBAL_HEADER; -+ c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; - - return true; - } +--- a/src/stream.h ++++ b/src/stream.h +@@ -94,7 +94,7 @@ + // assume default is OK, so just comment out. + // avcc->lmax= FF_QP2LAMBDA * 2; + if (interlaced) +- avcc->flags |= CODEC_FLAG_INTERLACED_DCT|CODEC_FLAG_INTERLACED_ME; ++ avcc->flags |= AV_CODEC_FLAG_INTERLACED_DCT|AV_CODEC_FLAG_INTERLACED_ME; + } + + friend class mpgfile; diff --git a/sources b/sources index 28790e9..60cbbd6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c7376ef1eda35a50a13ed537f0c24614 dvdstyler-1c9ce4c.tar.bz2 +3b4abf4d3376725dd81b73ddf06bb677 DVDStyler-3.1.tar.bz2