emulationstation: Update to 2.9.4. Hopefully fixes build.

8 files changed, 7 insertions, 87 deletions

diff --git a/emulators/emulationstation/Makefile b/emulators/emulationstation/Makefile
index 88ac32be58e..163132d497d 100644
--- a/emulators/emulationstation/Makefile
+++ b/emulators/emulationstation/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.32 2021/09/29 19:00:35 adam Exp $
+# $NetBSD: Makefile,v 1.33 2021/11/12 15:38:16 nia Exp $
 
-DISTNAME=	emulationstation-2.9.0
-PKGREVISION=	7
+DISTNAME=	emulationstation-2.9.4
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_GITHUB:=RetroPie/}
 GITHUB_PROJECT=	EmulationStation
@@ -14,7 +13,7 @@ LICENSE=	mit
 
 USE_CMAKE=	yes
 USE_TOOLS+=	pkg-config
-USE_LANGUAGES+=	c c++11
+USE_LANGUAGES+=	c c++
 GCC_REQD+=	4.7 # C++11
 
 WRKSRC=		${WRKDIR}/EmulationStation-${PKGVERSION_NOREV}
diff --git a/emulators/emulationstation/distinfo b/emulators/emulationstation/distinfo
index 5e1f979da70..58462fca252 100644
--- a/emulators/emulationstation/distinfo
+++ b/emulators/emulationstation/distinfo
@@ -1,14 +1,9 @@
-$NetBSD: distinfo,v 1.9 2021/10/26 10:23:49 nia Exp $
+$NetBSD: distinfo,v 1.10 2021/11/12 15:38:16 nia Exp $
 
-BLAKE2s (emulationstation-2.9.0.tar.gz) = 63c55e85d91597a40866caf9ca2c4b16a132902937993838f9f2d0df05a31bcf
-SHA512 (emulationstation-2.9.0.tar.gz) = e48b0338578b4840f633dbeffc692b3a225b448bf02e5770f2fe8ebf0d27bd8447bff69abbefe4864ec402f057f75b023f165bf708150ec7be0c8d632ac2156a
-Size (emulationstation-2.9.0.tar.gz) = 849388 bytes
-SHA1 (patch-es-app_src_FileFilterIndex.h) = f0adecf824f34d44038b7015360e2102a9962b89
-SHA1 (patch-es-app_src_MetaData.h) = 766871ec7b3bc3a142f502e9c61d4f431f65ddbd
+BLAKE2s (emulationstation-2.9.4.tar.gz) = a7e28f04b02e131de05d95d44c01dced2b7a7a5efc1e589eda053e5714f62d2e
+SHA512 (emulationstation-2.9.4.tar.gz) = aa2670668e0fac1c462351f98fd1440146dbb766fc08968a4c9c0b8181bf28646cd06e4bcc3b4baef9c46c5e54e3d2271bdc71c7fef28cda78550e0aae36ae04
+Size (emulationstation-2.9.4.tar.gz) = 852960 bytes
 SHA1 (patch-es-app_src_ScraperCmdLine.cpp) = cdb2ccc0a1cff45e407b3608c9c95b9aae7b3366
-SHA1 (patch-es-app_src_components_TextListComponent.h) = 63c33ad1f48a0654c881fc41455b22e3a8dc4c94
-SHA1 (patch-es-core_src_Settings.h) = 1c83a6d7ff35fc529fa808429b91ad783fc4b12a
-SHA1 (patch-es-core_src_Sound.h) = cc906d3eaa3450288cf139716becd6cd3794a822
 SHA1 (patch-es-core_src_components_ImageGridComponent.h) = f53ffe1528a351e58d99cfe76791c1ba4ab27b18
 SHA1 (patch-es-core_src_utils_FileSystemUtil.cpp) = bc0af15b0bd2bae44d8039911b2b1c6433f79b08
 SHA1 (patch-external_CMakeLists.txt) = d08cb2eecb59242ef1252338c6a79d6716ece8b1
