wok-next rev 20709
cdrdao: add patch.
author | Aleksej Bobylev <al.bobylev@gmail.com> |
---|---|
date | Sat May 26 17:09:29 2018 +0300 (2018-05-26) |
parents | c4cd004842d1 |
children | 1e959a3ea09a |
files | cdrdao/receipt cdrdao/stuff/patches/cdrdao-1.2.3-bitrate_table.patch cdrdao/stuff/patches/series |
line diff
1.1 --- a/cdrdao/receipt Sat May 26 16:30:46 2018 +0300 1.2 +++ b/cdrdao/receipt Sat May 26 17:09:29 2018 +0300 1.3 @@ -11,7 +11,8 @@ 1.4 TARBALL="$PACKAGE-$VERSION.tar.bz2" 1.5 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL" 1.6 1.7 -BUILD_DEPENDS="lame-dev libmad-dev libvorbis-dev libao-dev libao libogg-dev" 1.8 +BUILD_DEPENDS="lame-dev libmad-dev libvorbis-dev libao-dev libao libogg-dev \ 1.9 +GConf" 1.10 SPLIT="cdrdao-utils" 1.11 1.12 compile_rules() { 1.13 @@ -31,7 +32,7 @@ 1.14 --prefix=/usr \ 1.15 --with-lame \ 1.16 $CONFIGURE_ARGS && 1.17 - make && 1.18 + make -j1 && 1.19 make DESTDIR=$DESTDIR install 1.20 } 1.21 1.22 @@ -41,14 +42,14 @@ 1.23 mkdir -p $fs/usr/bin 1.24 cp -a $install/usr/bin/cdrdao $fs/usr/bin 1.25 cp -a $install/usr/share $fs/usr 1.26 - DEPENDS="gcc-lib-base lame libmad libvorbis libao" 1.27 + DEPENDS="libao libmad libvorbis" 1.28 ;; 1.29 cdrdao-utils) 1.30 mkdir -p $fs/usr/bin 1.31 cp -a $install/usr/bin/ $fs/usr 1.32 rm $fs/usr/bin/cdrdao 1.33 CAT="multimedia|extra utilities" 1.34 - DEPENDS="lame libao libmad libogg libvorbis" 1.35 + DEPENDS="lame libao libmad libvorbis" 1.36 ;; 1.37 esac 1.38 }
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 2.2 +++ b/cdrdao/stuff/patches/cdrdao-1.2.3-bitrate_table.patch Sat May 26 17:09:29 2018 +0300 2.3 @@ -0,0 +1,24 @@ 2.4 +--- a/utils/toc2mp3.cc 2.5 ++++ b/utils/toc2mp3.cc 2.6 +@@ -143,8 +143,8 @@ 2.7 + 2.8 + message(0, "LAME encoder version: %s", get_lame_version()); 2.9 + message(0, "Supported bit rates: "); 2.10 +- for (int i = 0; i < 16 && bitrate_table[1][i] >= 0; i++) { 2.11 +- message(0, "%d ", bitrate_table[1][i]); 2.12 ++ for (int i = 0; i < 16 && lame_get_bitrate(1, i) >= 0; i++) { 2.13 ++ message(0, "%d ", lame_get_bitrate(1, i)); 2.14 + } 2.15 + message(0, ""); 2.16 + } 2.17 +@@ -238,8 +238,8 @@ 2.18 + lame_global_flags *lf; 2.19 + int bitrateOk = 0; 2.20 + 2.21 +- for (int i = 0; bitrate_table[1][i] >= 0 && !bitrateOk; i++) { 2.22 +- if (bitrate == bitrate_table[1][i]) 2.23 ++ for (int i = 0; lame_get_bitrate(1, i) >= 0 && !bitrateOk; i++) { 2.24 ++ if (bitrate == lame_get_bitrate(1, i)) 2.25 + bitrateOk = 1; 2.26 + } 2.27 +