Control: tags 873861 + patch Control: tags 873861 + pending Dear maintainer,
I've prepared an NMU for darkice (versioned as 1.3-0.2) and uploaded it to DELAYED/10. Please feel free to tell me if I should cancel it. cu Adrian -- "Is there not promise of rain?" Ling Tan asked suddenly out of the darkness. There had been need of rain for many days. "Only a promise," Lao Er said. Pearl S. Buck - Dragon Seed
diff -Nru darkice-1.3/debian/changelog darkice-1.3/debian/changelog --- darkice-1.3/debian/changelog 2016-08-05 22:58:30.000000000 +0300 +++ darkice-1.3/debian/changelog 2017-10-14 12:17:23.000000000 +0300 @@ -1,3 +1,11 @@ +darkice (1.3-0.2) unstable; urgency=medium + + * Non-maintainer upload. + * Add the upstream fix for the FTBFS with libsamplerate 0.1.9. + (Closes: #873861) + + -- Adrian Bunk <b...@debian.org> Sat, 14 Oct 2017 12:17:23 +0300 + darkice (1.3-0.1) unstable; urgency=medium * Non-maintainer upload. Closes: #833022. diff -Nru darkice-1.3/debian/patches/0001-Cast-float-in-SRC-lib-calls-to-delete-fpermissive-co.patch darkice-1.3/debian/patches/0001-Cast-float-in-SRC-lib-calls-to-delete-fpermissive-co.patch --- darkice-1.3/debian/patches/0001-Cast-float-in-SRC-lib-calls-to-delete-fpermissive-co.patch 1970-01-01 02:00:00.000000000 +0200 +++ darkice-1.3/debian/patches/0001-Cast-float-in-SRC-lib-calls-to-delete-fpermissive-co.patch 2017-10-14 12:17:23.000000000 +0300 @@ -0,0 +1,59 @@ +From 1e2eb18d349f205c70cb2836232825442359b6e3 Mon Sep 17 00:00:00 2001 +From: belette <ouac...@yahoo.fr> +Date: Wed, 26 Oct 2016 02:43:43 +0200 +Subject: Cast float* in SRC lib calls to delete fpermissive compilation error + +--- + darkice/trunk/src/FaacEncoder.cpp | 2 +- + darkice/trunk/src/OpusLibEncoder.cpp | 2 +- + darkice/trunk/src/VorbisLibEncoder.cpp | 2 +- + darkice/trunk/src/aacPlusEncoder.cpp | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +--- a/src/FaacEncoder.cpp ++++ b/src/FaacEncoder.cpp +@@ -164,7 +164,7 @@ FaacEncoder :: write ( const void * buf, + if ( converter ) { + unsigned int converted; + #ifdef HAVE_SRC_LIB +- src_short_to_float_array ((short *) b, converterData.data_in, samples); ++ src_short_to_float_array ((short *) b, (float *) converterData.data_in, samples); + converterData.input_frames = nSamples; + converterData.data_out = resampledOffset + (resampledOffsetSize * channels); + int srcError = src_process (converter, &converterData); +--- a/src/OpusLibEncoder.cpp ++++ b/src/OpusLibEncoder.cpp +@@ -403,7 +403,7 @@ OpusLibEncoder :: write ( const void * buf, + #ifdef HAVE_SRC_LIB + (void)inCount; + converterData.input_frames = processed; +- src_short_to_float_array (shortBuffer, converterData.data_in, totalSamples); ++ src_short_to_float_array (shortBuffer, (float *) converterData.data_in, totalSamples); + int srcError = src_process (converter, &converterData); + if (srcError) + throw Exception (__FILE__, __LINE__, "libsamplerate error: ", src_strerror (srcError)); +--- a/src/VorbisLibEncoder.cpp ++++ b/src/VorbisLibEncoder.cpp +@@ -337,7 +337,7 @@ VorbisLibEncoder :: write ( const void * buf, + int converted; + #ifdef HAVE_SRC_LIB + converterData.input_frames = nSamples; +- src_short_to_float_array (shortBuffer, converterData.data_in, totalSamples); ++ src_short_to_float_array (shortBuffer, (float *) converterData.data_in, totalSamples); + int srcError = src_process (converter, &converterData); + if (srcError) + throw Exception (__FILE__, __LINE__, "libsamplerate error: ", src_strerror (srcError)); +--- a/src/aacPlusEncoder.cpp ++++ b/src/aacPlusEncoder.cpp +@@ -155,7 +155,7 @@ aacPlusEncoder :: write ( const void * buf, + if ( converter ) { + unsigned int converted; + #ifdef HAVE_SRC_LIB +- src_short_to_float_array ((short *) b, converterData.data_in, samples); ++ src_short_to_float_array ((short *) b, (float *) converterData.data_in, samples); + converterData.input_frames = nSamples; + converterData.data_out = resampledOffset + (resampledOffsetSize * channels); + int srcError = src_process (converter, &converterData); +-- +2.11.0 + diff -Nru darkice-1.3/debian/patches/series darkice-1.3/debian/patches/series --- darkice-1.3/debian/patches/series 1970-01-01 02:00:00.000000000 +0200 +++ darkice-1.3/debian/patches/series 2017-10-14 12:17:23.000000000 +0300 @@ -0,0 +1 @@ +0001-Cast-float-in-SRC-lib-calls-to-delete-fpermissive-co.patch