diff -Nru kodi-audiodecoder-organya-1.2.0/appveyor.yml kodi-audiodecoder-organya-1.2.1/appveyor.yml
--- kodi-audiodecoder-organya-1.2.0/appveyor.yml 2013-05-31 22:59:22.000000000 +0000
+++ kodi-audiodecoder-organya-1.2.1/appveyor.yml 2020-02-05 22:26:52.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.organya
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-organya-1.2.0/audiodecoder.organya/addon.xml.in kodi-audiodecoder-organya-1.2.1/audiodecoder.organya/addon.xml.in
--- kodi-audiodecoder-organya-1.2.0/audiodecoder.organya/addon.xml.in 2013-05-31 22:59:22.000000000 +0000
+++ kodi-audiodecoder-organya-1.2.1/audiodecoder.organya/addon.xml.in 2020-02-05 22:26:52.000000000 +0000
@@ -1,7 +1,7 @@
@ADDON_DEPENDS@
@@ -17,5 +17,10 @@
This addon allows playing of .ORG files for this format.
@PLATFORM@
+ GPL-2.0
+
+
+ icon.png
+
diff -Nru kodi-audiodecoder-organya-1.2.0/azure-pipelines.yml kodi-audiodecoder-organya-1.2.1/azure-pipelines.yml
--- kodi-audiodecoder-organya-1.2.0/azure-pipelines.yml 1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-organya-1.2.1/azure-pipelines.yml 2020-02-05 22:26:52.000000000 +0000
@@ -0,0 +1,65 @@
+variables:
+ app_id: 'audiodecoder.organya'
+
+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.16299.0"
+ ARM64-UWP:
+ GENERATOR: "Visual Studio 15 2017"
+ ARCHITECTURE: ARM64
+ CONFIGURATION: Release
+ WINSTORE: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.16299.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-organya-1.2.0/debian/changelog kodi-audiodecoder-organya-1.2.1/debian/changelog
--- kodi-audiodecoder-organya-1.2.0/debian/changelog 2013-05-31 22:59:22.000000000 +0000
+++ kodi-audiodecoder-organya-1.2.1/debian/changelog 2013-05-31 22:59:22.000000000 +0000
@@ -1,7 +1,7 @@
-kodi-audiodecoder-organya (1.2.0-1~xenial) xenial; urgency=low
+kodi-audiodecoder-organya (1.2.1-1~xenial) xenial; 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-organya-1.2.0/debian/changelog.in kodi-audiodecoder-organya-1.2.1/debian/changelog.in
--- kodi-audiodecoder-organya-1.2.0/debian/changelog.in 2013-05-31 22:59:22.000000000 +0000
+++ kodi-audiodecoder-organya-1.2.1/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-organya-1.2.0/debian/compat kodi-audiodecoder-organya-1.2.1/debian/compat
--- kodi-audiodecoder-organya-1.2.0/debian/compat 2013-05-31 22:59:22.000000000 +0000
+++ kodi-audiodecoder-organya-1.2.1/debian/compat 2013-05-31 22:59:22.000000000 +0000
@@ -1 +1 @@
-8
+9
diff -Nru kodi-audiodecoder-organya-1.2.0/debian/control kodi-audiodecoder-organya-1.2.1/debian/control
--- kodi-audiodecoder-organya-1.2.0/debian/control 2013-05-31 22:59:22.000000000 +0000
+++ kodi-audiodecoder-organya-1.2.1/debian/control 2013-05-31 22:59:22.000000000 +0000
@@ -1,9 +1,10 @@
Source: kodi-audiodecoder-organya
Priority: extra
-Maintainer: Arne Morten Kvarving
-Build-Depends: debhelper (>= 8.0.0), cmake, kodi-addon-dev, libp8-platform-dev
-Standards-Version: 3.9.6
+Maintainer: Nobody
+Build-Depends: debhelper (>= 9.0.0), cmake, kodi-addon-dev
+Standards-Version: 4.1.2
Section: libs
+Homepage: http://kodi.tv
Package: kodi-audiodecoder-organya
Section: libs
diff -Nru kodi-audiodecoder-organya-1.2.0/debian/copyright kodi-audiodecoder-organya-1.2.1/debian/copyright
--- kodi-audiodecoder-organya-1.2.0/debian/copyright 2013-05-31 22:59:22.000000000 +0000
+++ kodi-audiodecoder-organya-1.2.1/debian/copyright 2013-05-31 22:59:22.000000000 +0000
@@ -1,9 +1,9 @@
Format: http://dep.debian.net/deps/dep5
Upstream-Name: audiodecoder.organya
-Source:
+Source: https://github.com/xbmc/audiodecoder.organya
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-organya-1.2.0/debian/kodi-audiodecoder-organya.install kodi-audiodecoder-organya-1.2.1/debian/kodi-audiodecoder-organya.install
--- kodi-audiodecoder-organya-1.2.0/debian/kodi-audiodecoder-organya.install 1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-organya-1.2.1/debian/kodi-audiodecoder-organya.install 2013-05-31 22:59:22.000000000 +0000
@@ -0,0 +1,2 @@
+usr/lib/*
+usr/share/*
diff -Nru kodi-audiodecoder-organya-1.2.0/debian/rules kodi-audiodecoder-organya-1.2.1/debian/rules
--- kodi-audiodecoder-organya-1.2.0/debian/rules 2013-05-31 22:59:22.000000000 +0000
+++ kodi-audiodecoder-organya-1.2.1/debian/rules 2013-05-31 22:59:22.000000000 +0000
@@ -18,8 +18,5 @@
override_dh_strip:
dh_strip --dbg-package=kodi-audiodecoder-organya-dbg
-override_dh_auto_install:
- dh_auto_install --destdir=debian/kodi-audiodecoder-organya
-
override_dh_installdocs:
dh_installdocs --link-doc=kodi-audiodecoder-organya
diff -Nru kodi-audiodecoder-organya-1.2.0/debian/source/format kodi-audiodecoder-organya-1.2.1/debian/source/format
--- kodi-audiodecoder-organya-1.2.0/debian/source/format 2013-05-31 22:59:22.000000000 +0000
+++ kodi-audiodecoder-organya-1.2.1/debian/source/format 2013-05-31 22:59:22.000000000 +0000
@@ -1 +1 @@
-3.0 (native)
+3.0 (quilt)
diff -Nru kodi-audiodecoder-organya-1.2.0/.gitignore kodi-audiodecoder-organya-1.2.1/.gitignore
--- kodi-audiodecoder-organya-1.2.0/.gitignore 1970-01-01 00:00:00.000000000 +0000
+++ kodi-audiodecoder-organya-1.2.1/.gitignore 2020-02-05 22:26:52.000000000 +0000
@@ -0,0 +1,36 @@
+# 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/
diff -Nru kodi-audiodecoder-organya-1.2.0/README.md kodi-audiodecoder-organya-1.2.1/README.md
--- kodi-audiodecoder-organya-1.2.0/README.md 2013-05-31 22:59:22.000000000 +0000
+++ kodi-audiodecoder-organya-1.2.1/README.md 2020-02-05 22:26:52.000000000 +0000
@@ -3,7 +3,8 @@
This is a [Kodi](http://kodi.tv) audio decoder addon for ORG music files.
[![Build Status](https://travis-ci.org/xbmc/audiodecoder.organya.svg?branch=master)](https://travis-ci.org/xbmc/audiodecoder.organya)
-[![Build Status](https://ci.appveyor.com/api/projects/status/github/xbmc/audiodecoder.organya?svg=true)](https://ci.appveyor.com/project/xbmc/audiodecoder-organya)
+[![Build Status](https://dev.azure.com/teamkodi/binary-addons/_apis/build/status/xbmc.audiodecoder.openmpt?branchName=Leia)](https://dev.azure.com/teamkodi/binary-addons/_build/latest?definitionId=10&branchName=Leia)
+
## Build instructions
diff -Nru kodi-audiodecoder-organya-1.2.0/src/OrganyaCodec.cpp kodi-audiodecoder-organya-1.2.1/src/OrganyaCodec.cpp
--- kodi-audiodecoder-organya-1.2.0/src/OrganyaCodec.cpp 2013-05-31 22:59:22.000000000 +0000
+++ kodi-audiodecoder-organya-1.2.1/src/OrganyaCodec.cpp 2020-02-05 22:26:52.000000000 +0000
@@ -1,6 +1,6 @@
/*
- * Copyright (C) 2019 Team Kodi
- * Copyright (C) 2014 Arne Morten Kvarving
+ * Copyright (C) 2019-2020 Team Kodi
+ * Copyright (C) 2014-2020 Arne Morten Kvarving
*
* 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
diff -Nru kodi-audiodecoder-organya-1.2.0/src/OrganyaCodec.h kodi-audiodecoder-organya-1.2.1/src/OrganyaCodec.h
--- kodi-audiodecoder-organya-1.2.0/src/OrganyaCodec.h 2013-05-31 22:59:22.000000000 +0000
+++ kodi-audiodecoder-organya-1.2.1/src/OrganyaCodec.h 2020-02-05 22:26:52.000000000 +0000
@@ -1,6 +1,6 @@
/*
- * Copyright (C) 2019 Team Kodi
- * Copyright (C) 2014 Arne Morten Kvarving
+ * Copyright (C) 2019-2020 Team Kodi
+ * Copyright (C) 2014-2020 Arne Morten Kvarving
*
* 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
diff -Nru kodi-audiodecoder-organya-1.2.0/.travis.yml kodi-audiodecoder-organya-1.2.1/.travis.yml
--- kodi-audiodecoder-organya-1.2.0/.travis.yml 2013-05-31 22:59:22.000000000 +0000
+++ kodi-audiodecoder-organya-1.2.1/.travis.yml 2020-02-05 22:26:52.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,