New Upstream Release - kodi-pvr-teleboy
Ready changes
Summary
Merged new upstream version: 20.3.4+ds (was: 20.3.3+ds).
Resulting package
Built on 2023-07-25T12:03 (took 6m21s)
The resulting binary packages can be installed (if you have the apt repository enabled) by running one of:
apt install -t fresh-releases kodi-pvr-teleboy-dbgsymapt install -t fresh-releases kodi-pvr-teleboy
Lintian Result
Diff
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
new file mode 100644
index 0000000..283a658
--- /dev/null
+++ b/.github/workflows/build.yml
@@ -0,0 +1,61 @@
+name: Build and run tests
+on: [push, pull_request]
+env:
+ app_id: pvr.teleboy
+
+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 pvr.teleboy 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/changelog-and-release.yml b/.github/workflows/changelog-and-release.yml
new file mode 100644
index 0000000..c952b58
--- /dev/null
+++ b/.github/workflows/changelog-and-release.yml
@@ -0,0 +1,149 @@
+name: Changelog and Release
+# Update the changelog and news(optionally), bump the version, and create a release
+#
+# The release is created on the given branch, release and tag name format will be <version>-<branch> and
+# the body of the release will be created from the changelog.txt or news element in the addon.xml.in
+#
+# options:
+# - version_type: 'minor' / 'micro' # whether to do a minor or micro version bump
+# - changelog_text: string to add to the changelog and news
+# - update_news: 'true' / 'false' # whether to update the news in the addon.xml.in
+# - add_date: 'true' / 'false' # Add date to version number in changelog and news. ie. v1.0.1 (2021-7-17)
+
+on:
+ workflow_dispatch:
+ inputs:
+ version_type:
+ description: 'Create a ''minor'' or ''micro'' release?'
+ required: true
+ default: 'minor'
+ changelog_text:
+ description: 'Input the changes you''d like to add to the changelogs. Your text should be encapsulated in "''s with line feeds represented by literal \n''s. ie. "This is the first change\nThis is the second change"'
+ required: true
+ default: ''
+ update_news:
+ description: 'Update news in addon.xml.in? [true|false]'
+ required: true
+ default: 'true'
+ add_date:
+ description: 'Add date to version number in changelog and news. ie. "v1.0.1 (2021-7-17)" [true|false]'
+ required: true
+ default: 'false'
+
+jobs:
+ default:
+ runs-on: ubuntu-latest
+ name: Changelog and Release
+
+ steps:
+
+ # Checkout the current repository into a directory (repositories name)
+ - name: Checkout Repository
+ uses: actions/checkout@v2
+ with:
+ fetch-depth: 0
+ path: ${{ github.event.repository.name }}
+
+ # Checkout the required scripts from kodi-pvr/pvr-scripts into the 'scripts' directory
+ - name: Checkout Scripts
+ uses: actions/checkout@v2
+ with:
+ fetch-depth: 0
+ repository: kodi-pvr/pvr-scripts
+ path: scripts
+
+ # Install all dependencies required by the following steps
+ # - libxml2-utils, xmlstarlet: reading news and version from addon.xml.in
+ - name: Install dependencies
+ run: |
+ sudo apt-get install libxml2-utils xmlstarlet
+
+ # Setup python version 3.9
+ - name: Set up Python
+ uses: actions/setup-python@v2
+ with:
+ python-version: '3.9'
+
+ # Run the python script to increment the version, changelog and news
+ - name: Increment version and update changelogs
+ run: |
+ arguments=
+ if [[ ${{ github.event.inputs.update_news }} == true ]] ;
+ then
+ arguments=$(echo $arguments && echo --update-news)
+ fi
+ if [[ ${{ github.event.inputs.add_date }} == true ]] ;
+ then
+ arguments=$(echo $arguments && echo --add-date)
+ fi
+ python3 ../scripts/changelog_and_release.py ${{ github.event.inputs.version_type }} ${{ github.event.inputs.changelog_text }} $arguments
+ working-directory: ${{ github.event.repository.name }}
+
+ # Create the variables required by the following steps
+ # - steps.required-variables.outputs.changes: latest entry in the changelog.txt (if exists), or addon.xml.in news element
+ # - steps.required-variables.outputs.version: version element from addon.xml.in
+ # - steps.required-variables.outputs.branch: branch of the triggering ref
+ # - steps.required-variables.outputs.today: today's date in format '%Y-%m-%d'
+ - name: Get required variables
+ id: required-variables
+ run: |
+ changes=$(cat "$(find . -name changelog.txt)" | awk -v RS= 'NR==1')
+ if [ -z "$changes" ] ;
+ then
+ changes=$(xmlstarlet fo -R "$(find . -name addon.xml.in)" | xmlstarlet sel -t -v 'string(/addon/extension/news)' | awk -v RS= 'NR==1')
+ fi
+ changes="${changes//'%'/'%25'}"
+ changes="${changes//$'\n'/'%0A'}"
+ changes="${changes//$'\r'/'%0D'}"
+ changes="${changes//$'\\n'/'%0A'}"
+ changes="${changes//$'\\r'/'%0D'}"
+ echo ::set-output name=changes::$changes
+ version=$(xmlstarlet fo -R "$(find . -name addon.xml.in)" | xmlstarlet sel -t -v 'string(/addon/@version)')
+ echo ::set-output name=version::$version
+ branch=$(echo ${GITHUB_REF#refs/heads/})
+ echo ::set-output name=branch::$branch
+ echo ::set-output name=today::$(date +'%Y-%m-%d')
+ working-directory: ${{ github.event.repository.name }}
+
+ # Create a commit of the incremented version and changelog, news changes
+ # Commit message (add_date=false): changelog and version v{steps.required-variables.outputs.version}
+ # Commit message (add_date=true): changelog and version v{steps.required-variables.outputs.version} ({steps.required-variables.outputs.today})
+ - name: Commit changes
+ run: |
+ git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com"
+ git config --local user.name "github-actions[bot]"
+ commit_message="changelog and version v${{ steps.required-variables.outputs.version }}"
+ if [[ ${{ github.event.inputs.add_date }} == true ]] ;
+ then
+ commit_message="$commit_message (${{ steps.required-variables.outputs.today }})"
+ fi
+ git commit -m "$commit_message" -a
+ working-directory: ${{ github.event.repository.name }}
+
+ # Push the commit(s) created above to the triggering branch
+ - name: Push changes
+ uses: ad-m/github-push-action@master
+ with:
+ branch: ${{ github.ref }}
+ directory: ${{ github.event.repository.name }}
+
+ # Sleep for 60 seconds to allow for any delays in the push
+ - name: Sleep for 60 seconds
+ run: sleep 60s
+ shell: bash
+
+ # Create a release at {steps.required-variables.outputs.branch}
+ # - tag and release name format: {steps.required-variables.outputs.version}-{steps.required-variables.outputs.branch} ie. 20.0.0-Nexus
+ # - release body: {steps.required-variables.outputs.changes}
+ - name: Create Release
+ id: create-release
+ uses: actions/create-release@v1
+ env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ with:
+ tag_name: ${{ steps.required-variables.outputs.version }}-${{ steps.required-variables.outputs.branch }}
+ release_name: ${{ steps.required-variables.outputs.version }}-${{ steps.required-variables.outputs.branch }}
+ body: ${{ steps.required-variables.outputs.changes }}
+ draft: false
+ prerelease: false
+ commitish: ${{ steps.required-variables.outputs.branch }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
new file mode 100644
index 0000000..0e12688
--- /dev/null
+++ b/.github/workflows/release.yml
@@ -0,0 +1,66 @@
+name: Make Release
+# Create a release on the given branch
+# Release and tag name format will be <version>-<branch>
+# The body of the release will be created from the changelog.txt or news element in the addon.xml.in
+
+on: workflow_dispatch
+
+jobs:
+ default:
+ runs-on: ubuntu-latest
+ name: Make Release
+
+ steps:
+
+ # Checkout the current repository into a directory (repositories name)
+ - name: Checkout Repository
+ uses: actions/checkout@v2
+ with:
+ fetch-depth: 0
+ path: ${{ github.event.repository.name }}
+
+ # Install all dependencies required by the following steps
+ # - libxml2-utils, xmlstarlet: reading news and version from addon.xml.in
+ - name: Install dependencies
+ run: |
+ sudo apt-get install libxml2-utils xmlstarlet
+
+ # Create the variables required by the following steps
+ # - steps.required-variables.outputs.changes: latest entry in the changelog.txt (if exists), or addon.xml.in news element
+ # - steps.required-variables.outputs.version: version element from addon.xml.in
+ # - steps.required-variables.outputs.branch: branch of the triggering ref
+ - name: Get required variables
+ id: required-variables
+ run: |
+ changes=$(cat "$(find . -name changelog.txt)" | awk -v RS= 'NR==1')
+ if [ -z "$changes" ] ;
+ then
+ changes=$(xmlstarlet fo -R "$(find . -name addon.xml.in)" | xmlstarlet sel -t -v 'string(/addon/extension/news)' | awk -v RS= 'NR==1')
+ fi
+ changes="${changes//'%'/'%25'}"
+ changes="${changes//$'\n'/'%0A'}"
+ changes="${changes//$'\r'/'%0D'}"
+ changes="${changes//$'\\n'/'%0A'}"
+ changes="${changes//$'\\r'/'%0D'}"
+ echo ::set-output name=changes::$changes
+ version=$(xmlstarlet fo -R "$(find . -name addon.xml.in)" | xmlstarlet sel -t -v 'string(/addon/@version)')
+ echo ::set-output name=version::$version
+ branch=$(echo ${GITHUB_REF#refs/heads/})
+ echo ::set-output name=branch::$branch
+ working-directory: ${{ github.event.repository.name }}
+
+ # Create a release at {steps.required-variables.outputs.branch}
+ # - tag and release name format: {steps.required-variables.outputs.version}-{steps.required-variables.outputs.branch} ie. 20.0.0-Nexus
+ # - release body: {steps.required-variables.outputs.changes}
+ - name: Create Release
+ id: create-release
+ uses: actions/create-release@v1
+ env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ with:
+ tag_name: ${{ steps.required-variables.outputs.version }}-${{ steps.required-variables.outputs.branch }}
+ release_name: ${{ steps.required-variables.outputs.version }}-${{ steps.required-variables.outputs.branch }}
+ body: ${{ steps.required-variables.outputs.changes }}
+ draft: false
+ prerelease: false
+ commitish: ${{ steps.required-variables.outputs.branch }}
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..b8b8fd2
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,50 @@
+# build artifacts
+build/
+pvr.*/addon.xml
+
+# Debian build files
+debian/changelog
+debian/files
+debian/*.log
+debian/*.substvars
+debian/.debhelper/
+debian/tmp/
+debian/kodi-pvr-*/
+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/debian/changelog b/debian/changelog
index f9a7179..2d2e519 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+kodi-pvr-teleboy (20.3.4+ds-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Debian Janitor <janitor@jelmer.uk> Tue, 25 Jul 2023 11:57:54 -0000
+
kodi-pvr-teleboy (20.3.3+ds-1) unstable; urgency=medium
* New upstream version 20.3.3+ds
diff --git a/pvr.teleboy/addon.xml.in b/pvr.teleboy/addon.xml.in
index 67249d2..588bde4 100644
--- a/pvr.teleboy/addon.xml.in
+++ b/pvr.teleboy/addon.xml.in
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<addon id="pvr.teleboy"
- version="20.3.3"
+ version="20.3.4"
name="Teleboy PVR Client"
provider-name="rbuehlma">
<requires>
diff --git a/pvr.teleboy/changelog.txt b/pvr.teleboy/changelog.txt
index 5c229d1..852fda2 100644
--- a/pvr.teleboy/changelog.txt
+++ b/pvr.teleboy/changelog.txt
@@ -1,3 +1,5 @@
+v20.3.4
+- Show error if login fails
v20.3.3
- Fix segfault during addon creation (this time with actual change)
v20.3.2
diff --git a/src/Session.cpp b/src/Session.cpp
index 60b34e9..c3b6fae 100644
--- a/src/Session.cpp
+++ b/src/Session.cpp
@@ -62,6 +62,8 @@ void Session::LoginThread() {
else
{
kodi::Log(ADDON_LOG_ERROR, "Login failed");
+ m_nextLoginAttempt = std::time(0) + 3600;
+ kodi::QueueNotification(QUEUE_ERROR, "", kodi::addon::GetLocalizedString(30101));
}
}
}
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/debug/.build-id/18/0b29124ce8a028942ee51ef4bc0cfb3b984afb.debug -rw-r--r-- root/root /usr/lib/x86_64-linux-gnu/kodi/addons/pvr.teleboy/pvr.teleboy.so.20.3.4 lrwxrwxrwx root/root /usr/lib/x86_64-linux-gnu/kodi/addons/pvr.teleboy/pvr.teleboy.so.20.2 -> pvr.teleboy.so.20.3.4
Files in first set of .debs but not in second
-rw-r--r-- root/root /usr/lib/debug/.build-id/be/13b6670abfecc65d85f017a62e4bf2a757116e.debug -rw-r--r-- root/root /usr/lib/x86_64-linux-gnu/kodi/addons/pvr.teleboy/pvr.teleboy.so.20.3.3 lrwxrwxrwx root/root /usr/lib/x86_64-linux-gnu/kodi/addons/pvr.teleboy/pvr.teleboy.so.20.2 -> pvr.teleboy.so.20.3.3
No differences were encountered between the control files of package kodi-pvr-teleboy
Control files of package kodi-pvr-teleboy-dbgsym: lines which differ (wdiff format)
Build-Ids: be13b6670abfecc65d85f017a62e4bf2a757116e 180b29124ce8a028942ee51ef4bc0cfb3b984afb