commit 7f6e05512533e660665e21f8a6305b62db5cbe25
Author: Jan Rękorajski <[email protected]>
Date: Fri Apr 1 23:00:12 2016 +0900
- up to 2.5.0
- fixed build with ffmpeg 3
ffmpeg3.patch | 13 +++++++++++++
moc.spec | 13 ++++++-------
2 files changed, 19 insertions(+), 7 deletions(-)
---
diff --git a/moc.spec b/moc.spec
index 9fdb51d..374dd03 100644
--- a/moc.spec
+++ b/moc.spec
@@ -3,20 +3,18 @@
%bcond_with home_etc # enable HOME_ETC support
%bcond_without ffmpeg # disable ffmpeg
-%define subver beta1
-%define rel 5
Summary: Console audio player with simple ncurses interface
Summary(hu.UTF-8): Konzolos audiólejátszó egyszerű ncurses felülettel
Summary(pl.UTF-8): Konsolowy odtwarzacz audio z prostym interfejsem ncurses
Name: moc
Version: 2.5.0
-Release: 0.%{subver}.%{rel}
+Release: 1
License: GPL
Group: Applications/Sound
-#Source0:
ftp://ftp.daper.net/pub/soft/moc/stable/%{name}-%{version}.tar.bz2
-Source0:
ftp://ftp.daper.net/pub/soft/moc/unstable/%{name}-%{version}-%{subver}.tar.bz2
-# Source0-md5: 795ecba86847e082aa2f21937cc04804
+Source0:
http://ftp.daper.net/pub/soft/moc/stable/%{name}-%{version}.tar.bz2
+# Source0-md5: 18e3a979b67091bfee4b62217908c473
Patch0: %{name}-home_etc.patch
+Patch1: ffmpeg3.patch
URL: http://moc.daper.net/
BuildRequires: a52dec-libs-devel
BuildRequires: alsa-lib-devel
@@ -267,8 +265,9 @@ Ten pakiet zapewnia dekodowanie formatu WavPack. Po
zainstalowaniu
należy uruchomić ponownie MOC.
%prep
-%setup -q -n %{name}-%{version}-%{subver}
+%setup -q
%{?with_home_etc:%patch0 -p1}
+%patch1 -p1
rm -rf libltdl
%{__sed} -i -e '/SUBDIRS/ s/libltdl//' Makefile.am
diff --git a/ffmpeg3.patch b/ffmpeg3.patch
new file mode 100644
index 0000000..c93cf46
--- /dev/null
+++ b/ffmpeg3.patch
@@ -0,0 +1,13 @@
+diff -ur moc-2.5.0.orig/decoder_plugins/ffmpeg/ffmpeg.c
moc-2.5.0/decoder_plugins/ffmpeg/ffmpeg.c
+--- moc-2.5.0.orig/decoder_plugins/ffmpeg/ffmpeg.c 2014-08-30
11:32:27.000000000 +0900
++++ moc-2.5.0/decoder_plugins/ffmpeg/ffmpeg.c 2016-04-01 22:57:20.111650802
+0900
+@@ -66,9 +66,6 @@
+ #include <libavformat/avformat.h>
+ GCC_DIAG_ON(deprecated-declarations)
+ #include <libavutil/mathematics.h>
+-#ifdef HAVE_AV_GET_CHANNEL_LAYOUT_NB_CHANNELS
+-#include <libavutil/audioconvert.h>
+-#endif
+ #else
+ #include <ffmpeg/avformat.h>
+ #endif
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/moc.git/commitdiff/7f6e05512533e660665e21f8a6305b62db5cbe25
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
