From 53d69a60afa23841abbc123979c63e585ea635a9 Mon Sep 17 00:00:00 2001 From: Filipe Rosset Date: Tue, 24 Apr 2018 21:47:42 -0300 Subject: [PATCH] - fix FTBFS on rawhide --- cdrdao-1.2.3-lame-3.100.patch | 24 ++++++++++++++++++++++++ cdrdao.spec | 7 ++++++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 cdrdao-1.2.3-lame-3.100.patch diff --git a/cdrdao-1.2.3-lame-3.100.patch b/cdrdao-1.2.3-lame-3.100.patch new file mode 100644 index 0000000..c712de2 --- /dev/null +++ b/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; + } + diff --git a/cdrdao.spec b/cdrdao.spec index 2f2ee66..2eafd93 100644 --- a/cdrdao.spec +++ b/cdrdao.spec @@ -1,7 +1,7 @@ Summary: Writes audio CD-Rs in disk-at-once (DAO) mode Name: cdrdao Version: 1.2.3 -Release: 32%{?dist} +Release: 33%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://cdrdao.sourceforge.net/ @@ -26,6 +26,7 @@ Patch1: cdrdao-1.2.3-stat.patch Patch2: cdrdao-1.2.3-helpmansync.patch Patch3: cdrdao-1.2.3-format_security.patch Patch4: cdrdao-1.2.3-narrowing.patch +Patch5: cdrdao-1.2.3-lame-3.100.patch %description Cdrdao records audio CD-Rs in disk-at-once (DAO) mode, based on a @@ -41,6 +42,7 @@ of pre-gaps, the pause areas between tracks. %patch2 -p1 -b .helpmansync %patch3 -p1 -b .format_security %patch4 -p1 -b .narrowing +%patch5 -p1 -b .lame-3.100.patch %build #run autoreconf to support aarch64 @@ -74,6 +76,9 @@ find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' %changelog +* Wed Apr 25 2018 Filipe Rosset - 1.2.3-33 +- fix FTBFS on rawhide + * Wed Feb 07 2018 Fedora Release Engineering - 1.2.3-32 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild