New Upstream Release - kodi-vfs-libarchive
Ready changes
Summary
Merged new upstream version: 20.3.0+ds1 (was: 20.2.0+ds1).
Resulting package
Built on 2023-07-25T12:31 (took 6m0s)
The resulting binary packages can be installed (if you have the apt repository enabled) by running one of:
apt install -t fresh-releases kodi-vfs-libarchive-dbgsymapt install -t fresh-releases kodi-vfs-libarchive
Lintian Result
Diff
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
new file mode 100644
index 0000000..701d038
--- /dev/null
+++ b/.github/workflows/build.yml
@@ -0,0 +1,61 @@
+name: Build and run tests
+on: [push, pull_request]
+env:
+ app_id: vfs.libarchive
+
+jobs:
+ build:
+ runs-on: ${{ matrix.os }}
+ strategy:
+ fail-fast: false
+ matrix:
+ include:
+ - name: "Debian package test"
+ os: ubuntu-18.04
+ CC: gcc
+ CXX: g++
+ DEBIAN_BUILD: true
+ #- os: ubuntu-18.04
+ #CC: gcc
+ #CXX: g++
+ #- os: ubuntu-18.04
+ #CC: clang
+ #CXX: clang++
+ #- os: macos-10.15
+ steps:
+ - name: Install needed ubuntu depends
+ env:
+ DEBIAN_BUILD: ${{ matrix.DEBIAN_BUILD }}
+ run: |
+ if [[ $DEBIAN_BUILD == true ]]; then sudo add-apt-repository -y ppa:team-xbmc/xbmc-nightly; fi
+ if [[ $DEBIAN_BUILD == true ]]; then sudo apt-get update; fi
+ if [[ $DEBIAN_BUILD == true ]]; then sudo apt-get install fakeroot; fi
+ - name: Checkout Kodi repo
+ uses: actions/checkout@v2
+ with:
+ repository: xbmc/xbmc
+ ref: master
+ path: xbmc
+ - name: Checkout vfs.libarchive repo
+ uses: actions/checkout@v2
+ with:
+ path: ${{ env.app_id }}
+ - name: Configure
+ env:
+ CC: ${{ matrix.CC }}
+ CXX: ${{ matrix.CXX }}
+ DEBIAN_BUILD: ${{ matrix.DEBIAN_BUILD }}
+ run: |
+ if [[ $DEBIAN_BUILD != true ]]; then cd ${app_id} && mkdir -p build && cd build; fi
+ if [[ $DEBIAN_BUILD != true ]]; then cmake -DADDONS_TO_BUILD=${app_id} -DADDON_SRC_PREFIX=${{ github.workspace }} -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/xbmc/addons -DPACKAGE_ZIP=1 ${{ github.workspace }}/xbmc/cmake/addons; 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 ${{ github.workspace }}/${app_id}; fi
+ - name: Build
+ env:
+ CC: ${{ matrix.CC }}
+ CXX: ${{ matrix.CXX }}
+ DEBIAN_BUILD: ${{ matrix.DEBIAN_BUILD }}
+ run: |
+ if [[ $DEBIAN_BUILD != true ]]; then cd ${app_id}/build; fi
+ if [[ $DEBIAN_BUILD != true ]]; then make; fi
+ if [[ $DEBIAN_BUILD == true ]]; then ./debian-addon-package-test.sh ${{ github.workspace }}/${app_id}; fi
diff --git a/.github/workflows/sync-addon-metadata-translations.yml b/.github/workflows/sync-addon-metadata-translations.yml
new file mode 100644
index 0000000..48ef786
--- /dev/null
+++ b/.github/workflows/sync-addon-metadata-translations.yml
@@ -0,0 +1,58 @@
+name: Sync addon metadata translations
+
+on:
+ push:
+ branches: [ Matrix, Nexus ]
+ paths:
+ - '**addon.xml.in'
+ - '**resource.language.**strings.po'
+
+jobs:
+ default:
+ if: github.repository == 'xbmc/vfs.libarchive'
+ runs-on: ubuntu-latest
+
+ strategy:
+
+ fail-fast: false
+ matrix:
+ python-version: [ 3.9 ]
+
+ steps:
+
+ - name: Checkout repository
+ uses: actions/checkout@v2
+ with:
+ path: project
+
+ - name: Checkout sync_addon_metadata_translations repository
+ uses: actions/checkout@v2
+ with:
+ repository: xbmc/sync_addon_metadata_translations
+ path: sync_addon_metadata_translations
+
+ - name: Set up Python ${{ matrix.python-version }}
+ uses: actions/setup-python@v2
+ with:
+ python-version: ${{ matrix.python-version }}
+
+ - name: Install dependencies
+ run: |
+ python -m pip install --upgrade pip
+ python -m pip install sync_addon_metadata_translations/
+
+ - name: Run sync-addon-metadata-translations
+ run: |
+ sync-addon-metadata-translations
+ working-directory: ./project
+
+ - name: Create PR for sync-addon-metadata-translations changes
+ uses: peter-evans/create-pull-request@v3.10.0
+ with:
+ commit-message: Sync of addon metadata translations
+ title: Sync of addon metadata translations
+ body: Sync of addon metadata translations triggered by ${{ github.sha }}
+ branch: amt-sync
+ delete-branch: true
+ path: ./project
+ reviewers: gade01
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..33f2d0b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,50 @@
+# build artifacts
+build/
+vfs.*/addon.xml
+
+# Debian build files
+debian/changelog
+debian/files
+debian/*.log
+debian/*.substvars
+debian/.debhelper/
+debian/tmp/
+debian/kodi-vfs-*/
+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
+
+# Visual Studio Code
+.vscode
+
+# to prevent add if project code opened by Visual Studio over CMake file
+.vs/
+
+# General MacOS
+.DS_Store
+.AppleDouble
+.LSOverride
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index b2c8a80..dcb50a1 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -17,25 +17,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/changelog b/debian/changelog
index 507d68e..b8b43d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+kodi-vfs-libarchive (20.3.0+ds1-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Debian Janitor <janitor@jelmer.uk> Tue, 25 Jul 2023 12:25:50 -0000
+
kodi-vfs-libarchive (20.2.0+ds1-1) unstable; urgency=medium
* New upstream version 20.2.0+ds1
diff --git a/debian/patches/0001-Drop-OpenSSL-dependency.patch b/debian/patches/0001-Drop-OpenSSL-dependency.patch
index 3197502..c06f8bb 100644
--- a/debian/patches/0001-Drop-OpenSSL-dependency.patch
+++ b/debian/patches/0001-Drop-OpenSSL-dependency.patch
@@ -11,11 +11,11 @@ Signed-off-by: Vasyl Gello <vasek.gello@gmail.com>
debian/control | 8 +-------
2 files changed, 4 insertions(+), 28 deletions(-)
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 158b01e..b430c67 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -5,33 +5,15 @@ list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR})
+Index: kodi-vfs-libarchive.git/CMakeLists.txt
+===================================================================
+--- kodi-vfs-libarchive.git.orig/CMakeLists.txt
++++ kodi-vfs-libarchive.git/CMakeLists.txt
+@@ -5,33 +5,15 @@ list(APPEND CMAKE_MODULE_PATH ${PROJECT_
find_package(Kodi REQUIRED)
find_package(LibArchive REQUIRED)
@@ -52,6 +52,3 @@ index 158b01e..b430c67 100644
build_addon(vfs.libarchive ARCHIVE DEPLIBS)
include(CPack)
---
-2.20.1
-
diff --git a/vfs.libarchive/addon.xml.in b/vfs.libarchive/addon.xml.in
index 7c76170..4b9460a 100644
--- a/vfs.libarchive/addon.xml.in
+++ b/vfs.libarchive/addon.xml.in
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<addon
id="vfs.libarchive"
- version="20.2.0"
+ version="20.3.0"
name="Archive support"
provider-name="spiff">
<requires>@ADDON_DEPENDS@</requires>
Debdiff
[The following lists of changes regard files as different if they have different names, permissions or owners.]
Files in second set of .debs but not in first
-rw-r--r-- root/root /usr/lib/x86_64-linux-gnu/kodi/addons/vfs.libarchive/vfs.libarchive.so.20.3.0 lrwxrwxrwx root/root /usr/lib/x86_64-linux-gnu/kodi/addons/vfs.libarchive/vfs.libarchive.so.20.2 -> vfs.libarchive.so.20.3.0
Files in first set of .debs but not in second
-rw-r--r-- root/root /usr/lib/x86_64-linux-gnu/kodi/addons/vfs.libarchive/vfs.libarchive.so.20.2.0 lrwxrwxrwx root/root /usr/lib/x86_64-linux-gnu/kodi/addons/vfs.libarchive/vfs.libarchive.so.20.2 -> vfs.libarchive.so.20.2.0
No differences were encountered between the control files of package kodi-vfs-libarchive
No differences were encountered between the control files of package kodi-vfs-libarchive-dbgsym