Merge pull request #20 from AlwinEsch/Matrix-change

[Matrix] API releated update and cleanup

.travis.yml

@@ -1,16 +1,12 @@
 language: cpp
 
-#
-# Define the build matrix
-#
-# Travis defaults to building on Ubuntu Trusty when building on
-# Linux. We need Xenial in order to get up to date versions of
-# cmake and g++.
-#
 env:
   global:
     - app_id=screensaver.greynetic
 
+#
+# Define the build matrix
+#
 matrix:
   include:
     - os: linux
@@ -21,10 +17,22 @@ matrix:
       dist: xenial
       sudo: required
       compiler: clang
+    - os: linux
+      dist: bionic
+      sudo: required
+      compiler: gcc
+      env: DEBIAN_BUILD=true
+    - os: linux
+      dist: focal
+      sudo: required
+      compiler: gcc
+      env: DEBIAN_BUILD=true
     - os: osx
       osx_image: xcode10.2
 
 before_install:
+  - if [[ $DEBIAN_BUILD == true ]]; then sudo add-apt-repository -y ppa:team-xbmc/xbmc-nightly; fi
+  - if [[ $DEBIAN_BUILD == true ]]; then sudo apt-get install fakeroot; fi
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get update -qq; fi
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install -y libgl1-mesa-dev; fi
 
@@ -33,11 +41,15 @@ before_install:
 # we'll put the Kodi source on the same level
 #
 before_script:
-  - cd $TRAVIS_BUILD_DIR/..
-  - git clone --branch master --depth=1 https://github.com/xbmc/xbmc.git
-  - cd ${app_id} && mkdir build && cd build
-  - mkdir -p definition/${app_id}
-  - echo ${app_id} $TRAVIS_BUILD_DIR $TRAVIS_COMMIT > definition/${app_id}/${app_id}.txt
-  - 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
+  - if [[ $DEBIAN_BUILD != true ]]; then cd $TRAVIS_BUILD_DIR/..; fi
+  - if [[ $DEBIAN_BUILD != true ]]; then git clone --branch master --depth=1 https://github.com/xbmc/xbmc.git; fi
+  - if [[ $DEBIAN_BUILD != true ]]; then cd ${app_id} && mkdir build && cd build; fi
+  - 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-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: make
+script:
+  - if [[ $DEBIAN_BUILD != true ]]; then make; fi
+  - if [[ $DEBIAN_BUILD == true ]]; then ./debian-addon-package-test.sh $TRAVIS_BUILD_DIR; fi

README.md

