LILiK
/
openwrt-packages-dist
5
0
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 0 Wiki Activity
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
18201 Commits
1 Branch
46 MiB
Tree: 309e708a7d
Branches Tags
${ item.name }
Create branch ${ searchTerm }
from '309e708a7d'
${ noResults }
openwrt-packages-dist/sound/mpd/patches/010-treewide-use-boost-lrou...

196 lines
6.0 KiB
Raw Normal View History

mpd: fix compilation with uClibc-ng With mpd's build system, it requires either an iconv built into the libc or icu. Since uClibc-ng as configured by OpenWrt currently has no iconv, use icu for it to work around the problem. This is the simplest solution. Added a patch to use boost's rounding functions. They are more appropriate and work with uClibc-ng. Signed-off-by: Rosen Penev <rosenp@gmail.com>
5 years ago
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
 
  1. From bffc5cde6d71556f143500a12c53c1835deebe07 Mon Sep 17 00:00:00 2001
  2. From: Rosen Penev <rosenp@gmail.com>
  3. Date: Sun, 2 Feb 2020 21:21:57 -0800
  4. Subject: [PATCH 1/3] treewide: use boost::lround when std::round is
  5.  unavailable
  6. 

  7. This is the case with uClibc-ng currently.
  8. 

  9. Signed-off-by: Rosen Penev <rosenp@gmail.com>
  10. ---

  11.  src/Stats.cxx                             |  4 +--
  12.  src/command/PlayerCommands.cxx            |  5 ++-
  13.  src/decoder/plugins/FaadDecoderPlugin.cxx |  3 +-
  14.  src/mixer/plugins/WinmmMixerPlugin.cxx    |  2 +-
  15.  src/output/plugins/HaikuOutputPlugin.cxx  |  3 +-
  16.  src/pcm/Mix.cxx                           |  5 ++-
  17.  src/player/CrossFade.cxx                  |  5 ++-
  18.  src/util/Math.hxx                         | 41 +++++++++++++++++++++++
  19.  8 files changed, 52 insertions(+), 16 deletions(-)
  20.  create mode 100644 src/util/Math.hxx
  21. 

  22. --- a/src/Stats.cxx

  23. +++ b/src/Stats.cxx

  24. @@ -29,9 +29,9 @@

  25.  #include "system/Clock.hxx"
  26.  #include "Log.hxx"
  27.  #include "time/ChronoUtil.hxx"
  28. +#include "util/Math.hxx"

  29.  
  30.  #include <chrono>
  31. -#include <cmath>

  32.  
  33.  #ifndef _WIN32
  34.  /**
  35. @@ -121,7 +121,7 @@ stats_print(Response &r, const Partition &partition)

  36.  #else
  37.  		 (unsigned)std::chrono::duration_cast<std::chrono::seconds>(std::chrono::steady_clock::now() - start_time).count(),
  38.  #endif
  39. -		 std::lround(partition.pc.GetTotalPlayTime().count()));

  40. +		 lround(partition.pc.GetTotalPlayTime().count()));

  41.  
  42.  #ifdef ENABLE_DATABASE
  43.  	const Database *db = partition.instance.GetDatabase();
  44. --- a/src/command/PlayerCommands.cxx

  45. +++ b/src/command/PlayerCommands.cxx

  46. @@ -34,13 +34,12 @@

  47.  #include "util/StringBuffer.hxx"
  48.  #include "util/ScopeExit.hxx"
  49.  #include "util/Exception.hxx"
  50. +#include "util/Math.hxx"

  51.  
  52.  #ifdef ENABLE_DATABASE
  53.  #include "db/update/Service.hxx"
  54.  #endif
  55.  
  56. -#include <cmath>

  57. -

  58.  #define COMMAND_STATUS_STATE            "state"
  59.  #define COMMAND_STATUS_REPEAT           "repeat"
  60.  #define COMMAND_STATUS_SINGLE           "single"
  61. @@ -154,7 +153,7 @@ handle_status(Client &client, gcc_unused Request args, Response &r)

  62.  
  63.  	if (pc.GetCrossFade() > FloatDuration::zero())
  64.  		r.Format(COMMAND_STATUS_CROSSFADE ": %lu\n",
  65. -			 std::lround(pc.GetCrossFade().count()));

  66. +			 lround(pc.GetCrossFade().count()));

  67.  
  68.  	if (pc.GetMixRampDelay() > FloatDuration::zero())
  69.  		r.Format(COMMAND_STATUS_MIXRAMPDELAY ": %f\n",
  70. --- a/src/mixer/plugins/WinmmMixerPlugin.cxx

  71. +++ b/src/mixer/plugins/WinmmMixerPlugin.cxx

  72. @@ -20,13 +20,13 @@

  73.  #include "mixer/MixerInternal.hxx"
  74.  #include "output/OutputAPI.hxx"
  75.  #include "output/plugins/WinmmOutputPlugin.hxx"
  76. +#include "util/Math.hxx"

  77.  
  78.  #include <mmsystem.h>
  79.  
  80.  #include <stdexcept>
  81.  
  82.  #include <assert.h>
  83. -#include <math.h>

  84.  #include <windows.h>
  85.  
  86.  class WinmmMixer final : public Mixer {
  87. --- a/src/output/plugins/HaikuOutputPlugin.cxx

  88. +++ b/src/output/plugins/HaikuOutputPlugin.cxx

  89. @@ -22,6 +22,7 @@

  90.  #include "../OutputAPI.hxx"
  91.  #include "mixer/MixerList.hxx"
  92.  #include "util/Domain.hxx"
  93. +#include "util/Math.hxx"

  94.  #include "system/Error.hxx"
  95.  #include "Log.hxx"
  96.  
  97. @@ -37,8 +38,6 @@

  98.  #include <StringList.h>
  99.  #include <SoundPlayer.h>
  100.  
  101. -#include <cmath>

  102. -

  103.  #include <string.h>
  104.  
  105.  #define UTF8_PLAY "\xE2\x96\xB6"
  106. --- a/src/pcm/PcmMix.cxx

  107. +++ b/src/pcm/PcmMix.cxx

  108. @@ -22,11 +22,10 @@

  109.  #include "Clamp.hxx"
  110.  #include "Traits.hxx"
  111.  #include "util/Clamp.hxx"
  112. +#include "util/Math.hxx"

  113.  
  114.  #include "PcmDither.cxx" // including the .cxx file to get inlined templates
  115.  
  116. -#include <cmath>

  117. -

  118.  #include <assert.h>
  119.  
  120.  template<SampleFormat F, class Traits=SampleTraits<F>>
  121. @@ -225,7 +224,7 @@ pcm_mix(PcmDither &dither, void *buffer1, const void *buffer2, size_t size,

  122.  	s = sin(M_PI_2 * portion1);
  123.  	s *= s;
  124.  
  125. -	int vol1 = std::lround(s * PCM_VOLUME_1S);

  126. +	int vol1 = lround(s * PCM_VOLUME_1S);

  127.  	vol1 = Clamp<int>(vol1, 0, PCM_VOLUME_1S);
  128.  
  129.  	return pcm_add_vol(dither, buffer1, buffer2, size,
  130. --- a/src/player/CrossFade.cxx

  131. +++ b/src/player/CrossFade.cxx

  132. @@ -23,10 +23,9 @@

  133.  #include "AudioFormat.hxx"
  134.  #include "util/NumberParser.hxx"
  135.  #include "util/Domain.hxx"
  136. +#include "util/Math.hxx"

  137.  #include "Log.hxx"
  138.  
  139. -#include <cmath>

  140. -

  141.  #include <assert.h>
  142.  
  143.  static constexpr Domain cross_fade_domain("cross_fade");
  144. @@ -112,7 +111,7 @@ CrossFadeSettings::Calculate(SignedSongTime total_time,

  145.  
  146.  	if (mixramp_delay <= FloatDuration::zero() ||
  147.  	    !mixramp_start || !mixramp_prev_end) {
  148. -		chunks = std::lround(duration / chunk_duration);

  149. +		chunks = lround(duration / chunk_duration);

  150.  	} else {
  151.  		/* Calculate mixramp overlap. */
  152.  		const auto mixramp_overlap_current =
  153. --- /dev/null

  154. +++ b/src/util/Math.hxx

  155. @@ -0,0 +1,41 @@

  156. +/*

  157. + * Copyright (C) 2020 Rosen Penev <rosenp@gmail.com>

  158. + *

  159. + * Redistribution and use in source and binary forms, with or without

  160. + * modification, are permitted provided that the following conditions

  161. + * are met:

  162. + *

  163. + * - Redistributions of source code must retain the above copyright

  164. + * notice, this list of conditions and the following disclaimer.

  165. + *

  166. + * - Redistributions in binary form must reproduce the above copyright

  167. + * notice, this list of conditions and the following disclaimer in the

  168. + * documentation and/or other materials provided with the

  169. + * distribution.

  170. + *

  171. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

  172. + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

  173. + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS

  174. + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE

  175. + * FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,

  176. + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

  177. + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR

  178. + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)

  179. + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,

  180. + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

  181. + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED

  182. + * OF THE POSSIBILITY OF SUCH DAMAGE.

  183. + */

  184. +

  185. +#ifndef MATH_HXX

  186. +#define MATH_HXX

  187. +

  188. +#ifdef __UCLIBC__

  189. +#include <boost/math/special_functions/round.hpp>

  190. +using boost::math::lround;

  191. +#else

  192. +#include <cmath>

  193. +using std::lround;

  194. +#endif

  195. +

  196. +#endif