diff -Nru kodi-audioencoder-vorbis-2.0.3/audioencoder.vorbis/addon.xml.in kodi-audioencoder-vorbis-2.0.4/audioencoder.vorbis/addon.xml.in --- kodi-audioencoder-vorbis-2.0.3/audioencoder.vorbis/addon.xml.in 2019-09-20 22:20:55.000000000 +0000 +++ kodi-audioencoder-vorbis-2.0.4/audioencoder.vorbis/addon.xml.in 2020-02-06 21:09:55.000000000 +0000 @@ -1,7 +1,7 @@ @ADDON_DEPENDS@ @@ -13,5 +13,10 @@ Vorbis audio compression Vorbis is a general purpose perceptual audio CODEC intended to allow maximum encoder flexibility, thus allowing it to scale competitively over an exceptionally wide range of bitrates. @PLATFORM@ + GPL-2.0 + https://github.com/xbmc/audioencoder.vorbis + + icon.png + diff -Nru kodi-audioencoder-vorbis-2.0.3/azure-pipelines.yml kodi-audioencoder-vorbis-2.0.4/azure-pipelines.yml --- kodi-audioencoder-vorbis-2.0.3/azure-pipelines.yml 1970-01-01 00:00:00.000000000 +0000 +++ kodi-audioencoder-vorbis-2.0.4/azure-pipelines.yml 2020-02-06 21:09:55.000000000 +0000 @@ -0,0 +1,65 @@ +variables: + app_id: 'audioencoder.vorbis' + +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-audioencoder-vorbis-2.0.3/debian/changelog kodi-audioencoder-vorbis-2.0.4/debian/changelog --- kodi-audioencoder-vorbis-2.0.3/debian/changelog 2019-10-21 10:48:29.000000000 +0000 +++ kodi-audioencoder-vorbis-2.0.4/debian/changelog 2014-05-17 10:40:22.000000000 +0000 @@ -1,9 +1,7 @@ -kodi-audioencoder-vorbis (2.0.3-2~eoan) eoan; urgency=low +kodi-audioencoder-vorbis (2.0.4-1~eoan) eoan; urgency=low [ xbmc ] * autogenerated dummy changelog - [ wsnipex ] - * no upstream changelog available + -- dummy Sat, 17 May 2014 11:40:22 +0100 - -- wsnipex Mon, 21 Oct 2019 10:48:29 +0000 diff -Nru kodi-audioencoder-vorbis-2.0.3/debian/changelog.tmp kodi-audioencoder-vorbis-2.0.4/debian/changelog.tmp --- kodi-audioencoder-vorbis-2.0.3/debian/changelog.tmp 2019-10-21 10:48:26.000000000 +0000 +++ kodi-audioencoder-vorbis-2.0.4/debian/changelog.tmp 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -kodi-audioencoder-vorbis (2.0.3-2~#DIST#) #DIST#; urgency=low - - [ xbmc ] - * autogenerated dummy changelog - - -- dummy Sat, 17 May 2014 11:40:22 +0100 - diff -Nru kodi-audioencoder-vorbis-2.0.3/debian/compat kodi-audioencoder-vorbis-2.0.4/debian/compat --- kodi-audioencoder-vorbis-2.0.3/debian/compat 2019-09-20 22:20:55.000000000 +0000 +++ kodi-audioencoder-vorbis-2.0.4/debian/compat 2014-05-17 10:40:22.000000000 +0000 @@ -1 +1 @@ -8 +9 diff -Nru kodi-audioencoder-vorbis-2.0.3/debian/control kodi-audioencoder-vorbis-2.0.4/debian/control --- kodi-audioencoder-vorbis-2.0.3/debian/control 2019-09-20 22:20:55.000000000 +0000 +++ kodi-audioencoder-vorbis-2.0.4/debian/control 2014-05-17 10:40:22.000000000 +0000 @@ -1,8 +1,8 @@ Source: kodi-audioencoder-vorbis Priority: extra -Maintainer: Arne Morten Kvarving -Build-Depends: debhelper (>= 8.0.0), cmake, kodi-addon-dev, make, libtool, libvorbis-dev -Standards-Version: 3.9.6 +Maintainer: Nobody +Build-Depends: debhelper (>= 9.0.0), cmake, kodi-addon-dev, make, libtool, libvorbis-dev +Standards-Version: 4.1.2 Section: libs Homepage: http://kodi.org diff -Nru kodi-audioencoder-vorbis-2.0.3/debian/copyright kodi-audioencoder-vorbis-2.0.4/debian/copyright --- kodi-audioencoder-vorbis-2.0.3/debian/copyright 2019-09-20 22:20:55.000000000 +0000 +++ kodi-audioencoder-vorbis-2.0.4/debian/copyright 2014-05-17 10:40:22.000000000 +0000 @@ -3,6 +3,7 @@ Files: * Copyright: Arne Morten Kvarving + 2013-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 @@ -24,6 +25,7 @@ Files: debian/* Copyright: 2013 Arne Morten Kvarving 2013 wsnipex + 2013-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-audioencoder-vorbis-2.0.3/debian/kodi-audioencoder-vorbis.install kodi-audioencoder-vorbis-2.0.4/debian/kodi-audioencoder-vorbis.install --- kodi-audioencoder-vorbis-2.0.3/debian/kodi-audioencoder-vorbis.install 2019-10-21 10:48:26.000000000 +0000 +++ kodi-audioencoder-vorbis-2.0.4/debian/kodi-audioencoder-vorbis.install 2014-05-17 10:40:22.000000000 +0000 @@ -1,2 +1,2 @@ -usr/lib -usr/share +usr/lib/* +usr/share/* diff -Nru kodi-audioencoder-vorbis-2.0.3/debian/source/format kodi-audioencoder-vorbis-2.0.4/debian/source/format --- kodi-audioencoder-vorbis-2.0.3/debian/source/format 2019-09-20 22:20:55.000000000 +0000 +++ kodi-audioencoder-vorbis-2.0.4/debian/source/format 2014-05-17 10:40:22.000000000 +0000 @@ -1 +1 @@ -3.0 (native) +3.0 (quilt) diff -Nru kodi-audioencoder-vorbis-2.0.3/depends/common/vorbis/0001-fix-windows-arm-build.patch kodi-audioencoder-vorbis-2.0.4/depends/common/vorbis/0001-fix-windows-arm-build.patch --- kodi-audioencoder-vorbis-2.0.3/depends/common/vorbis/0001-fix-windows-arm-build.patch 1970-01-01 00:00:00.000000000 +0000 +++ kodi-audioencoder-vorbis-2.0.4/depends/common/vorbis/0001-fix-windows-arm-build.patch 2020-02-06 21:09:55.000000000 +0000 @@ -0,0 +1,32 @@ +--- a/lib/CMakeLists.txt ++++ b/lib/CMakeLists.txt +@@ -65,6 +65,18 @@ if(MSVC) + list(APPEND VORBIS_SOURCES ../win32/vorbis.def) + list(APPEND VORBISENC_SOURCES ../win32/vorbisenc.def) + list(APPEND VORBISFILE_SOURCES ../win32/vorbisfile.def) ++ ++ include(CheckSymbolExists) ++ check_symbol_exists(_X86_ "Windows.h" _X86_) ++ check_symbol_exists(_AMD64_ "Windows.h" _X64_) ++ check_symbol_exists(_ARM_ "Windows.h" _ARM_) ++ check_symbol_exists(_ARM64_ "Windows.h" _ARM64_) ++ ++ if(_ARM64_) ++ add_definitions(-D_M_ARM -D_M_ARM64) ++ elseif(_ARM_) ++ add_definitions(-D_M_ARM) ++ endif() + endif() + + include_directories(../include) +--- a/lib/os.h ++++ b/lib/os.h +@@ -147,7 +147,7 @@ static __inline void vorbis_fpu_restore(vorbis_fpu_control fpu){ + + /* Optimized code path for x86_64 builds. Uses SSE2 intrinsics. This can be + done safely because all x86_64 CPUs supports SSE2. */ +-#if (defined(_MSC_VER) && defined(_WIN64)) || (defined(__GNUC__) && defined (__x86_64__)) ++#if (defined(_MSC_VER) && defined(_WIN64) && !defined(_M_ARM)) || (defined(__GNUC__) && defined (__x86_64__)) + # define VORBIS_FPU_CONTROL + + typedef ogg_int16_t vorbis_fpu_control; diff -Nru kodi-audioencoder-vorbis-2.0.3/.gitignore kodi-audioencoder-vorbis-2.0.4/.gitignore --- kodi-audioencoder-vorbis-2.0.3/.gitignore 1970-01-01 00:00:00.000000000 +0000 +++ kodi-audioencoder-vorbis-2.0.4/.gitignore 2020-02-06 21:09:55.000000000 +0000 @@ -0,0 +1,42 @@ +# build artifacts +build/ +audioencoder.*/addon.xml + +# Debian build files +debian/changelog +debian/files +debian/*.log +debian/*.substvars +debian/.debhelper/ +debian/tmp/ +debian/kodi-audioencoder-*/ +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-audioencoder-vorbis-2.0.3/README.md kodi-audioencoder-vorbis-2.0.4/README.md --- kodi-audioencoder-vorbis-2.0.3/README.md 2019-09-20 22:20:55.000000000 +0000 +++ kodi-audioencoder-vorbis-2.0.4/README.md 2020-02-06 21:09:55.000000000 +0000 @@ -4,6 +4,7 @@ #### CI Testing [![Build Status](https://travis-ci.org/xbmc/audioencoder.vorbis.svg?branch=master)](https://travis-ci.org/xbmc/audioencoder.vorbis) +[![Build Status](https://dev.azure.com/teamkodi/binary-addons/_apis/build/status/xbmc.audioencoder.vorbis?branchName=Leia)](https://dev.azure.com/teamkodi/binary-addons/_build/latest?definitionId=23&branchName=Leia) [![Coverity Scan Build Status](https://scan.coverity.com/projects/5120/badge.svg)](https://scan.coverity.com/projects/5120) ## Build instructions diff -Nru kodi-audioencoder-vorbis-2.0.3/src/EncoderVorbis.cpp kodi-audioencoder-vorbis-2.0.4/src/EncoderVorbis.cpp --- kodi-audioencoder-vorbis-2.0.3/src/EncoderVorbis.cpp 2019-09-20 22:20:55.000000000 +0000 +++ kodi-audioencoder-vorbis-2.0.4/src/EncoderVorbis.cpp 2020-02-06 21:09:55.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2019 Team Kodi + * Copyright (C) 2005-2020 Team Kodi * http://kodi.tv * * This Program is free software; you can redistribute it and/or modify diff -Nru kodi-audioencoder-vorbis-2.0.3/.travis.yml kodi-audioencoder-vorbis-2.0.4/.travis.yml --- kodi-audioencoder-vorbis-2.0.3/.travis.yml 2019-09-20 22:20:55.000000000 +0000 +++ kodi-audioencoder-vorbis-2.0.4/.travis.yml 2020-02-06 21:09:55.000000000 +0000 @@ -18,8 +18,6 @@ sudo: required compiler: clang - os: osx - osx_image: xcode9 - - os: osx osx_image: xcode9.4 #