@@ -6,7 +6,6 @@ This is a [Kodi](http://kodi.tv) screensaver addon.
 [![Build Status](https://travis-ci.org/xbmc/screensaver.greynetic.svg?branch=master)](https://travis-ci.org/xbmc/screensaver.greynetic)
 [![Build Status](https://dev.azure.com/teamkodi/binary-addons/_apis/build/status/xbmc.screensaver.greynetic?branchName=Matrix)](https://dev.azure.com/teamkodi/binary-addons/_build/latest?definitionId=44&branchName=Matrix)
 [![Build Status](https://jenkins.kodi.tv/view/Addons/job/xbmc/job/screensaver.greynetic/job/Matrix/badge/icon)](https://jenkins.kodi.tv/blue/organizations/jenkins/xbmc%2Fscreensaver.greynetic/branches/)
-<!--- [![Build Status](https://ci.appveyor.com/api/projects/status/github/xbmc/screensaver.greynetic?svg=true)](https://ci.appveyor.com/project/xbmc/screensaver.greynetic) -->
 
 ## Build instructions
 

debian/control

@@ -6,7 +6,7 @@ Build-Depends: debhelper (>= 9.0.0), cmake, kodi-addon-dev,
                libglm-dev
 Standards-Version: 4.1.2
 Section: libs
-Homepage: http://kodi.tv
+Homepage: https://kodi.tv
 
 Package: kodi-screensaver-greynetic
 Section: libs

debian/copyright

@@ -3,7 +3,7 @@ Upstream-Name: screensaver.greynetic
 Source: https://github.com/xbmc/screensaver.greynetic
 
 Files: *
-Copyright: 2005-2019 Team Kodi
+Copyright: 2005-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

debian/rules

@@ -10,13 +10,10 @@
 #export DH_VERBOSE=1
 
 %:
-	dh $@ 
+	dh $@
 
 override_dh_auto_configure:
-	dh_auto_configure -- -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=1 -DUSE_LTO=1
-
-override_dh_strip:
-	dh_strip -pkodi-screensaver-greynetic --dbg-package=kodi-screensaver-greynetic-dbg
+	dh_auto_configure -- -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_SHARED_LIBS=1 -DUSE_LTO=1
 
 override_dh_installdocs:
 	dh_installdocs --link-doc=kodi-screensaver-greynetic

debian/source/format

@@ -1 +1 @@
-3.0 (quilt)
+3.0 (native)

screensaver.greynetic/addon.xml.in

@@ -1,15 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="screensaver.greynetic"
-  version="2.3.1"
+  version="2.4.0"
   name="Greynetic"
   provider-name="spiff">
   <requires>@ADDON_DEPENDS@</requires>
   <extension
     point="xbmc.ui.screensaver"
     library_@PLATFORM@="@LIBRARY_FILENAME@"/>
   <extension point="xbmc.addon.metadata">
+    <summary lang="de_DE">Zeichnet zufällige Farbrechtecke</summary>
     <summary lang="en_GB">Draw random color rectangles</summary>
+    <description lang="de_DE">Farbige und transparente Rechtecke.</description>
     <description lang="en_GB">Colored and transparent rectangles.</description>
     <platform>@PLATFORM@</platform>
     <license>GPL-2.0-or-later</license>

screensaver.greynetic/resources/language/resource.language.de_de/strings.po

@@ -0,0 +1,99 @@
+# Kodi Media Center language file
+# Addon Name: Flocks
+# Addon id: screensaver.greynetic
+# Addon Provider: Team Kodi
+msgid ""
+msgstr ""
+"Project-Id-Version: KODI Main\n"
+"Report-Msgid-Bugs-To: https://github.com/xbmc/screensaver.greynetic/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-main/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"
+
+#[Consistency] Make terms, settings names, brands and other minutiae, consistent throughout file.
+#[Capitalization] Avoid capitalizing every second word. See http://grammarist.com/capitalization/
+#For example, prefer wording as "This new string" instead of "This New String".
+#[Referencing] If a suitable string already exists, reuse it, making a note of where it's used!
+#[Description / location] For example, "#. Description of some setting" used on "#: xbmc/addons/guidialogaddoninfo.cpp"
+#When writing a description or setting, refer to a setting name in quotes. See existing entries for guidance.
+#For example, "Press \"OK\" for \"All seasons\"" instead of "Press OK for All seasons" after first word.
+
+# Following strings used for addon settings dialog
+
+msgctxt "#30000"
+msgid "General"
+msgstr "Allgemein"
+
+msgctxt "#30001"
+msgid "Colors"
+msgstr "Farben"
+
+msgctxt "#30010"
+msgid "Number of boxes"
+msgstr "Anzahl an Boxen"
+
+msgctxt "#30011"
+msgid "Use squares"
+msgstr "Verwende Quadrate"
+
+msgctxt "#30012"
+msgid "Maximum width"
+msgstr "Maximale Breite"
+
+msgctxt "#30013"
+msgid "Minimum width"
+msgstr "Minimale Breite"
+
+msgctxt "#30014"
+msgid "Maximum height"
+msgstr "Maximale Höhe"
+
+msgctxt "#30015"
+msgid "Minimum height"
+msgstr "Minimale Höhe"
+
+msgctxt "#30016"
+msgid "Maximum size"
+msgstr "Maximale Größe"
+
+msgctxt "#30017"
+msgid "Minimum size"
+msgstr "Minimale Größe"
+
+msgctxt "#30018"
+msgid "Minimum alpha"
+msgstr "Minimales Alpha"
+
+msgctxt "#30019"
+msgid "Maximum alpha"
+msgstr "Maximales Alpha"
+
+msgctxt "#30020"
+msgid "Minimum red"
+msgstr "Minimales Rot"
+
+msgctxt "#30021"
+msgid "Maximum red"
+msgstr "Maximales Rot"
+
+msgctxt "#30022"
+msgid "Minimum green"
+msgstr "Minimales Grün"
+
+msgctxt "#30023"
+msgid "Maximum green"
+msgstr "Maximales Grün"
+
+msgctxt "#30024"
+msgid "Minimum blue"
+msgstr "Minimales Blau"
+
+msgctxt "#30025"
+msgid "Maximum blue"
+msgstr "Maximales Blau"