From 304608af9c052e49dd9a73f81f0114b7a8e7056c Mon Sep 17 00:00:00 2001 From: newbluemoon Date: Mon, 15 Jan 2018 20:19:01 +0100 Subject: [PATCH] darkice: fix build Closes: #10851 [via git-merge-pr] --- srcpkgs/darkice/patches/casting.patch | 47 +++++++++++++++++++++++++++ srcpkgs/darkice/template | 2 +- 2 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/darkice/patches/casting.patch diff --git a/srcpkgs/darkice/patches/casting.patch b/srcpkgs/darkice/patches/casting.patch new file mode 100644 index 00000000000..fe16f26dbd7 --- /dev/null +++ b/srcpkgs/darkice/patches/casting.patch @@ -0,0 +1,47 @@ +Cast float* in SRC lib calls to delete fpermissive compilation error +https://github.com/rafael2k/darkice/commit/1e2eb18d349f205c70cb2836232825442359b6e3 + +--- src/aacPlusEncoder.cpp.orig 2015-05-18 19:38:07.000000000 +0200 ++++ src/aacPlusEncoder.cpp 2018-01-15 20:12:25.067851245 +0100 +@@ -155,7 +155,7 @@ + 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); +--- src/FaacEncoder.cpp.orig 2015-05-18 19:38:07.000000000 +0200 ++++ src/FaacEncoder.cpp 2018-01-15 20:10:28.737280304 +0100 +@@ -164,7 +164,7 @@ + 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); +--- src/OpusLibEncoder.cpp.orig 2016-08-03 22:18:23.000000000 +0200 ++++ src/OpusLibEncoder.cpp 2018-01-15 20:11:22.804545634 +0100 +@@ -403,7 +403,7 @@ + #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)); +--- src/VorbisLibEncoder.cpp.orig 2015-05-18 19:38:07.000000000 +0200 ++++ src/VorbisLibEncoder.cpp 2018-01-15 20:06:39.258178098 +0100 +@@ -337,7 +337,7 @@ + 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)); diff --git a/srcpkgs/darkice/template b/srcpkgs/darkice/template index 4903b9f03f0..337dd128968 100644 --- a/srcpkgs/darkice/template +++ b/srcpkgs/darkice/template @@ -1,7 +1,7 @@ # Template file for 'darkice' pkgname=darkice version=1.3 -revision=1 +revision=2 build_style=gnu-configure configure_args=" --with-lame-prefix=${XBPS_CROSS_BASE}/usr