From 1decbc97fa6a6eb018cb94363b7952e454a19024 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Sat, 8 Oct 2022 20:18:55 +0200 Subject: [PATCH] darkice: update to 1.4. --- srcpkgs/darkice/patches/casting.patch | 47 --------------------------- srcpkgs/darkice/template | 10 +++--- 2 files changed, 6 insertions(+), 51 deletions(-) delete mode 100644 srcpkgs/darkice/patches/casting.patch diff --git a/srcpkgs/darkice/patches/casting.patch b/srcpkgs/darkice/patches/casting.patch deleted file mode 100644 index 1a75f7cd52c..00000000000 --- a/srcpkgs/darkice/patches/casting.patch +++ /dev/null @@ -1,47 +0,0 @@ -Cast float* in SRC lib calls to delete fpermissive compilation error -https://github.com/rafael2k/darkice/commit/1e2eb18d349f205c70cb2836232825442359b6e3 - ---- a/src/aacPlusEncoder.cpp 2015-05-18 19:38:07.000000000 +0200 -+++ b/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); ---- a/src/FaacEncoder.cpp 2015-05-18 19:38:07.000000000 +0200 -+++ b/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); ---- a/src/OpusLibEncoder.cpp 2016-08-03 22:18:23.000000000 +0200 -+++ b/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)); ---- a/src/VorbisLibEncoder.cpp 2015-05-18 19:38:07.000000000 +0200 -+++ b/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 b61c6d8c7f8..c8993fffebd 100644 --- a/srcpkgs/darkice/template +++ b/srcpkgs/darkice/template @@ -1,7 +1,7 @@ # Template file for 'darkice' pkgname=darkice -version=1.3 -revision=3 +version=1.4 +revision=1 build_style=gnu-configure configure_args=" --with-lame-prefix=${XBPS_CROSS_BASE}/usr @@ -19,5 +19,7 @@ short_desc="Live audio streamer source client for icecast" maintainer="Orphaned " license="GPL-3.0-or-later" homepage="http://www.darkice.org" -distfiles="${SOURCEFORGE_SITE}/project/darkice/darkice/${version}/darkice-${version}.tar.gz" -checksum=2c0d0faaa627c0273b2ce8b38775a73ef97e34ef866862a398f660ad8f6e9de6 +distfiles="https://github.com/rafael2k/darkice/releases/download/v${version}/darkice-${version}.tar.gz" +checksum=e6a8ec2b447cf5b4ffaf9b62700502b6bdacebf00b476f4e9bf9f9fe1e3dd817 + +export CXXFLAGS="-std=c++14"