Updated by kodi-game-scripting

https://github.com/kodi-game/kodi-game-scripting/
kodi-game · Jul 17, 2024 · 95b5e13 · 95b5e13
1 parent 71286b2
commit 95b5e13
Show file tree

Hide file tree

Showing 9 changed files with 60 additions and 13 deletions.
diff --git a/.github/workflows/sync-addon-metadata-translations.yml b/.github/workflows/sync-addon-metadata-translations.yml
@@ -2,7 +2,7 @@ name: Sync addon metadata translations
 
 on:
   push:
-    branches: [ master, Matrix, Nexus ]
+    branches: [ master, Matrix, Nexus, Omega ]
     paths:
       - '**addon.xml.in'
       - '**resource.language.**strings.po'

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -5,6 +5,8 @@ list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR})
 
 find_package(Kodi REQUIRED)
 
+set(CMAKE_CXX_STANDARD 17)
+
 # CMake on windows only searches for .lib libraries (static library or import library).
 # The libretro game library is dynamically loaded so even if an import library would exists it's of no use.
 if(CMAKE_SYSTEM_NAME STREQUAL Windows)

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -1 +1 @@
-buildPlugin(version: "Nexus", platforms: ["android-aarch64", "android-armv7", "osx-x86_64", "osx-arm64", "windows-i686", "windows-x86_64"])
+buildPlugin(version: "Omega", platforms: ["android-aarch64", "android-armv7", "osx-x86_64", "osx-arm64", "windows-i686", "windows-x86_64"])
diff --git a/debian/control b/debian/control
@@ -4,7 +4,7 @@ Maintainer: wsnipex <[email protected]>
 Build-Depends: debhelper (>= 9.0.0),
                cmake,
                kodi-addon-dev,
-               libretro-picodrive (>= 2.00.0) | picodrive (>= 2.00.0)
+               libretro-picodrive (>= 0.0.1) | picodrive (>= 0.0.1)
 Standards-Version: 3.9.8
 Section: libs
 

diff --git a/depends/common/picodrive/CMakeLists.txt b/depends/common/picodrive/CMakeLists.txt
@@ -22,16 +22,36 @@ if(CORE_SYSTEM_NAME STREQUAL windows)
   else()
     set(MSYSTEM MINGW32)
   endif()
-  set(BUILD_COMMAND ${MINGW_MAKE} -j$ENV{NUMBER_OF_PROCESSORS} -C . -f Makefile.libretro platform=win MSYSTEM=${MSYSTEM}  ${LIBRETRO_DEBUG} GIT_VERSION=)
+  set(BUILD_COMMAND ${MINGW_MAKE}
+                    -j$ENV{NUMBER_OF_PROCESSORS}
+                    -C .
+                    -f Makefile.libretro
+                    platform=win
+                    MSYSTEM=${MSYSTEM}
+                     ${LIBRETRO_DEBUG} GIT_VERSION=)
 elseif(CORE_SYSTEM_NAME STREQUAL linux)
-  set(BUILD_COMMAND $(MAKE) -C . -f Makefile.libretro  platform=unix ${LIBRETRO_DEBUG} GIT_VERSION=)
+  set(BUILD_COMMAND $(MAKE)
+                    -j
+                    -C .
+                    -f Makefile.libretro
+                    platform=unix
+                     ${LIBRETRO_DEBUG} GIT_VERSION=)
 elseif(CORE_SYSTEM_NAME STREQUAL osx)
   if(CPU STREQUAL arm64)
     set(ARCH arm)
   else()
     set(ARCH intel)
   endif()
-  set(BUILD_COMMAND $(MAKE) -C . -f Makefile.libretro  platform=osx arch=${ARCH} ${LIBRETRO_DEBUG} GIT_VERSION=)
+  set(BUILD_COMMAND $(MAKE)
+                    -j
+                    -C .
+                    -f Makefile.libretro
+                    platform=osx
+                    arch=${ARCH}
+                    CROSS_COMPILE=1
+                    LIBRETRO_APPLE_PLATFORM=${CPU}-apple-macos
+                    LIBRETRO_APPLE_ISYSROOT=${CMAKE_OSX_SYSROOT}
+                     ${LIBRETRO_DEBUG} GIT_VERSION=)
 elseif(CORE_SYSTEM_NAME STREQUAL ios OR CORE_SYSTEM_NAME STREQUAL darwin_embedded)
   if(CORE_PLATFORM_NAME STREQUAL ios)
     set(LIBRETRO_SONAME picodrive_libretro_ios${CMAKE_SHARED_LIBRARY_SUFFIX})
@@ -40,10 +60,20 @@ elseif(CORE_SYSTEM_NAME STREQUAL ios OR CORE_SYSTEM_NAME STREQUAL darwin_embedde
     else()
       set(PLATFORM ios)
     endif()
-    set(BUILD_COMMAND IOSSDK=${CMAKE_OSX_SYSROOT} $(MAKE) -C . -f Makefile.libretro  platform=${PLATFORM} ${LIBRETRO_DEBUG} GIT_VERSION=)
+    set(BUILD_COMMAND IOSSDK=${CMAKE_OSX_SYSROOT} $(MAKE)
+                                                  -j
+                                                  -C .
+                                                  -f Makefile.libretro
+                                                  platform=${PLATFORM}
+                                                   ${LIBRETRO_DEBUG} GIT_VERSION=)
   elseif(CORE_PLATFORM_NAME STREQUAL tvos)
     set(LIBRETRO_SONAME picodrive_libretro_tvos${CMAKE_SHARED_LIBRARY_SUFFIX})
-    set(BUILD_COMMAND IOSSDK=${CMAKE_OSX_SYSROOT} $(MAKE) -C . -f Makefile.libretro  platform=tvos-arm64 ${LIBRETRO_DEBUG} GIT_VERSION=)
+    set(BUILD_COMMAND IOSSDK=${CMAKE_OSX_SYSROOT} $(MAKE)
+                                                  -j
+                                                  -C .
+                                                  -f Makefile.libretro
+                                                  platform=tvos-arm64
+                                                   ${LIBRETRO_DEBUG} GIT_VERSION=)
   endif()
 elseif(CORE_SYSTEM_NAME STREQUAL android)
   if(NOT NDKROOT)
@@ -56,13 +86,23 @@ elseif(CORE_SYSTEM_NAME STREQUAL android)
   else()
     message(FATAL_ERROR "${PROJECT_NAME} needs Android ${CPU} build command in CMakeLists.txt!")
   endif()
-  set(BUILD_COMMAND GNUMAKE=$(MAKE) ${NDKROOT}/ndk-build -C jni APP_ABI=${PLATFORM} V7NEONOPTIMIZATION=1 GIT_VERSION=
-                                    NDK_LIBS_OUT=${PROJECT_SOURCE_DIR}/${LIBRETRO_BINARY_DIR}  ${LIBRETRO_DEBUG} V=1
+  set(BUILD_COMMAND GNUMAKE=$(MAKE) ${NDKROOT}/ndk-build
+                                    -C jni
+                                    APP_ABI=${PLATFORM}
+                                    V7NEONOPTIMIZATION=1
+                                    NDK_LIBS_OUT=${PROJECT_SOURCE_DIR}/${LIBRETRO_BINARY_DIR}
+                                    V=1
+                                     ${LIBRETRO_DEBUG} GIT_VERSION=
                     && cp ${PROJECT_SOURCE_DIR}/${LIBRETRO_BINARY_DIR}/${PLATFORM}/${LIBRETRO_JNISONAME} ${PROJECT_SOURCE_DIR}/${LIBRETRO_BINARY_DIR}/${LIBRETRO_SONAME})
 elseif(CORE_SYSTEM_NAME STREQUAL rbpi)
   message(FATAL_ERROR "${PROJECT_NAME} needs RPi build command in CMakeLists.txt!")
 elseif(CORE_SYSTEM_NAME STREQUAL freebsd)
-  set(BUILD_COMMAND $(MAKE) -C . -f Makefile.libretro  platform=unix ${LIBRETRO_DEBUG} GIT_VERSION=)
+  set(BUILD_COMMAND $(MAKE)
+                    -j
+                    -C .
+                    -f Makefile.libretro
+                    platform=unix
+                     ${LIBRETRO_DEBUG} GIT_VERSION=)
 else()
   message(FATAL_ERROR "${PROJECT_NAME} - Unknown system: ${CORE_SYSTEM_NAME}")
 endif()

diff --git a/depends/common/picodrive/picodrive.txt b/depends/common/picodrive/picodrive.txt
@@ -1 +1 @@
-picodrive https://github.com/kodi-game/picodrive/archive/79c23b3d5765598ac1dfbf7de9a6650751ba13fe.tar.gz
+picodrive https://github.com/kodi-game/picodrive/archive/2f0c5639c13693092e36a00df5857b5b44302cef.tar.gz
diff --git a/game.libretro.picodrive/addon.xml.in b/game.libretro.picodrive/addon.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon id="game.libretro.picodrive"
 		name="Sega - MS/GG/MD/CD/32X (PicoDrive)"
-		version="2.00.0.45"
+		version="0.0.1.46"
 		provider-name="notaz, fdave, irixxxx">
 	<requires>
 		<import addon="game.libretro" version="1.0.0"/>

diff --git a/game.libretro.picodrive/resources/language/resource.language.en_gb/strings.po b/game.libretro.picodrive/resources/language/resource.language.en_gb/strings.po
@@ -111,3 +111,7 @@ msgstr ""
 msgctxt "#30020"
 msgid "68K Overclock"
 msgstr ""
+
+msgctxt "#30021"
+msgid "Master System Palette in TMS modes"
+msgstr ""
diff --git a/game.libretro.picodrive/resources/settings.xml b/game.libretro.picodrive/resources/settings.xml
@@ -4,6 +4,7 @@
 		<setting label="30001" type="select" id="picodrive_region" values="Auto|Japan NTSC|Japan PAL|US|Europe" default="Auto"/>
 		<setting label="30002" type="select" id="picodrive_smstype" values="Auto|Game Gear|Master System|SG-1000|SC-3000" default="Auto"/>
 		<setting label="30003" type="select" id="picodrive_smsmapper" values="Auto|Sega|Codemasters|Korea|Korea MSX|Korea X-in-1|Korea 4-Pak|Korea Janggun|Korea Nemesis|Taiwan 8K RAM" default="Auto"/>
+		<setting label="30021" type="select" id="picodrive_smstms" values="SMS|SG-1000" default="SMS"/>
 		<setting label="30004" type="select" id="picodrive_ramcart" values="disabled|enabled" default="disabled"/>
 		<setting label="30005" type="select" id="picodrive_aspect" values="PAR|4/3|CRT" default="PAR"/>
 		<setting label="30006" type="select" id="picodrive_ggghost" values="off|weak|normal" default="off"/>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		buildPlugin(version: "Nexus", platforms: ["android-aarch64", "android-armv7", "osx-x86_64", "osx-arm64", "windows-i686", "windows-x86_64"])
		buildPlugin(version: "Omega", platforms: ["android-aarch64", "android-armv7", "osx-x86_64", "osx-arm64", "windows-i686", "windows-x86_64"])
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		picodrive https://github.com/kodi-game/picodrive/archive/79c23b3d5765598ac1dfbf7de9a6650751ba13fe.tar.gz
		picodrive https://github.com/kodi-game/picodrive/archive/2f0c5639c13693092e36a00df5857b5b44302cef.tar.gz