Needs libSM. For clang, add explicit -std=c++11. Fix C++ syntax.

4 files changed, 36 insertions, 2 deletions

diff --git a/emulators/emulationstation/Makefile b/emulators/emulationstation/Makefile
index 5bf4b975b13..d73f42082b6 100644
--- a/emulators/emulationstation/Makefile
+++ b/emulators/emulationstation/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2015/02/13 19:47:51 jmcneill Exp $
+# $NetBSD: Makefile,v 1.3 2015/02/21 02:01:59 joerg Exp $
 
 DISTNAME=	abba19584636c28cd98e3810e857f493cb63d06c
 PKGNAME=	emulationstation-2.0.0_rc1_20150210
@@ -16,6 +16,11 @@ USE_CMAKE=	yes
 USE_LANGUAGES+=	c c++
 GCC_REQD=	4.7 # C++11
 
+.include "../../mk/compiler.mk"
+.if !empty(PKGSRC_COMPILER:Mclang)
+CXXFLAGS+=	-std=c++11
+.endif
+
 WRKSRC=		${WRKDIR}/EmulationStation-${DISTNAME}
 
 INSTALLATION_DIRS=	bin share/doc/emulationstation
@@ -59,6 +64,7 @@ post-install:
 .include "../../math/eigen3/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
 .include "../../x11/libICE/buildlink3.mk"
+.include "../../x11/libSM/buildlink3.mk"
 
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/emulationstation/distinfo b/emulators/emulationstation/distinfo
index ab97a2d5da3..b7d55b6a0b5 100644
--- a/emulators/emulationstation/distinfo
+++ b/emulators/emulationstation/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.2 2015/02/19 21:56:27 wiz Exp $
+$NetBSD: distinfo,v 1.3 2015/02/21 02:01:59 joerg Exp $
 
 SHA1 (abba19584636c28cd98e3810e857f493cb63d06c.zip) = cdfef679f7b428a7cd4986e7b0f8e47965186130
 RMD160 (abba19584636c28cd98e3810e857f493cb63d06c.zip) = b70ad1a8e826c959b58eba36e73df9932104b139
 Size (abba19584636c28cd98e3810e857f493cb63d06c.zip) = 1183630 bytes
 SHA1 (patch-CMakeLists.txt) = 9b8d3f1b774e4bc35bac281f1723670707eb2435
+SHA1 (patch-es-app_src_components_TextListComponent.h) = 63c33ad1f48a0654c881fc41455b22e3a8dc4c94
+SHA1 (patch-es-core_src_components_ImageGridComponent.h) = f53ffe1528a351e58d99cfe76791c1ba4ab27b18
diff --git a/emulators/emulationstation/patches/patch-es-app_src_components_TextListComponent.h b/emulators/emulationstation/patches/patch-es-app_src_components_TextListComponent.h
new file mode 100644
index 00000000000..6dcb86dae5b
--- /dev/null
+++ b/emulators/emulationstation/patches/patch-es-app_src_components_TextListComponent.h
@@ -0,0 +1,13 @@
+$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_components_ImageGridComponent.h b/emulators/emulationstation/patches/patch-es-core_src_components_ImageGridComponent.h
new file mode 100644
index 00000000000..9621c0d8b7a
--- /dev/null
+++ b/emulators/emulationstation/patches/patch-es-core_src_components_ImageGridComponent.h
@@ -0,0 +1,13 @@
+$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: