commit 0d1ee2a815d47936d45595b250d55e7192d5f17e Author: sagitter <sagitter(a)fedoraproject.org&gt; Date: Sat Jan 20 21:22:30 2018 +0100 Add patch for timidity from upstream ffmpeg35_buildfix.patch => moc-ffmpeg35_buildfix.patch | 0 moc-r2961+timidity_sint8-1.patch | 13 +++++++++++++ moc.spec | 12 ++++++++++-- 3 files changed, 23 insertions(+), 2 deletions(-) --- diff --git a/ffmpeg35_buildfix.patch b/moc-ffmpeg35_buildfix.patch similarity index 100% rename from ffmpeg35_buildfix.patch rename to moc-ffmpeg35_buildfix.patch diff --git a/moc-r2961+timidity_sint8-1.patch b/moc-r2961+timidity_sint8-1.patch new file mode 100644 index 0000000..842b676 --- /dev/null +++ b/moc-r2961+timidity_sint8-1.patch @@ -0,0 +1,13 @@ +diff --git a/decoder_plugins/timidity/timidity.c b/decoder_plugins/timidity/timidity.c +index cb10b3a..0293749 100644 +--- a/decoder_plugins/timidity/timidity.c ++++ b/decoder_plugins/timidity/timidity.c +@@ -142,7 +142,7 @@ static int timidity_decode (void *void_data, char *buf, int buf_len, + sound_params->rate = midioptions.rate; + sound_params->fmt = (midioptions.format==MID_AUDIO_S16LSB)?(SFMT_S16 | SFMT_LE):SFMT_S8; + +- return mid_song_read_wave(data->midisong, buf, buf_len); ++ return mid_song_read_wave(data->midisong, (void *)buf, buf_len); + } + + static int timidity_get_bitrate (void *unused ATTR_UNUSED) diff --git a/moc.spec b/moc.spec index 2aa2790..fa4a63e 100644 --- a/moc.spec +++ b/moc.spec @@ -10,7 +10,7 @@ Name: moc Summary: Music on Console - Console audio player for Linux/UNIX Version: 2.6 -Release: 0.22.alpha3%{?dist} +Release: 0.23.alpha3%{?dist} License: GPLv3+ URL: http://moc.daper.net @@ -20,7 +20,8 @@ URL: http://moc.daper.net ## tar -cvzf moc-git%%{checkout}.tar.gz trunk #Source0: moc-git%%{checkout}.tar.gz Source0: http://ftp.daper.net/pub/soft/moc/unstable/moc-%{version}-alpha3.tar.xz -Patch0: ffmpeg35_buildfix.patch +Patch0: %{name}-ffmpeg35_buildfix.patch +Patch1: %{name}-r2961+timidity_sint8-1.patch BuildRequires: pkgconfig(ncurses) BuildRequires: pkgconfig(alsa) @@ -59,7 +60,10 @@ files in this directory beginning from the chosen file. %prep %setup -q -n moc-%{version}-alpha3 +%if 0%{?fedora} > 27 %patch0 -p1 +%endif +%patch1 -p1 %build autoreconf -ivf @@ -88,6 +92,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/moc/decoder_plugins/*.la %{_libdir}/%{name}/ %changelog +* Fri Jan 19 2018 Antonio Trande <sagitter(a)fedoraproject.org&gt; - 2.6-0.23.alpha3 +- Rename patch for ffmpeg-3.5 and applied on fedora 28+ +- Add patch for timidity from upstream + * Thu Jan 18 2018 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 2.6-0.22.alpha3 - Rebuilt for ffmpeg-3.5 git