[packages/qmmp] - fix building with ffmpeg 4.0 - rel 4

baggins baggins at pld-linux.org
Sun Apr 29 21:48:13 CEST 2018


commit 9be5c436584a93e3c9a9803aafc2bea5658eaa82
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun Apr 29 21:47:53 2018 +0200

    - fix building with ffmpeg 4.0
    - rel 4

 ffmpeg4.patch | 11 +++++++++++
 qmmp.spec     |  4 +++-
 2 files changed, 14 insertions(+), 1 deletion(-)
---
diff --git a/qmmp.spec b/qmmp.spec
index 5f6ab9d..6601ce5 100644
--- a/qmmp.spec
+++ b/qmmp.spec
@@ -8,11 +8,12 @@ Summary(hu.UTF-8):	XMMS-szerű Qt alapú audio-lejátszó
 Summary(pl.UTF-8):	Odtwarzacz muzyki w stylu XMMS oparty na Qt
 Name:		qmmp
 Version:	1.2.0
-Release:	3
+Release:	4
 License:	GPL v2+
 Group:		X11/Applications/Multimedia
 Source0:	http://qmmp.ylsoftware.com/files/%{name}-%{version}.tar.bz2
 # Source0-md5:	cc3468fe610412e2db5113d8ce0a379e
+Patch0:		ffmpeg4.patch
 URL:		http://qmmp.ylsoftware.com/
 BuildRequires:	Qt5Core-devel >= 5.4.0
 BuildRequires:	Qt5DBus-devel >= 5.4.0
@@ -152,6 +153,7 @@ Pliki nagłówkowe qmmp.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 install -d build
diff --git a/ffmpeg4.patch b/ffmpeg4.patch
new file mode 100644
index 0000000..bff35de
--- /dev/null
+++ b/ffmpeg4.patch
@@ -0,0 +1,11 @@
+--- qmmp-1.2.0/src/plugins/Input/ffmpeg/decoder_ffmpeg.h~	2017-11-25 11:45:02.000000000 +0100
++++ qmmp-1.2.0/src/plugins/Input/ffmpeg/decoder_ffmpeg.h	2018-04-29 21:31:46.124815253 +0200
+@@ -61,7 +61,7 @@
+     AVPacket m_pkt;
+     AVPacket m_temp_pkt;
+     qint64 m_output_at;
+-    uchar m_input_buf[INPUT_BUFFER_SIZE + FF_INPUT_BUFFER_PADDING_SIZE];
++    uchar m_input_buf[INPUT_BUFFER_SIZE + AV_INPUT_BUFFER_PADDING_SIZE];
+     int64_t m_seekTime;
+     qint64  m_skipBytes;
+     int m_channels;
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/qmmp.git/commitdiff/9be5c436584a93e3c9a9803aafc2bea5658eaa82



More information about the pld-cvs-commit mailing list