Merge branch 'libretro:master' into master

Author: TheRhysWyrill

.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

@@ -66,6 +66,8 @@ jobs:
         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

CHANGES.md

@@ -1,9 +1,42 @@
 # Future
+- APPLE: Include sameduck, gearcoleco, geargrafx core in App Store builds
+- 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
 - 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
+- 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/XMB: Select button toggles thumbnails in playlists
+- MENU/XMB,OZONE: Fix content icons when playlist tabs are hidden
+- NETWORK: Fixes for nmcli wifi driver
+- NETWORK: Network command interface enabled for Android, iOS, TVOS
+- SAVESTATES: Savestate thumbnails are default enabled for x86_64 builds
+- VIDEO: Fix auto swap interval setup
+- VIDEO: Improvements for integer scale half scaling
+- VIDEO/SHADER: Shader hold function, useful for some lightguns and shader comparison
+- VIDEO/WAYLAND: Support for xdg-toplevel-icon-v1
+- WEBOS: Various fixes and tunings
+- WEBOS: Disable core dumps
 
 # 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

@@ -351,7 +351,6 @@ endif
 
 ifeq ($(HAVE_MICROPHONE), 1)
    DEFINES += -DHAVE_MICROPHONE
-   OBJ += audio/microphone_driver.o
 endif
 
 ifeq ($(HAVE_REWIND), 1)
@@ -1972,6 +1971,22 @@ 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/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
@@ -2124,6 +2139,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 \
@@ -2140,6 +2162,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