diff -Nru kodi-audiodecoder-2sf-2.0.2/appveyor.yml kodi-audiodecoder-2sf-2.0.3/appveyor.yml
--- kodi-audiodecoder-2sf-2.0.2/appveyor.yml 2013-05-31 22:59:22.000000000 +0000
+++ kodi-audiodecoder-2sf-2.0.3/appveyor.yml 2020-02-05 14:33:18.000000000 +0000
@@ -1,6 +1,6 @@
version: BuildNr.{build}
-image: Visual Studio 2015
+image: Visual Studio 2017
shallow_clone: true
@@ -10,14 +10,14 @@
app_id: audiodecoder.2sf
matrix:
- - GENERATOR: "Visual Studio 14"
+ - GENERATOR: "Visual Studio 15"
CONFIG: Release
- - GENERATOR: "Visual Studio 14 Win64"
+ - GENERATOR: "Visual Studio 15 Win64"
CONFIG: Release
- - GENERATOR: "Visual Studio 14 Win64"
+ - GENERATOR: "Visual Studio 15 Win64"
CONFIG: Release
WINSTORE: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.16299.0"
- - GENERATOR: "Visual Studio 14 ARM"
+ - GENERATOR: "Visual Studio 15 ARM"
CONFIG: Release
WINSTORE: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.16299.0"
diff -Nru kodi-audiodecoder-2sf-2.0.2/audiodecoder.2sf/addon.xml.in kodi-audiodecoder-2sf-2.0.3/audiodecoder.2sf/addon.xml.in
--- kodi-audiodecoder-2sf-2.0.2/audiodecoder.2sf/addon.xml.in 2013-05-31 22:59:22.000000000 +0000
+++ kodi-audiodecoder-2sf-2.0.3/audiodecoder.2sf/addon.xml.in 2020-02-05 14:33:18.000000000 +0000
@@ -1,7 +1,7 @@
@ADDON_DEPENDS@
@@ -15,8 +15,12 @@
Nintendo DS audio file decoder
To support game audio file used by some Nintendo DS games.
-Dual Screen Sound Format is an audio format based on PSF. It stores audio ripped from the ROMs of Nintendo DS games. Music instructions are stored in files with a .2sflib extension and the music notation is stored in files with a .mini2sf extension.
-
+Dual Screen Sound Format is an audio format based on PSF. It stores audio ripped from the ROMs of Nintendo DS games. Music instructions are stored in files with a .2sflib extension and the music notation is stored in files with a .mini2sf extension.
@PLATFORM@
+ GPL-2.0
+
+
+ icon.png
+
diff -Nru kodi-audiodecoder-2sf-2.0.2/azure-pipelines.yml kodi-audiodecoder-2sf-2.0.3/azure-pipelines.yml
--- kodi-audiodecoder-2sf-2.0.2/azure-pipelines.yml 1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-2sf-2.0.3/azure-pipelines.yml 2020-02-05 14:33:18.000000000 +0000
@@ -0,0 +1,65 @@
+variables:
+ app_id: 'audiodecoder.2sf'
+
+trigger:
+ branches:
+ include:
+ - Leia
+ - releases/*
+ paths:
+ include:
+ - '*'
+ exclude:
+ - 'debian/*'
+
+jobs:
+ - job: Windows
+
+ pool:
+ vmImage: 'VS2017-Win2016'
+
+ strategy:
+ matrix:
+ Win32:
+ GENERATOR: "Visual Studio 15 2017"
+ ARCHITECTURE: Win32
+ CONFIGURATION: Release
+ Win64:
+ GENERATOR: "Visual Studio 15 2017"
+ ARCHITECTURE: x64
+ CONFIGURATION: Release
+ Win64-UWP:
+ GENERATOR: "Visual Studio 15 2017"
+ ARCHITECTURE: x64
+ CONFIGURATION: Release
+ WINSTORE: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.17763.0"
+ ARM64-UWP:
+ GENERATOR: "Visual Studio 15 2017"
+ ARCHITECTURE: ARM64
+ CONFIGURATION: Release
+ WINSTORE: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.17763.0"
+
+ workspace:
+ clean: all
+
+ steps:
+
+ - script: |
+ cd ..
+ git clone --branch Leia --depth=1 https://github.com/xbmc/xbmc.git kodi
+ cd $(Build.SourcesDirectory)
+ mkdir build
+ cd build
+ mkdir "definition/$(app_id)"
+ echo $(app_id) . . > definition/$(app_id)/$(app_id).txt
+ mklink /J "$(Pipeline.Workspace)/$(app_id)" "$(Build.SourcesDirectory)"
+
+ - task: CMake@1
+ inputs:
+ workingDirectory: 'build'
+ cmakeArgs: '-T host=x64 -G "$(GENERATOR)" -A $(ARCHITECTURE) $(WINSTORE) -DADDONS_TO_BUILD=$(app_id) -DCMAKE_BUILD_TYPE=$(CONFIGURATION) -DADDONS_DEFINITION_DIR=$(Pipeline.Workspace)/$(app_id)/build/definition -DADDON_SRC_PREFIX=../.. -DCMAKE_INSTALL_PREFIX=../../kodi/addons -DPACKAGE_ZIP=1 ../../kodi/cmake/addons'
+
+ - task: CMake@1
+ inputs:
+ workingDirectory: 'build'
+ cmakeArgs: '--build . --config $(CONFIGURATION) --target $(app_id)'
diff -Nru kodi-audiodecoder-2sf-2.0.2/debian/changelog kodi-audiodecoder-2sf-2.0.3/debian/changelog
--- kodi-audiodecoder-2sf-2.0.2/debian/changelog 2013-05-31 22:59:22.000000000 +0000
+++ kodi-audiodecoder-2sf-2.0.3/debian/changelog 2013-05-31 22:59:22.000000000 +0000
@@ -1,7 +1,7 @@
-kodi-audiodecoder-2sf (2.0.2-1~bionic) bionic; urgency=low
+kodi-audiodecoder-2sf (2.0.3-1~bionic) bionic; urgency=low
[ kodi ]
* autogenerated dummy changelog
- -- Arne Morten Kvarving Sat, 01 Jun 2013 00:59:22 +0200
+ -- Nobody Sat, 01 Jun 2013 00:59:22 +0200
diff -Nru kodi-audiodecoder-2sf-2.0.2/debian/changelog.in kodi-audiodecoder-2sf-2.0.3/debian/changelog.in
--- kodi-audiodecoder-2sf-2.0.2/debian/changelog.in 2013-05-31 22:59:22.000000000 +0000
+++ kodi-audiodecoder-2sf-2.0.3/debian/changelog.in 2013-05-31 22:59:22.000000000 +0000
@@ -3,5 +3,5 @@
[ kodi ]
* autogenerated dummy changelog
- -- Arne Morten Kvarving Sat, 01 Jun 2013 00:59:22 +0200
+ -- Nobody Sat, 01 Jun 2013 00:59:22 +0200
diff -Nru kodi-audiodecoder-2sf-2.0.2/debian/compat kodi-audiodecoder-2sf-2.0.3/debian/compat
--- kodi-audiodecoder-2sf-2.0.2/debian/compat 2013-05-31 22:59:22.000000000 +0000
+++ kodi-audiodecoder-2sf-2.0.3/debian/compat 2013-05-31 22:59:22.000000000 +0000
@@ -1 +1 @@
-8
+9
diff -Nru kodi-audiodecoder-2sf-2.0.2/debian/control kodi-audiodecoder-2sf-2.0.3/debian/control
--- kodi-audiodecoder-2sf-2.0.2/debian/control 2013-05-31 22:59:22.000000000 +0000
+++ kodi-audiodecoder-2sf-2.0.3/debian/control 2013-05-31 22:59:22.000000000 +0000
@@ -1,10 +1,11 @@
Source: kodi-audiodecoder-2sf
Priority: extra
-Maintainer: Arne Morten Kvarving
-Build-Depends: debhelper (>= 8.0.0), cmake, kodi-addon-dev,
+Maintainer: Nobody
+Build-Depends: debhelper (>= 9.0.0), cmake, kodi-addon-dev,
zlib1g-dev
-Standards-Version: 3.9.6
+Standards-Version: 4.1.2
Section: libs
+Homepage: http://kodi.tv
Package: kodi-audiodecoder-2sf
Section: libs
diff -Nru kodi-audiodecoder-2sf-2.0.2/debian/copyright kodi-audiodecoder-2sf-2.0.3/debian/copyright
--- kodi-audiodecoder-2sf-2.0.2/debian/copyright 2013-05-31 22:59:22.000000000 +0000
+++ kodi-audiodecoder-2sf-2.0.3/debian/copyright 2013-05-31 22:59:22.000000000 +0000
@@ -1,9 +1,9 @@
Format: http://dep.debian.net/deps/dep5
Upstream-Name: audiodecoder.2sf
-Source:
+Source: https://github.com/xbmc/audiodecoder.2sf
Files: *
-Copyright: 2005-2013 Team XBMC
+Copyright: 2005-2020 Team Kodi
License: GPL-2+
This package is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -Nru kodi-audiodecoder-2sf-2.0.2/debian/kodi-audiodecoder-2sf.install kodi-audiodecoder-2sf-2.0.3/debian/kodi-audiodecoder-2sf.install
--- kodi-audiodecoder-2sf-2.0.2/debian/kodi-audiodecoder-2sf.install 1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-2sf-2.0.3/debian/kodi-audiodecoder-2sf.install 2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,2 @@
+usr/lib/*
+usr/share/*
diff -Nru kodi-audiodecoder-2sf-2.0.2/debian/rules kodi-audiodecoder-2sf-2.0.3/debian/rules
--- kodi-audiodecoder-2sf-2.0.2/debian/rules 2013-05-31 22:59:22.000000000 +0000
+++ kodi-audiodecoder-2sf-2.0.3/debian/rules 2013-05-31 22:59:22.000000000 +0000
@@ -18,8 +18,5 @@
override_dh_strip:
dh_strip --dbg-package=kodi-audiodecoder-2sf-dbg
-override_dh_auto_install:
- dh_auto_install --destdir=debian/kodi-audiodecoder-2sf
-
override_dh_installdocs:
dh_installdocs --link-doc=kodi-audiodecoder-2sf
diff -Nru kodi-audiodecoder-2sf-2.0.2/debian/source/format kodi-audiodecoder-2sf-2.0.3/debian/source/format
--- kodi-audiodecoder-2sf-2.0.2/debian/source/format 2013-05-31 22:59:22.000000000 +0000
+++ kodi-audiodecoder-2sf-2.0.3/debian/source/format 2013-05-31 22:59:22.000000000 +0000
@@ -1 +1 @@
-3.0 (native)
+3.0 (quilt)
diff -Nru kodi-audiodecoder-2sf-2.0.2/depends/common/zlib/02-disable-example-binaries.patch kodi-audiodecoder-2sf-2.0.3/depends/common/zlib/02-disable-example-binaries.patch
--- kodi-audiodecoder-2sf-2.0.2/depends/common/zlib/02-disable-example-binaries.patch 1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-2sf-2.0.3/depends/common/zlib/02-disable-example-binaries.patch 2020-02-05 14:33:18.000000000 +0000
@@ -0,0 +1,28 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -226,25 +226,3 @@ endif()
+ if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL )
+ install(FILES ${ZLIB_PC} DESTINATION "${INSTALL_PKGCONFIG_DIR}")
+ endif()
+-
+-#============================================================================
+-# Example binaries
+-#============================================================================
+-
+-add_executable(example test/example.c)
+-target_link_libraries(example zlib)
+-add_test(example example)
+-
+-add_executable(minigzip test/minigzip.c)
+-target_link_libraries(minigzip zlib)
+-
+-if(HAVE_OFF64_T)
+- add_executable(example64 test/example.c)
+- target_link_libraries(example64 zlib)
+- set_target_properties(example64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")
+- add_test(example64 example64)
+-
+- add_executable(minigzip64 test/minigzip.c)
+- target_link_libraries(minigzip64 zlib)
+- set_target_properties(minigzip64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")
+-endif()
diff -Nru kodi-audiodecoder-2sf-2.0.2/depends/common/zlib/03-install-pkgconfig-in-lib.patch kodi-audiodecoder-2sf-2.0.3/depends/common/zlib/03-install-pkgconfig-in-lib.patch
--- kodi-audiodecoder-2sf-2.0.2/depends/common/zlib/03-install-pkgconfig-in-lib.patch 1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-2sf-2.0.3/depends/common/zlib/03-install-pkgconfig-in-lib.patch 2020-02-05 14:33:18.000000000 +0000
@@ -0,0 +1,12 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -12,7 +12,7 @@ set(INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation direc
+ set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Installation directory for libraries")
+ set(INSTALL_INC_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "Installation directory for headers")
+ set(INSTALL_MAN_DIR "${CMAKE_INSTALL_PREFIX}/share/man" CACHE PATH "Installation directory for manual pages")
+-set(INSTALL_PKGCONFIG_DIR "${CMAKE_INSTALL_PREFIX}/share/pkgconfig" CACHE PATH "Installation directory for pkgconfig (.pc) files")
++set(INSTALL_PKGCONFIG_DIR "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig" CACHE PATH "Installation directory for pkgconfig (.pc) files")
+
+ include(CheckTypeSize)
+ include(CheckFunctionExists)
+
diff -Nru kodi-audiodecoder-2sf-2.0.2/.gitignore kodi-audiodecoder-2sf-2.0.3/.gitignore
--- kodi-audiodecoder-2sf-2.0.2/.gitignore 1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-2sf-2.0.3/.gitignore 2020-02-05 14:33:18.000000000 +0000
@@ -0,0 +1,42 @@
+# build artifacts
+build/
+audiodecoder.*/addon.xml
+
+# Debian build files
+debian/changelog
+debian/files
+debian/*.log
+debian/*.substvars
+debian/.debhelper/
+debian/tmp/
+debian/kodi-audiodecoder-*/
+obj-x86_64-linux-gnu/
+
+# commonly used editors
+# vim
+*.swp
+
+# Eclipse
+*.project
+*.cproject
+.classpath
+*.sublime-*
+.settings/
+
+# KDevelop 4
+*.kdev4
+
+# gedit
+*~
+
+# CLion
+/.idea
+
+# clion
+.idea/
+
+# to prevent add after a "git format-patch VALUE" and "git add ." call
+/*.patch
+
+# to prevent add if project code opened by Visual Studio over CMake file
+.vs/
diff -Nru kodi-audiodecoder-2sf-2.0.2/lib/vio2sf/.gitignore kodi-audiodecoder-2sf-2.0.3/lib/vio2sf/.gitignore
--- kodi-audiodecoder-2sf-2.0.2/lib/vio2sf/.gitignore 1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-2sf-2.0.3/lib/vio2sf/.gitignore 2020-02-05 14:33:18.000000000 +0000
@@ -0,0 +1,3 @@
+*.user
+Debug
+Release
diff -Nru kodi-audiodecoder-2sf-2.0.2/README.md kodi-audiodecoder-2sf-2.0.3/README.md
--- kodi-audiodecoder-2sf-2.0.2/README.md 2013-05-31 22:59:22.000000000 +0000
+++ kodi-audiodecoder-2sf-2.0.3/README.md 2020-02-05 14:33:18.000000000 +0000
@@ -3,7 +3,8 @@
This is a [Kodi](http://kodi.tv) audio decoder addon for 2SF files.
[![Build Status](https://travis-ci.org/xbmc/audiodecoder.2sf.svg?branch=master)](https://travis-ci.org/xbmc/audiodecoder.2sf)
-[![Build Status](https://ci.appveyor.com/api/projects/status/github/xbmc/audiodecoder.2sf?svg=true)](https://ci.appveyor.com/project/xbmc/audiodecoder-2sf)
+[![Build Status](https://dev.azure.com/teamkodi/binary-addons/_apis/build/status/xbmc.audiodecoder.2sf?branchName=Leia)](https://dev.azure.com/teamkodi/binary-addons/_build/latest?definitionId=3&branchName=Leia)
+
## Build instructions
diff -Nru kodi-audiodecoder-2sf-2.0.2/src/2SFCodec.cpp kodi-audiodecoder-2sf-2.0.3/src/2SFCodec.cpp
--- kodi-audiodecoder-2sf-2.0.2/src/2SFCodec.cpp 2013-05-31 22:59:22.000000000 +0000
+++ kodi-audiodecoder-2sf-2.0.3/src/2SFCodec.cpp 2020-02-05 14:33:18.000000000 +0000
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2014 Arne Morten Kvarving
+ * Copyright (C) 2014-2020 Arne Morten Kvarving
+ * Copyright (C) 2016-2020 Team Kodi
*
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -12,7 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with XBMC; see the file COPYING. If not, see
+ * along with Kodi; see the file COPYING. If not, see
* .
*
*/
diff -Nru kodi-audiodecoder-2sf-2.0.2/.travis.yml kodi-audiodecoder-2sf-2.0.3/.travis.yml
--- kodi-audiodecoder-2sf-2.0.2/.travis.yml 2013-05-31 22:59:22.000000000 +0000
+++ kodi-audiodecoder-2sf-2.0.3/.travis.yml 2020-02-05 14:33:18.000000000 +0000
@@ -22,16 +22,7 @@
sudo: required
compiler: clang
- os: osx
- osx_image: xcode9
-
-#
-# Some of the OS X images don't have cmake, contrary to what people
-# on the Internet say
-#
-before_install:
- - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then which cmake || brew update ; fi
- - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then which cmake || brew install cmake ; fi
- - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update && brew upgrade cmake || true; fi
+ osx_image: xcode9.4
#
# The addon source is automatically checked out in $TRAVIS_BUILD_DIR,