Skip to content

Commit

Permalink
Merge pull request #29 from AlwinEsch/Matrix-change
Browse files Browse the repository at this point in the history
[Matrix/Nexus] Copyright year increase, add translation support and minor cleanups.
  • Loading branch information
AlwinEsch authored Sep 26, 2021
2 parents f464093 + c0856be commit 2118271
Show file tree
Hide file tree
Showing 10 changed files with 164 additions and 11 deletions.
61 changes: 61 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
name: Build and run tests
on: [push, pull_request]
env:
app_id: audiodecoder.sidplay

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 audiodecoder.sidplay 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
46 changes: 46 additions & 0 deletions .github/workflows/sync-addon-metadata-translations.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
name: Sync addon metadata translations

on:
push:
branches: [ Matrix, Nexus ]
paths:
- '**addon.xml'
- '**resource.language.**strings.po'

jobs:
default:
if: github.repository == 'xbmc/audiodecoder.sidplay'
runs-on: ubuntu-latest

steps:

- name: Checkout repository
uses: actions/checkout@v2
with:
path: project

- name: Set up Python
uses: actions/setup-python@v2
with:
python-version: '3.9'

- name: Install dependencies
run: |
python -m pip install --upgrade pip
python -m pip install git+https://github.com/xbmc/sync_addon_metadata_translations.git
- 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/[email protected]
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
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ before_script:
- if [[ $DEBIAN_BUILD != true ]]; then mkdir -p definition/${app_id}; fi
- if [[ $DEBIAN_BUILD != true ]]; then echo ${app_id} $TRAVIS_BUILD_DIR $TRAVIS_COMMIT > definition/${app_id}/${app_id}.txt; fi
- if [[ $DEBIAN_BUILD != true ]]; then cmake -DADDONS_TO_BUILD=${app_id} -DADDON_SRC_PREFIX=$TRAVIS_BUILD_DIR/.. -DADDONS_DEFINITION_DIR=$TRAVIS_BUILD_DIR/build/definition -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=$TRAVIS_BUILD_DIR/../xbmc/addons -DPACKAGE_ZIP=1 $TRAVIS_BUILD_DIR/../xbmc/cmake/addons; fi
- if [[ $DEBIAN_BUILD == true ]]; then wget https://raw.githubusercontent.com/xbmc/xbmc/master/xbmc/addons/kodi-addon-dev-kit/tools/debian-addon-package-test.sh && chmod +x ./debian-addon-package-test.sh; 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 $TRAVIS_BUILD_DIR; fi

script:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
This is a [Kodi](https://kodi.tv) audio decoder addon for SID music files.

[![License: GPL-2.0-or-later](https://img.shields.io/badge/License-GPL%20v2+-blue.svg)](LICENSE.md)
[![Build Status](https://travis-ci.org/xbmc/audiodecoder.sidplay.svg?branch=Matrix)](https://travis-ci.org/xbmc/audiodecoder.sidplay/branches)
[![Build and run tests](https://github.com/xbmc/audiodecoder.sidplay/actions/workflows/build.yml/badge.svg?branch=Matrix)](https://github.com/xbmc/audiodecoder.sidplay/actions/workflows/build.yml)
[![Build Status](https://dev.azure.com/teamkodi/binary-addons/_apis/build/status/xbmc.audiodecoder.sidplay?branchName=Matrix)](https://dev.azure.com/teamkodi/binary-addons/_build/latest?definitionId=13&branchName=Matrix)
[![Build Status](https://jenkins.kodi.tv/view/Addons/job/xbmc/job/audiodecoder.sidplay/job/Matrix/badge/icon)](https://jenkins.kodi.tv/blue/organizations/jenkins/xbmc%2Faudiodecoder.sidplay/branches/)
<!--- [![Build Status](https://ci.appveyor.com/api/projects/status/github/xbmc/audiodecoder.sidplay?branch=Matrix&svg=true)](https://ci.appveyor.com/project/xbmc/audiodecoder-sidplay?branch=Matrix) -->
Expand Down
8 changes: 2 additions & 6 deletions audiodecoder.sidplay/addon.xml.in
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,8 @@
<extension point="xbmc.addon.metadata">
<summary lang="de_DE">SID (MOS 6581) Audio Decoder</summary>
<summary lang="en_GB">SID (MOS 6581) Audio Decoder</summary>
<description lang="de_DE">Sound Interface Device (SID) ist ein Format, das Commodore 64- und 128 Musik enthält.

Dies ist ein Addon, das die Emulation des SID-Chips (MOS 6581) und der CPU (6510) des C64 durch .SID- oder .SIDSTREAM-Dateien implementiert.</description>
<description lang="en_GB">Sound Interface Device (SID) is a format that houses Commodore 64 and 128 music.

This is a addon that implements the emulation of the C64's SID chip (MOS 6581) and CPU (6510) by .SID or .SIDSTREAM files.</description>
<description lang="de_DE">Sound Interface Device (SID) ist ein Format, das Commodore 64- und 128 Musik enthält.[CR][CR]Dies ist ein Addon, das die Emulation des SID-Chips (MOS 6581) und der CPU (6510) des C64 durch .SID- oder .SIDSTREAM-Dateien implementiert.</description>
<description lang="en_GB">Sound Interface Device (SID) is a format that houses Commodore 64 and 128 music.[CR][CR]This is a addon that implements the emulation of the C64's SID chip (MOS 6581) and CPU (6510) by .SID or .SIDSTREAM files.</description>
<platform>@PLATFORM@</platform>
<license>GPL-2.0-or-later</license>
<source>https://github.com/xbmc/audiodecoder.sidplay</source>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# Kodi Media Center language file
# Addon Name: Sidplay Audio Decoder
# Addon id: audiodecoder.sidplay
# Addon Provider: Team Kodi
msgid ""
msgstr ""
"Project-Id-Version: KODI Addons\n"
"Report-Msgid-Bugs-To: https://github.com/xbmc/audiodecoder.sidplay/issues/\n"
"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Kodi Translation Team\n"
"Language-Team: German (Germany) (http://www.transifex.com/projects/p/kodi-addons/language/de_DE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: de_DE\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"

msgctxt "Addon Summary"
msgid "SID (MOS 6581) Audio Decoder"
msgstr "SID (MOS 6581) Audio Decoder"

msgctxt "Addon Description"
msgid "Sound Interface Device (SID) is a format that houses Commodore 64 and 128 music.[CR][CR]This is a addon that implements the emulation of the C64's SID chip (MOS 6581) and CPU (6510) by .SID or .SIDSTREAM files."
msgstr "Sound Interface Device (SID) ist ein Format, das Commodore 64- und 128 Musik enthält.[CR][CR]Dies ist ein Addon, das die Emulation des SID-Chips (MOS 6581) und der CPU (6510) des C64 durch .SID- oder .SIDSTREAM-Dateien implementiert."
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# Kodi Media Center language file
# Addon Name: Sidplay Audio Decoder
# Addon id: audiodecoder.sidplay
# Addon Provider: Team Kodi
msgid ""
msgstr ""
"Project-Id-Version: KODI Addons\n"
"Report-Msgid-Bugs-To: https://github.com/xbmc/audiodecoder.sidplay/issues/\n"
"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Kodi Translation Team\n"
"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/kodi-addons/language/en_GB/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: en_GB\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"

msgctxt "Addon Summary"
msgid "SID (MOS 6581) Audio Decoder"
msgstr ""

msgctxt "Addon Description"
msgid "Sound Interface Device (SID) is a format that houses Commodore 64 and 128 music.[CR][CR]This is a addon that implements the emulation of the C64's SID chip (MOS 6581) and CPU (6510) by .SID or .SIDSTREAM files."
msgstr ""
2 changes: 1 addition & 1 deletion debian/copyright
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Upstream-Name: audiodecoder.sidplay
Source: https://github.com/xbmc/audiodecoder.sidplay

Files: *
Copyright: 2005-2020 Team Kodi
Copyright: 2005-2021 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
Expand Down
2 changes: 1 addition & 1 deletion src/SIDCodec.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2005-2020 Team Kodi (https://kodi.tv)
* Copyright (C) 2005-2021 Team Kodi (https://kodi.tv)
*
* SPDX-License-Identifier: GPL-2.0-or-later
* See LICENSE.md for more information.
Expand Down
2 changes: 1 addition & 1 deletion src/SIDCodec.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2005-2020 Team Kodi (https://kodi.tv)
* Copyright (C) 2005-2021 Team Kodi (https://kodi.tv)
*
* SPDX-License-Identifier: GPL-2.0-or-later
* See LICENSE.md for more information.
Expand Down

0 comments on commit 2118271

Please sign in to comment.