From 67d6e2e40d348c4b0e529a6ab01e4298b414fd7d Mon Sep 17 00:00:00 2001 From: Michael Schwendt Date: Sep 22 2016 20:50:13 +0000 Subject: Patch for Audacious plugin API 48. --- diff --git a/audacious-plugin-fc-API-48.patch b/audacious-plugin-fc-API-48.patch new file mode 100644 index 0000000..4430036 --- /dev/null +++ b/audacious-plugin-fc-API-48.patch @@ -0,0 +1,55 @@ +diff -Nur audacious-plugin-fc-0.8.3.6-orig/src/audfc.cpp audacious-plugin-fc-0.8.3.6/src/audfc.cpp +--- audacious-plugin-fc-0.8.3.6-orig/src/audfc.cpp 2014-12-10 19:29:09.000000000 +0100 ++++ audacious-plugin-fc-0.8.3.6/src/audfc.cpp 2016-09-22 22:17:18.000000000 +0200 +@@ -165,28 +165,27 @@ + return true; + } + +-Tuple AudFC::read_tuple(const char *filename, VFSFile &fd) { ++bool AudFC::read_tag(const char *filename, VFSFile &fd, Tuple &t, Index *image) { + void *decoder = nullptr; + void *fileBuf = nullptr; + size_t fileLen; + + if ( fd.fseek(0,VFS_SEEK_END)!=0 ) { +- return Tuple(); ++ return false; + } + fileLen = fd.ftell(); + if ( fd.fseek(0,VFS_SEEK_SET)!=0 ) { +- return Tuple(); ++ return false; + } + fileBuf = malloc(fileLen); + if ( !fileBuf ) { +- return Tuple(); ++ return false; + } + if ( fileLen != fd.fread((char*)fileBuf,1,fileLen) ) { + free(fileBuf); +- return Tuple(); ++ return false; + } + decoder = fc14dec_new(); +- Tuple t; + if (fc14dec_init(decoder,fileBuf,fileLen)) { + t.set_filename(filename); + t.set_int(Tuple::Length,fc14dec_duration(decoder)); +@@ -194,5 +193,5 @@ + } + free(fileBuf); + fc14dec_delete(decoder); +- return t; ++ return true; + } +diff -Nur audacious-plugin-fc-0.8.3.6-orig/src/audfc.h audacious-plugin-fc-0.8.3.6/src/audfc.h +--- audacious-plugin-fc-0.8.3.6-orig/src/audfc.h 2014-12-11 10:23:06.000000000 +0100 ++++ audacious-plugin-fc-0.8.3.6/src/audfc.h 2016-09-22 22:14:04.000000000 +0200 +@@ -26,6 +26,6 @@ + + bool init(); + bool is_our_file(const char *filename, VFSFile &file); +- Tuple read_tuple(const char *filename, VFSFile &file); ++ bool read_tag(const char *filename, VFSFile &file, Tuple &tuple, Index * image); + bool play(const char *filename, VFSFile &file); + }; diff --git a/audacious-plugin-fc.spec b/audacious-plugin-fc.spec index 6eb82e2..445dd0b 100644 --- a/audacious-plugin-fc.spec +++ b/audacious-plugin-fc.spec @@ -9,14 +9,16 @@ Summary: Future Composer input plugin for Audacious Name: audacious-plugin-fc Version: 0.8.3.6 -Release: 0.5%{?dist} +Release: 0.6%{?dist} Provides: audacious-plugins-fc = %{version}-%{release} URL: http://xmms-fc.sourceforge.net/ License: GPLv2+ Group: Applications/Multimedia Source0: http://downloads.sourceforge.net/xmms-fc/audacious-plugin-fc-%{version}.tar.gz -BuildRequires: pkgconfig(audacious) >= 3.6 +Patch0: audacious-plugin-fc-API-48.patch + +BuildRequires: pkgconfig(audacious) >= 3.8 BuildRequires: libfc14audiodecoder-devel BuildRequires: pkgconfig BuildRequires: libtool automake @@ -38,6 +40,7 @@ music files from AMIGA. Song-length detection and seek are implemented, too. pkg-config --print-variables audacious | grep ^plugin_dir %setup -q +%patch0 -p1 -b .API-change %build @@ -58,6 +61,9 @@ appstream-util validate-relax --nonet ${RPM_BUILD_ROOT}%{_datadir}/appdata/*.xml %changelog +* Thu Sep 22 2016 Michael Schwendt - 0.8.3.6-0.6 +- Patch for Audacious plugin API 48. + * Wed Feb 03 2016 Fedora Release Engineering - 0.8.3.6-0.5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild