Attachment #196090 for bug #230537




# $FreeBSD$

PORTNAME=	emulationstation
DISTVERSION=	2.7.1
CATEGORIES=	emulators

MAINTAINER=	freebsd@coombscloud.com
COMMENT=	Cross-platform graphical front-end for emulators (RetroPie fork)

LICENSE=	UNKNOWN APACHE20
LICENSE_COMB=	multi
LICENSE_NAME_UNKNOWN=	unknown
LICENSE_FILE_UNKNOWN=	${WRKSRC}/LICENSE.md
LICENSE_PERMS_UNKNOWN=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept

LIB_DEPENDS=	libfreeimage.so:graphics/freeimage\
		libSDL2.so:devel/sdl20\
		libboost_system.so:devel/boost-libs\
		libboost_filesystem.so:devel/boost-libs\
		libboost_date_time.so:devel/boost-libs\
		libboost_locale.so:devel/boost-libs\
		libfreetype.so:print/freetype2\
		libcurl.so:ftp/curl\
		libvlc.so:multimedia/vlc\
		libpugixml.so:textproc/pugixml

USES+=		cmake compiler:gcc-c++11-lib pkgconfig

USE_GITHUB=	yes
GH_ACCOUNT=	RetroPie
GH_PROJECT=	EmulationStation
GH_TAGNAME=	b833b45

USE_GL+=	gl glu

PLIST_FILES=	bin/emulationstation

.include <bsd.port.mk>

Line 0 Link Here

(-)distinfo (+3 lines)
	1	TIMESTAMP = 1533948882
	2	SHA256 (RetroPie-EmulationStation-2.7.1-b833b45_GH0.tar.gz) = 872eaad1569d9c76e83e6734e5e269f65ecebc782df24fbda11dba63a7bd6855
	3	SIZE (RetroPie-EmulationStation-2.7.1-b833b45_GH0.tar.gz) = 1040103




Fix compiler error (missing include)

--- es-app/src/FileFilterIndex.h.orig	2018-08-11 01:19:16 UTC
+++ es-app/src/FileFilterIndex.h
@@ -4,6 +4,7 @@
 
 #include <map>
 #include <vector>
+#include <string>
 
 class FileData;
 




Use pugixml from ports, rather than embedded

--- es-app/src/MetaData.h.orig	2018-08-11 01:00:43 UTC
+++ es-app/src/MetaData.h
@@ -4,7 +4,7 @@
 
 #include <boost/date_time/posix_time/ptime.hpp>
 #include <boost/filesystem/path.hpp>
