# HG changeset patch # User Aleksej Bobylev # Date 1527343769 -10800 # Node ID 83a4efc5740ad594a0d741ea015036a647aed5ef # Parent c4cd004842d13446eaee1eed7cb31134c45ff30c cdrdao: add patch. diff -r c4cd004842d1 -r 83a4efc5740a cdrdao/receipt --- a/cdrdao/receipt Sat May 26 16:30:46 2018 +0300 +++ b/cdrdao/receipt Sat May 26 17:09:29 2018 +0300 @@ -11,7 +11,8 @@ TARBALL="$PACKAGE-$VERSION.tar.bz2" WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL" -BUILD_DEPENDS="lame-dev libmad-dev libvorbis-dev libao-dev libao libogg-dev" +BUILD_DEPENDS="lame-dev libmad-dev libvorbis-dev libao-dev libao libogg-dev \ +GConf" SPLIT="cdrdao-utils" compile_rules() { @@ -31,7 +32,7 @@ --prefix=/usr \ --with-lame \ $CONFIGURE_ARGS && - make && + make -j1 && make DESTDIR=$DESTDIR install } @@ -41,14 +42,14 @@ mkdir -p $fs/usr/bin cp -a $install/usr/bin/cdrdao $fs/usr/bin cp -a $install/usr/share $fs/usr - DEPENDS="gcc-lib-base lame libmad libvorbis libao" + DEPENDS="libao libmad libvorbis" ;; cdrdao-utils) mkdir -p $fs/usr/bin cp -a $install/usr/bin/ $fs/usr rm $fs/usr/bin/cdrdao CAT="multimedia|extra utilities" - DEPENDS="lame libao libmad libogg libvorbis" + DEPENDS="lame libao libmad libvorbis" ;; esac } diff -r c4cd004842d1 -r 83a4efc5740a cdrdao/stuff/patches/cdrdao-1.2.3-bitrate_table.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cdrdao/stuff/patches/cdrdao-1.2.3-bitrate_table.patch Sat May 26 17:09:29 2018 +0300 @@ -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 -r c4cd004842d1 -r 83a4efc5740a cdrdao/stuff/patches/series --- a/cdrdao/stuff/patches/series Sat May 26 16:30:46 2018 +0300 +++ b/cdrdao/stuff/patches/series Sat May 26 17:09:29 2018 +0300 @@ -1,1 +1,4 @@ cdrdao-1.2.3-stat.patch + +# from https://bugs.gentoo.org/635014 +cdrdao-1.2.3-bitrate_table.patch