Merge pull request #66 from AlwinEsch/Matrix-change

[Matrix] update related to API as Release before was wrong, cleanups, settings.xml rework, german language added

.travis.yml

@@ -3,8 +3,8 @@ language: cpp
 #
 # Define the build matrix
 #
-# Travis defaults to building on Ubuntu Precise when building on
-# Linux. We need Trusty in order to get up to date versions of
+# 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:
@@ -14,26 +14,40 @@ env:
 matrix:
   include:
     - os: linux
-      dist: trusty
+      dist: xenial
       sudo: required
       compiler: gcc
     - os: linux
-      dist: trusty
+      dist: xenial
       sudo: required
       compiler: clang
+    - os: linux
+      dist: bionic
+      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 update; fi
+  - if [[ $DEBIAN_BUILD == true ]]; then sudo apt-get install fakeroot; fi
+
 #
 # The addon source is automatically checked out in $TRAVIS_BUILD_DIR,
 # 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-addon-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

debian/rules

@@ -13,10 +13,7 @@
 	dh $@
 
 override_dh_auto_configure:
-	dh_auto_configure -- -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=1
-
-override_dh_strip:
-	dh_strip --dbg-package=kodi-game-libretro-dbg
+	dh_auto_configure -- -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_SHARED_LIBS=1 -DUSE_LTO=1
 
 override_dh_installdocs:
 	dh_installdocs --link-doc=kodi-game-libretro

debian/source/format

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

game.libretro/addon.xml.in

@@ -1,15 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="game.libretro"
        name="Libretro Compatibility"
-       version="2.0.2"
+       version="2.1.0"
        provider-name="Team Kodi">
   <backwards-compatibility abi="1.0.0"/>
   <requires>@ADDON_DEPENDS@</requires>
   <extension point="kodi.gameclient"
        library_@PLATFORM@="@LIBRARY_FILENAME@">
   </extension>
   <extension point="xbmc.addon.metadata">
+    <summary lang="de_DE">Libretro-Kompatibilitätsschicht für Kodi's Spiele API</summary>
     <summary lang="en_GB">Libretro compatibility layer for Kodi's Game API</summary>
+    <description lang="de_DE">Dieses Add-On bietet einen Umwandler für Libretro-Kerne, mit dem sie als Spielsystem Add-On's für Kodi geladen und genutzt werden können.</description>
     <description lang="en_GB">This add-on provides a wrapper for libretro cores, allowing them to be loaded as game add-ons.</description>
     <platform>@PLATFORM@</platform>
     <license>GPL-2.0-or-later</license>

game.libretro/resources/language/resource.language.de_de/strings.po

@@ -0,0 +1,25 @@
+# game.libretro language file
+# Addon Name: Libretro Compatibility
+# Addon id: game.libretro
+# Addon Provider: Garrett Brown
+msgid ""
+msgstr ""
+"Project-Id-Version: Libretro Compatibility\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: 2014-05-30 17:00+8\n"
+"PO-Revision-Date: 2014-05-30 17:00+8\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 "#30000"
+msgid "Crop overscan"
+msgstr "Überlappung beschneiden"
+
+msgctxt "#30001"
+msgid "Crop away invisible edges of the screen, if the game is aware of any."
+msgstr "Schneide unsichtbare Ränder des Bildschirms ab, wenn das Spiel etwas davon bemerkt."

game.libretro/resources/language/resource.language.en_gb/strings.po

@@ -17,5 +17,9 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 msgctxt "#30000"
-msgid "Crop overscap"
+msgid "Crop overscan"
+msgstr ""
+
+msgctxt "#30001"
+msgid "Crop away invisible edges of the screen, if the game is aware of any."
 msgstr ""

game.libretro/resources/settings.xml

@@ -1,6 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<settings>
-    <category label="5">
-        <setting label="30000" type="bool" id="cropoverscan" default="false"/>
+<settings version="1">
+  <section id="game.libretro">
+    <category id="general" label="128">
+      <group id="1">
+        <setting id="cropoverscan" type="boolean" label="30000" help="30001">
+          <default>false</default>
+          <control type="toggle" />
+        </setting>
+      </group>
     </category>
+  </section>
 </settings>

src/audio/AudioStream.h

@@ -17,7 +17,7 @@ class CGameLibRetro;
 
 namespace LIBRETRO
 {
-  class CAudioStream
+  class ATTRIBUTE_HIDDEN CAudioStream
   {
   public:
     CAudioStream();

src/libretro/LibretroEnvironment.h

@@ -26,7 +26,7 @@ namespace LIBRETRO
   class CClientBridge;
   class CLibretroDLL;
 
-  class CLibretroEnvironment
+  class ATTRIBUTE_HIDDEN CLibretroEnvironment
   {
   public:
     static CLibretroEnvironment& Get(void);

src/video/VideoStream.h

@@ -18,7 +18,7 @@ namespace LIBRETRO
 {
   class CVideoGeometry;
 
-  class CVideoStream
+  class ATTRIBUTE_HIDDEN CVideoStream
   {
   public:
     CVideoStream();