Attachment #247286 for bug #273676

View | Details | Raw Unified | Return to bug 273676
Collapse All | Expand All




PORTNAME=	emulationstation
DISTVERSIONPREFIX=	v
DISTVERSION=	2.11.2
PORTREVISION=	5
CATEGORIES=	emulators

MAINTAINER=	freebsd@coombscloud.com

LICENSE_FILE_APACHE20=	${WRKSRC}/opensans_license.txt
LICENSE_FILE_MIT=	${WRKSRC}/LICENSE.md

BUILD_DEPENDS=	${LOCALBASE}/include/rapidjson/document.h:devel/rapidjson \
		pugixml>0:textproc/pugixml
LIB_DEPENDS=	libboost_date_time.so:devel/boost-libs \
		libboost_filesystem.so:devel/boost-libs \
		libboost_locale.so:devel/boost-libs \

		libpugixml.so:textproc/pugixml \
		libvlc.so:multimedia/vlc

USES=		cmake gl pkgconfig sdl
USE_GITHUB=	yes
GH_ACCOUNT=	RetroPie
GH_PROJECT=	EmulationStation
USE_GCC=	yes
USE_GL=		gl glu
USE_SDL=	sdl2


Lines 1-3 Link Here

(-)b/emulators/emulationstation/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1606557422	1	TIMESTAMP = 1703604202
2	SHA256 (RetroPie-EmulationStation-v2.9.4_GH0.tar.gz) = 79452f6c1e8aaebe98c19708b3587a0a45330bf20b3301d556285d5cd756fa4a	2	SHA256 (RetroPie-EmulationStation-v2.11.2_GH0.tar.gz) = 6b632fe68bad5c3e0567e3bb171fe18ad7b2f8b1531d1297a7a91be95bf8734a
3	SIZE (RetroPie-EmulationStation-v2.9.4_GH0.tar.gz) = 852960	3	SIZE (RetroPie-EmulationStation-v2.11.2_GH0.tar.gz) = 942655

Added Link Here

(-)b/emulators/emulationstation/files/patch-es-app_src_SystemData.h (+11 lines)
1	--- es-app/src/SystemData.h.orig 2023-12-18 20:19:11 UTC
2	+++ es-app/src/SystemData.h
3	@@ -9,7 +9,7 @@
4	#include <string>
5	#include <vector>
6
7	-#include <pugixml/src/pugixml.hpp>
8	+#include <pugixml.hpp>
9
10	class FileData;
11	class FileFilterIndex;




--- es-core/src/utils/FileSystemUtil.cpp.orig	2023-12-18 20:00:52 UTC
+++ es-core/src/utils/FileSystemUtil.cpp
@@ -578,10 +578,10 @@ namespace Utils
 				CloseHandle(hFile);
 			}
 #else // _WIN32
-			struct stat64 info;
+			struct stat info;
 
