From 169d64dc91f2c372b69535980d12e0824ab8f7c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Thu, 4 Jan 2018 00:30:10 +0100 Subject: [PATCH] cdrdao: fix build with newer libmp3lame --- .../patches/fix-lame-bitrate_table.patch | 24 +++++++++++++++++++ srcpkgs/cdrdao/template | 2 +- 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/cdrdao/patches/fix-lame-bitrate_table.patch diff --git a/srcpkgs/cdrdao/patches/fix-lame-bitrate_table.patch b/srcpkgs/cdrdao/patches/fix-lame-bitrate_table.patch new file mode 100644 index 00000000000..e1089f94a02 --- /dev/null +++ b/srcpkgs/cdrdao/patches/fix-lame-bitrate_table.patch @@ -0,0 +1,24 @@ +--- utils/toc2mp3.cc ++++ 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; + } + diff --git a/srcpkgs/cdrdao/template b/srcpkgs/cdrdao/template index ae88e7a0b1e..b6bd37ce758 100644 --- a/srcpkgs/cdrdao/template +++ b/srcpkgs/cdrdao/template @@ -1,7 +1,7 @@ # Template file for 'cdrdao' pkgname=cdrdao version=1.2.3 -revision=2 +revision=3 nocross=yes # runs pccts/antlr/antlr build_style=gnu-configure hostmakedepends="pkg-config"