-#include <pugixml/src/pugixml.hpp>
+#include <pugixml.hpp>
 
 enum MetaDataType
 {




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
@@ -5,17 +5,13 @@
 #include "SystemData.h"
 #include <iostream>
 #include <signal.h>
-#if defined(__linux__)
 #include <unistd.h>
-#elif defined(WIN32)
-#include <Windows.h>
-#endif
 
 std::ostream& out = std::cout;
 
 void handle_interrupt_signal(int p)
 {
-	sleep(50);
+	usleep(50);
 
 	LOG(LogInfo) << "Interrupt received during scrape...";
 




Use pugixml from ports, rather than embedded

--- es-core/src/InputConfig.h.orig	2018-08-11 01:03:59 UTC
+++ es-core/src/InputConfig.h
@@ -2,7 +2,7 @@
 #ifndef ES_CORE_INPUT_CONFIG_H
 #define ES_CORE_INPUT_CONFIG_H
 
-#include <pugixml/src/pugixml.hpp>
+#include <pugixml.hpp>
 #include <SDL_joystick.h>
 #include <SDL_keyboard.h>
 #include <map>




Fix compiler error (missing include)

--- es-core/src/PowerSaver.cpp.orig	2018-08-11 01:13:24 UTC
+++ es-core/src/PowerSaver.cpp
@@ -2,6 +2,7 @@
 
 #include "AudioManager.h"
 #include "Settings.h"
+#include <string>
 
 bool PowerSaver::mState = false;
 bool PowerSaver::mRunningScreenSaver = false;




Use pugixml from ports, rather than embedded

--- es-core/src/Settings.cpp.orig	2018-08-11 01:05:37 UTC
+++ es-core/src/Settings.cpp
@@ -3,7 +3,7 @@
 #include "Log.h"
 #include "platform.h"
 #include <boost/filesystem/operations.hpp>
-#include <pugixml/src/pugixml.hpp>
+#include <pugixml.hpp>
 
 Settings* Settings::sInstance = NULL;
 




Fix compiler error (missing include)

--- es-core/src/Sound.h.orig	2018-08-11 01:14:12 UTC
+++ es-core/src/Sound.h
@@ -5,6 +5,7 @@
 #include "SDL_audio.h"
 #include <map>
 #include <memory>
+#include <string>
 
 class ThemeData;
 




Use pugixml from ports, rather than embedded

--- es-core/src/ThemeData.h.orig	2018-08-11 01:03:37 UTC
+++ es-core/src/ThemeData.h
@@ -6,7 +6,7 @@
 #include <boost/filesystem/path.hpp>
 #include <boost/variant/get.hpp>
 #include <boost/variant/variant.hpp>
-#include <pugixml/src/pugixml.hpp>
+#include <pugixml.hpp>
 #include <deque>
 #include <map>
 #include <sstream>

Line 0 Link Here

(-)files/patch-external_CMakeLists.txt (+9 lines)
	1	Use pugixml from ports, rather than embedded
	2
	3	--- external/CMakeLists.txt.orig 2018-08-11 01:01:24 UTC
	4	+++ external/CMakeLists.txt
	5	@@ -2,4 +2,3 @@
	6	# package managers are included with the project (in the 'external' folder)
	7
	8	add_subdirectory("nanosvg")
	9	-add_subdirectory("pugixml")

Line 0 Link Here

(-)pkg-descr (+7 lines)
	1	EmulationStation is a cross-platform graphical front-end for emulators, with
	2	controller navigation.
	3
	4	Originally written by Alec "Aloshi" Lofquist, this is a fork by RetroPie.
	5
	6	WWW: https://emulationstation.org (original)
	7	https://github.com/RetroPie/EmulationStation (RetroPi Fork)

Return to bug 230537

Line 0 Link Here

(-)Makefile (+38 lines)
	1	# $FreeBSD$
	2
	3	PORTNAME= emulationstation
	4	DISTVERSION= 2.7.1
	5	CATEGORIES= emulators
	6
	7	MAINTAINER= freebsd@coombscloud.com
	8	COMMENT= Cross-platform graphical front-end for emulators (RetroPie fork)
	9
	10	LICENSE= UNKNOWN APACHE20
	11	LICENSE_COMB= multi
	12	LICENSE_NAME_UNKNOWN= unknown
	13	LICENSE_FILE_UNKNOWN= ${WRKSRC}/LICENSE.md
	14	LICENSE_PERMS_UNKNOWN= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
	15
	16	LIB_DEPENDS= libfreeimage.so:graphics/freeimage\
	17	libSDL2.so:devel/sdl20\
	18	libboost_system.so:devel/boost-libs\
	19	libboost_filesystem.so:devel/boost-libs\
	20	libboost_date_time.so:devel/boost-libs\
	21	libboost_locale.so:devel/boost-libs\
	22	libfreetype.so:print/freetype2\
	23	libcurl.so:ftp/curl\
	24	libvlc.so:multimedia/vlc\
	25	libpugixml.so:textproc/pugixml
	26
	27	USES+= cmake compiler:gcc-c++11-lib pkgconfig
	28
	29	USE_GITHUB= yes
	30	GH_ACCOUNT= RetroPie
	31	GH_PROJECT= EmulationStation
	32	GH_TAGNAME= b833b45
	33
	34	USE_GL+= gl glu
	35
	36	PLIST_FILES= bin/emulationstation
	37
	38	.include <bsd.port.mk>

Line 0 Link Here

(-)files/patch-es-app_src_FileFilterIndex.h (+12 lines)
	1	Fix compiler error (missing include)
	2
	3	--- es-app/src/FileFilterIndex.h.orig 2018-08-11 01:19:16 UTC
	4	+++ es-app/src/FileFilterIndex.h
	5	@@ -4,6 +4,7 @@
	6
	7	#include <map>
	8	#include <vector>
	9	+#include <string>
	10
	11	class FileData;
	12

Line 0 Link Here

(-)files/patch-es-app_src_MetaData.h (+13 lines)
	1	Use pugixml from ports, rather than embedded
	2
	3	--- es-app/src/MetaData.h.orig 2018-08-11 01:00:43 UTC
	4	+++ es-app/src/MetaData.h
	5	@@ -4,7 +4,7 @@
	6
	7	#include <boost/date_time/posix_time/ptime.hpp>
	8	#include <boost/filesystem/path.hpp>
	9	-#include <pugixml/src/pugixml.hpp>
	10	+#include <pugixml.hpp>
	11
	12	enum MetaDataType
	13	{

Line 0 Link Here

(-)files/patch-es-app_src_ScraperCmdLine.cpp (+23 lines)
	1	Use POSIX sleep funtion, instead of Windows
	2
	3	--- es-app/src/ScraperCmdLine.cpp.orig 2018-08-11 01:17:21 UTC
	4	+++ es-app/src/ScraperCmdLine.cpp
	5	@@ -5,17 +5,13 @@
	6	#include "SystemData.h"
	7	#include <iostream>
	8	#include <signal.h>
	9	-#if defined(__linux__)
	10	#include <unistd.h>
	11	-#elif defined(WIN32)
	12	-#include <Windows.h>
	13	-#endif
	14
	15	std::ostream& out = std::cout;
	16
	17	void handle_interrupt_signal(int p)
	18	{
	19	- sleep(50);
	20	+ usleep(50);
	21
	22	LOG(LogInfo) << "Interrupt received during scrape...";
	23

Line 0 Link Here

(-)files/patch-es-core_src_InputConfig.h (+13 lines)
	1	Use pugixml from ports, rather than embedded
	2
	3	--- es-core/src/InputConfig.h.orig 2018-08-11 01:03:59 UTC
	4	+++ es-core/src/InputConfig.h
	5	@@ -2,7 +2,7 @@
	6	#ifndef ES_CORE_INPUT_CONFIG_H
	7	#define ES_CORE_INPUT_CONFIG_H
	8
	9	-#include <pugixml/src/pugixml.hpp>
	10	+#include <pugixml.hpp>
	11	#include <SDL_joystick.h>
	12	#include <SDL_keyboard.h>
	13	#include <map>

Line 0 Link Here

(-)files/patch-es-core_src_PowerSaver.cpp (+12 lines)
	1	Fix compiler error (missing include)
	2
	3	--- es-core/src/PowerSaver.cpp.orig 2018-08-11 01:13:24 UTC
	4	+++ es-core/src/PowerSaver.cpp
	5	@@ -2,6 +2,7 @@
	6
	7	#include "AudioManager.h"
	8	#include "Settings.h"
	9	+#include <string>
	10
	11	bool PowerSaver::mState = false;
	12	bool PowerSaver::mRunningScreenSaver = false;

Line 0 Link Here

(-)files/patch-es-core_src_Settings.cpp (+13 lines)
	1	Use pugixml from ports, rather than embedded
	2
	3	--- es-core/src/Settings.cpp.orig 2018-08-11 01:05:37 UTC
	4	+++ es-core/src/Settings.cpp
	5	@@ -3,7 +3,7 @@
	6	#include "Log.h"
	7	#include "platform.h"
	8	#include <boost/filesystem/operations.hpp>
	9	-#include <pugixml/src/pugixml.hpp>
	10	+#include <pugixml.hpp>
	11
	12	Settings* Settings::sInstance = NULL;
	13

Line 0 Link Here

(-)files/patch-es-core_src_Sound.h (+12 lines)
	1	Fix compiler error (missing include)
	2
	3	--- es-core/src/Sound.h.orig 2018-08-11 01:14:12 UTC
	4	+++ es-core/src/Sound.h
	5	@@ -5,6 +5,7 @@
	6	#include "SDL_audio.h"
	7	#include <map>
	8	#include <memory>
	9	+#include <string>
	10
	11	class ThemeData;
	12

Line 0 Link Here

(-)files/patch-es-core_src_ThemeData.h (+13 lines)
	1	Use pugixml from ports, rather than embedded
	2
	3	--- es-core/src/ThemeData.h.orig 2018-08-11 01:03:37 UTC
	4	+++ es-core/src/ThemeData.h
	5	@@ -6,7 +6,7 @@
	6	#include <boost/filesystem/path.hpp>
	7	#include <boost/variant/get.hpp>
	8	#include <boost/variant/variant.hpp>
	9	-#include <pugixml/src/pugixml.hpp>
	10	+#include <pugixml.hpp>
	11	#include <deque>
	12	#include <map>
	13	#include <sstream>