diff --git a/emulators/emulationstation/patches/patch-es-app_src_FileFilterIndex.h b/emulators/emulationstation/patches/patch-es-app_src_FileFilterIndex.h
deleted file mode 100644
index 09d2ec0f8b9..00000000000
--- a/emulators/emulationstation/patches/patch-es-app_src_FileFilterIndex.h
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-es-app_src_FileFilterIndex.h,v 1.1 2020/04/20 00:35:23 joerg Exp $
-
---- es-app/src/FileFilterIndex.h.orig	2020-04-19 17:33:56.878739257 +0000
-+++ es-app/src/FileFilterIndex.h
-@@ -3,6 +3,7 @@
- #define ES_APP_FILE_FILTER_INDEX_H
- 
- #include <map>
-+#include <string>
- #include <vector>
- 
- class FileData;
diff --git a/emulators/emulationstation/patches/patch-es-app_src_MetaData.h b/emulators/emulationstation/patches/patch-es-app_src_MetaData.h
deleted file mode 100644
index 05059690ab8..00000000000
--- a/emulators/emulationstation/patches/patch-es-app_src_MetaData.h
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-es-app_src_MetaData.h,v 1.1 2020/04/20 00:35:23 joerg Exp $
-
---- es-app/src/MetaData.h.orig	2020-04-19 17:33:17.811997487 +0000
-+++ es-app/src/MetaData.h
-@@ -3,6 +3,7 @@
- #define ES_APP_META_DATA_H
- 
- #include <map>
-+#include <string>
- #include <vector>
- 
- namespace pugi { class xml_node; }
diff --git a/emulators/emulationstation/patches/patch-es-app_src_components_TextListComponent.h b/emulators/emulationstation/patches/patch-es-app_src_components_TextListComponent.h
deleted file mode 100644
index 6dcb86dae5b..00000000000
--- a/emulators/emulationstation/patches/patch-es-app_src_components_TextListComponent.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-es-app_src_components_TextListComponent.h,v 1.1 2015/02/21 02:01:59 joerg Exp $
-
---- es-app/src/components/TextListComponent.h.orig	2015-02-21 01:49:13.000000000 +0000
-+++ es-app/src/components/TextListComponent.h
-@@ -31,7 +31,7 @@ protected:
- 	using IList<TextListData, T>::getTransform;
- 	using IList<TextListData, T>::mSize;
- 	using IList<TextListData, T>::mCursor;
--	using IList<TextListData, T>::Entry;
-+	using typename IList<TextListData, T>::Entry;
- 
- public:
- 	using IList<TextListData, T>::size;
diff --git a/emulators/emulationstation/patches/patch-es-core_src_Settings.h b/emulators/emulationstation/patches/patch-es-core_src_Settings.h
deleted file mode 100644
index 95aaff81b2c..00000000000
--- a/emulators/emulationstation/patches/patch-es-core_src_Settings.h
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-es-core_src_Settings.h,v 1.1 2020/04/20 00:35:23 joerg Exp $
-
---- es-core/src/Settings.h.orig	2020-04-19 17:25:24.616894372 +0000
-+++ es-core/src/Settings.h
-@@ -3,6 +3,7 @@
- #define ES_CORE_SETTINGS_H
- 
- #include <map>
-+#include <string>
- 
- //This is a singleton for storing settings.
- class Settings
diff --git a/emulators/emulationstation/patches/patch-es-core_src_Sound.h b/emulators/emulationstation/patches/patch-es-core_src_Sound.h
deleted file mode 100644
index 8f55078a3c9..00000000000
--- a/emulators/emulationstation/patches/patch-es-core_src_Sound.h
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-es-core_src_Sound.h,v 1.1 2020/04/20 00:35:23 joerg Exp $
-
---- es-core/src/Sound.h.orig	2020-04-19 17:26:02.882026668 +0000
-+++ es-core/src/Sound.h
-@@ -5,6 +5,7 @@
- #include "SDL_audio.h"
- #include <map>
- #include <memory>
-+#include <string>
- 
- class ThemeData;
- 
diff --git a/emulators/emulationstation/patches/patch-es-core_src_components_ImageGridComponent.h b/emulators/emulationstation/patches/patch-es-core_src_components_ImageGridComponent.h
deleted file mode 100644
index 9621c0d8b7a..00000000000
--- a/emulators/emulationstation/patches/patch-es-core_src_components_ImageGridComponent.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-es-core_src_components_ImageGridComponent.h,v 1.1 2015/02/21 02:01:59 joerg Exp $
-
---- es-core/src/components/ImageGridComponent.h.orig	2015-02-21 01:50:53.000000000 +0000
-+++ es-core/src/components/ImageGridComponent.h
-@@ -21,7 +21,7 @@ protected:
- 	using IList<ImageGridData, T>::getTransform;
- 	using IList<ImageGridData, T>::mSize;
- 	using IList<ImageGridData, T>::mCursor;
--	using IList<ImageGridData, T>::Entry;
-+	using typename IList<ImageGridData, T>::Entry;
- 	using IList<ImageGridData, T>::mWindow;
- 
- public: