Merge pull request #41 from AlwinEsch/Nexus-change

[Nexus] Translation update / workflow update / depends update (zlib)
xbmc · May 29, 2022 · dc83d28 · dc83d28
2 parents 6369b5f + c5e4c62
commit dc83d28
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 17 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -11,17 +11,17 @@ jobs:
       matrix:
         include:
         - name: "Debian package test"
-          os: ubuntu-18.04
+          os: ubuntu-20.04
           CC: gcc
           CXX: g++
           DEBIAN_BUILD: true
-        #- os: ubuntu-18.04
+        #- os: ubuntu-20.04
           #CC: gcc
           #CXX: g++
-        #- os: ubuntu-18.04
+        #- os: ubuntu-20.04
           #CC: clang
           #CXX: clang++
-        #- os: macos-10.15
+        #- os: macos-11
     steps:
     - name: Install needed ubuntu depends
       env:

diff --git a/audiodecoder.gsf/addon.xml.in b/audiodecoder.gsf/addon.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="audiodecoder.gsf"
-  version="20.2.0"
+  version="20.2.1"
   name="GSF Audio Decoder"
   provider-name="spiff">
   <requires>@ADDON_DEPENDS@</requires>

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -16,25 +16,25 @@ jobs:
   - job: Windows
 
     pool:
-      vmImage: 'VS2017-Win2016'
+      vmImage: 'windows-2022'
 
     strategy:
       matrix:
         Win32:
-          GENERATOR: "Visual Studio 15 2017"
+          GENERATOR: "Visual Studio 17 2022"
           ARCHITECTURE: Win32
           CONFIGURATION: Release
         Win64:
-          GENERATOR: "Visual Studio 15 2017"
+          GENERATOR: "Visual Studio 17 2022"
           ARCHITECTURE: x64
           CONFIGURATION: Release
         Win64-UWP:
-          GENERATOR: "Visual Studio 15 2017"
+          GENERATOR: "Visual Studio 17 2022"
           ARCHITECTURE: x64
           CONFIGURATION: Release
           WINSTORE: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.17763.0"
         ARM64-UWP:
-          GENERATOR: "Visual Studio 15 2017"
+          GENERATOR: "Visual Studio 17 2022"
           ARCHITECTURE: ARM64
           CONFIGURATION: Release
           WINSTORE: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.17763.0"

diff --git a/debian/copyright b/debian/copyright
@@ -3,7 +3,7 @@ Upstream-Name: audiodecoder.gsf
 Source: https://github.com/xbmc/audiodecoder.gme
 
 Files: *
-Copyright: 2005-2021 Team Kodi
+Copyright: 2005-2022 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 --git a/depends/common/zlib/zlib.sha256 b/depends/common/zlib/zlib.sha256
@@ -1 +1 @@
-c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1
+7db46b8d7726232a621befaab4a1c870f00a90805511c0e0090441dac57def18
diff --git a/depends/common/zlib/zlib.txt b/depends/common/zlib/zlib.txt
@@ -1 +1 @@
-zlib http://mirrors.kodi.tv/build-deps/sources/zlib-1.2.11.tar.gz
+zlib http://mirrors.kodi.tv/build-deps/sources/zlib-1.2.12.tar.xz
diff --git a/src/GSFCodec.cpp b/src/GSFCodec.cpp
@@ -1,6 +1,6 @@
 /*
- *  Copyright (C) 2014-2021 Arne Morten Kvarving
- *  Copyright (C) 2016-2021 Team Kodi (https://kodi.tv)
+ *  Copyright (C) 2014-2022 Arne Morten Kvarving
+ *  Copyright (C) 2016-2022 Team Kodi (https://kodi.tv)
  *
  *  SPDX-License-Identifier: GPL-2.0-or-later
  *  See LICENSE.md for more information.

diff --git a/src/GSFCodec.h b/src/GSFCodec.h
@@ -1,6 +1,6 @@
 /*
- *  Copyright (C) 2014-2021 Arne Morten Kvarving
- *  Copyright (C) 2016-2021 Team Kodi (https://kodi.tv)
+ *  Copyright (C) 2014-2022 Arne Morten Kvarving
+ *  Copyright (C) 2016-2022 Team Kodi (https://kodi.tv)
  *
  *  SPDX-License-Identifier: GPL-2.0-or-later
  *  See LICENSE.md for more information.
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1
		7db46b8d7726232a621befaab4a1c870f00a90805511c0e0090441dac57def18
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		zlib http://mirrors.kodi.tv/build-deps/sources/zlib-1.2.11.tar.gz
		zlib http://mirrors.kodi.tv/build-deps/sources/zlib-1.2.12.tar.xz