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.
18644 Commits
1 Branch
46 MiB
Tree: 6b90684e97
Branches Tags
${ item.name }
Create branch ${ searchTerm }
from '6b90684e97'
${ noResults }
openwrt-packages-dist/sound/mpd/patches/040-treewide-get-rid-of-C-m...

162 lines
4.7 KiB
Raw Normal View History

mpd: update to 0.21.20 Updated patches to latest patchset and removed upstreamed ones. Ran init script through shellcheck. Restart using SIGHUP. Added logging from stderr as any kind of logging is missing in --no-daemon mode. Signed-off-by: Rosen Penev <rosenp@gmail.com>
5 years ago
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
​
mpd: update to 0.21.20 Updated patches to latest patchset and removed upstreamed ones. Ran init script through shellcheck. Restart using SIGHUP. Added logging from stderr as any kind of logging is missing in --no-daemon mode. Signed-off-by: Rosen Penev <rosenp@gmail.com>
5 years ago
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
​
​
​
​
​
​
​
​
​
​
​
​
​
mpd: update to 0.21.20 Updated patches to latest patchset and removed upstreamed ones. Ran init script through shellcheck. Restart using SIGHUP. Added logging from stderr as any kind of logging is missing in --no-daemon mode. Signed-off-by: Rosen Penev <rosenp@gmail.com>
5 years ago
​
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
​
mpd: update to 0.21.20 Updated patches to latest patchset and removed upstreamed ones. Ran init script through shellcheck. Restart using SIGHUP. Added logging from stderr as any kind of logging is missing in --no-daemon mode. Signed-off-by: Rosen Penev <rosenp@gmail.com>
5 years ago
​
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
​
​
mpd: update to 0.21.20 Updated patches to latest patchset and removed upstreamed ones. Ran init script through shellcheck. Restart using SIGHUP. Added logging from stderr as any kind of logging is missing in --no-daemon mode. Signed-off-by: Rosen Penev <rosenp@gmail.com>
5 years ago
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
​
​
​
​
​
​
mpd: update to 0.21.20 Updated patches to latest patchset and removed upstreamed ones. Ran init script through shellcheck. Restart using SIGHUP. Added logging from stderr as any kind of logging is missing in --no-daemon mode. Signed-off-by: Rosen Penev <rosenp@gmail.com>
5 years ago
​
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
​
​
​
​
​
​
​
​
​
​
​
mpd: update to 0.21.20 Updated patches to latest patchset and removed upstreamed ones. Ran init script through shellcheck. Restart using SIGHUP. Added logging from stderr as any kind of logging is missing in --no-daemon mode. Signed-off-by: Rosen Penev <rosenp@gmail.com>
5 years ago
​
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
​
mpd: update to 0.21.20 Updated patches to latest patchset and removed upstreamed ones. Ran init script through shellcheck. Restart using SIGHUP. Added logging from stderr as any kind of logging is missing in --no-daemon mode. Signed-off-by: Rosen Penev <rosenp@gmail.com>
5 years ago
​
​
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
mpd: update to 0.21.20 Updated patches to latest patchset and removed upstreamed ones. Ran init script through shellcheck. Restart using SIGHUP. Added logging from stderr as any kind of logging is missing in --no-daemon mode. Signed-off-by: Rosen Penev <rosenp@gmail.com>
5 years ago
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
​
​
​
​
​
​
​
mpd: update to 0.21.20 Updated patches to latest patchset and removed upstreamed ones. Ran init script through shellcheck. Restart using SIGHUP. Added logging from stderr as any kind of logging is missing in --no-daemon mode. Signed-off-by: Rosen Penev <rosenp@gmail.com>
5 years ago
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
​
​
​
​
​
​
​
mpd: update to 0.21.20 Updated patches to latest patchset and removed upstreamed ones. Ran init script through shellcheck. Restart using SIGHUP. Added logging from stderr as any kind of logging is missing in --no-daemon mode. Signed-off-by: Rosen Penev <rosenp@gmail.com>
5 years ago
​
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
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
mpd: update to 0.21.20 Updated patches to latest patchset and removed upstreamed ones. Ran init script through shellcheck. Restart using SIGHUP. Added logging from stderr as any kind of logging is missing in --no-daemon mode. Signed-off-by: Rosen Penev <rosenp@gmail.com>
5 years ago
​
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
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
mpd: update to 0.21.20 Updated patches to latest patchset and removed upstreamed ones. Ran init script through shellcheck. Restart using SIGHUP. Added logging from stderr as any kind of logging is missing in --no-daemon mode. Signed-off-by: Rosen Penev <rosenp@gmail.com>
5 years ago
​
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
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
mpd: update to 0.21.20 Updated patches to latest patchset and removed upstreamed ones. Ran init script through shellcheck. Restart using SIGHUP. Added logging from stderr as any kind of logging is missing in --no-daemon mode. Signed-off-by: Rosen Penev <rosenp@gmail.com>
5 years ago
​
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 2a8e7c50743ec6a20c7bd9c8e84ccd36d59e69ad Mon Sep 17 00:00:00 2001
  2. From: Rosen Penev <rosenp@gmail.com>
  3. Date: Mon, 3 Feb 2020 15:50:46 -0800
  4. Subject: [PATCH] treewide: get rid of C math function usage
  5. 

  6. Boost does not seem to offer an overload for lrint.
  7. 

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

  10.  src/ReplayGainGlobal.cxx                    | 2 +-
  11.  src/ReplayGainInfo.cxx                      | 3 +--
  12.  src/decoder/Bridge.cxx                      | 5 +++--
  13.  src/decoder/plugins/MpcdecDecoderPlugin.cxx | 3 +--
  14.  src/mixer/plugins/AlsaMixerPlugin.cxx       | 3 +--
  15.  src/mixer/plugins/SoftwareMixerPlugin.cxx   | 5 +++--
  16.  src/util/Math.hxx                           | 6 ++++++
  17.  7 files changed, 16 insertions(+), 11 deletions(-)
  18. 

  19. diff --git a/src/ReplayGainGlobal.cxx b/src/ReplayGainGlobal.cxx

  20. index 741381dcb..01ba8769d 100644

  21. --- a/src/ReplayGainGlobal.cxx

  22. +++ b/src/ReplayGainGlobal.cxx

  23. @@ -21,11 +21,11 @@

  24.  #include "ReplayGainConfig.hxx"
  25.  #include "config/Param.hxx"
  26.  #include "config/Data.hxx"
  27. +#include "util/Math.hxx"

  28.  #include "util/RuntimeError.hxx"
  29.  
  30.  #include <assert.h>
  31.  #include <stdlib.h>
  32. -#include <math.h>

  33.  
  34.  static float
  35.  ParsePreamp(const char *s)
  36. diff --git a/src/ReplayGainInfo.cxx b/src/ReplayGainInfo.cxx

  37. index a0685507a..76713aded 100644

  38. --- a/src/ReplayGainInfo.cxx

  39. +++ b/src/ReplayGainInfo.cxx

  40. @@ -19,8 +19,7 @@

  41.  
  42.  #include "ReplayGainInfo.hxx"
  43.  #include "ReplayGainConfig.hxx"
  44. -

  45. -#include <math.h>

  46. +#include "util/Math.hxx"

  47.  
  48.  float
  49.  ReplayGainTuple::CalculateScale(const ReplayGainConfig &config) const noexcept
  50. diff --git a/src/decoder/Bridge.cxx b/src/decoder/Bridge.cxx

  51. index 27d1a577a..7f9ffe02d 100644

  52. --- a/src/decoder/Bridge.cxx

  53. +++ b/src/decoder/Bridge.cxx

  54. @@ -31,11 +31,11 @@

  55.  #include "Log.hxx"
  56.  #include "input/InputStream.hxx"
  57.  #include "util/ConstBuffer.hxx"
  58. +#include "util/Math.hxx"

  59.  #include "util/StringBuffer.hxx"
  60.  
  61.  #include <assert.h>
  62.  #include <string.h>
  63. -#include <math.h>

  64.  
  65.  DecoderBridge::~DecoderBridge()
  66.  {
  67. @@ -591,7 +592,7 @@ DecoderBridge::SubmitReplayGain(const ReplayGainInfo *new_replay_gain_info) noex

  68.  			const auto &tuple = new_replay_gain_info->Get(rgm);
  69.  			const auto scale =
  70.  				tuple.CalculateScale(dc.replay_gain_config);
  71. -			dc.replay_gain_db = 20.0 * log10f(scale);

  72. +			dc.replay_gain_db = 20.0 * std::log10(scale);

  73.  		}
  74.  
  75.  		replay_gain_info = *new_replay_gain_info;
  76. diff --git a/src/decoder/plugins/MpcdecDecoderPlugin.cxx b/src/decoder/plugins/MpcdecDecoderPlugin.cxx

  77. index c19aee75c..4e9ef798e 100644

  78. --- a/src/decoder/plugins/MpcdecDecoderPlugin.cxx

  79. +++ b/src/decoder/plugins/MpcdecDecoderPlugin.cxx

  80. @@ -26,6 +26,7 @@

  81.  #include "util/Domain.hxx"
  82.  #include "util/Macros.hxx"
  83.  #include "util/Clamp.hxx"
  84. +#include "util/Math.hxx"

  85.  #include "util/ScopeExit.hxx"
  86.  #include "Log.hxx"
  87.  
  88. @@ -33,8 +34,6 @@

  89.  
  90.  #include <exception>
  91.  
  92. -#include <math.h>

  93. -

  94.  struct mpc_decoder_data {
  95.  	InputStream &is;
  96.  	DecoderClient *client;
  97. diff --git a/src/mixer/plugins/AlsaMixerPlugin.cxx b/src/mixer/plugins/AlsaMixerPlugin.cxx

  98. index e3d774194..4b916319b 100644

  99. --- a/src/mixer/plugins/AlsaMixerPlugin.cxx

  100. +++ b/src/mixer/plugins/AlsaMixerPlugin.cxx

  101. @@ -26,6 +26,7 @@

  102.  #include "event/Call.hxx"
  103.  #include "util/ASCII.hxx"
  104.  #include "util/Domain.hxx"
  105. +#include "util/Math.hxx"

  106.  #include "util/RuntimeError.hxx"
  107.  #include "Log.hxx"
  108.  
  109. @@ -35,8 +36,6 @@ extern "C" {

  110.  
  111.  #include <alsa/asoundlib.h>
  112.  
  113. -#include <math.h>

  114. -

  115.  #define VOLUME_MIXER_ALSA_DEFAULT		"default"
  116.  #define VOLUME_MIXER_ALSA_CONTROL_DEFAULT	"PCM"
  117.  static constexpr unsigned VOLUME_MIXER_ALSA_INDEX_DEFAULT = 0;
  118. diff --git a/src/mixer/plugins/SoftwareMixerPlugin.cxx b/src/mixer/plugins/SoftwareMixerPlugin.cxx

  119. index c394a9628..9c48279f9 100644

  120. --- a/src/mixer/plugins/SoftwareMixerPlugin.cxx

  121. +++ b/src/mixer/plugins/SoftwareMixerPlugin.cxx

  122. @@ -22,8 +22,9 @@

  123.  #include "filter/plugins/VolumeFilterPlugin.hxx"
  124.  #include "pcm/Volume.hxx"
  125.  
  126. +#include <cmath>

  127. +

  128.  #include <assert.h>
  129. -#include <math.h>

  130.  
  131.  class SoftwareMixer final : public Mixer {
  132.  	Filter *filter = nullptr;
  133. @@ -73,7 +74,7 @@ PercentVolumeToSoftwareVolume(unsigned volume) noexcept

  134.  	if (volume >= 100)
  135.  		return PCM_VOLUME_1;
  136.  	else if (volume > 0)
  137. -		return pcm_float_to_volume((exp(volume / 25.0) - 1) /

  138. +		return pcm_float_to_volume((std::exp(volume / 25.0) - 1) /

  139.  					   (54.5981500331F - 1));
  140.  	else
  141.  		return 0;
  142. diff --git a/src/util/Math.hxx b/src/util/Math.hxx

  143. index bd856f5a9..2206b045f 100644

  144. --- a/src/util/Math.hxx

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

  146. @@ -31,10 +31,16 @@

  147.  #define MATH_HXX
  148.  
  149.  #ifdef __UCLIBC__
  150. +#include <boost/math/special_functions/pow.hpp>

  151.  #include <boost/math/special_functions/round.hpp>
  152. +using boost::math::iround;

  153. +using boost::math::pow;

  154.  using boost::math::lround;
  155. +#define lrint iround

  156.  #else
  157.  #include <cmath>
  158. +using std::pow;

  159. +using std::lrint;

  160.  using std::lround;
  161.  #endif
  162.