Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libretro-81 for openSUSE:Factory checked in at 2021-09-20 23:32:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libretro-81 (Old) and /work/SRC/openSUSE:Factory/.libretro-81.new.1899 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libretro-81" Mon Sep 20 23:32:43 2021 rev:3 rq:919853 version:0~git20210311 Changes: -------- --- /work/SRC/openSUSE:Factory/libretro-81/libretro-81.changes 2020-06-07 21:39:08.365606269 +0200 +++ /work/SRC/openSUSE:Factory/.libretro-81.new.1899/libretro-81.changes 2021-09-20 23:34:08.227246511 +0200 @@ -1,0 +2,28 @@ +Fri Sep 10 14:58:45 UTC 2021 - [email protected] + +- Remove fix-multiple-definition-error.patch +- Update to version 0~git20210311: + * Add ios-arm64/tvos-arm64 + * Fix explicit CC/CXX settings breaking Windows build + * Update .gitlab-ci.yml + * (macOS) Add ARM 64bit Mac support + * Update to new PS2 toolchain + * Add armv8 support + * Update .gitlab-ci.yml + * Update .gitlab-ci.yml + * Update .gitlab-ci.yml + * Update .gitlab-ci.yml + * Add CI for PS2 + * Add PS2 support in Makefile + * Add BGR color support + * Update .gitlab-ci.yml + * Update .gitlab-ci.yml + * Update .gitlab-ci.yml + * Buildfix for Windows + * Add .gitlab-ci.yml + * Update + * Update README.md + * Update README.md + * Fix multiple definition error when -fno-common + +------------------------------------------------------------------- Old: ---- fix-multiple-definition-error.patch libretro-81-0~git20190918.tar.xz New: ---- libretro-81-0~git20210311.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libretro-81.spec ++++++ --- /var/tmp/diff_new_pack.Qfkqlp/_old 2021-09-20 23:34:09.051247529 +0200 +++ /var/tmp/diff_new_pack.Qfkqlp/_new 2021-09-20 23:34:09.055247534 +0200 @@ -1,7 +1,7 @@ # # spec file for package libretro-81 # -# 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,14 +17,13 @@ Name: libretro-81 -Version: 0~git20190918 +Version: 0~git20210311 Release: 0 Summary: 81 libretro core for ZX81 emulation License: GPL-3.0-only Group: System/Emulators/Other URL: http://www.retroarch.com Source: %{name}-%{version}.tar.xz -Patch0: fix-multiple-definition-error.patch BuildRequires: gcc-c++ BuildRequires: make @@ -34,7 +33,6 @@ %prep %setup -q -%patch0 -p1 %build make ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.Qfkqlp/_old 2021-09-20 23:34:09.091247578 +0200 +++ /var/tmp/diff_new_pack.Qfkqlp/_new 2021-09-20 23:34:09.095247583 +0200 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/libretro/81-libretro.git</param> - <param name="changesrevision">338b558a2c6c13541c836195a84b644a91d84df5</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">028da99de5a69c1d067eb3f270c0507377c83bb7</param></service></servicedata> \ No newline at end of file ++++++ libretro-81-0~git20190918.tar.xz -> libretro-81-0~git20210311.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libretro-81-0~git20190918/.gitlab-ci.yml new/libretro-81-0~git20210311/.gitlab-ci.yml --- old/libretro-81-0~git20190918/.gitlab-ci.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/libretro-81-0~git20210311/.gitlab-ci.yml 2021-03-11 05:45:10.000000000 +0100 @@ -0,0 +1,229 @@ +# DESCRIPTION: GitLab CI/CD for libRetro (NOT FOR GitLab-proper) + +############################################################################## +################################# BOILERPLATE ################################ +############################################################################## + +# Core definitions +.core-defs: + variables: + JNI_PATH: build + CORENAME: 81 + +# 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' + + # 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 2 + - project: 'libretro-infrastructure/ci-templates' + file: '/ps2-static.yml' + + # PlayStation Portable + - project: 'libretro-infrastructure/ci-templates' + file: '/psp-static.yml' + + # PlayStation Vita + - project: 'libretro-infrastructure/ci-templates' + file: '/vita-static.yml' + + # Nintendo 3DS + - project: 'libretro-infrastructure/ci-templates' + file: '/ctr-static.yml' + + # Nintendo GameCube + - project: 'libretro-infrastructure/ci-templates' + file: '/ngc-static.yml' + + # Nintendo Wii + - project: 'libretro-infrastructure/ci-templates' + file: '/wii-static.yml' + + # Nintendo WiiU + - project: 'libretro-infrastructure/ci-templates' + file: '/wiiu-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 + +# 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 ################################# +# Nintendo 3DS +libretro-build-ctr: + extends: + - .libretro-ctr-static-retroarch-master + - .core-defs + +# Nintendo GameCube +libretro-build-ngc: + extends: + - .libretro-ngc-static-retroarch-master + - .core-defs + +# Nintendo Wii +libretro-build-wii: + extends: + - .libretro-wii-static-retroarch-master + - .core-defs + +# Nintendo WiiU +libretro-build-wiiu: + extends: + - .libretro-wiiu-static-retroarch-master + - .core-defs + +# Nintendo Switch +libretro-build-libnx-aarch64: + extends: + - .libretro-libnx-static-retroarch-master + - .core-defs + +# PlayStation 2 +libretro-build-ps2: + extends: + - .libretro-ps2-static-retroarch-master + - .core-defs + +# PlayStation Portable +libretro-build-psp: + extends: + - .libretro-psp-static-retroarch-master + - .core-defs + +# PlayStation Vita +libretro-build-vita: + extends: + - .libretro-vita-static-retroarch-master + - .core-defs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libretro-81-0~git20190918/81/sp0256.c new/libretro-81-0~git20210311/81/sp0256.c --- old/libretro-81-0~git20190918/81/sp0256.c 2019-09-18 00:48:21.000000000 +0200 +++ new/libretro-81-0~git20210311/81/sp0256.c 2021-03-11 05:45:10.000000000 +0100 @@ -1,5 +1,5 @@ #include <stdio.h> -#if !defined(__CELLOS_LV2__) && !defined(__APPLE__) +#if ((!(defined(__PS3__) && !defined(__PSL1GHT))) && !defined(__APPLE__)) #include <malloc.h> #endif #include <string.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libretro-81-0~git20190918/Makefile.libretro new/libretro-81-0~git20210311/Makefile.libretro --- old/libretro-81-0~git20190918/Makefile.libretro 2019-09-18 00:48:21.000000000 +0200 +++ new/libretro-81-0~git20210311/Makefile.libretro 2021-03-11 05:45:10.000000000 +0100 @@ -31,8 +31,6 @@ include $(BUILD_DIR)/Makefile.osx_x86 else ifeq ($(platform),osx_x86_64) include $(BUILD_DIR)/Makefile.osx_x86_64 -else ifeq ($(platform),ps3_ppc) -include $(BUILD_DIR)/Makefile.ps3_ppc else ifeq ($(platform),wii_ppc) include $(BUILD_DIR)/Makefile.wii_ppc else ifeq ($(platform),windows_x86) @@ -43,7 +41,7 @@ TARGET_NAME := 81 -LOG_PERFORMANCE = 1 +LOG_PERFORMANCE = 0 HAVE_COMPAT = 0 SOURCES_C := @@ -107,7 +105,17 @@ SHARED := -dynamiclib OSXVER = `sw_vers -productVersion | cut -d. -f 2` OSX_LT_MAVERICKS = `(( $(OSXVER) <= 9)) && echo "YES"` - #fpic += -mmacosx-version-min=10.5 + ifeq ($(OSX_LT_MAVERICKS),YES) + fpic += -mmacosx-version-min=10.5 + 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 # iOS else ifneq (,$(findstring ios,$(platform))) @@ -171,30 +179,6 @@ AR = QCC -Vgcc_ntoarmv7le PLATFORM_DEFINES := -D__BLACKBERRY_QNX__ -fexceptions -marm -mcpu=cortex-a9 -mfpu=neon -mfloat-abi=softfp -# PS3 -else ifeq ($(platform), ps3) - TARGET := $(TARGET_NAME)_libretro_$(platform).a - CC = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-gcc.exe - AR = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-ar.exe - PLATFORM_DEFINES := -D__CELLOS_LV2__ - CFLAGS += -DMSB_FIRST -DWORDS_BIGENDIAN=1 - CXXFLAGS += -DMSB_FIRST -DWORDS_BIGENDIAN=1 - STATIC_LINKING = 1 - HAVE_COMPAT = 1 - -# sncps3 -else ifeq ($(platform), sncps3) - TARGET := $(TARGET_NAME)_libretro_ps3.a - CC = $(CELL_SDK)/host-win32/sn/bin/ps3ppusnc.exe - CC_AS = $(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 - PLATFORM_DEFINES := -D__CELLOS_LV2__ - CFLAGS += -DMSB_FIRST -DWORDS_BIGENDIAN=1 - CXXFLAGS += -DMSB_FIRST -DWORDS_BIGENDIAN=1 - STATIC_LINKING = 1 - HAVE_COMPAT = 1 - # Lightweight PS3 Homebrew SDK else ifeq ($(platform), psl1ght) TARGET := $(TARGET_NAME)_libretro_$(platform).a @@ -202,12 +186,25 @@ CC_AS = $(PS3DEV)/ppu/bin/ppu-gcc$(EXE_EXT) CXX = $(PS3DEV)/ppu/bin/ppu-g++$(EXE_EXT) AR = $(PS3DEV)/ppu/bin/ppu-ar$(EXE_EXT) - PLATFORM_DEFINES := -D__CELLOS_LV2__ + PLATFORM_DEFINES := -D__PSL1GHT__ -D__PS3__ CFLAGS += -DMSB_FIRST -DWORDS_BIGENDIAN=1 CXXFLAGS += -DMSB_FIRST -DWORDS_BIGENDIAN=1 STATIC_LINKING = 1 HAVE_COMPAT = 1 +# PS2 +else ifeq ($(platform), ps2) + TARGET := $(TARGET_NAME)_libretro_$(platform).a + CC = mips64r5900el-ps2-elf-gcc$(EXE_EXT) + CC_AS = mips64r5900el-ps2-elf-gcc$(EXE_EXT) + CXX = mips64r5900el-ps2-elf-g++$(EXE_EXT) + AR = mips64r5900el-ps2-elf-ar$(EXE_EXT) + PLATFORM_DEFINES := -DPS2 -DBGR + CFLAGS += -G0 + CXXFLAGS += -G0 + STATIC_LINKING = 1 + HAVE_COMPAT = 1 + # PSP else ifeq ($(platform), psp1) TARGET := $(TARGET_NAME)_libretro_$(platform).a @@ -312,14 +309,31 @@ endif ####################################### +# (armv8 a35, hard point, neon based) ### +# PlayStation Classic +else ifeq ($(platform), classic_armv8_a35) + TARGET := $(TARGET_NAME)_libretro.so + fpic := -fPIC + SHARED := -shared -Wl,--version-script=build/link.T -Wl,--no-undefined + CFLAGS += -DARM -Ofast \ + -fuse-linker-plugin \ + -fno-stack-protector -fno-ident -fomit-frame-pointer \ + -fmerge-all-constants -ffast-math -funroll-all-loops \ + -marm -mcpu=cortex-a35 -mfpu=neon-fp-armv8 -mfloat-abi=hard + CXXFLAGS += $(CFLAGS) + CPPFLAGS += $(CFLAGS) + ASFLAGS += $(CFLAGS) + LDFLAGS += -marm -mcpu=cortex-a35 -mfpu=neon-fp-armv8 -mfloat-abi=hard -Ofast -flto -fuse-linker-plugin +####################################### + # ARM else ifneq (,$(findstring armv,$(platform))) TARGET := $(TARGET_NAME)_libretro.so fpic := -fPIC SHARED := -shared -Wl,-version-script=build/link.T - CC = gcc - CC_AS = gcc - CXX = g++ + CC ?= gcc + CC_AS ?= gcc + CXX ?= g++ ifneq (,$(findstring cortexa8,$(platform))) PLATFORM_DEFINES += -marm -mcpu=cortex-a8 else ifneq (,$(findstring cortexa9,$(platform))) @@ -372,12 +386,10 @@ # Windows else TARGET := $(TARGET_NAME)_libretro.dll - CC = gcc - CC_AS = gcc - CXX = g++ + CC ?= gcc + CC_AS ?= gcc + CXX ?= g++ SHARED := -shared -static-libgcc -static-libstdc++ -Wl,-no-undefined -Wl,-version-script=build/link.T - LIBS += -lshlwapi - HAVE_WIN32_MSX_MANAGER = 1 endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libretro-81-0~git20190918/README.md new/libretro-81-0~git20210311/README.md --- old/libretro-81-0~git20190918/README.md 2019-09-18 00:48:21.000000000 +0200 +++ new/libretro-81-0~git20210311/README.md 2021-03-11 05:45:10.000000000 +0100 @@ -1,10 +1,10 @@ # 81-libretro -**81-libretro** is an *work in progress* port of the [EightyOne](http://www.chuntey.com/) (a.k.a. THE Sinclair Emulator) to [libretro](http://www.libretro.com/). It's being developed on Windows with MinGW (64 bits) and Debian 8, and tested on RetroArch 1.2 frontend. +**81-libretro** is an *work in progress* port of the [EightyOne](https://sourceforge.net/projects/eightyone-sinclair-emulator/) (a.k.a. THE Sinclair Emulator) to [libretro](http://www.libretro.com/). It's being developed on Windows with MinGW (64 bits) and Debian 8, and tested on RetroArch 1.2 frontend. ## Games -The classic ZX81 games are all over the Internet, but check the [colorized](https://github.com/leiradel/81-libretro/tree/master/colorized) folder for games with Chroma 81 support. There are also many original games for the Zeddy, check [Bob's Stuff](http://www.bobs-stuff.co.uk/zx81.html) for some high quality games. +The classic ZX81 games are all over the Internet, but check the [colorized](https://github.com/leiradel/81-libretro/tree/master/colorized) folder for games with Chroma 81 support. There are also many original games for the Zeddy, check [Bob's Stuff](https://bobs-stuff.itch.io/) for some high quality games. ## Emulated Machines diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libretro-81-0~git20190918/build/Makefile.ps3_ppc new/libretro-81-0~git20210311/build/Makefile.ps3_ppc --- old/libretro-81-0~git20190918/build/Makefile.ps3_ppc 2019-09-18 00:48:21.000000000 +0200 +++ new/libretro-81-0~git20210311/build/Makefile.ps3_ppc 1970-01-01 01:00:00.000000000 +0100 @@ -1,96 +0,0 @@ -############## -# Works on hosts Windows or Linux using Wine -# Install CellSDK - -######################### -# Check the host platform - -HOST_PLATFORM = linux -ifeq ($(shell uname -a),) - HOST_PLATFORM = windows -else ifneq ($(findstring MINGW,$(shell uname -a)),) - HOST_PLATFORM = windows -else ifneq ($(findstring Darwin,$(shell uname -a)),) - HOST_PLATFORM = darwin -else ifneq ($(findstring win,$(shell uname -a)),) - HOST_PLATFORM = windows -endif - -######################### -# Set the target platform - -TARGET_PLATFORM = ps3_ppc - -################# -# Toolchain setup - -CC = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-gcc -CXX = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-g++ -AS = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-as -AR = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-ar - -############ -# Extensions - -OBJEXT = .ps3_ppc.o -SOEXT = .ps3_ppc.so -LIBEXT = .ps3_ppc.a - -################ -# Platform setup - -STATIC_LINKING = 1 -platform = ps3 -PLATDEFS = -D__CELLOS_LV2__ -PLATCFLAGS = -DMSB_FIRST -DWORDS_BIGENDIAN=1 -PLATCXXFLAGS = -DMSB_FIRST -DWORDS_BIGENDIAN=1 -PLATLDFLAGS = -shared -lm -PLATLDXFLAGS = -shared -lm - -################ -# libretro setup - -RETRODEFS = -D__LIBRETRO__ -RETROCFLAGS = -RETROCXXFLAGS = -RETROLDFLAGS = -RETROLDXFLAGS = - -################# -# Final variables - -DEFINES = $(PLATDEFS) $(RETRODEFS) -CFLAGS = $(PLATCFLAGS) $(RETROCFLAGS) $(DEFINES) $(INCLUDES) -CXXFLAGS = $(PLATCXXFLAGS) $(RETROCXXFLAGS) $(DEFINES) $(INCLUDES) -LDFLAGS = $(PLATLDFLAGS) $(RETROLDFLAGS) -LDXFLAGS = $(PLATLDXFLAGS) $(RETROLDXFLAGS) - -######## -# Tuning - -ifneq ($(DEBUG),) - CFLAGS += -O0 -g - CXXFLAGS += -O0 -g -else - CFLAGS += -O3 -DNDEBUG - CXXFLAGS += -O3 -DNDEBUG -endif - -ifneq ($(LOG_PERFORMANCE),) - CFLAGS += -DLOG_PERFORMANCE - CXXFLAGS += -DLOG_PERFORMANCE -endif - -#################################### -# Variable setup for Makefile.common - -CORE_DIR ?= .. -BUILD_DIR ?= . -INCLUDES = - -include $(BUILD_DIR)/Makefile.common - -############### -# Include rules - -include $(BUILD_DIR)/Makefile.rules diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libretro-81-0~git20190918/src/compat.cpp new/libretro-81-0~git20210311/src/compat.cpp --- old/libretro-81-0~git20190918/src/compat.cpp 2019-09-18 00:48:21.000000000 +0200 +++ new/libretro-81-0~git20210311/src/compat.cpp 2021-03-11 05:45:10.000000000 +0100 @@ -286,9 +286,20 @@ #define Plot( x, c ) do { *(uint16_t*)( dest + RasterX + ( x ) ) = Colours[ ( c ) ]; } while ( 0 ) -#define DoPal( r, g, b ) ( ( ( ( b > 255 ? 255 : ( b < 0 ? 0 : b ) ) & 0xff ) << 16 ) \ - | ( ( ( g > 255 ? 255 : ( g < 0 ? 0 : g ) ) & 0xff ) << 8 ) \ - | ( ( r > 255 ? 255 : ( r < 0 ? 0 : r ) ) & 0xff ) ) +#if defined(BGR) +#define RED_SHIFT 16 +#define GREEN_SHIFT 8 +#define BLUE_SHIFT 0 +#else +#define RED_SHIFT 0 +#define GREEN_SHIFT 8 +#define BLUE_SHIFT 16 +#endif + +#define DoPal( r, g, b ) ( ( ( ( b > 255 ? 255 : ( b < 0 ? 0 : b ) ) & 0xff ) << BLUE_SHIFT ) \ + | ( ( ( g > 255 ? 255 : ( g < 0 ? 0 : g ) ) & 0xff ) << GREEN_SHIFT ) \ + | ( ( ( r > 255 ? 255 : ( r < 0 ? 0 : r ) ) & 0xff ) << RED_SHIFT ) ) + extern "C" void add_blank( int tstates, BYTE colour ) { @@ -762,7 +773,7 @@ return list.size(); } -#if defined( VITA ) || defined( __CELLOS_LV2__ ) +#if defined( VITA ) || defined(__PS3__) && !defined( __PSL1GHT__ ) extern "C" char* getcwd( char* buf, size_t size ) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libretro-81-0~git20190918/src/coreopt.c new/libretro-81-0~git20210311/src/coreopt.c --- old/libretro-81-0~git20190918/src/coreopt.c 2019-09-18 00:48:21.000000000 +0200 +++ new/libretro-81-0~git20210311/src/coreopt.c 2021-03-11 05:45:10.000000000 +0100 @@ -7,7 +7,7 @@ #include <gamedb/db.inl> -retro_log_printf_t log_cb; +extern retro_log_printf_t log_cb; static int getindex( const char* options, const char* value ) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libretro-81-0~git20190918/src/libretro.h new/libretro-81-0~git20210311/src/libretro.h --- old/libretro-81-0~git20190918/src/libretro.h 2019-09-18 00:48:21.000000000 +0200 +++ new/libretro-81-0~git20210311/src/libretro.h 2021-03-11 05:45:10.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
