Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package libretro-3dengine for
openSUSE:Factory checked in at 2021-09-17 23:26:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libretro-3dengine (Old)
and /work/SRC/openSUSE:Factory/.libretro-3dengine.new.1899 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libretro-3dengine"
Fri Sep 17 23:26:13 2021 rev:3 rq:919768 version:0~git20210107
Changes:
--------
--- /work/SRC/openSUSE:Factory/libretro-3dengine/libretro-3dengine.changes
2020-06-07 21:35:49.712976549 +0200
+++
/work/SRC/openSUSE:Factory/.libretro-3dengine.new.1899/libretro-3dengine.changes
2021-09-17 23:26:37.953272617 +0200
@@ -1,0 +2,12 @@
+Fri Sep 10 14:57:54 UTC 2021 - [email protected]
+
+- Update to version 0~git20210107:
+ * Update .gitlab-ci.yml
+ * Update .gitlab-ci.yml
+ * Revert "Update shared.hpp"
+ * Update shared.hpp
+ * Update Application.mk
+ * Create .gitlab-ci.yml
+ * Update
+
+-------------------------------------------------------------------
Old:
----
libretro-3dengine-0~git20191116.tar.xz
New:
----
libretro-3dengine-0~git20210107.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libretro-3dengine.spec ++++++
--- /var/tmp/diff_new_pack.2szpzl/_old 2021-09-17 23:26:38.361272981 +0200
+++ /var/tmp/diff_new_pack.2szpzl/_new 2021-09-17 23:26:38.365272985 +0200
@@ -1,7 +1,7 @@
#
# spec file for package libretro-3dengine
#
-# 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-3dengine
-Version: 0~git20191116
+Version: 0~git20210107
Release: 0
Summary: 3D Engine libretro core
License: GPL-3.0-only
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.2szpzl/_old 2021-09-17 23:26:38.401273016 +0200
+++ /var/tmp/diff_new_pack.2szpzl/_new 2021-09-17 23:26:38.401273016 +0200
@@ -1,4 +1,4 @@
<servicedata>
<service name="tar_scm">
<param
name="url">https://github.com/libretro/libretro-3dengine.git</param>
- <param
name="changesrevision">18940e014b2147c18aa4d1168175153b6989c241</param></service></servicedata>
\ No newline at end of file
+ <param
name="changesrevision">4fbe7cb2f90d3c8db994af60085fb2ac93677545</param></service></servicedata>
\ No newline at end of file
++++++ libretro-3dengine-0~git20191116.tar.xz ->
libretro-3dengine-0~git20210107.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libretro-3dengine-0~git20191116/.gitlab-ci.yml
new/libretro-3dengine-0~git20210107/.gitlab-ci.yml
--- old/libretro-3dengine-0~git20191116/.gitlab-ci.yml 1970-01-01
01:00:00.000000000 +0100
+++ new/libretro-3dengine-0~git20210107/.gitlab-ci.yml 2021-01-07
20:15:03.000000000 +0100
@@ -0,0 +1,46 @@
+# DESCRIPTION: GitLab CI/CD for libRetro (NOT FOR GitLab-proper)
+
+##############################################################################
+################################# BOILERPLATE ################################
+##############################################################################
+
+# Core definitions
+.core-defs:
+ variables:
+ JNI_PATH: .
+ CORENAME: 3dengine
+ MAKEFILE: Makefile
+
+# Inclusion templates, required for the build to work
+include:
+ ################################## DESKTOPS ################################
+ # Linux 64-bit
+ - project: 'libretro-infrastructure/ci-templates'
+ file: '/linux-x64.yml'
+
+ # Linux 32-bit
+ - project: 'libretro-infrastructure/ci-templates'
+ file: '/linux-i686.yml'
+
+# Stages for building
+stages:
+ - build-prepare
+ - build-shared
+ - build-static
+
+##############################################################################
+#################################### STAGES ##################################
+##############################################################################
+#
+################################### DESKTOPS #################################
+# 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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libretro-3dengine-0~git20191116/jni/Application.mk
new/libretro-3dengine-0~git20210107/jni/Application.mk
--- old/libretro-3dengine-0~git20191116/jni/Application.mk 2019-11-16
09:40:03.000000000 +0100
+++ new/libretro-3dengine-0~git20210107/jni/Application.mk 2021-01-07
20:15:03.000000000 +0100
@@ -1,2 +1,2 @@
APP_ABI := all
-APP_STL := gnustl_static
+APP_STL := c++_static
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libretro-3dengine-0~git20191116/libretro-common/features/features_cpu.c
new/libretro-3dengine-0~git20210107/libretro-common/features/features_cpu.c
--- old/libretro-3dengine-0~git20191116/libretro-common/features/features_cpu.c
2019-11-16 09:40:03.000000000 +0100
+++ new/libretro-3dengine-0~git20210107/libretro-common/features/features_cpu.c
2021-01-07 20:15:03.000000000 +0100
@@ -39,11 +39,7 @@
#include <windows.h>
#endif
-#if defined(__CELLOS_LV2__)
-#ifndef _PPU_INTRINSICS_H
-#include <ppu_intrinsics.h>
-#endif
-#elif defined(_XBOX360)
+#if defined(_XBOX360)
#include <PPCIntrinsics.h>
#elif defined(_POSIX_MONOTONIC_CLOCK) || defined(ANDROID) || defined(__QNX__)
|| defined(DJGPP)
/* POSIX_MONOTONIC_CLOCK is not being defined in Android headers despite
support being present. */
@@ -73,8 +69,6 @@
#if defined(__PSL1GHT__)
#include <sys/time.h>
-#elif defined(__CELLOS_LV2__)
-#include <sys/sys_time.h>
#endif
#ifdef GEKKO
@@ -181,7 +175,7 @@
time_ticks = (retro_perf_tick_t)a | ((retro_perf_tick_t)d << 32);
#elif defined(__ARM_ARCH_6__)
__asm__ volatile( "mrc p15, 0, %0, c9, c13, 0" : "=r"(time_ticks) );
-#elif defined(__CELLOS_LV2__) || defined(_XBOX360) || defined(__powerpc__) ||
defined(__ppc__) || defined(__POWERPC__)
+#elif defined(_XBOX360) || defined(__powerpc__) || defined(__ppc__) ||
defined(__POWERPC__)
time_ticks = __mftb();
#elif defined(GEKKO)
time_ticks = gettime();
@@ -226,8 +220,6 @@
if (!QueryPerformanceCounter(&count))
return 0;
return count.QuadPart * 1000000 / freq.QuadPart;
-#elif defined(__CELLOS_LV2__)
- return sys_time_get_system_time();
#elif defined(GEKKO)
return ticks_to_microsecs(gettime());
#elif defined(WIIU)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libretro-3dengine-0~git20191116/libretro-common/file/config_file.c
new/libretro-3dengine-0~git20210107/libretro-common/file/config_file.c
--- old/libretro-3dengine-0~git20191116/libretro-common/file/config_file.c
2019-11-16 09:40:03.000000000 +0100
+++ new/libretro-3dengine-0~git20210107/libretro-common/file/config_file.c
2021-01-07 20:15:03.000000000 +0100
@@ -26,7 +26,7 @@
#include <ctype.h>
#include <errno.h>
-#if !defined(_WIN32) && !defined(__CELLOS_LV2__) && !defined(_XBOX)
+#if !defined(_WIN32) && !defined(_XBOX)
#include <sys/param.h> /* PATH_MAX */
#elif defined(_WIN32) && !defined(_XBOX)
#define WIN32_LEAN_AND_MEAN
@@ -300,7 +300,6 @@
fill_pathname_resolve_relative(real_path, conf->path,
path, sizeof(real_path));
#else
-#ifndef __CELLOS_LV2__
if (*path == '~')
{
const char *home = getenv("HOME");
@@ -308,7 +307,6 @@
strlcat(real_path, path + 1, sizeof(real_path));
}
else
-#endif
if (!string_is_empty(conf->path))
fill_pathname_resolve_relative(real_path, conf->path,
path, sizeof(real_path));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libretro-3dengine-0~git20191116/libretro-common/file/file_path.c
new/libretro-3dengine-0~git20210107/libretro-common/file/file_path.c
--- old/libretro-3dengine-0~git20191116/libretro-common/file/file_path.c
2019-11-16 09:40:03.000000000 +0100
+++ new/libretro-3dengine-0~git20210107/libretro-common/file/file_path.c
2021-01-07 20:15:03.000000000 +0100
@@ -87,15 +87,11 @@
#include <fileXio.h>
#endif
-#if defined(__CELLOS_LV2__)
-#include <cell/cell_fs.h>
-#endif
-
#if defined(VITA)
#define FIO_S_ISDIR SCE_S_ISDIR
#endif
-#if (defined(__CELLOS_LV2__) && !defined(__PSL1GHT__)) || defined(__QNX__) ||
defined(PSP) || defined(PS2)
+#if defined(__QNX__) || defined(PSP) || defined(PS2)
#include <unistd.h> /* stat() is defined here */
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libretro-3dengine-0~git20191116/libretro-common/include/libretro.h
new/libretro-3dengine-0~git20210107/libretro-common/include/libretro.h
--- old/libretro-3dengine-0~git20191116/libretro-common/include/libretro.h
2019-11-16 09:40:03.000000000 +0100
+++ new/libretro-3dengine-0~git20210107/libretro-common/include/libretro.h
2021-01-07 20:15:03.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-3dengine-0~git20191116/libretro-common/include/memmap.h
new/libretro-3dengine-0~git20210107/libretro-common/include/memmap.h
--- old/libretro-3dengine-0~git20191116/libretro-common/include/memmap.h
2019-11-16 09:40:03.000000000 +0100
+++ new/libretro-3dengine-0~git20210107/libretro-common/include/memmap.h
2021-01-07 20:15:03.000000000 +0100
@@ -26,7 +26,7 @@
#include <stdio.h>
#include <stdint.h>
-#if defined(__CELLOS_LV2__) || defined(PSP) || defined(PS2) || defined(GEKKO)
|| defined(VITA) || defined(_XBOX) || defined(_3DS) || defined(WIIU) ||
defined(SWITCH)
+#if defined(PSP) || defined(PS2) || defined(GEKKO) || defined(VITA) ||
defined(_XBOX) || defined(_3DS) || defined(WIIU) || defined(SWITCH)
/* No mman available */
#elif defined(_WIN32) && !defined(_XBOX)
#include <windows.h>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libretro-3dengine-0~git20191116/libretro-common/include/net/net_compat.h
new/libretro-3dengine-0~git20210107/libretro-common/include/net/net_compat.h
---
old/libretro-3dengine-0~git20191116/libretro-common/include/net/net_compat.h
2019-11-16 09:40:03.000000000 +0100
+++
new/libretro-3dengine-0~git20210107/libretro-common/include/net/net_compat.h
2021-01-07 20:15:03.000000000 +0100
@@ -116,19 +116,7 @@
#include <netdb.h>
#include <fcntl.h>
-#if defined(__CELLOS_LV2__) && !defined(__PSL1GHT__)
-#include <cell/sysmodule.h>
-#include <netex/net.h>
-#include <netex/libnetctl.h>
-#include <sys/timer.h>
-
-#ifndef EWOULDBLOCK
-#define EWOULDBLOCK SYS_NET_EWOULDBLOCK
-#endif
-
-#else
#include <signal.h>
-#endif
#endif
@@ -155,8 +143,6 @@
if (WSAGetLastError() != WSAEWOULDBLOCK)
return false;
return true;
-#elif defined(__CELLOS_LV2__) && !defined(__PSL1GHT__)
- return (sys_net_errno == SYS_NET_EWOULDBLOCK) || (sys_net_errno ==
SYS_NET_EAGAIN);//35
#elif defined(VITA)
return (bytes<0 && (bytes == SCE_NET_ERROR_EAGAIN || bytes ==
SCE_NET_ERROR_EWOULDBLOCK));
#elif defined(WIIU)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libretro-3dengine-0~git20191116/libretro-common/include/retro_miscellaneous.h
new/libretro-3dengine-0~git20210107/libretro-common/include/retro_miscellaneous.h
---
old/libretro-3dengine-0~git20191116/libretro-common/include/retro_miscellaneous.h
2019-11-16 09:40:03.000000000 +0100
+++
new/libretro-3dengine-0~git20210107/libretro-common/include/retro_miscellaneous.h
2021-01-07 20:15:03.000000000 +0100
@@ -39,10 +39,6 @@
#include <Xtl.h>
#endif
-#if defined(__CELLOS_LV2__)
-#include <sys/fs_external.h>
-#endif
-
#include <limits.h>
#ifdef _MSC_VER
@@ -75,9 +71,7 @@
}
#ifndef PATH_MAX_LENGTH
-#if defined(__CELLOS_LV2__)
-#define PATH_MAX_LENGTH CELL_FS_MAX_FS_PATH_LENGTH
-#elif defined(_XBOX1) || defined(_3DS) || defined(PSP) || defined(PS2) ||
defined(GEKKO)|| defined(WIIU) || defined(ORBIS)
+#if defined(_XBOX1) || defined(_3DS) || defined(PSP) || defined(PS2) ||
defined(GEKKO)|| defined(WIIU) || defined(ORBIS)
#define PATH_MAX_LENGTH 512
#else
#define PATH_MAX_LENGTH 4096
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libretro-3dengine-0~git20191116/libretro-common/include/retro_timers.h
new/libretro-3dengine-0~git20210107/libretro-common/include/retro_timers.h
--- old/libretro-3dengine-0~git20191116/libretro-common/include/retro_timers.h
2019-11-16 09:40:03.000000000 +0100
+++ new/libretro-3dengine-0~git20210107/libretro-common/include/retro_timers.h
2021-01-07 20:15:03.000000000 +0100
@@ -25,9 +25,7 @@
#include <stdint.h>
-#if defined(__CELLOS_LV2__) && !defined(__PSL1GHT__)
-#include <sys/timer.h>
-#elif defined(XENON)
+#if defined(XENON)
#include <time/time.h>
#elif defined(GEKKO) || defined(__PSL1GHT__) || defined(__QNX__)
#include <unistd.h>
@@ -87,9 +85,7 @@
**/
static INLINE void retro_sleep(unsigned msec)
{
-#if defined(__CELLOS_LV2__) && !defined(__PSL1GHT__)
- sys_timer_usleep(1000 * msec);
-#elif defined(PSP) || defined(VITA)
+#if defined(PSP) || defined(VITA)
sceKernelDelayThread(1000 * msec);
#elif defined(PS2)
SDL_Delay(msec);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libretro-3dengine-0~git20191116/libretro-common/net/net_compat.c
new/libretro-3dengine-0~git20210107/libretro-common/net/net_compat.c
--- old/libretro-3dengine-0~git20191116/libretro-common/net/net_compat.c
2019-11-16 09:40:03.000000000 +0100
+++ new/libretro-3dengine-0~git20210107/libretro-common/net/net_compat.c
2021-01-07 20:15:03.000000000 +0100
@@ -224,7 +224,7 @@
in_addr->sin_family = host->h_addrtype;
-#if defined(AF_INET6) && !defined(__CELLOS_LV2__) || defined(VITA)
+#if defined(AF_INET6) || defined(VITA)
/* TODO/FIXME - In case we ever want to support IPv6 */
in_addr->sin_addr.s_addr = inet_addr(host->h_addr_list[0]);
#else
@@ -282,29 +282,6 @@
network_deinit();
return false;
}
-#elif defined(__CELLOS_LV2__) && !defined(__PSL1GHT__)
- int timeout_count = 10;
-
- cellSysmoduleLoadModule(CELL_SYSMODULE_NET);
- sys_net_initialize_network();
-
- if (cellNetCtlInit() < 0)
- return false;
-
- for (;;)
- {
- int state;
- if (cellNetCtlGetState(&state) < 0)
- return false;
-
- if (state == CELL_NET_CTL_STATE_IPObtained)
- break;
-
- retro_sleep(500);
- timeout_count--;
- if (timeout_count < 0)
- return 0;
- }
#elif defined(VITA)
SceNetInitParam initparam;
@@ -352,10 +329,6 @@
{
#if defined(_WIN32)
WSACleanup();
-#elif defined(__CELLOS_LV2__) && !defined(__PSL1GHT__)
- cellNetCtlTerm();
- sys_net_finalize_network();
- cellSysmoduleUnloadModule(CELL_SYSMODULE_NET);
#elif defined(VITA)
sceNetCtlTerm();
sceNetTerm();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libretro-3dengine-0~git20191116/libretro-common/net/net_socket.c
new/libretro-3dengine-0~git20210107/libretro-common/net/net_socket.c
--- old/libretro-3dengine-0~git20191116/libretro-common/net/net_socket.c
2019-11-16 09:40:03.000000000 +0100
+++ new/libretro-3dengine-0~git20210107/libretro-common/net/net_socket.c
2021-01-07 20:15:03.000000000 +0100
@@ -119,7 +119,7 @@
bool socket_nonblock(int fd)
{
-#if defined(__CELLOS_LV2__) || defined(VITA) || defined(WIIU)
+#if defined(VITA) || defined(WIIU)
int i = 1;
setsockopt(fd, SOL_SOCKET, SO_NBIO, &i, sizeof(int));
return true;
@@ -136,7 +136,7 @@
#if defined(_WIN32) && !defined(_XBOX360)
/* WinSock has headers from the stone age. */
return closesocket(fd);
-#elif defined(__CELLOS_LV2__) || defined(WIIU)
+#elif defined(WIIU)
return socketclose(fd);
#elif defined(VITA)
return sceNetSocketClose(fd);
@@ -148,9 +148,7 @@
int socket_select(int nfds, fd_set *readfs, fd_set *writefds,
fd_set *errorfds, struct timeval *timeout)
{
-#if defined(__CELLOS_LV2__)
- return socketselect(nfds, readfs, writefds, errorfds, timeout);
-#elif defined(VITA)
+#if defined(VITA)
extern int retro_epoll_fd;
SceNetEpollEvent ev = {0};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libretro-3dengine-0~git20191116/libretro-common/rthreads/rthreads.c
new/libretro-3dengine-0~git20210107/libretro-common/rthreads/rthreads.c
--- old/libretro-3dengine-0~git20191116/libretro-common/rthreads/rthreads.c
2019-11-16 09:40:03.000000000 +0100
+++ new/libretro-3dengine-0~git20210107/libretro-common/rthreads/rthreads.c
2021-01-07 20:15:03.000000000 +0100
@@ -50,9 +50,6 @@
#include "gx_pthread.h"
#elif defined(_3DS)
#include "ctr_pthread.h"
-#elif defined(__CELLOS_LV2__)
-#include <pthread.h>
-#include <sys/sys_time.h>
#else
#include <pthread.h>
#include <time.h>
@@ -862,13 +859,6 @@
mach_port_deallocate(mach_task_self(), cclock);
now.tv_sec = mts.tv_sec;
now.tv_nsec = mts.tv_nsec;
-#elif defined(__CELLOS_LV2__)
- sys_time_sec_t s;
- sys_time_nsec_t n;
-
- sys_time_get_current_time(&s, &n);
- now.tv_sec = s;
- now.tv_nsec = n;
#elif defined(PS2)
int tickms = clock();
now.tv_sec = tickms/1000;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libretro-3dengine-0~git20191116/libretro-common/streams/stdin_stream.c
new/libretro-3dengine-0~git20210107/libretro-common/streams/stdin_stream.c
--- old/libretro-3dengine-0~git20191116/libretro-common/streams/stdin_stream.c
2019-11-16 09:40:03.000000000 +0100
+++ new/libretro-3dengine-0~git20210107/libretro-common/streams/stdin_stream.c
2021-01-07 20:15:03.000000000 +0100
@@ -38,7 +38,7 @@
#include <retro_environment.h>
#include <streams/stdin_stream.h>
-#if (defined(_WIN32) && defined(_XBOX)) || defined(__CELLOS_LV2__) ||
defined(__WINRT__)
+#if (defined(_WIN32) && defined(_XBOX)) || defined(__WINRT__)
size_t read_stdin(char *buf, size_t size)
{
/* Not implemented. */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libretro-3dengine-0~git20191116/libretro-common/vfs/vfs_implementation.c
new/libretro-3dengine-0~git20210107/libretro-common/vfs/vfs_implementation.c
---
old/libretro-3dengine-0~git20191116/libretro-common/vfs/vfs_implementation.c
2019-11-16 09:40:03.000000000 +0100
+++
new/libretro-3dengine-0~git20210107/libretro-common/vfs/vfs_implementation.c
2021-01-07 20:15:03.000000000 +0100
@@ -68,16 +68,7 @@
# endif
#endif
-#ifdef __CELLOS_LV2__
-#include <cell/cell_fs.h>
-#define O_RDONLY CELL_FS_O_RDONLY
-#define O_WRONLY CELL_FS_O_WRONLY
-#define O_CREAT CELL_FS_O_CREAT
-#define O_TRUNC CELL_FS_O_TRUNC
-#define O_RDWR CELL_FS_O_RDWR
-#else
#include <fcntl.h>
-#endif
/* TODO: Some things are duplicated but I'm really afraid of breaking other
platforms by touching this */
#if defined(VITA)
@@ -102,7 +93,7 @@
# include <unistd.h>
#endif
-#if (defined(__CELLOS_LV2__) && !defined(__PSL1GHT__)) || defined(__QNX__) ||
defined(PSP) || defined(PS2)
+#if defined(__QNX__) || defined(PSP) || defined(PS2)
#include <unistd.h> /* stat() is defined here */
#endif
@@ -151,15 +142,11 @@
#include <fileXio.h>
#endif
-#if defined(__CELLOS_LV2__)
-#include <cell/cell_fs.h>
-#endif
-
#if defined(VITA)
#define FIO_S_ISDIR SCE_S_ISDIR
#endif
-#if (defined(__CELLOS_LV2__) && !defined(__PSL1GHT__)) || defined(__QNX__) ||
defined(PSP)
+#if defined(__QNX__) || defined(PSP)
#include <unistd.h> /* stat() is defined here */
#endif
@@ -205,7 +192,7 @@
/* VC2005 and up have a special 64-bit fseek */
#ifdef ATLEAST_VC2005
return _fseeki64(stream->fp, offset, whence);
-#elif defined(__CELLOS_LV2__) || defined(_MSC_VER) && _MSC_VER <= 1310
+#elif defined(_MSC_VER) && _MSC_VER <= 1310
return fseek(stream->fp, (long)offset, whence);
#elif defined(PS2)
{
@@ -947,24 +934,6 @@
return RETRO_VFS_STAT_IS_VALID | (is_dir ? RETRO_VFS_STAT_IS_DIRECTORY : 0)
| (is_character_special ? RETRO_VFS_STAT_IS_CHARACTER_SPECIAL : 0);
-#elif defined(__CELLOS_LV2__)
- /* CellOS Lv2 */
- bool is_dir;
- bool is_character_special = false;
- CellFsStat buf;
-
- if (!path || !*path)
- return 0;
- if (cellFsStat(path, &buf) < 0)
- return 0;
-
- if (size)
- *size = (int32_t)buf.st_size;
-
- is_dir = ((buf.st_mode & S_IFMT) == S_IFDIR);
-
- return RETRO_VFS_STAT_IS_VALID | (is_dir ? RETRO_VFS_STAT_IS_DIRECTORY : 0)
| (is_character_special ? RETRO_VFS_STAT_IS_CHARACTER_SPECIAL : 0);
-
#elif defined(_WIN32)
/* Windows */
bool is_dir;
@@ -1093,10 +1062,6 @@
#elif defined(PS2)
int directory;
iox_dirent_t entry;
-#elif defined(__CELLOS_LV2__)
- CellFsErrno error;
- int directory;
- CellFsDirent entry;
#elif defined(ORBIS)
int directory;
struct dirent entry;
@@ -1112,8 +1077,6 @@
return (rdir->directory == INVALID_HANDLE_VALUE);
#elif defined(VITA) || defined(PSP) || defined(PS2) || defined(ORBIS)
return (rdir->directory < 0);
-#elif defined(__CELLOS_LV2__)
- return (rdir->error != CELL_FS_SUCCEEDED);
#else
return !(rdir->directory);
#endif
@@ -1179,8 +1142,6 @@
#elif defined(_3DS)
rdir->directory = !string_is_empty(name) ? opendir(name) : NULL;
rdir->entry = NULL;
-#elif defined(__CELLOS_LV2__)
- rdir->error = cellFsOpendir(name, &rdir->directory);
#elif defined(ORBIS)
rdir->directory = orbisDopen(name);
#else
@@ -1221,10 +1182,6 @@
int ret = ps2fileXioDread(rdir->directory, &record);
rdir->entry = record;
return ( ret > 0);
-#elif defined(__CELLOS_LV2__)
- uint64_t nread;
- rdir->error = cellFsReaddir(rdir->directory, &rdir->entry, &nread);
- return (nread != 0);
#elif defined(ORBIS)
return (orbisDread(rdir->directory, &rdir->entry) > 0);
#else
@@ -1255,7 +1212,7 @@
}
#endif
return (char*)rdir->entry.cFileName;
-#elif defined(VITA) || defined(PSP) || defined(__CELLOS_LV2__) ||
defined(ORBIS)
+#elif defined(VITA) || defined(PSP) || defined(ORBIS)
return rdir->entry.d_name;
#elif defined(PS2)
return rdir->entry.name;
@@ -1281,9 +1238,6 @@
#elif defined(PS2)
const iox_dirent_t *entry = (const iox_dirent_t*)&rdir->entry;
return FIO_S_ISDIR(entry->stat.mode);
-#elif defined(__CELLOS_LV2__)
- CellFsDirent *entry = (CellFsDirent*)&rdir->entry;
- return (entry->d_type == CELL_FS_TYPE_DIRECTORY);
#elif defined(ORBIS)
const struct dirent *entry = &rdir->entry;
if (entry->d_type == DT_DIR)
@@ -1322,8 +1276,6 @@
sceIoDclose(rdir->directory);
#elif defined(PS2)
ps2fileXioDclose(rdir->directory);
-#elif defined(__CELLOS_LV2__)
- rdir->error = cellFsClosedir(rdir->directory);
#elif defined(ORBIS)
orbisDclose(rdir->directory);
#else
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libretro-3dengine-0~git20191116/shared.hpp
new/libretro-3dengine-0~git20210107/shared.hpp
--- old/libretro-3dengine-0~git20191116/shared.hpp 2019-11-16
09:40:03.000000000 +0100
+++ new/libretro-3dengine-0~git20210107/shared.hpp 2021-01-07
20:15:03.000000000 +0100
@@ -28,7 +28,7 @@
#include <tr1/memory>
#endif
-#if defined(__QNX__) || defined(__CELLOS_LV2__) || defined(IOS) || defined(OSX)
+#if defined(__QNX__) || defined(IOS) || defined(OSX)
namespace std1 = compat;
#elif !defined(EMSCRIPTEN)
namespace std1 = std::tr1;
