Updated by kodi-game-scripting

https://github.com/kodi-game/kodi-game-scripting/
kodi-game · Jul 18, 2024 · 599437c · 599437c
1 parent 7e8a07a
commit 599437c
Show file tree

Hide file tree

Showing 8 changed files with 74 additions and 17 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/depends/common/vice_xcbm5x0/CMakeLists.txt b/depends/common/vice_xcbm5x0/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 platform=win MSYSTEM=${MSYSTEM} EMUTYPE=xcbm5x0 ${LIBRETRO_DEBUG} GIT_VERSION=)
+  set(BUILD_COMMAND ${MINGW_MAKE}
+                    -j$ENV{NUMBER_OF_PROCESSORS}
+                    -C .
+                    -f Makefile
+                    platform=win
+                    MSYSTEM=${MSYSTEM}
+                    EMUTYPE=xcbm5x0 ${LIBRETRO_DEBUG} GIT_VERSION=)
 elseif(CORE_SYSTEM_NAME STREQUAL linux)
-  set(BUILD_COMMAND $(MAKE) -C . -f Makefile EMUTYPE=xcbm5x0 platform=unix ${LIBRETRO_DEBUG} GIT_VERSION=)
+  set(BUILD_COMMAND $(MAKE)
+                    -j
+                    -C .
+                    -f Makefile
+                    platform=unix
+                    EMUTYPE=xcbm5x0 ${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 EMUTYPE=xcbm5x0 platform=osx arch=${ARCH} ${LIBRETRO_DEBUG} GIT_VERSION=)
+  set(BUILD_COMMAND $(MAKE)
+                    -j
+                    -C .
+                    -f Makefile
+                    platform=osx
+                    arch=${ARCH}
+                    CROSS_COMPILE=1
+                    LIBRETRO_APPLE_PLATFORM=${CPU}-apple-macos
+                    LIBRETRO_APPLE_ISYSROOT=${CMAKE_OSX_SYSROOT}
+                    EMUTYPE=xcbm5x0 ${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 vice_xcbm5x0_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 EMUTYPE=xcbm5x0 platform=${PLATFORM} ${LIBRETRO_DEBUG} GIT_VERSION=)
+    set(BUILD_COMMAND IOSSDK=${CMAKE_OSX_SYSROOT} $(MAKE)
+                                                  -j
+                                                  -C .
+                                                  -f Makefile
+                                                  platform=${PLATFORM}
+                                                  EMUTYPE=xcbm5x0 ${LIBRETRO_DEBUG} GIT_VERSION=)
   elseif(CORE_PLATFORM_NAME STREQUAL tvos)
     set(LIBRETRO_SONAME vice_xcbm5x0_libretro_tvos${CMAKE_SHARED_LIBRARY_SUFFIX})
-    set(BUILD_COMMAND IOSSDK=${CMAKE_OSX_SYSROOT} $(MAKE) -C . -f Makefile EMUTYPE=xcbm5x0 platform=tvos-arm64 ${LIBRETRO_DEBUG} GIT_VERSION=)
+    set(BUILD_COMMAND IOSSDK=${CMAKE_OSX_SYSROOT} $(MAKE)
+                                                  -j
+                                                  -C .
+                                                  -f Makefile
+                                                  platform=tvos-arm64
+                                                  EMUTYPE=xcbm5x0 ${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} EMUTYPE=xcbm5x0 ${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
+                                    EMUTYPE=xcbm5x0 ${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 EMUTYPE=xcbm5x0 platform=unix ${LIBRETRO_DEBUG} GIT_VERSION=)
+  set(BUILD_COMMAND $(MAKE)
+                    -j
+                    -C .
+                    -f Makefile
+                    platform=unix
+                    EMUTYPE=xcbm5x0 ${LIBRETRO_DEBUG} GIT_VERSION=)
 else()
   message(FATAL_ERROR "${PROJECT_NAME} - Unknown system: ${CORE_SYSTEM_NAME}")
 endif()

diff --git a/depends/common/vice_xcbm5x0/vice_xcbm5x0.txt b/depends/common/vice_xcbm5x0/vice_xcbm5x0.txt
@@ -1 +1 @@
-vice_xcbm5x0 https://github.com/libretro/vice-libretro/archive/0046085610289777b5806495d8eef213e0a201aa.tar.gz
+vice_xcbm5x0 https://github.com/libretro/vice-libretro/archive/d884b8125905551e2832b5eee524db74defc2e00.tar.gz
diff --git a/game.libretro.vice_xcbm5x0/addon.xml.in b/game.libretro.vice_xcbm5x0/addon.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon id="game.libretro.vice_xcbm5x0"
 		name="Commodore - CBM-II 5x0 (VICE xcbm5x0)"
-		version="3.7.0.19"
+		version="3.7.0.20"
 		provider-name="VICE Team">
 	<requires>
 		<import addon="game.libretro" version="1.0.0"/>

diff --git a/game.libretro.vice_xcbm5x0/resources/language/resource.language.en_gb/strings.po b/game.libretro.vice_xcbm5x0/resources/language/resource.language.en_gb/strings.po
@@ -240,10 +240,6 @@ msgctxt "#30053"
 msgid "Input > Analog Stick Mouse Deadzone"
 msgstr ""
 
-msgctxt "#30054"
-msgid "Input > Analog Stick Mouse Speed"
-msgstr ""
-
 msgctxt "#30055"
 msgid "Input > D-Pad Mouse Speed"
 msgstr ""
@@ -455,3 +451,19 @@ msgstr ""
 msgctxt "#30107"
 msgid "System > Printer"
 msgstr ""
+
+msgctxt "#30108"
+msgid "Media > Floppy MultiDrive"
+msgstr ""
+
+msgctxt "#30109"
+msgid "Video > Automatic Crop Delay"
+msgstr ""
+
+msgctxt "#30110"
+msgid "Input > Left Analog Stick Mouse Speed"
+msgstr ""
+
+msgctxt "#30111"
+msgid "Input > Right Analog Stick Mouse Speed"
+msgstr ""
diff --git a/game.libretro.vice_xcbm5x0/resources/settings.xml b/game.libretro.vice_xcbm5x0/resources/settings.xml
@@ -10,12 +10,14 @@
 		<setting label="30006" type="select" id="vice_autostart" values="enabled|disabled|warp" default="enabled"/>
 		<setting label="30007" type="select" id="vice_drive_true_emulation" values="enabled|disabled" default="enabled"/>
 		<setting label="30008" type="select" id="vice_virtual_device_traps" values="disabled|enabled" default="disabled"/>
+		<setting label="30108" type="select" id="vice_floppy_multidrive" values="disabled|enabled" default="disabled"/>
 		<setting label="30009" type="select" id="vice_floppy_write_protection" values="disabled|enabled" default="disabled"/>
 		<setting label="30010" type="select" id="vice_work_disk" values="disabled|8_d64|9_d64|8_d71|9_d71|8_d81|9_d81|8_fs|9_fs" default="disabled"/>
 		<setting label="30011" type="select" id="vice_cartridge" values="none" default="none"/>
 		<setting label="30012" type="select" id="vice_video_options_display" values="disabled|enabled" default="disabled"/>
 		<setting label="30013" type="select" id="vice_aspect_ratio" values="auto|pal|ntsc|raw" default="auto"/>
 		<setting label="30014" type="select" id="vice_crop" values="disabled|small|medium|maximum|auto|auto_disable|manual" default="disabled"/>
+		<setting label="30109" type="select" id="vice_crop_delay" values="enabled|disabled" default="enabled"/>
 		<setting label="30015" type="select" id="vice_zoom_mode" values="deprecated|disabled|small|medium|maximum|auto|auto_disable|manual" default="deprecated"/>
 		<setting label="30016" type="select" id="vice_crop_mode" values="both|horizontal|vertical|16:9|16:10|4:3|5:4" default="both"/>
 		<setting label="30017" type="select" id="vice_zoom_mode_crop" values="deprecated|both|horizontal|vertical|16:9|16:10|4:3|5:4" default="deprecated"/>
@@ -55,7 +57,8 @@
 		<setting label="30051" type="select" id="vice_sound_sample_rate" values="48000|22050|44100|96000" default="48000"/>
 		<setting label="30052" type="select" id="vice_analogmouse" values="left|disabled|right|both" default="left"/>
 		<setting label="30053" type="select" id="vice_analogmouse_deadzone" values="20|0|5|10|15|25|30|35|40|45|50" default="20"/>
-		<setting label="30054" type="select" id="vice_analogmouse_speed" values="1.0|0.1|0.2|0.3|0.4|0.5|0.6|0.7|0.8|0.9|1.1|1.2|1.3|1.4|1.5|1.6|1.7|1.8|1.9|2.0|2.1|2.2|2.3|2.4|2.5|2.6|2.7|2.8|2.9|3.0" default="1.0"/>
+		<setting label="30110" type="select" id="vice_analogmouse_speed" values="1.0|0.1|0.2|0.3|0.4|0.5|0.6|0.7|0.8|0.9|1.1|1.2|1.3|1.4|1.5|1.6|1.7|1.8|1.9|2.0|2.1|2.2|2.3|2.4|2.5|2.6|2.7|2.8|2.9|3.0" default="1.0"/>
+		<setting label="30111" type="select" id="vice_analogmouse_speed_right" values="1.0|0.1|0.2|0.3|0.4|0.5|0.6|0.7|0.8|0.9|1.1|1.2|1.3|1.4|1.5|1.6|1.7|1.8|1.9|2.0|2.1|2.2|2.3|2.4|2.5|2.6|2.7|2.8|2.9|3.0" default="1.0"/>
 		<setting label="30055" type="select" id="vice_dpadmouse_speed" values="6|1|2|3|4|5|7|8|9|10|11|12|13|14|15|16|17|18" default="6"/>
 		<setting label="30056" type="select" id="vice_mouse_speed" values="100|10|20|30|40|50|60|70|80|90|110|120|130|140|150|160|170|180|190|200|210|220|230|240|250|260|270|280|290|300" default="100"/>
 		<setting label="30057" type="select" id="vice_physical_keyboard_pass_through" values="disabled|enabled" default="disabled"/>
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 @@
		vice_xcbm5x0 https://github.com/libretro/vice-libretro/archive/0046085610289777b5806495d8eef213e0a201aa.tar.gz
		vice_xcbm5x0 https://github.com/libretro/vice-libretro/archive/d884b8125905551e2832b5eee524db74defc2e00.tar.gz