From ae25922f5cd111a1b0d3b2552901328a6d1a49cc Mon Sep 17 00:00:00 2001 From: Alwin Esch Date: Tue, 11 Aug 2020 22:22:36 +0200 Subject: [PATCH 1/6] update travis to include also debian test build --- .travis.yml | 36 +++++++++++++++++++++++++----------- 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2499b1a2..7e8bc607 100644 --- a/.travis.yml +++ b/.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 From be9f9f494490a7efeb38d62f79b24a0ef66b4bb2 Mon Sep 17 00:00:00 2001 From: Alwin Esch Date: Tue, 11 Aug 2020 22:24:24 +0200 Subject: [PATCH 2/6] update debian build code --- debian/rules | 5 +---- debian/source/format | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) mode change 100644 => 100755 debian/rules diff --git a/debian/rules b/debian/rules old mode 100644 new mode 100755 index 4d63eb57..b26fe92d --- a/debian/rules +++ b/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 diff --git a/debian/source/format b/debian/source/format index 163aaf8d..89ae9db8 100644 --- a/debian/source/format +++ b/debian/source/format @@ -1 +1 @@ -3.0 (quilt) +3.0 (native) From 1f77f04659c79cb1a885d3ebe7940bb2c25469eb Mon Sep 17 00:00:00 2001 From: Alwin Esch Date: Tue, 11 Aug 2020 23:31:57 +0200 Subject: [PATCH 3/6] change settings.xml to new format and add help text --- .../language/resource.language.en_gb/strings.po | 4 ++++ game.libretro/resources/settings.xml | 13 ++++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/game.libretro/resources/language/resource.language.en_gb/strings.po b/game.libretro/resources/language/resource.language.en_gb/strings.po index a84f9def..6e3a0e6a 100644 --- a/game.libretro/resources/language/resource.language.en_gb/strings.po +++ b/game.libretro/resources/language/resource.language.en_gb/strings.po @@ -19,3 +19,7 @@ msgstr "" msgctxt "#30000" msgid "Crop overscap" msgstr "" + +msgctxt "#30001" +msgid "Crop away invisible edges of the screen, if the game is aware of any." +msgstr "" diff --git a/game.libretro/resources/settings.xml b/game.libretro/resources/settings.xml index 4db727f7..7256992a 100644 --- a/game.libretro/resources/settings.xml +++ b/game.libretro/resources/settings.xml @@ -1,6 +1,13 @@ - - - + +
+ + + + false + + + +
From 4de72ff6b068d144be867f489d6ba142bd1fcc99 Mon Sep 17 00:00:00 2001 From: Alwin Esch Date: Tue, 11 Aug 2020 23:38:35 +0200 Subject: [PATCH 4/6] add german translation --- game.libretro/addon.xml.in | 2 ++ .../resource.language.de_de/strings.po | 25 +++++++++++++++++++ .../resource.language.en_gb/strings.po | 2 +- 3 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 game.libretro/resources/language/resource.language.de_de/strings.po diff --git a/game.libretro/addon.xml.in b/game.libretro/addon.xml.in index 801f2ae8..2de2e9b2 100644 --- a/game.libretro/addon.xml.in +++ b/game.libretro/addon.xml.in @@ -9,7 +9,9 @@ library_@PLATFORM@="@LIBRARY_FILENAME@"> + Libretro-Kompatibilitätsschicht für Kodi's Spiele API Libretro compatibility layer for Kodi's Game API + 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. This add-on provides a wrapper for libretro cores, allowing them to be loaded as game add-ons. @PLATFORM@ GPL-2.0-or-later diff --git a/game.libretro/resources/language/resource.language.de_de/strings.po b/game.libretro/resources/language/resource.language.de_de/strings.po new file mode 100644 index 00000000..9196f7bb --- /dev/null +++ b/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." diff --git a/game.libretro/resources/language/resource.language.en_gb/strings.po b/game.libretro/resources/language/resource.language.en_gb/strings.po index 6e3a0e6a..8bba22dc 100644 --- a/game.libretro/resources/language/resource.language.en_gb/strings.po +++ b/game.libretro/resources/language/resource.language.en_gb/strings.po @@ -17,7 +17,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" msgctxt "#30000" -msgid "Crop overscap" +msgid "Crop overscan" msgstr "" msgctxt "#30001" From 6bc903fc352e8e355f05ac83616e5422d9305f71 Mon Sep 17 00:00:00 2001 From: Alwin Esch Date: Tue, 11 Aug 2020 23:41:41 +0200 Subject: [PATCH 5/6] add ATTRIBUTE_HIDDEN on few places to prevent compile warning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Before was come: ``` warning: ‘...’ declared with greater visibility than the type of its field ‘...’ [-Wattributes] ``` --- src/audio/AudioStream.h | 2 +- src/libretro/LibretroEnvironment.h | 2 +- src/video/VideoStream.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/audio/AudioStream.h b/src/audio/AudioStream.h index 91c5ae78..70e3c4e2 100644 --- a/src/audio/AudioStream.h +++ b/src/audio/AudioStream.h @@ -17,7 +17,7 @@ class CGameLibRetro; namespace LIBRETRO { - class CAudioStream + class ATTRIBUTE_HIDDEN CAudioStream { public: CAudioStream(); diff --git a/src/libretro/LibretroEnvironment.h b/src/libretro/LibretroEnvironment.h index db414363..018adc74 100644 --- a/src/libretro/LibretroEnvironment.h +++ b/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); diff --git a/src/video/VideoStream.h b/src/video/VideoStream.h index 36ed6aac..a16ff2fa 100644 --- a/src/video/VideoStream.h +++ b/src/video/VideoStream.h @@ -18,7 +18,7 @@ namespace LIBRETRO { class CVideoGeometry; - class CVideoStream + class ATTRIBUTE_HIDDEN CVideoStream { public: CVideoStream(); From dbdcfcead1c334a25a039d4c7c4109ddf234f0e2 Mon Sep 17 00:00:00 2001 From: Alwin Esch Date: Tue, 11 Aug 2020 23:43:47 +0200 Subject: [PATCH 6/6] increase version to 2.1.0 (also API related) --- game.libretro/addon.xml.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/game.libretro/addon.xml.in b/game.libretro/addon.xml.in index 2de2e9b2..4ddcac68 100644 --- a/game.libretro/addon.xml.in +++ b/game.libretro/addon.xml.in @@ -1,7 +1,7 @@ @ADDON_DEPENDS@