svn commit: r563600 - in head/emulators/emulationstation: . files
Fernando Apesteguía
fernape at FreeBSD.org
Mon Feb 1 17:50:00 UTC 2021
Author: fernape
Date: Mon Feb 1 17:49:58 2021
New Revision: 563600
URL: https://svnweb.freebsd.org/changeset/ports/563600
Log:
emulators/emulationstation: Update to 2.9.4
ChangeLog: https://github.com/RetroPie/EmulationStation/compare/v2.9.4...master
PR: 251474
Submitted by: freebsd at coombscloud.com (maintainer)
Added:
head/emulators/emulationstation/files/patch-CMakeLists.txt (contents, props changed)
head/emulators/emulationstation/files/patch-es-app_CMakeLists.txt (contents, props changed)
head/emulators/emulationstation/files/patch-es-core_src_resources_ResourceManager.cpp (contents, props changed)
head/emulators/emulationstation/files/patch-es-core_src_utils_FileSystemUtil.cpp (contents, props changed)
head/emulators/emulationstation/files/patch-es-core_src_utils_TimeUtil.h (contents, props changed)
head/emulators/emulationstation/pkg-plist (contents, props changed)
Deleted:
head/emulators/emulationstation/files/patch-es-app_src_FileFilterIndex.h
head/emulators/emulationstation/files/patch-es-app_src_MetaData.h
head/emulators/emulationstation/files/patch-es-core_src_InputConfig.h
head/emulators/emulationstation/files/patch-es-core_src_PowerSaver.cpp
head/emulators/emulationstation/files/patch-es-core_src_Settings.cpp
head/emulators/emulationstation/files/patch-es-core_src_Sound.h
head/emulators/emulationstation/files/patch-es-core_src_ThemeData.h
Modified:
head/emulators/emulationstation/Makefile
head/emulators/emulationstation/distinfo
head/emulators/emulationstation/files/patch-es-app_src_ScraperCmdLine.cpp
Modified: head/emulators/emulationstation/Makefile
==============================================================================
--- head/emulators/emulationstation/Makefile Mon Feb 1 17:47:29 2021 (r563599)
+++ head/emulators/emulationstation/Makefile Mon Feb 1 17:49:58 2021 (r563600)
@@ -2,8 +2,7 @@
PORTNAME= emulationstation
DISTVERSIONPREFIX= v
-DISTVERSION= 2.7.1
-PORTREVISION= 4
+DISTVERSION= 2.9.4
CATEGORIES= emulators
MAINTAINER= freebsd at coombscloud.com
@@ -14,6 +13,7 @@ LICENSE_COMB= multi
LICENSE_FILE_APACHE20= ${WRKSRC}/opensans_license.txt
LICENSE_FILE_MIT= ${WRKSRC}/LICENSE.md
+BUILD_DEPENDS= ${LOCALBASE}/include/rapidjson/document.h:devel/rapidjson
LIB_DEPENDS= libboost_date_time.so:devel/boost-libs \
libboost_filesystem.so:devel/boost-libs \
libboost_locale.so:devel/boost-libs \
@@ -31,11 +31,24 @@ GH_PROJECT= EmulationStation
USE_GL= gl glu
USE_SDL= sdl2
-PLIST_FILES= bin/emulationstation
PORTDOCS= CREDITS.md DEVNOTES.md GAMELISTS.md README.md SYSTEMS.md \
THEMES.md
OPTIONS_DEFINE= DOCS
+
+post-patch:
+ @${REINPLACE_CMD} -e 's|<pugixml/src/pugixml.hpp>|<pugixml.hpp>|g' \
+ ${WRKSRC}/es-app/src/CollectionSystemManager.cpp \
+ ${WRKSRC}/es-app/src/Gamelist.cpp \
+ ${WRKSRC}/es-app/src/MetaData.cpp \
+ ${WRKSRC}/es-app/src/SystemData.cpp \
+ ${WRKSRC}/es-app/src/scrapers/GamesDBJSONScraper.cpp \
+ ${WRKSRC}/es-app/src/scrapers/ScreenScraper.cpp \
+ ${WRKSRC}/es-core/src/InputConfig.cpp \
+ ${WRKSRC}/es-core/src/InputManager.cpp \
+ ${WRKSRC}/es-core/src/MameNames.cpp \
+ ${WRKSRC}/es-core/src/Settings.cpp \
+ ${WRKSRC}/es-core/src/ThemeData.cpp
post-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
Modified: head/emulators/emulationstation/distinfo
==============================================================================
--- head/emulators/emulationstation/distinfo Mon Feb 1 17:47:29 2021 (r563599)
+++ head/emulators/emulationstation/distinfo Mon Feb 1 17:49:58 2021 (r563600)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1548463566
-SHA256 (RetroPie-EmulationStation-v2.7.1_GH0.tar.gz) = 07415511cc5abf36ba2e35d97bd2f651947040bcc8af9cffc491724a19afb214
-SIZE (RetroPie-EmulationStation-v2.7.1_GH0.tar.gz) = 1040103
+TIMESTAMP = 1606557422
+SHA256 (RetroPie-EmulationStation-v2.9.4_GH0.tar.gz) = 79452f6c1e8aaebe98c19708b3587a0a45330bf20b3301d556285d5cd756fa4a
+SIZE (RetroPie-EmulationStation-v2.9.4_GH0.tar.gz) = 852960
Added: head/emulators/emulationstation/files/patch-CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/emulators/emulationstation/files/patch-CMakeLists.txt Mon Feb 1 17:49:58 2021 (r563600)
@@ -0,0 +1,23 @@
+--- CMakeLists.txt.orig 2020-11-01 21:39:18 UTC
++++ CMakeLists.txt
+@@ -16,6 +16,10 @@ endif()
+
+ project(emulationstation-all)
+
++# program name to be used as a reference when looking up resources
++set(AppDataName "EmulationStation" CACHE STRING "Internal program name passed to compiler")
++add_definitions(-DAPPDATANAME="${AppDataName}")
++
+ #-------------------------------------------------------------------------------
+ #add local find scripts to CMAKE path
+ LIST(APPEND CMAKE_MODULE_PATH
+@@ -244,6 +248,9 @@ set(dir ${CMAKE_CURRENT_SOURCE_DIR})
+ set(EXECUTABLE_OUTPUT_PATH ${dir} CACHE PATH "Build directory" FORCE)
+ set(LIBRARY_OUTPUT_PATH ${dir} CACHE PATH "Build directory" FORCE)
+
++# install rules for resources
++include(GNUInstallDirs)
++install(DIRECTORY resources DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/${AppDataName}/")
+
+ #-------------------------------------------------------------------------------
+ # add each component
Added: head/emulators/emulationstation/files/patch-es-app_CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/emulators/emulationstation/files/patch-es-app_CMakeLists.txt Mon Feb 1 17:49:58 2021 (r563600)
@@ -0,0 +1,14 @@
+--- es-app/CMakeLists.txt.orig 2020-11-29 16:39:56 UTC
++++ es-app/CMakeLists.txt
+@@ -143,9 +143,10 @@ endif()
+ #-------------------------------------------------------------------------------
+ # set up CPack install stuff so `make install` does something useful
+
++include(GNUInstallDirs)
+ install(TARGETS emulationstation
+ RUNTIME
+- DESTINATION bin)
++ DESTINATION "${CMAKE_INSTALL_BINDIR}")
+
+ INCLUDE(InstallRequiredSystemLibraries)
+
Modified: head/emulators/emulationstation/files/patch-es-app_src_ScraperCmdLine.cpp
==============================================================================
--- head/emulators/emulationstation/files/patch-es-app_src_ScraperCmdLine.cpp Mon Feb 1 17:47:29 2021 (r563599)
+++ head/emulators/emulationstation/files/patch-es-app_src_ScraperCmdLine.cpp Mon Feb 1 17:49:58 2021 (r563600)
@@ -1,6 +1,4 @@
-Use POSIX sleep funtion, instead of Windows
-
---- es-app/src/ScraperCmdLine.cpp.orig 2018-08-11 01:17:21 UTC
+--- es-app/src/ScraperCmdLine.cpp.orig 2020-11-29 11:43:15 UTC
+++ es-app/src/ScraperCmdLine.cpp
@@ -5,17 +5,13 @@
#include "SystemData.h"
@@ -14,7 +12,7 @@ Use POSIX sleep funtion, instead of Windows
std::ostream& out = std::cout;
- void handle_interrupt_signal(int p)
+ void handle_interrupt_signal(int /*p*/)
{
- sleep(50);
+ usleep(50);
Added: head/emulators/emulationstation/files/patch-es-core_src_resources_ResourceManager.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/emulators/emulationstation/files/patch-es-core_src_resources_ResourceManager.cpp Mon Feb 1 17:49:58 2021 (r563600)
@@ -0,0 +1,33 @@
+--- es-core/src/resources/ResourceManager.cpp.orig 2020-11-29 16:33:50 UTC
++++ es-core/src/resources/ResourceManager.cpp
+@@ -3,6 +3,10 @@
+ #include "utils/FileSystemUtil.h"
+ #include <fstream>
+
++#ifndef APPDATANAME
++#define APPDATANAME "EmulationStation"
++#endif
++
+ auto array_deleter = [](unsigned char* p) { delete[] p; };
+ auto nop_deleter = [](unsigned char* /*p*/) { };
+
+@@ -26,6 +30,19 @@ std::string ResourceManager::getResourcePath(const std
+ if((path[0] == ':') && (path[1] == '/'))
+ {
+ std::string test;
++
++ // check in standard AppData locations
++ test = Utils::FileSystem::getHomePath() + "/.local/share/" + APPDATANAME + "/resources/" + &path[2];
++ if (Utils::FileSystem::exists(test))
++ return test;
++
++ test = std::string("/usr/local/share/") + APPDATANAME + "/resources/" + &path[2];
++ if (Utils::FileSystem::exists(test))
++ return test;
++
++ test = std::string("/usr/share/") + APPDATANAME + "/resources/" + &path[2];
++ if (Utils::FileSystem::exists(test))
++ return test;
+
+ // check in homepath
+ test = Utils::FileSystem::getHomePath() + "/.emulationstation/resources/" + &path[2];
Added: head/emulators/emulationstation/files/patch-es-core_src_utils_FileSystemUtil.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/emulators/emulationstation/files/patch-es-core_src_utils_FileSystemUtil.cpp Mon Feb 1 17:49:58 2021 (r563600)
@@ -0,0 +1,39 @@
+--- es-core/src/utils/FileSystemUtil.cpp.orig 2020-11-29 11:37:59 UTC
++++ es-core/src/utils/FileSystemUtil.cpp
+@@ -577,10 +577,10 @@ namespace Utils
+ bool exists(const std::string& _path)
+ {
+ std::string path = getGenericPath(_path);
+- struct stat64 info;
++ struct stat info;
+
+ // check if stat64 succeeded
+- return (stat64(path.c_str(), &info) == 0);
++ return (stat(path.c_str(), &info) == 0);
+
+ } // exists
+
+@@ -599,10 +599,10 @@ namespace Utils
+ bool isRegularFile(const std::string& _path)
+ {
+ std::string path = getGenericPath(_path);
+- struct stat64 info;
++ struct stat info;
+
+ // check if stat64 succeeded
+- if(stat64(path.c_str(), &info) != 0)
++ if(stat(path.c_str(), &info) != 0)
+ return false;
+
+ // check for S_IFREG attribute
+@@ -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;
Added: head/emulators/emulationstation/files/patch-es-core_src_utils_TimeUtil.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/emulators/emulationstation/files/patch-es-core_src_utils_TimeUtil.h Mon Feb 1 17:49:58 2021 (r563600)
@@ -0,0 +1,10 @@
+--- es-core/src/utils/TimeUtil.h.orig 2020-11-29 11:32:59 UTC
++++ es-core/src/utils/TimeUtil.h
+@@ -3,6 +3,7 @@
+ #define ES_CORE_UTILS_TIME_UTIL_H
+
+ #include <string>
++#include <time.h>
+
+ namespace Utils
+ {
Added: head/emulators/emulationstation/pkg-plist
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/emulators/emulationstation/pkg-plist Mon Feb 1 17:49:58 2021 (r563600)
@@ -0,0 +1,68 @@
+bin/emulationstation
+share/EmulationStation/resources/arrow.svg
+share/EmulationStation/resources/busy_0.svg
+share/EmulationStation/resources/busy_1.svg
+share/EmulationStation/resources/busy_2.svg
+share/EmulationStation/resources/busy_3.svg
+share/EmulationStation/resources/button.png
+share/EmulationStation/resources/button_filled.png
+share/EmulationStation/resources/cartridge.svg
+share/EmulationStation/resources/checkbox_checked.svg
+share/EmulationStation/resources/checkbox_unchecked.svg
+share/EmulationStation/resources/fav_add.svg
+share/EmulationStation/resources/fav_remove.svg
+share/EmulationStation/resources/folder.svg
+share/EmulationStation/resources/frame.png
+share/EmulationStation/resources/help/analog_down.svg
+share/EmulationStation/resources/help/analog_left.svg
+share/EmulationStation/resources/help/analog_right.svg
+share/EmulationStation/resources/help/analog_stick.svg
+share/EmulationStation/resources/help/analog_thumb.svg
+share/EmulationStation/resources/help/analog_up.svg
+share/EmulationStation/resources/help/button_1.svg
+share/EmulationStation/resources/help/button_2.svg
+share/EmulationStation/resources/help/button_3.svg
+share/EmulationStation/resources/help/button_4.svg
+share/EmulationStation/resources/help/button_a.svg
+share/EmulationStation/resources/help/button_b.svg
+share/EmulationStation/resources/help/button_circle.svg
+share/EmulationStation/resources/help/button_cross.svg
+share/EmulationStation/resources/help/button_hotkey.svg
+share/EmulationStation/resources/help/button_l.svg
+share/EmulationStation/resources/help/button_lr.svg
+share/EmulationStation/resources/help/button_lt.svg
+share/EmulationStation/resources/help/button_r.svg
+share/EmulationStation/resources/help/button_rt.svg
+share/EmulationStation/resources/help/button_select.svg
+share/EmulationStation/resources/help/button_square.svg
+share/EmulationStation/resources/help/button_start.svg
+share/EmulationStation/resources/help/button_triangle.svg
+share/EmulationStation/resources/help/button_x.svg
+share/EmulationStation/resources/help/button_y.svg
+share/EmulationStation/resources/help/buttons_east.svg
+share/EmulationStation/resources/help/buttons_north.svg
+share/EmulationStation/resources/help/buttons_south.svg
+share/EmulationStation/resources/help/buttons_west.svg
+share/EmulationStation/resources/help/dpad_all.svg
+share/EmulationStation/resources/help/dpad_down.svg
+share/EmulationStation/resources/help/dpad_left.svg
+share/EmulationStation/resources/help/dpad_leftright.svg
+share/EmulationStation/resources/help/dpad_right.svg
+share/EmulationStation/resources/help/dpad_up.svg
+share/EmulationStation/resources/help/dpad_updown.svg
+share/EmulationStation/resources/mamebioses.xml
+share/EmulationStation/resources/mamedevices.xml
+share/EmulationStation/resources/mamenames.xml
+share/EmulationStation/resources/off.svg
+share/EmulationStation/resources/on.svg
+share/EmulationStation/resources/opensans_hebrew_condensed_light.ttf
+share/EmulationStation/resources/opensans_hebrew_condensed_regular.ttf
+share/EmulationStation/resources/option_arrow.svg
+share/EmulationStation/resources/scroll_gradient.png
+share/EmulationStation/resources/slider_knob.svg
+share/EmulationStation/resources/splash.svg
+share/EmulationStation/resources/star_filled.svg
+share/EmulationStation/resources/star_unfilled.svg
+share/EmulationStation/resources/textinput_ninepatch.png
+share/EmulationStation/resources/textinput_ninepatch_active.png
+share/EmulationStation/resources/window_icon_256.png
More information about the svn-ports-all
mailing list