Hello community, here is the log from the commit of package kradio for openSUSE:Factory checked in at 2018-07-02 23:34:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kradio (Old) and /work/SRC/openSUSE:Factory/.kradio.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kradio" Mon Jul 2 23:34:16 2018 rev:38 rq:620241 version:4.0.8 Changes: -------- --- /work/SRC/openSUSE:Factory/kradio/kradio.changes 2018-03-09 10:46:53.270047441 +0100 +++ /work/SRC/openSUSE:Factory/.kradio.new/kradio.changes 2018-07-02 23:34:20.861182650 +0200 @@ -1,0 +2,6 @@ +Mon Jul 2 13:41:46 UTC 2018 - [email protected] + +- Add fix-build-with-ffmpeg4.patch to fix build with recent ffmpeg + versions. + +------------------------------------------------------------------- New: ---- fix-build-with-ffmpeg4.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kradio.spec ++++++ --- /var/tmp/diff_new_pack.Qlw9hw/_old 2018-07-02 23:34:24.293178404 +0200 +++ /var/tmp/diff_new_pack.Qlw9hw/_new 2018-07-02 23:34:24.297178399 +0200 @@ -1,7 +1,7 @@ # # spec file for package kradio # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,39 +18,39 @@ %bcond_without ffmpeg %bcond_without lame - Name: kradio Version: 4.0.8 Release: 0 Summary: AM/FM Application for KDE 4 -License: GPL-2.0+ +License: GPL-2.0-or-later Group: Productivity/Multimedia/Sound/Players -Url: http://kradio.sourceforge.net +URL: http://kradio.sourceforge.net Source: http://sourceforge.net/projects/kradio/files/kradio/%{version}/kradio4-%{version}.tar.bz2 # PATCH-FIX-OPENSUSE suse_docdir.patch -- Use openSUSE default doc directory Patch0: suse_docdir.patch +# PATCH-FIX-UPSTREAM fix-build-with-ffmpeg4.patch -- Fix build with ffmpeg 4 +Patch1: fix-build-with-ffmpeg4.patch BuildRequires: alsa-devel -%if 0%{?suse_version} > 1325 -BuildRequires: libboost_headers-devel -%else -BuildRequires: boost-devel -%endif BuildRequires: fdupes BuildRequires: libkde4-devel +BuildRequires: libmms-devel BuildRequires: libsndfile-devel BuildRequires: libvorbis-devel BuildRequires: lirc-devel +%{kde4_runtime_requires} +%if 0%{?suse_version} > 1325 +BuildRequires: libboost_headers-devel +%else +BuildRequires: boost-devel +%endif %if %{with ffmpeg} BuildRequires: pkgconfig(libavcodec) BuildRequires: pkgconfig(libavformat) BuildRequires: pkgconfig(libswresample) %endif -BuildRequires: libmms-devel %if %{with lame} BuildRequires: libmp3lame-devel %endif -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%kde4_runtime_requires %description Comfortable AM/FM Application for KDE4 @@ -74,7 +74,7 @@ %prep %setup -q -n kradio4-%{version} -%patch0 -p1 +%autopatch -p1 %build %if %{with ffmpeg} @@ -92,7 +92,8 @@ %find_lang kradio4 --all-name %files -f kradio4.lang -%defattr(-,root,root,-) +%license COPYING +%doc README* %{_datadir}/pixmaps/kradio4.png %{_docdir}/%{name} %exclude %{_docdir}/%{name}/INSTALL ++++++ fix-build-with-ffmpeg4.patch ++++++ commit 06aab2b91666246cc884eb7734e465bba6d1752a Author: Pino Toscano <[email protected]> Date: Sun May 27 12:54:48 2018 +0200 internet radio: FF_INPUT_BUFFER_PADDING_SIZE -> AV_INPUT_BUFFER_PADDING_SIZE libavcodec 4.0+ does not provide FF_INPUT_BUFFER_PADDING_SIZE anymore, so use AV_INPUT_BUFFER_PADDING_SIZE when available, falling back to the old define for older ffmpeg versions Index: kradio4-4.0.8/plugins/internetradio/decoder_thread.cpp =================================================================== --- kradio4-4.0.8.orig/plugins/internetradio/decoder_thread.cpp +++ kradio4-4.0.8/plugins/internetradio/decoder_thread.cpp @@ -40,6 +40,10 @@ extern "C" { #include <libavutil/opt.h> } +#ifndef AV_INPUT_BUFFER_PADDING_SIZE /* LIBAVCODEC_VERSION_INT < AV_VERSION_INT(56, 60, 100) */ +# define AV_INPUT_BUFFER_PADDING_SIZE FF_INPUT_BUFFER_PADDING_SIZE +#endif + InternetRadioDecoder::InternetRadioDecoder(QObject *event_parent, const InternetRadioStation &rs, @@ -566,7 +570,7 @@ static int InternetRadioDecoder_readInpu void InternetRadioDecoder::initIOCallbacks(void *opaque, int(*read_packet_func)(void *, uint8_t *, int )) { // paranoia padding: 4x requirement - unsigned char *ioBuffer = reinterpret_cast<unsigned char*>(av_malloc(DEFAULT_MMS_BUFFER_SIZE + 4 * FF_INPUT_BUFFER_PADDING_SIZE)); + unsigned char *ioBuffer = reinterpret_cast<unsigned char*>(av_malloc(DEFAULT_MMS_BUFFER_SIZE + 4 * AV_INPUT_BUFFER_PADDING_SIZE)); #if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52, 110, 0) // checked: avformat_open_input in ffmpeg >= 0.7
