Hi All,

please find below a diff to fix the clang build for emulationstation.

Ok? Comments?

Rafael Sadowski

Index: Makefile
===================================================================
RCS file: /cvs/ports/emulators/emulationstation/Makefile,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 Makefile
--- Makefile    26 Jul 2017 22:45:19 -0000      1.4
+++ Makefile    20 Aug 2017 21:31:04 -0000
@@ -24,6 +24,8 @@ MODULES =             devel/cmake
 
 COMPILER =             gcc
 
+CXXFLAGS +=    -std=c++11 -Wno-inconsistent-missing-override
+
 BUILD_DEPENDS =                math/eigen3
 LIB_DEPENDS =          devel/boost \
                        devel/sdl2 \
Index: patches/patch-es-app_src_components_TextListComponent_h
===================================================================
RCS file: patches/patch-es-app_src_components_TextListComponent_h
diff -N patches/patch-es-app_src_components_TextListComponent_h
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-es-app_src_components_TextListComponent_h     20 Aug 2017 
21:31:04 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: es-app/src/components/TextListComponent.h
+--- es-app/src/components/TextListComponent.h.orig
++++ es-app/src/components/TextListComponent.h
+@@ -31,7 +31,7 @@ class TextListComponent : public IList<TextListData, T
+       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;
Index: patches/patch-es-core_src_Util_cpp
===================================================================
RCS file: patches/patch-es-core_src_Util_cpp
diff -N patches/patch-es-core_src_Util_cpp
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-es-core_src_Util_cpp  20 Aug 2017 21:31:04 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: es-core/src/Util.cpp
+--- es-core/src/Util.cpp.orig
++++ es-core/src/Util.cpp
+@@ -26,7 +26,7 @@ std::string strToUpper(const std::string& str)
+ }
+ 
+ 
+-#if _MSC_VER < 1800
++#if defined(_WIN32) && _MSC_VER < 1800
+ float round(float num)
+ {
+       return (float)((int)(num + 0.5f));
Index: patches/patch-es-core_src_Util_h
===================================================================
RCS file: patches/patch-es-core_src_Util_h
diff -N patches/patch-es-core_src_Util_h
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-es-core_src_Util_h    20 Aug 2017 21:31:04 -0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Index: es-core/src/Util.h
+--- es-core/src/Util.h.orig
++++ es-core/src/Util.h
+@@ -15,7 +15,9 @@ Eigen::Affine3f roundMatrix(const Eigen::Affine3f& mat
+ Eigen::Vector3f roundVector(const Eigen::Vector3f& vec);
+ Eigen::Vector2f roundVector(const Eigen::Vector2f& vec);
+ 
++#if defined(_WIN32) && _MSC_VER < 1800
+ float round(float num);
++#endif
+ 
+ std::string getCanonicalPath(const std::string& str);
+ 
Index: patches/patch-es-core_src_animations_Animation_h
===================================================================
RCS file: patches/patch-es-core_src_animations_Animation_h
diff -N patches/patch-es-core_src_animations_Animation_h
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-es-core_src_animations_Animation_h    20 Aug 2017 21:31:04 
-0000
@@ -0,0 +1,13 @@
+$OpenBSD$
+
+Index: es-core/src/animations/Animation.h
+--- es-core/src/animations/Animation.h.orig
++++ es-core/src/animations/Animation.h
+@@ -5,6 +5,7 @@
+ class Animation
+ {
+ public:
++      virtual ~Animation() = default;
+       virtual int getDuration() const = 0;
+       virtual void apply(float t) = 0;
+ };
Index: patches/patch-es-core_src_components_ImageGridComponent_h
===================================================================
RCS file: patches/patch-es-core_src_components_ImageGridComponent_h
diff -N patches/patch-es-core_src_components_ImageGridComponent_h
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-es-core_src_components_ImageGridComponent_h   20 Aug 2017 
21:31:04 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: es-core/src/components/ImageGridComponent.h
+--- es-core/src/components/ImageGridComponent.h.orig
++++ es-core/src/components/ImageGridComponent.h
+@@ -21,7 +21,7 @@ class ImageGridComponent : public IList<ImageGridData,
+       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:

Reply via email to