Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=multilib.git;a=commitdiff;h=3a40047229955790037b04a573a56842ef4f6bb7
commit 3a40047229955790037b04a573a56842ef4f6bb7
Author: crazy <cr...@frugalware.org>
Date: Fri Feb 2 18:11:49 2018 +0100
cdrdao-1.2.3-9-x86_64
* rebuild with tc
* added toc2mp3 patch to fix compile errors
diff --git a/source/multimedia/cdrdao/FrugalBuild
b/source/multimedia/cdrdao/FrugalBuild
index 40713ab..5ef20b8 100644
--- a/source/multimedia/cdrdao/FrugalBuild
+++ b/source/multimedia/cdrdao/FrugalBuild
@@ -4,21 +4,24 @@
pkgname=cdrdao
pkgver=1.2.3
-pkgrel=7
+pkgrel=9
pkgdesc="Records audio/data CD-Rs in disk-at-once (DAO) mode"
depends=('libmad>=0.15.1b-9' 'lame>=3.99.5-5' 'libstdc++>=6.3.1-4'
'libao>=1.2.0-4' 'libvorbis>=1.3.5-5')
groups=('multimedia')
archs=("x86_64")
_F_sourceforge_ext=".tar.bz2"
Finclude sourceforge
+options+=('noprotector' 'nofortify' 'norelro')
source=($source cdrdao-1.2.3-autoconf-update.patch \
cdrdao-1.2.3-k3b.patch \
- cdrdao-1.2.3-stat.patch cdrdao-1.2.3-narrowing.patch)
+ cdrdao-1.2.3-stat.patch \
+ cdrdao-1.2.3-narrowing.patch toc2mp3.patch)
sha1sums=('70d6547795a1342631c7ab56709fd1940c2aff9f' \
'00e9b111c50e381f8cb4fcbc837cc4293dc21648' \
'e4f9fc95df1e1084791146e1dc0c040f6cdf873e' \
'2d4f9a5beb3f89b313f204e47d01eb0c2901e058' \
- 'c56724905c2595a5f020b10ca2d08a641b6628e3')
+ 'c56724905c2595a5f020b10ca2d08a641b6628e3' \
+ 'd3821875e069b0b418d1c6ebe4186043a959a649')
build()
{
diff --git a/source/multimedia/cdrdao/toc2mp3.patch
b/source/multimedia/cdrdao/toc2mp3.patch
new file mode 100644
index 0000000..5265c26
--- /dev/null
+++ b/source/multimedia/cdrdao/toc2mp3.patch
@@ -0,0 +1,25 @@
+diff -Naur cdrdao-1.2.3/utils/toc2mp3.cc cdrdao-1.2.3-p/utils/toc2mp3.cc
+--- cdrdao-1.2.3/utils/toc2mp3.cc 2003-02-22 11:16:56.000000000 +0100
++++ cdrdao-1.2.3-p/utils/toc2mp3.cc 2018-02-02 18:08:32.183687866 +0100
+@@ -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 br, i = 0; (br = lame_get_bitrate(1, i)) >= 0; i++) {
++ message(0, "%d ", br);
+ }
+ 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 br, i = 0; (br = lame_get_bitrate(1, i)) >= 0 && !bitrateOk; i++) {
++ if (br == bitrate)
+ bitrateOk = 1;
+ }
+
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
