commit: 0b91829596d09d210b12edc8eee0aacbb1291107 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Tue Dec 19 22:42:28 2017 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue Dec 19 22:43:20 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b918295
app-cdr/cdrdao: Fix build with >=media-sound/lame-3.100 Thanks-to: Michael Palimaka (kensington) <kensington <AT> gentoo.org> Tested-by: Brendan Horan <brendan <AT> horan.hk> Closes: https://bugs.gentoo.org/635014 Package-Manager: Portage-2.3.19, Repoman-2.3.6 app-cdr/cdrdao/cdrdao-1.2.3-r4.ebuild | 13 +++++++----- app-cdr/cdrdao/files/cdrdao-1.2.3-lame-3.100.patch | 24 ++++++++++++++++++++++ 2 files changed, 32 insertions(+), 5 deletions(-) diff --git a/app-cdr/cdrdao/cdrdao-1.2.3-r4.ebuild b/app-cdr/cdrdao/cdrdao-1.2.3-r4.ebuild index 8f7487c4dd4..9f93e4dc692 100644 --- a/app-cdr/cdrdao/cdrdao-1.2.3-r4.ebuild +++ b/app-cdr/cdrdao/cdrdao-1.2.3-r4.ebuild @@ -19,26 +19,29 @@ SLOT="0" KEYWORDS="alpha amd64 ~arm hppa ia64 ~ppc ~ppc64 ~sh sparc x86 ~x86-fbsd" IUSE="encode mad vorbis" -RDEPEND="virtual/cdrtools +COMMON_DEPEND=" + virtual/cdrtools encode? ( >=media-sound/lame-3.99 ) mad? ( media-libs/libmad media-libs/libao - ) + ) vorbis? ( media-libs/libvorbis media-libs/libao - ) + )" +DEPEND="${COMMON_DEPEND} + virtual/pkgconfig" +RDEPEND="${COMMON_DEPEND} !app-cdr/cue2toc !dev-util/pccts" -DEPEND="${RDEPEND} - virtual/pkgconfig" PATCHES=( "${FILESDIR}/${P}-glibc212.patch" "${FILESDIR}/${P}-unsigned-char.patch" "${FILESDIR}/${P}-ax_pthread.patch" "${FILESDIR}/${P}-wformat-security.patch" + "${FILESDIR}/${P}-lame-3.100.patch" ) S="${WORKDIR}/${P/_}" diff --git a/app-cdr/cdrdao/files/cdrdao-1.2.3-lame-3.100.patch b/app-cdr/cdrdao/files/cdrdao-1.2.3-lame-3.100.patch new file mode 100644 index 00000000000..c712de2394c --- /dev/null +++ b/app-cdr/cdrdao/files/cdrdao-1.2.3-lame-3.100.patch @@ -0,0 +1,24 @@ +--- a/utils/toc2mp3.cc ++++ b/utils/toc2mp3.cc +@@ -143,8 +143,8 @@ + + message(0, "LAME encoder version: %s", get_lame_version()); + message(0, "Supported bit rates: "); +- for (int i = 0; i < 16 && bitrate_table[1][i] >= 0; i++) { +- message(0, "%d ", bitrate_table[1][i]); ++ for (int i = 0; i < 16 && lame_get_bitrate(1, i) >= 0; i++) { ++ message(0, "%d ", lame_get_bitrate(1, i)); + } + message(0, ""); + } +@@ -238,8 +238,8 @@ + lame_global_flags *lf; + int bitrateOk = 0; + +- for (int i = 0; bitrate_table[1][i] >= 0 && !bitrateOk; i++) { +- if (bitrate == bitrate_table[1][i]) ++ for (int i = 0; lame_get_bitrate(1, i) >= 0 && !bitrateOk; i++) { ++ if (bitrate == lame_get_bitrate(1, i)) + bitrateOk = 1; + } +
