Merge remote-tracking branch 'libretro/master' into warmenhoven/dev/macOS-Core-Audio-Mic-Fix

Author: warmenhoven

.dir-locals.el

@@ -0,0 +1,13 @@
+;;; Directory Local Variables
+;;; See Info node `(emacs) Directory Variables' for more information.
+
+(
+ (c-mode . ((c-basic-offset . 3)
+            (c-file-offsets . ((arglist-intro . ++)
+                               (arglist-cont-nonempty . ++)))
+            (eval . (setq-local c-cleanup-list
+                                (cl-set-difference c-cleanup-list
+                                                   '(brace-else-brace
+                                                     brace-elseif-brace))))))
+ (objc-mode . ((c-basic-offset . 3)))
+ )

.github/workflows/webOS.yml

@@ -51,21 +51,23 @@ jobs:
         with:
           repository: "openlgtv/buildroot-nc4"
           latest: true
-          fileName: "arm-webos-linux-gnueabi_sdk-buildroot.tar.gz"
+          fileName: "arm-webos-linux-gnueabi_sdk-buildroot-x86_64.tar.gz"
           out-file-path: "/tmp"
 
       - name: Extract webOS NDK
         shell: bash
         working-directory: /tmp
         run: |
-          tar xzf arm-webos-linux-gnueabi_sdk-buildroot.tar.gz
+          tar xzf arm-webos-linux-gnueabi_sdk-buildroot-x86_64.tar.gz
           ./arm-webos-linux-gnueabi_sdk-buildroot/relocate-sdk.sh
 
       - name: Compile RA
         shell: bash
         run: |
           . /tmp/arm-webos-linux-gnueabi_sdk-buildroot/environment-setup
           make -f Makefile.webos ipk PACKAGE_NAME=${PACKAGE_NAME} ADD_SDL2_LIB=1 -j$(getconf _NPROCESSORS_ONLN)
+        env:
+          DEBUG: ${{ github.event_name == 'release' && '0' || '1' }}
 
       - name: Get short SHA
         id: slug

.gitignore

@@ -148,7 +148,6 @@ wiiu/wut/elf2rpl/elf2rpl
 /pkg/android/phoenix/bin/
 /pkg/android/phoenix/gen/
 /pkg/android/phoenix/local.properties
-/pkg/android/phoenix/gradle.properties
 /pkg/android/phoenix/.gradle
 /pkg/android/phoenix/.externalNativeBuild
 /pkg/android/phoenix/build
@@ -264,3 +263,18 @@ param.sfo
 
 # Clazy
 *.clazy.yaml
+
+# PSL1GHT
+*.SELF
+EBOOT.BIN
+pkg/psl1ght/*.pkg
+modern_alpha_blend_fpo.h
+modern_alpha_blend_vpo.h
+modern_opaque_fpo.h
+modern_opaque_vpo.h
+gfx/drivers/rsx_shaders/modern_alpha_blend.fpo
+gfx/drivers/rsx_shaders/modern_alpha_blend.vpo
+gfx/drivers/rsx_shaders/modern_opaque.fpo
+gfx/drivers/rsx_shaders/modern_opaque.vpo
+pkg/psl1ght/pkg/USRDIR/shaders_cg/
+!pkg/psl1ght/pkg/USRDIR/system/

CHANGES.md

@@ -1,9 +1,69 @@
 # Future
+- APPLE: Include sameduck, gearcoleco, geargrafx cores in App Store builds
+- APPLE: Include reminiscence, virtualjaguar, vitaquake2 cores in App Store builds
+- APPLE: Bundle identifier added to Information menu
+- APPLE: Option to control the usage of Metal argument buffers
+- APPLE: Don't force fullscreen, allow multitasking on iPad
+- AUDIO: Microphone CoreAudio driver for iOS and macOS
+- CAMERA: Use ffmpeg libavfilter virtual input device as default
+- CHEEVOS: Show additional message for unsupported achievements
+- CLOUDSYNC: Enable icloud_drive cloud sync backend on MacOS / iOS
+- CLOUDSYNC: Don't always trust the server hash
+- CLOUDSYNC: Enable WebDAV support for Android
+- CLOUDSYNC: Speed up cloudsync on Apple
+- DATABASE: Improve multidisk game scanning
 - EMSCRIPTEN: Support suspend screensaver
 - EMSCRIPTEN/RWEBCAM: Fix camera driver
 - EMSCRIPTEN/RWEBINPUT: Add accelerometer/gyroscope support
 - EMSCRIPTEN/RWEBPAD: Add rumble support
 - EMSCRIPTEN/RWEBAUDIO: Rewrite driver, set as default audio driver
+- INPUT: Default key and mouse binds for lightgun Start and Select buttons
+- INPUT: Turbo mode corrections
+- INPUT: Turbo fire settings are now saved to remaps, not to overrides
+- INPUT: Fix menu usage when OK/Cancel has mouse binds
+- INPUT: Ignore menu mouse startup position before moving
+- INPUT: Fix heavy slowdown when using Bluetooth XInput controllers with rumble
+- INPUT/UDEV: Fix lost terminal settings after restart from menu
+- INTL: Add Irish Gaelic to selectable languages
+- IOS: Fix crash on iOS9 when fetching refresh rate
+- LINUX: Add full complement of key/value pairs to desktop entry
+- MENU: Common Thumbnail Background option for all menu drivers
+- MENU: Move core options reset from Settings/Configuration to Main Menu / Configuration Files
+- MENU: Use right analog stick for thumbnail cycling in playlists
+- MENU: Option to always suggest cores, even when a core is already loaded
+- MENU: Option to show Favorites before History
+- MENU: Media history playlists are now visible in playlist manager
+- MENU: Import Content visibility defaults reverted
+- MENU: Update CRTSwitchRes menu options for future use
+- MENU: Debug builds are indicated in Information menu
+- MENU: Save As / Save Main options for configuration file
+- MENU: Unwanted input is prevented when menu is triggered by toggle combo
+- MENU: 32-bit values in cheats and rumble are not presented as huge lists
+- MENU: Less important widgets are now sized like task notifications
+- MENU/XMB: Select button toggles thumbnails in playlists
+- MENU/XMB,OZONE: Fix content icons when playlist tabs are hidden
+- MENU/OZONE: Horizontal padding factor option
+- MENU/OZONE: Custom font selection and scaling factor
+- NETWORK: Fixes for nmcli wifi driver
+- NETWORK: Network command interface enabled for Android, iOS, TVOS
+- OTHER: ZStandard support and libchdr update for support of chd files converted with createdvd option
+- OVERLAY: Speed limit on touch pointer tracking
+- PLAYLIST: Built-in playlists are now stored under playlists/builtin
+- PLAYLIST: Fix subsystem information in playlists
+- REPLAY: Bugs fixed regarding rewind
+- REPLAY: Same timeline check and future state check for replays vs. savestates
+- SAVESTATES: Savestate thumbnails are default enabled for x86_64 builds
+- VIDEO: Fix auto swap interval setup
+- VIDEO: Improvements for integer scale half scaling
+- VIDEO: Frame delay improvements for the automatic setting
+- VIDEO/D3D11/D3D12: snappy extra vsync presentation mode
+- VIDEO/SHADER: Shader hold function, useful for some lightguns and shader comparison
+- VIDEO/SWITCHRES: Horizontal and vertical geometry adjustment options added
+- VIDEO/SWITCHRES: Game overrides
+- VIDEO/WAYLAND: Support for xdg-toplevel-icon-v1
+- WEBOS: Various fixes and tunings
+- WEBOS: Disable core dumps
+- WEBOS: Debug builds enabled
 
 # 1.21.0
 - 3DS: Fix unique IDs for newer cores

Makefile

@@ -112,7 +112,7 @@ endif
 
 ifneq ($(CXX_BUILD), 1)
    ifneq ($(C89_BUILD),)
-      CFLAGS += -std=c89 -ansi -pedantic -Werror=pedantic -Wno-long-long -Werror=declaration-after-statement
+      CFLAGS += -std=c89 -ansi -pedantic -Werror=pedantic -Wno-long-long -Werror=declaration-after-statement -Wno-variadic-macros
    else ifeq ($(HAVE_C99), 1)
       CFLAGS += $(C99_CFLAGS)
    endif

Makefile.common

@@ -860,10 +860,6 @@ ifeq ($(HAVE_ALSA), 1)
    OBJ += audio/drivers/alsa.o \
           audio/common/alsa.o
 
-   ifeq ($(HAVE_MICROPHONE), 1)
-      OBJ += audio/drivers_microphone/alsa.o
-   endif
-
    ifneq ($(HAVE_HAKCHI), 1)
       ifneq ($(HAVE_SEGAM), 1)
          ifneq ($(DINGUX), 1)
@@ -874,12 +870,7 @@ ifeq ($(HAVE_ALSA), 1)
 
    ifneq ($(MIYOO), 1)
       ifeq ($(HAVE_THREADS), 1)
-         OBJ += audio/drivers/alsathread.o \
-                audio/common/alsathread.o
-
-         ifeq ($(HAVE_MICROPHONE), 1)
-            OBJ += audio/drivers_microphone/alsathread.o
-         endif
+         OBJ += audio/drivers/alsathread.o
       endif
    endif
 
@@ -927,10 +918,6 @@ ifeq ($(HAVE_PIPEWIRE), 1)
    OBJ += audio/drivers/pipewire.o \
           audio/common/pipewire.o
 
-   ifeq ($(HAVE_MICROPHONE), 1)
-      OBJ += audio/drivers_microphone/pipewire.o
-   endif
-
    ifeq ($(HAVE_PIPEWIRE_STABLE), 1)
       OBJ += camera/drivers/pipewire.o
    endif
@@ -958,14 +945,9 @@ endif
 
 ifeq ($(HAVE_WASAPI), 1)
 	HAVE_MMDEVAPI = 1
-   OBJ += audio/drivers/wasapi.o \
-          audio/common/wasapi.o
+   OBJ += audio/drivers/wasapi.o
    DEFINES += -DHAVE_WASAPI
    LIBS += -lole32 -lksuser
-
-   ifeq ($(HAVE_MICROPHONE), 1)
-      OBJ += audio/drivers_microphone/wasapi.o
-      endif
 endif
 
 ifeq ($(HAVE_XAUDIO), 1)
@@ -1637,14 +1619,9 @@ endif
 ifeq ($(HAVE_SDL2), 1)
    HAVE_SDL_COMMON = 1
    OBJ += gfx/drivers/sdl2_gfx.o \
-			 gfx/common/sdl2_common.o
+	  gfx/common/sdl2_common.o
    DEF_FLAGS += $(SDL2_CFLAGS)
    LIBS += $(SDL2_LIBS)
-
-   ifeq ($(HAVE_MICROPHONE), 1)
-      OBJ += audio/drivers_microphone/sdl_microphone.o
-      # Microphones are not supported by SDL 1.x
-   endif
 else ifeq ($(HAVE_SDL), 1)
    HAVE_SDL_COMMON = 1
    OBJ += gfx/drivers/sdl_gfx.o
@@ -1710,11 +1687,15 @@ ifeq ($(HAVE_VULKAN), 1)
 endif
 
 ifeq ($(HAVE_OPENGL_CORE), 1)
-   OBJ += gfx/drivers/gl3.o \
-	  gfx/drivers_shader/shader_gl3.o
+   OBJ += gfx/drivers/gl3.o
 
    DEFINES += -DHAVE_OPENGL_CORE
-   NEED_CXX_LINKER  = 1
+
+   ifeq ($(HAVE_SLANG), 1)
+      OBJ += gfx/drivers_shader/shader_gl3.o
+
+      NEED_CXX_LINKER = 1
+   endif
 endif
 
 ifeq ($(HAVE_OMAP), 1)
@@ -1776,22 +1757,19 @@ endif
 
 ifeq ($(HAVE_D3D10), 1)
    HAVE_D3D_COMMON = 1
-   OBJ += gfx/drivers/d3d10.o \
-          gfx/common/d3d10_common.o
+   OBJ += gfx/drivers/d3d10.o
    DEFINES += -DHAVE_D3D10
 endif
 
 ifeq ($(HAVE_D3D11), 1)
    HAVE_D3D_COMMON = 1
-   OBJ += gfx/drivers/d3d11.o \
-          gfx/common/d3d11_common.o
+   OBJ += gfx/drivers/d3d11.o
    DEFINES += -DHAVE_D3D11
 endif
 
 ifeq ($(HAVE_D3D12), 1)
    HAVE_D3D_COMMON = 1
-   OBJ += gfx/drivers/d3d12.o \
-          gfx/common/d3d12_common.o
+   OBJ += gfx/drivers/d3d12.o
    DEFINES += -DHAVE_D3D12
 endif
 
@@ -1971,6 +1949,34 @@ ifeq ($(HAVE_7ZIP),1)
            $(7ZOBJ)
 endif
 
+ifeq ($(HAVE_ZSTD),1)
+   INCLUDE_DIRS += -I$(DEPS_DIR)/zstd/lib
+   DEFINES += -DHAVE_ZSTD -DZSTD_DISABLE_ASM
+   ZSOBJ = $(DEPS_DIR)/zstd/lib/common/entropy_common.o \
+           $(DEPS_DIR)/zstd/lib/common/error_private.o \
+           $(DEPS_DIR)/zstd/lib/common/fse_decompress.o \
+           $(DEPS_DIR)/zstd/lib/common/zstd_common.o \
+           $(DEPS_DIR)/zstd/lib/common/xxhash.o \
+           $(DEPS_DIR)/zstd/lib/compress/fse_compress.o \
+           $(DEPS_DIR)/zstd/lib/compress/hist.o \
+           $(DEPS_DIR)/zstd/lib/compress/huf_compress.o \
+           $(DEPS_DIR)/zstd/lib/compress/zstd_compress.o \
+           $(DEPS_DIR)/zstd/lib/compress/zstd_compress_literals.o \
+           $(DEPS_DIR)/zstd/lib/compress/zstd_compress_sequences.o \
+           $(DEPS_DIR)/zstd/lib/compress/zstd_compress_superblock.o \
+           $(DEPS_DIR)/zstd/lib/compress/zstd_double_fast.o \
+           $(DEPS_DIR)/zstd/lib/compress/zstd_fast.o \
+           $(DEPS_DIR)/zstd/lib/compress/zstd_lazy.o \
+           $(DEPS_DIR)/zstd/lib/compress/zstd_ldm.o \
+           $(DEPS_DIR)/zstd/lib/compress/zstd_opt.o \
+           $(DEPS_DIR)/zstd/lib/decompress/huf_decompress.o \
+           $(DEPS_DIR)/zstd/lib/decompress/zstd_ddict.o \
+           $(DEPS_DIR)/zstd/lib/decompress/zstd_decompress.o \
+           $(DEPS_DIR)/zstd/lib/decompress/zstd_decompress_block.o
+
+   OBJ +=  $(ZSOBJ)
+endif
+
 ifeq ($(HAVE_IBXM), 1)
    DEFINES += -DHAVE_IBXM
    OBJ += $(DEPS_DIR)/ibxm/ibxm.o
@@ -2123,6 +2129,13 @@ ifeq ($(HAVE_ZLIB_COMMON), 1)
          DEFINES += -Dcdlz_codec_init=retroarch_internal_cdlz_codec_init
          DEFINES += -Dcdlz_codec_free=retroarch_internal_cdlz_codec_free
          DEFINES += -Dcdlz_codec_decompress=retroarch_internal_cdlz_codec_decompress
+
+         DEFINES += -Dzstd_codec_init=retroarch_internal_zstd_codec_init
+         DEFINES += -Dzstd_codec_free=retroarch_internal_zstd_codec_free
+         DEFINES += -Dzstd_codec_decompress=retroarch_internal_zstd_codec_decompress
+         DEFINES += -Dcdzs_codec_init=retroarch_internal_cdzs_codec_init
+         DEFINES += -Dcdzs_codec_free=retroarch_internal_cdzs_codec_free
+         DEFINES += -Dcdzs_codec_decompress=retroarch_internal_cdzs_codec_decompress
       endif
       OBJ     += $(LIBRETRO_COMM_DIR)/formats/libchdr/libchdr_bitstream.o \
                  $(LIBRETRO_COMM_DIR)/formats/libchdr/libchdr_cdrom.o \
@@ -2139,6 +2152,10 @@ ifeq ($(HAVE_ZLIB_COMMON), 1)
       ifeq ($(HAVE_7ZIP), 1)
          OBJ += $(LIBRETRO_COMM_DIR)/formats/libchdr/libchdr_lzma.o
       endif
+
+      ifeq ($(HAVE_ZSTD), 1)
+         OBJ += $(LIBRETRO_COMM_DIR)/formats/libchdr/libchdr_zstd.o
+      endif
    endif
 endif
 
@@ -2372,6 +2389,10 @@ ifeq ($(HAVE_NETWORKING), 1)
              deps/rcheevos/src/rhash/aes.o \
              deps/rcheevos/src/rhash/cdreader.o \
              deps/rcheevos/src/rhash/hash.o \
+             deps/rcheevos/src/rhash/hash_disc.o \
+             deps/rcheevos/src/rhash/hash_encrypted.o \
+             deps/rcheevos/src/rhash/hash_rom.o \
+             deps/rcheevos/src/rhash/hash_zip.o \
              deps/rcheevos/src/rapi/rc_api_common.o \
              deps/rcheevos/src/rapi/rc_api_info.o \
              deps/rcheevos/src/rapi/rc_api_runtime.o \

Makefile.emscripten

@@ -260,7 +260,10 @@ endif
 
 include Makefile.common
 
-CFLAGS += $(DEF_FLAGS) -Ideps -Ideps/stb
+DEF_FLAGS += $(INCLUDE_DIRS) -Ideps -Ideps/stb
+
+CFLAGS += $(DEF_FLAGS)
+CXXFLAGS += $(DEF_FLAGS) -D__STDC_CONSTANT_MACROS
 
 libretro     =
 libretro_new =

Makefile.griffin

@@ -116,6 +116,7 @@ else ifeq ($(platform), ps3-cobra)
 # NGC/Wii - libogc
 else ifeq ($(libogc_platform), 1)
    EXTERNAL_LIBOGC   ?= 0
+   HAVE_OGG_OGC      ?= 0
    GX_PTHREAD_LEGACY ?= 1
    CC = $(DEVKITPPC)/bin/powerpc-eabi-gcc$(EXE_EXT)
    CXX = $(DEVKITPPC)/bin/powerpc-eabi-g++$(EXE_EXT)
@@ -183,6 +184,10 @@ else ifeq ($(libogc_platform), 1)
       endif
    endif
 
+   ifeq ($(HAVE_OGG_OGC), 1)
+      LIBS += -L$(DEVKITPRO)/portlibs/ppc/lib -lvorbisfile -lvorbis -logg
+   endif
+
    ifeq ($(EXTERNAL_LIBOGC), 1)
       LIBS += -lfat
    endif

Makefile.ngc

@@ -58,6 +58,7 @@ LIBS               := $(WHOLE_START) $(LIB_CORE) $(WHOLE_END)
 libogc_platform    := 1
 
 EXTERNAL_LIBOGC   ?= 0
+HAVE_OGG_OGC      ?= 0
 GX_PTHREAD_LEGACY ?= 1
 CC                 = $(DEVKITPPC)/bin/powerpc-eabi-gcc$(EXE_EXT)
 CXX                = $(DEVKITPPC)/bin/powerpc-eabi-g++$(EXE_EXT)
@@ -102,6 +103,10 @@ ifeq ($(BIG_STACK), 1)
    LDFLAGS += -T bootstrap/gx/ogc.ld
 endif
 
+ifeq ($(HAVE_OGG_OGC), 1)
+   LIBS += -L$(DEVKITPRO)/portlibs/ppc/lib -lvorbisfile -lvorbis -logg
+endif
+
 ifeq ($(EXTERNAL_LIBOGC), 1)
    LIBS += -lfat
 endif