Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package libretro-virtualjaguar for
openSUSE:Factory checked in at 2021-09-20 23:32:45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libretro-virtualjaguar (Old)
and /work/SRC/openSUSE:Factory/.libretro-virtualjaguar.new.1899 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libretro-virtualjaguar"
Mon Sep 20 23:32:45 2021 rev:3 rq:919859 version:0~git20210314
Changes:
--------
---
/work/SRC/openSUSE:Factory/libretro-virtualjaguar/libretro-virtualjaguar.changes
2020-06-23 21:07:11.726346408 +0200
+++
/work/SRC/openSUSE:Factory/.libretro-virtualjaguar.new.1899/libretro-virtualjaguar.changes
2021-09-20 23:34:14.131253804 +0200
@@ -1,0 +2,20 @@
+Fri Sep 10 17:24:37 UTC 2021 - [email protected]
+
+- Update to version 0~git20210314:
+ * Add ios-arm64/tvos-arm64/osx-arm64
+ * (MSVC) Embed MSVCRT runtime
+ * Add MSVC 2005 / 2010 cores
+ * Update .gitlab-ci.yml
+ * Update .gitlab-ci.yml
+ * Update .gitlab-ci.yml
+ * Update .gitlab-ci.yml
+ * Update .gitlab-ci.yml
+ * Update .gitlab-ci.yml
+ * Update
+ * Fix warning
+ * Add .gitlab-ci.yml
+ * Fix incorrect controller mapping
+ * Fix arm build
+ * Force a rebuild
+
+-------------------------------------------------------------------
Old:
----
libretro-virtualjaguar-0~git20200521.tar.xz
New:
----
libretro-virtualjaguar-0~git20210314.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libretro-virtualjaguar.spec ++++++
--- /var/tmp/diff_new_pack.EXtjat/_old 2021-09-20 23:34:14.647254442 +0200
+++ /var/tmp/diff_new_pack.EXtjat/_new 2021-09-20 23:34:14.651254447 +0200
@@ -1,7 +1,7 @@
#
# spec file for package libretro-virtualjaguar
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: libretro-virtualjaguar
-Version: 0~git20200521
+Version: 0~git20210314
Release: 0
Summary: Virtual Jaguar libretro core for Atari Jaguar emulation
License: GPL-3.0-only
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.EXtjat/_old 2021-09-20 23:34:14.687254492 +0200
+++ /var/tmp/diff_new_pack.EXtjat/_new 2021-09-20 23:34:14.687254492 +0200
@@ -1,4 +1,4 @@
<servicedata>
<service name="tar_scm">
<param
name="url">https://github.com/libretro/virtualjaguar-libretro.git</param>
- <param
name="changesrevision">6ea61ff250a981b4ab6bb1ad92b46af1f64f62da</param></service></servicedata>
\ No newline at end of file
+ <param
name="changesrevision">2069160f316d09a2713286bd9bf4d5c2805bd143</param></service></servicedata>
\ No newline at end of file
++++++ libretro-virtualjaguar-0~git20200521.tar.xz ->
libretro-virtualjaguar-0~git20210314.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libretro-virtualjaguar-0~git20200521/.gitlab-ci.yml
new/libretro-virtualjaguar-0~git20210314/.gitlab-ci.yml
--- old/libretro-virtualjaguar-0~git20200521/.gitlab-ci.yml 1970-01-01
01:00:00.000000000 +0100
+++ new/libretro-virtualjaguar-0~git20210314/.gitlab-ci.yml 2021-03-14
11:30:48.000000000 +0100
@@ -0,0 +1,199 @@
+# DESCRIPTION: GitLab CI/CD for libRetro (NOT FOR GitLab-proper)
+
+##############################################################################
+################################# BOILERPLATE ################################
+##############################################################################
+
+# Core definitions
+.core-defs:
+ variables:
+ JNI_PATH: .
+ CORENAME: virtualjaguar
+
+# Inclusion templates, required for the build to work
+include:
+ ################################## DESKTOPS ################################
+ # Windows 64-bit
+ - project: 'libretro-infrastructure/ci-templates'
+ file: '/windows-x64-mingw.yml'
+
+ # Windows 32-bit
+ - project: 'libretro-infrastructure/ci-templates'
+ file: '/windows-i686-mingw.yml'
+
+ # Windows msvc10 64-bit
+ - project: 'libretro-infrastructure/ci-templates'
+ file: '/windows-x64-msvc10-msys2.yml'
+
+ # Windows msvc10 32-bit
+ - project: 'libretro-infrastructure/ci-templates'
+ file: '/windows-i686-msvc10-msys2.yml'
+
+ # Windows msvc05 32-bit
+ - project: 'libretro-infrastructure/ci-templates'
+ file: '/windows-i686-msvc05-msys2.yml'
+
+ # Linux 64-bit
+ - project: 'libretro-infrastructure/ci-templates'
+ file: '/linux-x64.yml'
+
+ # Linux 32-bit
+ - project: 'libretro-infrastructure/ci-templates'
+ file: '/linux-i686.yml'
+
+ # MacOS 64-bit
+ - project: 'libretro-infrastructure/ci-templates'
+ file: '/osx-x64.yml'
+
+ # MacOS ARM 64-bit
+ - project: 'libretro-infrastructure/ci-templates'
+ file: '/osx-arm64.yml'
+
+ ################################## CELLULAR ################################
+ # Android
+ - project: 'libretro-infrastructure/ci-templates'
+ file: '/android-jni.yml'
+
+ # iOS
+ - project: 'libretro-infrastructure/ci-templates'
+ file: '/ios-arm64.yml'
+
+ # iOS (armv7)
+ - project: 'libretro-infrastructure/ci-templates'
+ file: '/ios9.yml'
+
+ ################################## CONSOLES ################################
+ # PlayStation Vita
+ - project: 'libretro-infrastructure/ci-templates'
+ file: '/vita-static.yml'
+
+ # Nintendo Switch
+ - project: 'libretro-infrastructure/ci-templates'
+ file: '/libnx-static.yml'
+
+ # tvOS (AppleTV)
+ - project: 'libretro-infrastructure/ci-templates'
+ file: '/tvos-arm64.yml'
+
+ #################################### MISC ##################################
+
+# Stages for building
+stages:
+ - build-prepare
+ - build-shared
+ - build-static
+
+##############################################################################
+#################################### STAGES ##################################
+##############################################################################
+#
+################################### DESKTOPS #################################
+# Windows 64-bit
+libretro-build-windows-x64:
+ extends:
+ - .libretro-windows-x64-mingw-make-default
+ - .core-defs
+
+# Windows 32-bit
+libretro-build-windows-i686:
+ extends:
+ - .libretro-windows-i686-mingw-make-default
+ - .core-defs
+
+# Windows msvc10 64-bit
+libretro-build-windows-msvc10-x64:
+ extends:
+ - .libretro-windows-x64-msvc10-msys2-make-default
+ - .core-defs
+
+# Windows msvc10 32-bit
+libretro-build-windows-msvc10-i686:
+ extends:
+ - .libretro-windows-i686-msvc10-msys2-make-default
+ - .core-defs
+
+# Windows msvc05 32-bit
+libretro-build-windows-msvc05-i686:
+ extends:
+ - .libretro-windows-i686-msvc05-msys2-make-default
+ - .core-defs
+
+# Linux 64-bit
+libretro-build-linux-x64:
+ extends:
+ - .libretro-linux-x64-make-default
+ - .core-defs
+
+# Linux 32-bit
+libretro-build-linux-i686:
+ extends:
+ - .libretro-linux-i686-make-default
+ - .core-defs
+
+# MacOS 64-bit
+libretro-build-osx-x64:
+ extends:
+ - .libretro-osx-x64-make-default
+ - .core-defs
+
+# MacOS ARM 64-bit
+libretro-build-osx-arm64:
+ extends:
+ - .libretro-osx-arm64-make-default
+ - .core-defs
+
+################################### CELLULAR #################################
+# Android ARMv7a
+android-armeabi-v7a:
+ extends:
+ - .libretro-android-jni-armeabi-v7a
+ - .core-defs
+
+# Android ARMv8a
+android-arm64-v8a:
+ extends:
+ - .libretro-android-jni-arm64-v8a
+ - .core-defs
+
+# Android 64-bit x86
+android-x86_64:
+ extends:
+ - .libretro-android-jni-x86_64
+ - .core-defs
+
+# Android 32-bit x86
+android-x86:
+ extends:
+ - .libretro-android-jni-x86
+ - .core-defs
+
+# iOS
+libretro-build-ios-arm64:
+ extends:
+ - .libretro-ios-arm64-make-default
+ - .core-defs
+
+# iOS (armv7) [iOS 9 and up]
+libretro-build-ios9:
+ extends:
+ - .libretro-ios9-make-default
+ - .core-defs
+
+# tvOS
+libretro-build-tvos-arm64:
+ extends:
+ - .libretro-tvos-arm64-make-default
+ - .core-defs
+
+################################### CONSOLES #################################
+# PlayStation Vita
+libretro-build-vita:
+ extends:
+ - .libretro-vita-static-retroarch-master
+ - .core-defs
+
+# Nintendo Switch
+libretro-build-libnx-aarch64:
+ extends:
+ - .libretro-libnx-static-retroarch-master
+ - .core-defs
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libretro-virtualjaguar-0~git20200521/Makefile
new/libretro-virtualjaguar-0~git20210314/Makefile
--- old/libretro-virtualjaguar-0~git20200521/Makefile 2020-05-21
20:30:40.000000000 +0200
+++ new/libretro-virtualjaguar-0~git20210314/Makefile 2021-03-14
11:30:48.000000000 +0100
@@ -19,6 +19,9 @@
ifeq ($(shell uname -p),powerpc)
arch = ppc
endif
+ ifeq ($(shell uname -p),arm)
+ arch = arm
+ endif
else ifneq ($(findstring MINGW,$(shell uname -a)),)
platform = win
endif
@@ -98,13 +101,28 @@
endif
OSXVER = `sw_vers -productVersion | cut -d. -f 2`
OSX_LT_MAVERICKS = `(( $(OSXVER) <= 9)) && echo "YES"`
+ifeq ($(OSX_LT_MAVERICKS),YES)
fpic += -mmacosx-version-min=10.1
+endif
+
+ ifeq ($(CROSS_COMPILE),1)
+ TARGET_RULE = -target $(LIBRETRO_APPLE_PLATFORM) -isysroot
$(LIBRETRO_APPLE_ISYSROOT)
+ CFLAGS += $(TARGET_RULE)
+ CPPFLAGS += $(TARGET_RULE)
+ CXXFLAGS += $(TARGET_RULE)
+ LDFLAGS += $(TARGET_RULE)
+ endif
+
+ CFLAGS += $(ARCHFLAGS)
+ CXXFLAGS += $(ARCHFLAGS)
+ LDFLAGS += $(ARCHFLAGS)
# iOS
else ifneq (,$(findstring ios,$(platform)))
TARGET := $(TARGET_NAME)_libretro_ios.dylib
fpic := -fPIC
SHARED := -dynamiclib
+ MINVERSION :=
ifeq ($(IOSSDK),)
IOSSDK := $(shell xcodebuild -version -sdk iphoneos Path)
endif
@@ -116,15 +134,12 @@
CXX = clang++ -arch armv7 -isysroot $(IOSSDK)
endif
ifeq ($(platform),$(filter $(platform),ios9 ios-arm64))
- CC += -miphoneos-version-min=8.0
- CXX += -miphoneos-version-min=8.0
- SHARED += -miphoneos-version-min=8.0
- CFLAGS += -miphoneos-version-min=8.0
+ MINVERSION = -miphoneos-version-min=8.0
else
- SHARED += -miphoneos-version-min=5.0
- CC += -miphoneos-version-min=5.0
- CXX += -miphoneos-version-min=5.0
+ MINVERSION = -miphoneos-version-min=5.0
endif
+ SHARED += $(MINVERSION)
+ CFLAGS += $(MINVERSION)
else ifeq ($(platform), tvos-arm64)
# tvOS
@@ -134,6 +149,8 @@
ifeq ($(IOSSDK),)
IOSSDK := $(shell xcodebuild -version -sdk appletvos Path)
endif
+ CC = cc -arch arm64 -isysroot $(IOSSDK)
+ CXX = clang++ -arch arm64 -isysroot $(IOSSDK)
# Theos
else ifeq ($(platform), theos_ios)
@@ -153,15 +170,12 @@
CC = qcc -Vgcc_ntoarmv7le
CXX = QCC -Vgcc_ntoarmv7le_cpp
-# PS3
-else ifeq ($(platform), ps3)
- TARGET := $(TARGET_NAME)_libretro_$(platform).a
- CC = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-gcc.exe
- CXX = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-g++.exe
- AR = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-ar.exe
- STATIC_LINKING = 1
- FLAGS += -DMSB_FIRST
- OLD_GCC = 1
+# ARM
+else ifneq (,$(findstring armv,$(platform)))
+ TARGET := $(TARGET_NAME)_libretro.so
+ fpic := -fPIC
+ SHARED := -shared -Wl,--no-undefined -Wl,--version-script=link.T
+ ARCH = arm
# Nintendo Switch (libnx)
else ifeq ($(platform), libnx)
@@ -173,16 +187,6 @@
CXXFLAGS := $(ASFLAGS) $(CFLAGS)
STATIC_LINKING = 1
-# sncps3
-else ifeq ($(platform), sncps3)
- TARGET := $(TARGET_NAME)_libretro_ps3.a
- CC = $(CELL_SDK)/host-win32/sn/bin/ps3ppusnc.exe
- CXX = $(CELL_SDK)/host-win32/sn/bin/ps3ppusnc.exe
- AR = $(CELL_SDK)/host-win32/sn/bin/ps3snarl.exe
- STATIC_LINKING = 1
- FLAGS += -DMSB_FIRST
- NO_GCC = 1
-
# Lightweight PS3 Homebrew SDK
else ifeq ($(platform), psl1ght)
TARGET := $(TARGET_NAME)_libretro_$(platform).a
@@ -390,16 +394,16 @@
LIB := $(shell IFS=$$'\n'; cygpath "$(VS100COMNTOOLS)../../VC/lib/amd64")
INCLUDE := $(shell IFS=$$'\n'; cygpath "$(VS100COMNTOOLS)../../VC/include")
-WindowsSdkDir := $(shell reg query "HKLM\SOFTWARE\Microsoft\Microsoft
SDKs\Windows\v7.0A" -v "InstallationFolder" | grep -o '[A-Z]:\\.*')lib/x64
-WindowsSdkDir ?= $(shell reg query "HKLM\SOFTWARE\Microsoft\Microsoft
SDKs\Windows\v7.1A" -v "InstallationFolder" | grep -o '[A-Z]:\\.*')lib/x64
-
-WindowsSdkDirInc := $(shell reg query "HKLM\SOFTWARE\Microsoft\Microsoft
SDKs\Windows\v7.0A" -v "InstallationFolder" | grep -o '[A-Z]:\\.*')Include
-WindowsSdkDirInc ?= $(shell reg query "HKLM\SOFTWARE\Microsoft\Microsoft
SDKs\Windows\v7.1A" -v "InstallationFolder" | grep -o '[A-Z]:\\.*')Include
-
+WindowsSdkDir := $(shell reg query "HKLM\SOFTWARE\Microsoft\Microsoft
SDKs\Windows\v7.1A" -v "InstallationFolder" | grep -o '[A-Z]:\\.*')
+WindowsSdkDir ?= $(shell reg query "HKLM\SOFTWARE\Microsoft\Microsoft
SDKs\Windows\v7.0A" -v "InstallationFolder" | grep -o '[A-Z]:\\.*')
-INCFLAGS_PLATFORM = -I"$(WindowsSdkDirInc)"
-export INCLUDE := $(INCLUDE)
-export LIB := $(LIB);$(WindowsSdkDir)
+WindowsSDKIncludeDir := $(shell cygpath -w "$(WindowsSdkDir)\Include")
+WindowsSDKGlIncludeDir := $(shell cygpath -w "$(WindowsSdkDir)\Include\gl")
+WindowsSDKLibDir := $(shell cygpath -w "$(WindowsSdkDir)\Lib\x64")
+
+INCFLAGS_PLATFORM = -I"$(WindowsSDKIncludeDir)"
+export INCLUDE := $(INCLUDE);$(WindowsSDKIncludeDir);$(WindowsSDKGlIncludeDir)
+export LIB := $(LIB);$(WindowsSDKLibDir)
TARGET := $(TARGET_NAME)_libretro.dll
PSS_STYLE :=2
LDFLAGS += -DLL
@@ -415,16 +419,16 @@
LIB := $(shell IFS=$$'\n'; cygpath -w "$(VS100COMNTOOLS)../../VC/lib")
INCLUDE := $(shell IFS=$$'\n'; cygpath "$(VS100COMNTOOLS)../../VC/include")
-WindowsSdkDir := $(shell reg query "HKLM\SOFTWARE\Microsoft\Microsoft
SDKs\Windows\v7.0A" -v "InstallationFolder" | grep -o '[A-Z]:\\.*')lib
-WindowsSdkDir ?= $(shell reg query "HKLM\SOFTWARE\Microsoft\Microsoft
SDKs\Windows\v7.1A" -v "InstallationFolder" | grep -o '[A-Z]:\\.*')lib
+WindowsSdkDir := $(shell reg query "HKLM\SOFTWARE\Microsoft\Microsoft
SDKs\Windows\v7.1A" -v "InstallationFolder" | grep -o '[A-Z]:\\.*')
+WindowsSdkDir ?= $(shell reg query "HKLM\SOFTWARE\Microsoft\Microsoft
SDKs\Windows\v7.0A" -v "InstallationFolder" | grep -o '[A-Z]:\\.*')
-WindowsSdkDirInc := $(shell reg query "HKLM\SOFTWARE\Microsoft\Microsoft
SDKs\Windows\v7.0A" -v "InstallationFolder" | grep -o '[A-Z]:\\.*')Include
-WindowsSdkDirInc ?= $(shell reg query "HKLM\SOFTWARE\Microsoft\Microsoft
SDKs\Windows\v7.1A" -v "InstallationFolder" | grep -o '[A-Z]:\\.*')Include
-
-
-INCFLAGS_PLATFORM = -I"$(WindowsSdkDirInc)"
-export INCLUDE := $(INCLUDE)
-export LIB := $(LIB);$(WindowsSdkDir)
+WindowsSDKIncludeDir := $(shell cygpath -w "$(WindowsSdkDir)\Include")
+WindowsSDKGlIncludeDir := $(shell cygpath -w "$(WindowsSdkDir)\Include\gl")
+WindowsSDKLibDir := $(shell cygpath -w "$(WindowsSdkDir)\Lib")
+
+INCFLAGS_PLATFORM = -I"$(WindowsSDKIncludeDir)"
+export INCLUDE := $(INCLUDE);$(WindowsSDKIncludeDir);$(WindowsSDKGlIncludeDir)
+export LIB := $(LIB);$(WindowsSDKLibDir)
TARGET := $(TARGET_NAME)_libretro.dll
PSS_STYLE :=2
LDFLAGS += -DLL
@@ -441,10 +445,17 @@
LIB := $(shell IFS=$$'\n'; cygpath -w "$(VS80COMNTOOLS)../../VC/lib")
BIN := $(shell IFS=$$'\n'; cygpath "$(VS80COMNTOOLS)../../VC/bin")
-WindowsSdkDir := $(INETSDK)
+WindowsSdkDir := $(shell reg query
"HKLM\SOFTWARE\Microsoft\MicrosoftSDK\InstalledSDKs\8F9E5EF3-A9A5-491B-A889-C58EFFECE8B3"
-v "Install Dir" | grep -o '[A-Z]:\\.*')
-export INCLUDE :=
$(INCLUDE);$(INETSDK)/Include;libretro-common/include/compat/msvc
-export LIB := $(LIB);$(WindowsSdkDir);$(INETSDK)/Lib
+WindowsSDKIncludeDir := $(shell cygpath -w "$(WindowsSdkDir)\Include")
+WindowsSDKAtlIncludeDir := $(shell cygpath -w "$(WindowsSdkDir)\Include\atl")
+WindowsSDKCrtIncludeDir := $(shell cygpath -w "$(WindowsSdkDir)\Include\crt")
+WindowsSDKGlIncludeDir := $(shell cygpath -w "$(WindowsSdkDir)\Include\gl")
+WindowsSDKMfcIncludeDir := $(shell cygpath -w "$(WindowsSdkDir)\Include\mfc")
+WindowsSDKLibDir := $(shell cygpath -w "$(WindowsSdkDir)\Lib")
+
+export INCLUDE :=
$(INCLUDE);$(WindowsSDKIncludeDir);$(WindowsSDKAtlIncludeDir);$(WindowsSDKCrtIncludeDir);$(WindowsSDKGlIncludeDir);$(WindowsSDKMfcIncludeDir);libretro-common/include/compat/msvc
+export LIB := $(LIB);$(WindowsSDKLibDir)
TARGET := $(TARGET_NAME)_libretro.dll
PSS_STYLE :=2
LDFLAGS += -DLL
@@ -503,36 +514,24 @@
OBJECTS := $(SOURCES_CXX:.cpp=.o) $(SOURCES_C:.c=.o)
ifeq ($(DEBUG),1)
- ifneq (,$(findstring msvc,$(platform)))
- ifeq ($(STATIC_LINKING),1)
- CFLAGS += -MTd
- CXXFLAGS += -MTd
- else
- CFLAGS += -MDd
- CXXFLAGS += -MDd
- endif
-
- CFLAGS += -Od -Zi -D_DEBUG
- CXXFLAGS += -Od -Zi -D_DEBUG
- LDFLAGS += -DEBUG
- else
- FLAGS += -O0 -g
- endif
+ ifneq (,$(findstring msvc,$(platform)))
+ CFLAGS += -MTd
+ CXXFLAGS += -MTd
+ CFLAGS += -Od -Zi -D_DEBUG
+ CXXFLAGS += -Od -Zi -D_DEBUG
+ LDFLAGS += -DEBUG
+ else
+ FLAGS += -O0 -g
+ endif
else
- ifneq (,$(findstring msvc,$(platform)))
- ifeq ($(STATIC_LINKING),1)
- CFLAGS += -MT
- CXXFLAGS += -MT
- else
- CFLAGS += -MD
- CXXFLAGS += -MD
- endif
-
- CFLAGS += -O2 -DNDEBUG
- CXXFLAGS += -O2 -DNDEBUG
- else
- FLAGS += -O2 -DNDEBUG
- endif
+ ifneq (,$(findstring msvc,$(platform)))
+ CFLAGS += -MT
+ CXXFLAGS += -MT
+ CFLAGS += -O2 -DNDEBUG
+ CXXFLAGS += -O2 -DNDEBUG
+ else
+ FLAGS += -O2 -DNDEBUG
+ endif
endif
ifeq (,$(findstring msvc,$(platform)))
@@ -611,3 +610,4 @@
print-%:
@echo '$*=$($*)'
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libretro-virtualjaguar-0~git20200521/libretro.c
new/libretro-virtualjaguar-0~git20210314/libretro.c
--- old/libretro-virtualjaguar-0~git20200521/libretro.c 2020-05-21
20:30:40.000000000 +0200
+++ new/libretro-virtualjaguar-0~git20210314/libretro.c 2021-03-14
11:30:48.000000000 +0100
@@ -218,9 +218,9 @@
joypad0Buttons[BUTTON_3] = 0xff;
if (ret[0] & (1 << RETRO_DEVICE_ID_JOYPAD_R2) || (input_state_cb(0,
RETRO_DEVICE_KEYBOARD, 0, RETROK_4)? 1 : 0))
joypad0Buttons[BUTTON_4] = 0xff;
- if (ret[0] & (1 << RETRO_DEVICE_ID_JOYPAD_L2) || (input_state_cb(0,
RETRO_DEVICE_KEYBOARD, 0, RETROK_5)? 1 : 0))
+ if (ret[0] & (1 << RETRO_DEVICE_ID_JOYPAD_L3) || (input_state_cb(0,
RETRO_DEVICE_KEYBOARD, 0, RETROK_5)? 1 : 0))
joypad0Buttons[BUTTON_5] = 0xff;
- if (ret[0] & (1 << RETRO_DEVICE_ID_JOYPAD_R2) || (input_state_cb(0,
RETRO_DEVICE_KEYBOARD, 0, RETROK_6)? 1 : 0))
+ if (ret[0] & (1 << RETRO_DEVICE_ID_JOYPAD_R3) || (input_state_cb(0,
RETRO_DEVICE_KEYBOARD, 0, RETROK_6)? 1 : 0))
joypad0Buttons[BUTTON_6] = 0xff;
if((input_state_cb(0, RETRO_DEVICE_KEYBOARD, 0, RETROK_7)? 1 : 0))
joypad0Buttons[BUTTON_7] = 0xff;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libretro-virtualjaguar-0~git20200521/libretro.h
new/libretro-virtualjaguar-0~git20210314/libretro.h
--- old/libretro-virtualjaguar-0~git20200521/libretro.h 2020-05-21
20:30:40.000000000 +0200
+++ new/libretro-virtualjaguar-0~git20210314/libretro.h 2021-03-14
11:30:48.000000000 +0100
@@ -69,7 +69,7 @@
# endif
# endif
# else
-# if defined(__GNUC__) && __GNUC__ >= 4 && !defined(__CELLOS_LV2__)
+# if defined(__GNUC__) && __GNUC__ >= 4
# define RETRO_API RETRO_CALLCONV
__attribute__((__visibility__("default")))
# else
# define RETRO_API RETRO_CALLCONV
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libretro-virtualjaguar-0~git20200521/src/m68000/cpuemu.c
new/libretro-virtualjaguar-0~git20210314/src/m68000/cpuemu.c
--- old/libretro-virtualjaguar-0~git20200521/src/m68000/cpuemu.c
2020-05-21 20:30:40.000000000 +0200
+++ new/libretro-virtualjaguar-0~git20210314/src/m68000/cpuemu.c
2021-03-14 11:30:48.000000000 +0100
@@ -12743,7 +12743,9 @@
}
}
}}}m68k_incpc(4);
+#if 0
endlabel842: ;
+#endif
return 12;
}
unsigned long CPUFUNC(op_50d0_4)(uint32_t opcode) /* Scc */
@@ -13372,7 +13374,9 @@
}
}
}}}m68k_incpc(4);
+#if 0
endlabel877: ;
+#endif
return 12;
}
unsigned long CPUFUNC(op_51d0_4)(uint32_t opcode) /* Scc */
@@ -13473,7 +13477,9 @@
}
}
}}}m68k_incpc(4);
+#if 0
endlabel886: ;
+#endif
return 12;
}
unsigned long CPUFUNC(op_52d0_4)(uint32_t opcode) /* Scc */
@@ -13574,7 +13580,9 @@
}
}
}}}m68k_incpc(4);
+#if 0
endlabel895: ;
+#endif
return 12;
}
unsigned long CPUFUNC(op_53d0_4)(uint32_t opcode) /* Scc */
@@ -13675,9 +13683,12 @@
}
}
}}}m68k_incpc(4);
+#if 0
endlabel904: ;
+#endif
return 12;
}
+
unsigned long CPUFUNC(op_54d0_4)(uint32_t opcode) /* Scc */
{
uint32_t srcreg = (opcode & 7);
@@ -13776,7 +13787,9 @@
}
}
}}}m68k_incpc(4);
+#if 0
endlabel913: ;
+#endif
return 12;
}
unsigned long CPUFUNC(op_55d0_4)(uint32_t opcode) /* Scc */
@@ -13877,7 +13890,9 @@
}
}
}}}m68k_incpc(4);
+#if 0
endlabel922: ;
+#endif
return 12;
}
unsigned long CPUFUNC(op_56d0_4)(uint32_t opcode) /* Scc */
@@ -13978,7 +13993,9 @@
}
}
}}}m68k_incpc(4);
+#if 0
endlabel931: ;
+#endif
return 12;
}
unsigned long CPUFUNC(op_57d0_4)(uint32_t opcode) /* Scc */
@@ -14079,7 +14096,9 @@
}
}
}}}m68k_incpc(4);
+#if 0
endlabel940: ;
+#endif
return 12;
}
unsigned long CPUFUNC(op_58d0_4)(uint32_t opcode) /* Scc */
@@ -14180,7 +14199,9 @@
}
}
}}}m68k_incpc(4);
+#if 0
endlabel949: ;
+#endif
return 12;
}
unsigned long CPUFUNC(op_59d0_4)(uint32_t opcode) /* Scc */
@@ -14281,7 +14302,9 @@
}
}
}}}m68k_incpc(4);
+#if 0
endlabel958: ;
+#endif
return 12;
}
unsigned long CPUFUNC(op_5ad0_4)(uint32_t opcode) /* Scc */
@@ -14382,7 +14405,9 @@
}
}
}}}m68k_incpc(4);
+#if 0
endlabel967: ;
+#endif
return 12;
}
unsigned long CPUFUNC(op_5bd0_4)(uint32_t opcode) /* Scc */
@@ -14483,7 +14508,9 @@
}
}
}}}m68k_incpc(4);
+#if 0
endlabel976: ;
+#endif
return 12;
}
unsigned long CPUFUNC(op_5cd0_4)(uint32_t opcode) /* Scc */
@@ -14584,7 +14611,9 @@
}
}
}}}m68k_incpc(4);
+#if 0
endlabel985: ;
+#endif
return 12;
}
unsigned long CPUFUNC(op_5dd0_4)(uint32_t opcode) /* Scc */
@@ -14685,7 +14714,9 @@
}
}
}}}m68k_incpc(4);
+#if 0
endlabel994: ;
+#endif
return 12;
}
unsigned long CPUFUNC(op_5ed0_4)(uint32_t opcode) /* Scc */
@@ -14786,7 +14817,9 @@
}
}
}}}m68k_incpc(4);
+#if 0
endlabel1003: ;
+#endif
return 12;
}
unsigned long CPUFUNC(op_5fd0_4)(uint32_t opcode) /* Scc */
@@ -14872,7 +14905,9 @@
return 10;
didnt_jump:;
}}m68k_incpc(4);
+#if 0
endlabel1011: ;
+#endif
return 12;
}
unsigned long CPUFUNC(op_6001_4)(uint32_t opcode) /* Bcc */
@@ -14885,7 +14920,9 @@
return 10;
didnt_jump:;
}}m68k_incpc(2);
+#if 0
endlabel1012: ;
+#endif
return 8;
}
unsigned long CPUFUNC(op_60ff_4)(uint32_t opcode) /* Bcc */
@@ -14939,7 +14976,9 @@
return 10;
didnt_jump:;
}}m68k_incpc(4);
+#if 0
endlabel1017: ;
+#endif
return 12;
}
unsigned long CPUFUNC(op_6201_4)(uint32_t opcode) /* Bcc */
@@ -14952,7 +14991,9 @@
return 10;
didnt_jump:;
}}m68k_incpc(2);
+#if 0
endlabel1018: ;
+#endif
return 8;
}
unsigned long CPUFUNC(op_62ff_4)(uint32_t opcode) /* Bcc */
@@ -14981,7 +15022,9 @@
return 10;
didnt_jump:;
}}m68k_incpc(4);
+#if 0
endlabel1020: ;
+#endif
return 12;
}
unsigned long CPUFUNC(op_6301_4)(uint32_t opcode) /* Bcc */
@@ -14994,7 +15037,9 @@
return 10;
didnt_jump:;
}}m68k_incpc(2);
+#if 0
endlabel1021: ;
+#endif
return 8;
}
unsigned long CPUFUNC(op_63ff_4)(uint32_t opcode) /* Bcc */
@@ -15023,7 +15068,9 @@
return 10;
didnt_jump:;
}}m68k_incpc(4);
+#if 0
endlabel1023: ;
+#endif
return 12;
}
unsigned long CPUFUNC(op_6401_4)(uint32_t opcode) /* Bcc */
@@ -15036,7 +15083,9 @@
return 10;
didnt_jump:;
}}m68k_incpc(2);
+#if 0
endlabel1024: ;
+#endif
return 8;
}
unsigned long CPUFUNC(op_64ff_4)(uint32_t opcode) /* Bcc */
@@ -15065,7 +15114,9 @@
return 10;
didnt_jump:;
}}m68k_incpc(4);
+#if 0
endlabel1026: ;
+#endif
return 12;
}
unsigned long CPUFUNC(op_6501_4)(uint32_t opcode) /* Bcc */
@@ -15078,7 +15129,9 @@
return 10;
didnt_jump:;
}}m68k_incpc(2);
+#if 0
endlabel1027: ;
+#endif
return 8;
}
unsigned long CPUFUNC(op_65ff_4)(uint32_t opcode) /* Bcc */
@@ -15107,7 +15160,9 @@
return 10;
didnt_jump:;
}}m68k_incpc(4);
+#if 0
endlabel1029: ;
+#endif
return 12;
}
unsigned long CPUFUNC(op_6601_4)(uint32_t opcode) /* Bcc */
@@ -15120,7 +15175,9 @@
return 10;
didnt_jump:;
}}m68k_incpc(2);
+#if 0
endlabel1030: ;
+#endif
return 8;
}
unsigned long CPUFUNC(op_66ff_4)(uint32_t opcode) /* Bcc */
@@ -15149,7 +15206,9 @@
return 10;
didnt_jump:;
}}m68k_incpc(4);
+#if 0
endlabel1032: ;
+#endif
return 12;
}
unsigned long CPUFUNC(op_6701_4)(uint32_t opcode) /* Bcc */
@@ -15162,7 +15221,9 @@
return 10;
didnt_jump:;
}}m68k_incpc(2);
+#if 0
endlabel1033: ;
+#endif
return 8;
}
unsigned long CPUFUNC(op_67ff_4)(uint32_t opcode) /* Bcc */
@@ -15191,7 +15252,9 @@
return 10;
didnt_jump:;
}}m68k_incpc(4);
+#if 0
endlabel1035: ;
+#endif
return 12;
}
unsigned long CPUFUNC(op_6801_4)(uint32_t opcode) /* Bcc */
@@ -15204,7 +15267,9 @@
return 10;
didnt_jump:;
}}m68k_incpc(2);
+#if 0
endlabel1036: ;
+#endif
return 8;
}
unsigned long CPUFUNC(op_68ff_4)(uint32_t opcode) /* Bcc */
@@ -15233,7 +15298,9 @@
return 10;
didnt_jump:;
}}m68k_incpc(4);
+#if 0
endlabel1038: ;
+#endif
return 12;
}
unsigned long CPUFUNC(op_6901_4)(uint32_t opcode) /* Bcc */
@@ -15246,7 +15313,9 @@
return 10;
didnt_jump:;
}}m68k_incpc(2);
+#if 0
endlabel1039: ;
+#endif
return 8;
}
unsigned long CPUFUNC(op_69ff_4)(uint32_t opcode) /* Bcc */
@@ -15275,7 +15344,9 @@
return 10;
didnt_jump:;
}}m68k_incpc(4);
+#if 0
endlabel1041: ;
+#endif
return 12;
}
unsigned long CPUFUNC(op_6a01_4)(uint32_t opcode) /* Bcc */
@@ -15288,7 +15359,9 @@
return 10;
didnt_jump:;
}}m68k_incpc(2);
+#if 0
endlabel1042: ;
+#endif
return 8;
}
unsigned long CPUFUNC(op_6aff_4)(uint32_t opcode) /* Bcc */
@@ -15317,7 +15390,9 @@
return 10;
didnt_jump:;
}}m68k_incpc(4);
+#if 0
endlabel1044: ;
+#endif
return 12;
}
unsigned long CPUFUNC(op_6b01_4)(uint32_t opcode) /* Bcc */
@@ -15330,7 +15405,9 @@
return 10;
didnt_jump:;
}}m68k_incpc(2);
+#if 0
endlabel1045: ;
+#endif
return 8;
}
unsigned long CPUFUNC(op_6bff_4)(uint32_t opcode) /* Bcc */
@@ -15359,7 +15436,9 @@
return 10;
didnt_jump:;
}}m68k_incpc(4);
+#if 0
endlabel1047: ;
+#endif
return 12;
}
unsigned long CPUFUNC(op_6c01_4)(uint32_t opcode) /* Bcc */
@@ -15372,7 +15451,9 @@
return 10;
didnt_jump:;
}}m68k_incpc(2);
+#if 0
endlabel1048: ;
+#endif
return 8;
}
unsigned long CPUFUNC(op_6cff_4)(uint32_t opcode) /* Bcc */
@@ -15401,7 +15482,9 @@
return 10;
didnt_jump:;
}}m68k_incpc(4);
+#if 0
endlabel1050: ;
+#endif
return 12;
}
unsigned long CPUFUNC(op_6d01_4)(uint32_t opcode) /* Bcc */
@@ -15414,7 +15497,9 @@
return 10;
didnt_jump:;
}}m68k_incpc(2);
+#if 0
endlabel1051: ;
+#endif
return 8;
}
unsigned long CPUFUNC(op_6dff_4)(uint32_t opcode) /* Bcc */
@@ -15443,7 +15528,9 @@
return 10;
didnt_jump:;
}}m68k_incpc(4);
+#if 0
endlabel1053: ;
+#endif
return 12;
}
unsigned long CPUFUNC(op_6e01_4)(uint32_t opcode) /* Bcc */
@@ -15456,7 +15543,9 @@
return 10;
didnt_jump:;
}}m68k_incpc(2);
+#if 0
endlabel1054: ;
+#endif
return 8;
}
unsigned long CPUFUNC(op_6eff_4)(uint32_t opcode) /* Bcc */
@@ -15485,7 +15574,9 @@
return 10;
didnt_jump:;
}}m68k_incpc(4);
+#if 0
endlabel1056: ;
+#endif
return 12;
}
unsigned long CPUFUNC(op_6f01_4)(uint32_t opcode) /* Bcc */
@@ -15498,7 +15589,9 @@
return 10;
didnt_jump:;
}}m68k_incpc(2);
+#if 0
endlabel1057: ;
+#endif
return 8;
}
unsigned long CPUFUNC(op_6fff_4)(uint32_t opcode) /* Bcc */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libretro-virtualjaguar-0~git20200521/src/memtrack.c
new/libretro-virtualjaguar-0~git20210314/src/memtrack.c
--- old/libretro-virtualjaguar-0~git20200521/src/memtrack.c 2020-05-21
20:30:40.000000000 +0200
+++ new/libretro-virtualjaguar-0~git20210314/src/memtrack.c 2021-03-14
11:30:48.000000000 +0100
@@ -42,7 +42,7 @@
uint8_t mtCommand = MT_NONE;
uint8_t mtState = MT_IDLE;
bool haveMT = false;
-char mtFilename[MAX_PATH];
+char mtFilename[8192];
// Private function prototypes
void MTWriteFile(void);
