[HandBrake: 1/3] Fix SubRip subtitle issue when built with FFmpeg
by Dominik Mierzejewski
commit c9dc8559ddb1f62ce61811a2aa48be93dab50000
Author: Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net>
Date: Fri Dec 29 12:30:46 2017 +0100
Fix SubRip subtitle issue when built with FFmpeg
HandBrake.spec | 8 +++++++-
handbrake_subrip.patch | 36 ++++++++++++++++++++++++++++++++++++
2 files changed, 43 insertions(+), 1 deletion(-)
---
diff --git a/HandBrake.spec b/HandBrake.spec
index 0de6337..136d737 100644
--- a/HandBrake.spec
+++ b/HandBrake.spec
@@ -17,7 +17,7 @@
Name: HandBrake
Version: 1.0.7
-Release: 4%{!?tag:.%{date}git%{shortcommit0}}%{?dist}
+Release: 5%{!?tag:.%{date}git%{shortcommit0}}%{?dist}
Summary: An open-source multiplatform video transcoder
License: GPLv2+
URL: http://handbrake.fr/
@@ -46,6 +46,8 @@ Patch2: %{name}-system-OpenCL.patch
Patch3: %{name}-nostrip.patch
# Don't link with libva unnecessarily
Patch4: %{name}-no-libva.patch
+# Fix SubRip subtitle issue when built with FFmpeg
+Patch5: https://trac.ffmpeg.org/raw-attachment/ticket/6304/handbrake_subrip.patch
BuildRequires: a52dec-devel >= 0.7.4
BuildRequires: cmake
@@ -135,6 +137,7 @@ gpgv2 --keyring %{S:2} %{S:1} %{S:0}
%patch2 -p1
%patch3 -p1
%patch4 -p1
+%{!?_without_ffmpeg:%patch5 -p1}
mkdir -p download
%{?_without_ffmpeg:cp -p %{SOURCE10} download}
@@ -234,6 +237,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_bindir}/HandBrakeCLI
%changelog
+* Fri Dec 29 2017 Dominik Mierzejewski <rpm(a)greysector.net> - 1.0.7-5
+- Fix SubRip subtitle issue when built with FFmpeg
+
* Thu Jul 20 2017 Dominik Mierzejewski <rpm(a)greysector.net> - 1.0.7-4
- update commit id to match 1.0.7 release
- drop redundant Provides/Obsoletes
diff --git a/handbrake_subrip.patch b/handbrake_subrip.patch
new file mode 100644
index 0000000..ba4d4db
--- /dev/null
+++ b/handbrake_subrip.patch
@@ -0,0 +1,36 @@
+From 8066b69b14735e94432316055d8546572ae65c9e Mon Sep 17 00:00:00 2001
+From: Sven Gothel <sgothel(a)jausoft.com>
+Date: Thu, 28 Dec 2017 04:28:26 +0100
+Subject: [PATCH] Using AV_CODEC_ID_SUBRIP instead of AV_CODEC_ID_SRT
+ (libav->ffmpeg)
+
+This fixes issue https://trac.ffmpeg.org/ticket/6304
+See https://github.com/HandBrake/HandBrake/pull/981#issuecomment-347364763
+See https://github.com/HandBrake/HandBrake/issues/974#issuecomment-353986772
+---
+ libhb/stream.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libhb/stream.c b/libhb/stream.c
+index e223482cd..34670160b 100644
+--- a/libhb/stream.c
++++ b/libhb/stream.c
+@@ -5309,7 +5309,7 @@ static void add_ffmpeg_subtitle( hb_title_t *title, hb_stream_t *stream, int id
+ "subtitle colors likely to be wrong" );
+ break;
+ case AV_CODEC_ID_TEXT:
+- case AV_CODEC_ID_SRT:
++ case AV_CODEC_ID_SUBRIP:
+ subtitle->format = TEXTSUB;
+ subtitle->source = UTF8SUB;
+ subtitle->config.dest = PASSTHRUSUB;
+@@ -5882,7 +5882,7 @@ hb_buffer_t * hb_ffmpeg_read( hb_stream_t *stream )
+ break;
+ }
+ if ( ffmpeg_pkt_codec == AV_CODEC_ID_TEXT ||
+- ffmpeg_pkt_codec == AV_CODEC_ID_SRT ||
++ ffmpeg_pkt_codec == AV_CODEC_ID_SUBRIP ||
+ ffmpeg_pkt_codec == AV_CODEC_ID_MOV_TEXT ) {
+ int64_t ffmpeg_pkt_duration = stream->ffmpeg_pkt.duration;
+ int64_t buf_duration = av_to_hb_pts( ffmpeg_pkt_duration, tsconv, 0 );
+
6 years, 4 months
[vdr-xineliboutput] Update to 2.0.0-1.20171207gitf397e7e
by Martin Gansser
commit 0503c5b8498fdca3ea70babcf7c4b9bf855298ad
Author: martinkg <martinkg(a)fedoraproject.org>
Date: Thu Dec 28 20:39:12 2017 +0100
Update to 2.0.0-1.20171207gitf397e7e
.gitignore | 1 +
sources | 2 +-
vdr-xineliboutput.spec | 11 +++++++----
3 files changed, 9 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9610df3..04e7f45 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ vdr-xineliboutput-1.1.0-20150422.tgz
/vdr-xineliboutput-1.1.0-29f7afd.tar.gz
/vdr-xineliboutput-1.1.0-71eefbe.tar.gz
/vdr-xineliboutput-1.1.0-46f0f1d.tar.gz
+/vdr-xineliboutput-2.0.0-f397e7e.tar.gz
diff --git a/sources b/sources
index e0f094f..5e3e2dc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7c37926596338c407eb1aa9da130a7f9 vdr-xineliboutput-1.1.0-46f0f1d.tar.gz
+eeca05191e00fe79359215f497cf49b2 vdr-xineliboutput-2.0.0-f397e7e.tar.gz
diff --git a/vdr-xineliboutput.spec b/vdr-xineliboutput.spec
index 16868a8..32a5a60 100644
--- a/vdr-xineliboutput.spec
+++ b/vdr-xineliboutput.spec
@@ -3,14 +3,14 @@
%global xinepluginver 2.0.1
%global pname xineliboutput
%global vdrver %(vdr-config --version 2>/dev/null || echo ERROR)
-%global gitrev 46f0f1d
-%global gitdate 20170315
+%global gitrev f397e7e
+%global gitdate 20171207
# build bluray support (disabled for now)
%global have_bluray 1
Name: vdr-%{pname}
-Version: 1.1.0
-Release: 24.%{gitdate}git%{gitrev}%{?dist}
+Version: 2.0.0
+Release: 1.%{gitdate}git%{gitrev}%{?dist}
Summary: Plugins for watching VDR over Xine
Group: Applications/Multimedia
License: GPLv2+
@@ -149,6 +149,9 @@ find %{buildroot}%{xineplugindir} -name '*.so' -exec chmod +x '{}' ';'
%{vdr_plugindir}/libxineliboutput-sxfe.so.%{xinepluginver}-git
%changelog
+* Thu Dec 28 2017 Martin Gansser <martinkg(a)fedoraproject.org> - 2.0.0-1.20171207gitf397e7e
+- Update to 2.0.0-1.20171207gitf397e7e
+
* Thu Aug 31 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org> - 1.1.0-24.20170315git46f0f1d
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
6 years, 4 months
[aegisub] Fix build for icu-59.1
by Leigh Scott
commit 6f2ba0be6ef3fb7885436245384ba316db57da7b
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Wed Dec 27 11:24:50 2017 +0000
Fix build for icu-59.1
aegisub.spec | 10 +++++++++-
icu_59_buildfix.patch | 21 +++++++++++++++++++++
2 files changed, 30 insertions(+), 1 deletion(-)
---
diff --git a/aegisub.spec b/aegisub.spec
index 0e7d871..37bfb58 100644
--- a/aegisub.spec
+++ b/aegisub.spec
@@ -6,7 +6,7 @@
Name: aegisub
Version: 3.2.2
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Tool for creating and modifying subtitles
#src/gl/ - MIT license. See src/gl/glext.h
@@ -17,6 +17,11 @@ URL: http://www.aegisub.org
# https://github.com/Aegisub/Aegisub
Source0: https://github.com/%{gituser}/%{gitname}/archive/v%{version}.tar.gz#/%{na...
Patch0: %{name}-pthread.patch
+# Fix compilation against icu 59.1
+# https://github.com/Aegisub/Aegisub/commit/dd67db47cb2203e7a14058e52549721...
+%if 0%{?fedora} > 27
+Patch1: https://github.com/%{gituser}/%{gitname}/commit/dd67db47cb2203e7a14058e52...
+%endif
ExclusiveArch: i686 x86_64 armv7hl
@@ -97,6 +102,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
+* Wed Dec 27 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 3.2.2-7
+- Fix build for icu-59.1
+
* Thu Aug 31 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org> - 3.2.2-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
diff --git a/icu_59_buildfix.patch b/icu_59_buildfix.patch
new file mode 100644
index 0000000..a15d656
--- /dev/null
+++ b/icu_59_buildfix.patch
@@ -0,0 +1,21 @@
+From dd67db47cb2203e7a14058e52549721f6ff16a49 Mon Sep 17 00:00:00 2001
+From: Maxime Gauduin <alucryd(a)archlinux.org>
+Date: Tue, 9 May 2017 04:01:47 +0200
+Subject: [PATCH] Fix compilation against icu 59.1 (#46)
+
+---
+ src/utils.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/utils.cpp b/src/utils.cpp
+index e1cde5e83..876c4c011 100644
+--- a/src/utils.cpp
++++ b/src/utils.cpp
+@@ -44,6 +44,7 @@
+ #include <boost/filesystem/path.hpp>
+ #include <map>
+ #include <unicode/locid.h>
++#include <unicode/unistr.h>
+ #include <wx/clipbrd.h>
+ #include <wx/filedlg.h>
+ #include <wx/stdpaths.h>
6 years, 4 months
[dwarffortress] Update to latest upstream release, 0.44.03.
by Ben Rosser
commit 7322b05b601444c42af1a165ee0cc0f22c596c4f
Author: Ben Rosser <rosser.bjr(a)gmail.com>
Date: Tue Dec 26 20:57:02 2017 +0000
Update to latest upstream release, 0.44.03.
.gitignore | 3 +++
dwarffortress.spec | 9 ++++++---
sources | 6 +++---
3 files changed, 12 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index fa70018..17473e1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,6 @@
/0.44.02.zip
/df_44_02_linux.tar.bz2
/df_44_02_linux32.tar.bz2
+/0.44.03.zip
+/df_44_03_linux32.tar.bz2
+/df_44_03_linux.tar.bz2
diff --git a/dwarffortress.spec b/dwarffortress.spec
index a960479..1bdcc82 100644
--- a/dwarffortress.spec
+++ b/dwarffortress.spec
@@ -4,15 +4,15 @@
%global __strip /bin/true
Name: dwarffortress
-Version: 0.44.02
+Version: 0.44.03
Release: 1%{?dist}
Summary: A single-player procedurally generated fantasy game
License: Dwarf Fortress
URL: http://www.bay12games.com/dwarves/
-Source0: http://www.bay12games.com/dwarves/df_44_02_linux.tar.bz2
-Source1: http://www.bay12games.com/dwarves/df_44_02_linux32.tar.bz2
+Source0: http://www.bay12games.com/dwarves/df_44_03_linux.tar.bz2
+Source1: http://www.bay12games.com/dwarves/df_44_03_linux32.tar.bz2
Source2: https://github.com/svenstaro/dwarf_fortress_unfuck/archive/%{version}.zip
Source3: https://mars.arosser.com/fedora/dwarffortress/rpmfusion/dwarffortress-lau...
@@ -129,6 +129,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata
%{_datadir}/appdata/dwarffortress.appdata.xml
%changelog
+* Tue Dec 26 2017 Ben Rosser <rosser.bjr(a)gmail.com> 0.44.03-1
+- Updated to latest upstream release.
+
* Wed Nov 29 2017 Ben Rosser <rosser.bjr(a)gmail.com> 0.44.02-1
- Updated to latest upstream release.
- Update URL for dwarffortress launcher.
diff --git a/sources b/sources
index 6f105c7..0067edc 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
df7f7f5f00c918504c3fa2147566154f dwarffortress-launcher.tar.xz
-8b84bc3dc0060f461308af5d8a6c955b 0.44.02.zip
-56501ed956a0802d9cc219a66bffa8f8 df_44_02_linux.tar.bz2
-39f1a8aa32c3afa8a73d3513439f286c df_44_02_linux32.tar.bz2
+ff916c575f587db43dce5d28ce50f4f2 0.44.03.zip
+316e6d0c34bcc489364fc13ec467b28b df_44_03_linux32.tar.bz2
+60a68261747673a91d583fa7129eb6c1 df_44_03_linux.tar.bz2
6 years, 4 months
[mlt-freeworld] Add vid.stab support
by Sérgio M. Basto
commit 280d9887e3a081b2bb72bea16bdca96fe20b37c2
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Tue Dec 26 18:03:25 2017 +0000
Add vid.stab support
mlt-freeworld.spec | 2 ++
1 file changed, 2 insertions(+)
---
diff --git a/mlt-freeworld.spec b/mlt-freeworld.spec
index 9fc0a36..5b3ea8c 100644
--- a/mlt-freeworld.spec
+++ b/mlt-freeworld.spec
@@ -41,6 +41,7 @@ BuildRequires: libquicktime-devel
BuildRequires: xine-lib-devel
BuildRequires: alsa-lib-devel
BuildRequires: movit-devel
+BuildRequires: vid.stab-devel
Requires: mlt = %{version}
@@ -107,6 +108,7 @@ find %{buildroot} -type d -empty -delete
%changelog
* Sun Dec 24 2017 Sérgio Basto <sergio(a)serjux.com> - 6.5.0-0.6.20171213gitea973eb
- Update snapshot
+- Add vid.stab support
* Fri Nov 17 2017 Sérgio Basto <sergio(a)serjux.com> - 6.5.0-0.5.20171114git73bfefd
- Update snapshot
6 years, 4 months
[smplayer] update update_smplayer.txt
by Sérgio M. Basto
Summary of changes:
6bd5290... update update_smplayer.txt (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 4 months
