Merge pull request #1 from AlwinEsch/fix

Final build fixes

.travis.yml

@@ -26,6 +26,11 @@ matrix:
       sudo: required
       compiler: gcc
       env: DEBIAN_BUILD=true
+    - os: linux
+      dist: focal
+      sudo: required
+      compiler: gcc
+      env: DEBIAN_BUILD=true
     - os: osx
       osx_image: xcode10.2
 
@@ -45,7 +50,7 @@ before_script:
   - if [[ $DEBIAN_BUILD != true ]]; then mkdir -p definition/${app_id}; fi
   - if [[ $DEBIAN_BUILD != true ]]; then echo ${app_id} $TRAVIS_BUILD_DIR $TRAVIS_COMMIT > definition/${app_id}/${app_id}.txt; fi
   - if [[ $DEBIAN_BUILD != true ]]; then cmake -DADDONS_TO_BUILD=${app_id} -DADDON_SRC_PREFIX=$TRAVIS_BUILD_DIR/.. -DADDONS_DEFINITION_DIR=$TRAVIS_BUILD_DIR/build/definition -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=$TRAVIS_BUILD_DIR/../xbmc/addons -DPACKAGE_ZIP=1 $TRAVIS_BUILD_DIR/../xbmc/cmake/addons; fi
-  - if [[ $DEBIAN_BUILD == true ]]; then wget https://raw.githubusercontent.com/xbmc/xbmc/master/xbmc/addons/kodi-addon-dev-kit/tools/debian-addon-package-test.sh && chmod +x ./debian-addon-package-test.sh; fi
+  - if [[ $DEBIAN_BUILD == true ]]; then wget https://raw.githubusercontent.com/xbmc/xbmc/master/xbmc/addons/kodi-dev-kit/tools/debian-addon-package-test.sh && chmod +x ./debian-addon-package-test.sh; fi
   - if [[ $DEBIAN_BUILD == true ]]; then sudo apt-get build-dep $TRAVIS_BUILD_DIR; fi
 
 script: 

audiodecoder.sacd/addon.xml.in

@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="audiodecoder.sacd"
-  version="0.1.0"
+  version="0.1.1"
   name="SACD ISO support"
   provider-name="Team Kodi, AlwinEsch">
   <requires>@ADDON_DEPENDS@</requires>
   <extension
     point="kodi.audiodecoder"
     name="sacd"
     extension=".iso|.sacdstream"
-    tracks="true"
     tags="true"
     library_@PLATFORM@="@LIBRARY_FILENAME@"/>
   <extension point="xbmc.addon.metadata">

depends/common/wavpack/02-fix-android-arm-build.patch

@@ -0,0 +1,13 @@
+index fbb5e75..5cd9fc0 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -126,7 +126,7 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "amd64.*|x86_64.*|AMD64.*")
+     endif()
+ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "i386.*|i486.*|i586.*|i686.*|i786.*")
+     set(CPU_ASM_X86 1)
+-elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "arm*")
++elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "arm*" AND WIN32) # WIN32 as about Android ARM it fails
+     if(CMAKE_SIZEOF_VOID_P EQUAL 4)
+         set(CPU_ASM_ARM32 1)
+     endif()
+

depends/common/wavpack/03-fix-android-arch64.patch

@@ -0,0 +1,10 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -60,6 +60,7 @@ option(WAVPACK_ENABLE_DSD "Enable support for WavPack DSD files" ON)
+ option(WAVPACK_INSTALL_CMAKE_MODULE "Generate and install CMake package configuration module" ON)
+ option(WAVPACK_INSTALL_DOCS "Install documentation" ON)
+ option(WAVPACK_INSTALL_PKGCONFIG_MODULE "Generate and install wavpack.pc" ON)
++option(COMPILER_SUPPORTS_SYMBOL_MAPS "To set manually the support about" OFF)
+
+ # Configuration tests
+

src/Settings.cpp

@@ -12,7 +12,7 @@
 bool CSACDSettings::Load()
 {
   m_volumeAdjust = kodi::GetSettingFloat("volume-adjust", 0.0f);
-  m_lfeAdjust = pow(10.0f, kodi::GetSettingFloat("volume-lfe", 0.0f) / 20.0f);
+  m_lfeAdjust = pow(10.0f, kodi::GetSettingFloat("lfe-adjust", 0.0f) / 20.0f);
   m_samplerate = kodi::GetSettingInt("samplerate", 352800);
   m_dsd2pcmMode = kodi::GetSettingInt("dsd2pcm-mode", 0);
   m_dsd2pcmFirFile = kodi::GetSettingString("firconverter", "");

src/sacd/sacd_core.cpp

@@ -17,9 +17,11 @@
 
 #include <memory>
 
-std::string getFileExt(const std::string& s)
+namespace
 {
 
+std::string getFileExt(const std::string& s)
+{
   size_t i = s.rfind('.', s.length());
   if (i != std::string::npos)
   {
@@ -29,17 +31,6 @@ std::string getFileExt(const std::string& s)
   return ("");
 }
 
-void replaceExt(std::string& s, const std::string& newExt)
-{
-
-  std::string::size_type i = s.rfind('.', s.length());
-
-  if (i != std::string::npos)
-  {
-    s.replace(i + 1, newExt.length(), newExt);
-  }
-}
-
 bool icasecmp(const std::string& l, const std::string& r)
 {
   return l.size() == r.size() && equal(l.cbegin(), l.cend(), r.cbegin(),
@@ -48,6 +39,7 @@ bool icasecmp(const std::string& l, const std::string& r)
                                        });
 }
 
+} /* namespace */
 
 bool sacd_core_t::g_is_our_content_type(const std::string& p_type)
 {