-			// check if lstat64 succeeded
-			if(lstat64(path.c_str(), &info) == 0)
+			// check if lstat succeeded
+			if(lstat(path.c_str(), &info) == 0)
 			{
 				resolved.resize(info.st_size);
 				if(readlink(path.c_str(), (char*)resolved.data(), resolved.size()) > 0)
@@ -658,9 +658,9 @@ namespace Utils
 			if(pathExistsIndex.find(_path) == pathExistsIndex.cend())
 			{
 				const std::string path = getGenericPath(_path);
-				struct stat64 info;
-				// check if stat64 succeeded
-				pathExistsIndex[_path] = (stat64(path.c_str(), &info) == 0);
+				struct stat info;
+				// check if stat succeeded
+				pathExistsIndex[_path] = (stat(path.c_str(), &info) == 0);
 			}
 
 			return pathExistsIndex.at(_path);
@@ -686,10 +686,10 @@ namespace Utils
 		bool isRegularFile(const std::string& _path)
 		{
 			const std::string path = getGenericPath(_path);
-			struct stat64     info;
+			struct stat     info;
 
-			// check if stat64 succeeded
-			if(stat64(path.c_str(), &info) != 0)
+			// check if stat succeeded
+			if(stat(path.c_str(), &info) != 0)
 				return false;
 
 			// check for S_IFREG attribute
@@ -702,10 +702,10 @@ namespace Utils
 		bool isDirectory(const std::string& _path)
 		{
 			const std::string path = getGenericPath(_path);
-			struct stat64     info;
+			struct stat     info;
 
-			// check if stat64 succeeded
-			if(stat64(path.c_str(), &info) != 0)
+			// check if stat succeeded
+			if(stat(path.c_str(), &info) != 0)
 				return false;
 
 			// check for S_IFDIR attribute
@@ -725,10 +725,10 @@ namespace Utils
 			if((Attributes != INVALID_FILE_ATTRIBUTES) && (Attributes & FILE_ATTRIBUTE_REPARSE_POINT))
 				return true;
 #else // _WIN32
-			struct stat64 info;
+			struct stat info;
 
-			// check if lstat64 succeeded
-			if(lstat64(path.c_str(), &info) != 0)
+			// check if lstat succeeded
+			if(lstat(path.c_str(), &info) != 0)
 				return false;
 
 			// check for S_IFLNK attribute
@@ -772,10 +772,10 @@ namespace Utils
 			// regular files and executables, but not setuid, setgid, shared text
 			const mode_t mask = S_IFREG;
 			const mode_t mask_exec = S_IXUSR | S_IXGRP | S_IXOTH;
-			struct stat64 info;
+			struct stat info;
 
-			// check if stat64 succeeded
-			if(stat64(path.c_str(), &info) != 0)
+			// check if stat succeeded
+			if(stat(path.c_str(), &info) != 0)
 				return false;
 
 			// check for mask attributes
@@ -670,8 +670,8 @@ namespace Utils
 		} // isHidden
 #ifndef WIN32 // osx / linux
 		bool isExecutable(const std::string& _path) {
-			struct stat64 st;
-			if(stat64(_path.c_str(), &st) == 0){
+			struct stat st;
+			if(stat(_path.c_str(), &st) == 0){
 				mode_t perm = st.st_mode;
 				// regular files and executables but not setuid, setgid, shared text (mode 0755)
 				mode_t mask = S_IFREG | S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH;

Removed Link Here

(-)a/emulators/emulationstation/files/patch-es-core_src_utils_TimeUtil.h (-10 lines)
1	--- es-core/src/utils/TimeUtil.h.orig 2020-11-29 11:32:59 UTC
2	+++ es-core/src/utils/TimeUtil.h
3	@@ -3,6 +3,7 @@
4	#define ES_CORE_UTILS_TIME_UTIL_H
5
6	#include <string>
7	+#include <time.h>
8
9	namespace Utils
10	{

Lines 53-58 share/EmulationStation/resources/help/dpad_updown.svg Link Here

(-)b/emulators/emulationstation/pkg-plist (-1 / +1 lines)
53	share/EmulationStation/resources/mamebioses.xml	53	share/EmulationStation/resources/mamebioses.xml
54	share/EmulationStation/resources/mamedevices.xml	54	share/EmulationStation/resources/mamedevices.xml
55	share/EmulationStation/resources/mamenames.xml	55	share/EmulationStation/resources/mamenames.xml
		56	share/EmulationStation/resources/mameres.py
56	share/EmulationStation/resources/off.svg	57	share/EmulationStation/resources/off.svg
57	share/EmulationStation/resources/on.svg	58	share/EmulationStation/resources/on.svg
58	share/EmulationStation/resources/opensans_hebrew_condensed_light.ttf	59	share/EmulationStation/resources/opensans_hebrew_condensed_light.ttf
59	-

Return to bug 273676

Lines 1-7 Link Here

(-)b/emulators/emulationstation/Makefile (-4 / +5 lines)
1	PORTNAME= emulationstation	1	PORTNAME= emulationstation
2	DISTVERSIONPREFIX= v	2	DISTVERSIONPREFIX= v
3	DISTVERSION= 2.9.4	3	DISTVERSION= 2.11.2
4	PORTREVISION= 5
5	CATEGORIES= emulators	4	CATEGORIES= emulators
6		5
7	MAINTAINER= freebsd@coombscloud.com	6	MAINTAINER= freebsd@coombscloud.com
Lines 13-19 LICENSE_COMB= multi Link Here
13	LICENSE_FILE_APACHE20= ${WRKSRC}/opensans_license.txt	12	LICENSE_FILE_APACHE20= ${WRKSRC}/opensans_license.txt
14	LICENSE_FILE_MIT= ${WRKSRC}/LICENSE.md	13	LICENSE_FILE_MIT= ${WRKSRC}/LICENSE.md
15		14
16	BUILD_DEPENDS= ${LOCALBASE}/include/rapidjson/document.h:devel/rapidjson	15	BUILD_DEPENDS= ${LOCALBASE}/include/rapidjson/document.h:devel/rapidjson \
		16	pugixml>0:textproc/pugixml
17	LIB_DEPENDS= libboost_date_time.so:devel/boost-libs \	17	LIB_DEPENDS= libboost_date_time.so:devel/boost-libs \
18	libboost_filesystem.so:devel/boost-libs \	18	libboost_filesystem.so:devel/boost-libs \
19	libboost_locale.so:devel/boost-libs \	19	libboost_locale.so:devel/boost-libs \
Lines 24-33 LIB_DEPENDS= libboost_date_time.so:devel/boost-libs \ Link Here
24	libpugixml.so:textproc/pugixml \	24	libpugixml.so:textproc/pugixml \
25	libvlc.so:multimedia/vlc	25	libvlc.so:multimedia/vlc
26		26
27	USES= cmake compiler:gcc-c++11-lib gl pkgconfig sdl	27	USES= cmake gl pkgconfig sdl
28	USE_GITHUB= yes	28	USE_GITHUB= yes
29	GH_ACCOUNT= RetroPie	29	GH_ACCOUNT= RetroPie
30	GH_PROJECT= EmulationStation	30	GH_PROJECT= EmulationStation
		31	USE_GCC= yes
31	USE_GL= gl glu	32	USE_GL= gl glu
32	USE_SDL= sdl2	33	USE_SDL= sdl2
33		34

Lines 1-39 Link Here

(-)b/emulators/emulationstation/files/patch-es-core_src_utils_FileSystemUtil.cpp (-25 / +71 lines)
1	--- es-core/src/utils/FileSystemUtil.cpp.orig 2020-11-29 11:37:59 UTC	1	--- es-core/src/utils/FileSystemUtil.cpp.orig 2023-12-18 20:00:52 UTC
2	+++ es-core/src/utils/FileSystemUtil.cpp	2	+++ es-core/src/utils/FileSystemUtil.cpp
3	@@ -577,10 +577,10 @@ namespace Utils	3	@@ -578,10 +578,10 @@ namespace Utils
4	bool exists(const std::string& _path)	4	CloseHandle(hFile);
5	{	5	}
6	std::string path = getGenericPath(_path);	6	#else // _WIN32
7	- struct stat64 info;	7	- struct stat64 info;
8	+ struct stat info;	8	+ struct stat info;
9		9
10	// check if stat64 succeeded	10	- // check if lstat64 succeeded
11	- return (stat64(path.c_str(), &info) == 0);	11	- if(lstat64(path.c_str(), &info) == 0)
12	+ return (stat(path.c_str(), &info) == 0);	12	+ // check if lstat succeeded
13		13	+ if(lstat(path.c_str(), &info) == 0)
14	} // exists	14	{
		15	resolved.resize(info.st_size);
		16	if(readlink(path.c_str(), (char*)resolved.data(), resolved.size()) > 0)
		17	@@ -658,9 +658,9 @@ namespace Utils
		18	if(pathExistsIndex.find(_path) == pathExistsIndex.cend())
		19	{
		20	const std::string path = getGenericPath(_path);
		21	- struct stat64 info;
		22	- // check if stat64 succeeded
		23	- pathExistsIndex[_path] = (stat64(path.c_str(), &info) == 0);
		24	+ struct stat info;
		25	+ // check if stat succeeded
		26	+ pathExistsIndex[_path] = (stat(path.c_str(), &info) == 0);
		27	}
15		28
16	@@ -599,10 +599,10 @@ namespace Utils	29	return pathExistsIndex.at(_path);
		30	@@ -686,10 +686,10 @@ namespace Utils
17	bool isRegularFile(const std::string& _path)	31	bool isRegularFile(const std::string& _path)
18	{	32	{
19	std::string path = getGenericPath(_path);	33	const std::string path = getGenericPath(_path);
		34	- struct stat64 info;
		35	+ struct stat info;
		36
		37	- // check if stat64 succeeded
		38	- if(stat64(path.c_str(), &info) != 0)
		39	+ // check if stat succeeded
		40	+ if(stat(path.c_str(), &info) != 0)
		41	return false;
		42
		43	// check for S_IFREG attribute
		44	@@ -702,10 +702,10 @@ namespace Utils
		45	bool isDirectory(const std::string& _path)
		46	{
		47	const std::string path = getGenericPath(_path);
		48	- struct stat64 info;
		49	+ struct stat info;
		50
		51	- // check if stat64 succeeded
		52	- if(stat64(path.c_str(), &info) != 0)
		53	+ // check if stat succeeded
		54	+ if(stat(path.c_str(), &info) != 0)
		55	return false;
		56
		57	// check for S_IFDIR attribute
		58	@@ -725,10 +725,10 @@ namespace Utils
		59	if((Attributes != INVALID_FILE_ATTRIBUTES) && (Attributes & FILE_ATTRIBUTE_REPARSE_POINT))
		60	return true;
		61	#else // _WIN32
		62	- struct stat64 info;
		63	+ struct stat info;
		64
		65	- // check if lstat64 succeeded
		66	- if(lstat64(path.c_str(), &info) != 0)
		67	+ // check if lstat succeeded
		68	+ if(lstat(path.c_str(), &info) != 0)
		69	return false;
		70
		71	// check for S_IFLNK attribute
		72	@@ -772,10 +772,10 @@ namespace Utils
		73	// regular files and executables, but not setuid, setgid, shared text
		74	const mode_t mask = S_IFREG;
		75	const mode_t mask_exec = S_IXUSR \| S_IXGRP \| S_IXOTH;
20	- struct stat64 info;	76	- struct stat64 info;
21	+ struct stat info;	77	+ struct stat info;
22		78
23	// check if stat64 succeeded	79	- // check if stat64 succeeded
24	- if(stat64(path.c_str(), &info) != 0)	80	- if(stat64(path.c_str(), &info) != 0)
		81	+ // check if stat succeeded
25	+ if(stat(path.c_str(), &info) != 0)	82	+ if(stat(path.c_str(), &info) != 0)
26	return false;	83	return false;
27		84
28	// check for S_IFREG attribute	85	// check for mask attributes
29	@@ -670,8 +670,8 @@ namespace Utils
30	} // isHidden
31	#ifndef WIN32 // osx / linux
32	bool isExecutable(const std::string& _path) {
33	- struct stat64 st;
34	- if(stat64(_path.c_str(), &st) == 0){
35	+ struct stat st;
36	+ if(stat(_path.c_str(), &st) == 0){
37	mode_t perm = st.st_mode;
38	// regular files and executables but not setuid, setgid, shared text (mode 0755)
39	mode_t mask = S_IFREG \| S_IRWXU \| S_IRGRP \| S_IXGRP \| S_IROTH \| S_IXOTH;