commit: 0568ae6dc56356713ac50cfb05230ceefb2e576c Author: Tim Harder <radhermit <AT> gentoo <DOT> org> AuthorDate: Wed Jul 10 08:10:12 2019 +0000 Commit: Tim Harder <radhermit <AT> gentoo <DOT> org> CommitDate: Wed Jul 10 08:13:51 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0568ae6d
media-sound/audiotools: fix build with older libcdio-paranoia versions Closes: https://bugs.gentoo.org/689580 Signed-off-by: Tim Harder <radhermit <AT> gentoo.org> .../files/audiotools-3.1.1-libcdio-paranoia.patch | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/media-sound/audiotools/files/audiotools-3.1.1-libcdio-paranoia.patch b/media-sound/audiotools/files/audiotools-3.1.1-libcdio-paranoia.patch index 1081149641a..f0ac41661d9 100644 --- a/media-sound/audiotools/files/audiotools-3.1.1-libcdio-paranoia.patch +++ b/media-sound/audiotools/files/audiotools-3.1.1-libcdio-paranoia.patch @@ -1,4 +1,4 @@ -Add support for Gentoo's newer dev-libs/libcdio-paranoia file layout and +Add support for Gentoo's dev-libs/libcdio-paranoia file layout and versioning. --- audiotools-3.1.1/setup.py @@ -20,14 +20,17 @@ versioning. # library not found --- audiotools-3.1.1/src/cdiomodule.h +++ audiotools-3.1.1/src/cdiomodule.h -@@ -3,8 +3,8 @@ - #include <cdio/cdda.h> - #include <cdio/paranoia.h> - #else +@@ -1,11 +1,6 @@ + #include <Python.h> +-#ifdef OLD_PARANOIA +-#include <cdio/cdda.h> +-#include <cdio/paranoia.h> +-#else -#include <cdio/cdparanoia/cdda.h> -#include <cdio/cdparanoia/paranoia.h> +-#endif +#include <cdio/paranoia/cdda.h> +#include <cdio/paranoia/paranoia.h> - #endif /******************************************************** + Audio Tools, a module and set of tools for manipulating audio data
