diff --git a/flac-no_rice_asm.patch b/flac-no_rice_asm.patch new file mode 100644 index 0000000..18d4fdb --- /dev/null +++ b/flac-no_rice_asm.patch @@ -0,0 +1,27 @@ +From 4e5a0bacf021737fb1a8366ad07dc66f3286b1be Mon Sep 17 00:00:00 2001 +From: Miroslav Lichvar +Date: Mon, 3 Jun 2013 13:25:47 +0200 +Subject: [PATCH 2/2] Don't use + FLAC__bitreader_read_rice_signed_block_asm_ia32_bswap. + +It seems to be slower than the C function. +--- + src/libFLAC/stream_decoder.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/libFLAC/stream_decoder.c b/src/libFLAC/stream_decoder.c +index f987c27..bc9c715 100644 +--- a/src/libFLAC/stream_decoder.c ++++ b/src/libFLAC/stream_decoder.c +@@ -400,7 +400,7 @@ static FLAC__StreamDecoderInitStatus init_stream_internal_( + #ifdef FLAC__CPU_IA32 + FLAC__ASSERT(decoder->private_->cpuinfo.type == FLAC__CPUINFO_TYPE_IA32); + #ifdef FLAC__HAS_NASM +-#if 1 /*@@@@@@ OPT: not clearly faster, needs more testing */ ++#if 0 /*@@@@@@ OPT: not clearly faster, needs more testing */ + if(decoder->private_->cpuinfo.data.ia32.bswap) + decoder->private_->local_bitreader_read_rice_signed_block = FLAC__bitreader_read_rice_signed_block_asm_ia32_bswap; + #endif +-- +1.8.1.4 + diff --git a/flac.spec b/flac.spec index 29f5091..6ccb739 100644 --- a/flac.spec +++ b/flac.spec @@ -18,6 +18,7 @@ BuildRequires: nasm >= 2.0 %endif Patch1: flac-metaflac_strcat.patch +Patch2: flac-no_rice_asm.patch %description FLAC stands for Free Lossless Audio Codec. Grossly oversimplified, FLAC @@ -57,6 +58,7 @@ will use the Free Lossless Audio Codec. %prep %setup -q %patch1 -p1 -b .metaflac-strcat +%patch2 -p1 -b .no_rice_asm %build # use our libtool to avoid problems with RPATH