summaryrefslogtreecommitdiff
path: root/emulators
diff options
context:
space:
mode:
authorJan Beich <jbeich@FreeBSD.org>2017-01-03 12:49:39 +0000
committerJan Beich <jbeich@FreeBSD.org>2017-01-03 12:49:39 +0000
commit9e586240425781f0aebd2d638a86dfdc45b4fca2 (patch)
tree1469256abd4e099d9e0091af6618f1011270b470 /emulators
parentNew maintainer: bob@eager.cx (diff)
Drop pre-10.3 support in my ports
Figuring out which GCC hacks are safe to drop is tricky but at least devel/fb-adb is limited to x86 due to ADA bootstrap.
Notes
Notes: svn path=/head/; revision=430462
Diffstat (limited to 'emulators')
-rw-r--r--emulators/citra/files/patch-externals_dynarmic_src_common_mp.h34
-rw-r--r--emulators/ppsspp/Makefile3
2 files changed, 1 insertions, 36 deletions
diff --git a/emulators/citra/files/patch-externals_dynarmic_src_common_mp.h b/emulators/citra/files/patch-externals_dynarmic_src_common_mp.h
deleted file mode 100644
index 6e732890460e..000000000000
--- a/emulators/citra/files/patch-externals_dynarmic_src_common_mp.h
+++ /dev/null
@@ -1,34 +0,0 @@
-std::tuple_element_t appeared in FreeBSD 10.2 (libcxx r202673) but
-USES=compiler cannot pull newer C++14-compatible libc++ version.
-
- In file included from externals/dynarmic/src/frontend/disassembler/disassembler_arm.cpp:15:
- In file included from externals/dynarmic/src/./frontend/decoder/arm.h:18:
- In file included from externals/dynarmic/src/./frontend/decoder/decoder_detail.h:14:
- externals/dynarmic/src/./common/mp.h:34:27: fatal error: no template named 'tuple_element_t' in namespace 'std'; did you mean 'tuple_element'?
- using type = std::tuple_element_t<ParameterIndex, std::tuple<Args...>>;
- ~~~~~^~~~~~~~~~~~~~~
- tuple_element
- /usr/include/c++/v1/__tuple:44:62: note: 'tuple_element' declared here
- template <size_t _Ip, class _Tp> class _LIBCPP_TYPE_VIS_ONLY tuple_element;
- ^
-
---- externals/dynarmic/src/common/mp.h.orig 2016-09-14 22:03:09 UTC
-+++ externals/dynarmic/src/common/mp.h
-@@ -9,6 +9,17 @@
- #include <cstddef>
- #include <tuple>
-
-+#ifdef __FreeBSD__
-+#include <osreldate.h>
-+# if defined(_LIBCPP_VERSION) && __FreeBSD_version < 1001508
-+// Copied from <tuple>
-+namespace std {
-+ template <size_t _Ip, class ..._Tp>
-+ using tuple_element_t = typename tuple_element <_Ip, _Tp...>::type;
-+}
-+# endif
-+#endif
-+
- namespace Dynarmic {
- namespace mp {
-
diff --git a/emulators/ppsspp/Makefile b/emulators/ppsspp/Makefile
index 61766b357dcf..56952c5db083 100644
--- a/emulators/ppsspp/Makefile
+++ b/emulators/ppsspp/Makefile
@@ -76,9 +76,8 @@ post-patch:
do-install-SDL-on:
# cmake doesn't pack assets into the app unlike qmake
-# XXX Convert to ${PORTDATA:N${PORTNAME}} once fmake is EOL
(cd ${INSTALL_WRKSRC} && ${COPYTREE_SHARE} \
- "${PORTDATA:Nppsspp}" ${STAGEDIR}${DATADIR})
+ "${PORTDATA:N${PORTNAME}}" ${STAGEDIR}${DATADIR})
# Install the app alongside assets to avoid warnings with GetExeDirectory()
${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/${PORTNAME:tu}* \
${STAGEDIR}${DATADIR}/${PORTNAME}