4 files changed, 49 insertions, 73 deletions

diff --git a/emulators/citra/Makefile b/emulators/citra/Makefile
index 972f8d83b747..e150f1ca68ee 100644
--- a/emulators/citra/Makefile
+++ b/emulators/citra/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	citra
-PORTVERSION=	s20180529
+PORTVERSION=	s20180601
 PORTREVISION?=	0
 CATEGORIES=	emulators
 
@@ -23,14 +23,16 @@ BUILD_DEPENDS=	boost-libs>=1.66:devel/boost-libs
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	citra-emu
-GH_TAGNAME=	72f9142b
+GH_TAGNAME=	08b119153
 GH_TUPLE=	citra-emu:ext-libressl-portable:cbb1dca:libressl/externals/libressl \
 		citra-emu:ext-soundtouch:1d0e6cf:soundtouch/externals/soundtouch \
 		MerryMage:dynarmic:d1d4705:dynarmic/externals/dynarmic \
+		arsenm:sanitizers-cmake:f09151b:sanitizers_cmake/externals/cubeb/cmake/sanitizers-cmake \
 		benhoyt:inih:r40:inih/externals/inih/inih \
 		catchorg:Catch2:v2.1.1:catch/externals/catch \
 		fmtlib:fmt:4.0.0-510-g5859e58:fmt/externals/fmt \
 		herumi:xbyak:v5.64:xbyak/externals/xbyak \
+		kinetiknz:cubeb:cubeb-0.2-1039-g44341a1:cubeb/externals/cubeb \
 		lsalzman:enet:39a72ab:enet/externals/enet \
 		neobrain:nihstro:fd69de1:nihstro/externals/nihstro \
 		weidai11:cryptopp:CRYPTOPP_6_1_0:cryptopp/externals/cryptopp/cryptopp
@@ -43,11 +45,28 @@ CXXFLAGS+=	-D_GLIBCXX_USE_C99 -D_GLIBCXX_USE_C99_MATH_TR1 \
 		-D_DECLARE_C99_LDBL_MATH # XXX ports/193528
 LDFLAGS+=	-Wl,--as-needed # Qt5Network
 
+OPTIONS_DEFINE=	ALSA PULSEAUDIO JACK SNDIO
+OPTIONS_DEFAULT=ALSA PULSEAUDIO JACK
 OPTIONS_MULTI=	GUI
 OPTIONS_MULTI_GUI=	QT5 SDL
 OPTIONS_SLAVE?=	SDL
 OPTIONS_EXCLUDE:=	${OPTIONS_MULTI_GUI}
 
+CUBEB_DESC=	Cubeb audio backend
+
+ALSA_CMAKE_BOOL=	USE_ALSA
+ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
+ALSA_RUN_DEPENDS=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins
+
+JACK_BUILD_DEPENDS=	jackit>0:audio/jack
+JACK_CMAKE_BOOL=	USE_JACK
+
+PULSEAUDIO_BUILD_DEPENDS=pulseaudio>0.:audio/pulseaudio
+PULSEAUDIO_CMAKE_BOOL=	USE_PULSE
+
+SNDIO_LIB_DEPENDS=	libsndio.so:audio/sndio
+SNDIO_CMAKE_BOOL=	USE_
+
 SDL_CMAKE_BOOL=	ENABLE_SDL2
 SDL_PLIST_FILES=bin/${PORTNAME} \
 		bin/${PORTNAME}-room \
diff --git a/emulators/citra/distinfo b/emulators/citra/distinfo
index 37d15db84c36..6630a9120047 100644
--- a/emulators/citra/distinfo
+++ b/emulators/citra/distinfo
@@ -1,12 +1,14 @@
-TIMESTAMP = 1527659661
-SHA256 (citra-emu-citra-s20180529-72f9142b_GH0.tar.gz) = 3d5d446d66ac111eb5c11ff6e43a189163549f757ea6173181446303d0c14209
-SIZE (citra-emu-citra-s20180529-72f9142b_GH0.tar.gz) = 2209733
+TIMESTAMP = 1527852268
+SHA256 (citra-emu-citra-s20180601-08b119153_GH0.tar.gz) = e69d9879158a060733095be4f76a65fa5e6e445a3ec9f9058ddc3488418c6b56
+SIZE (citra-emu-citra-s20180601-08b119153_GH0.tar.gz) = 2218324
 SHA256 (citra-emu-ext-libressl-portable-cbb1dca_GH0.tar.gz) = f3741a3bb480d9f8a817f032f59d1908e659620cbb93c0fe8289cfb46d2ab89c
 SIZE (citra-emu-ext-libressl-portable-cbb1dca_GH0.tar.gz) = 1761962
 SHA256 (citra-emu-ext-soundtouch-1d0e6cf_GH0.tar.gz) = ee4efc44220ebc52a93d7c357c19b17a7b8292b620f81bf5d3e095b20f2c8f01
 SIZE (citra-emu-ext-soundtouch-1d0e6cf_GH0.tar.gz) = 59516
 SHA256 (MerryMage-dynarmic-d1d4705_GH0.tar.gz) = cf120bc77912cf58e0965db2abcb2067c36aca612c42459e0eb72b740ea6cb0e
 SIZE (MerryMage-dynarmic-d1d4705_GH0.tar.gz) = 1248870
+SHA256 (arsenm-sanitizers-cmake-f09151b_GH0.tar.gz) = 40d826a6c98fdedf1097bdb96944b2905be507ed5d11e74480680d459fc22431
+SIZE (arsenm-sanitizers-cmake-f09151b_GH0.tar.gz) = 6856
 SHA256 (benhoyt-inih-r40_GH0.tar.gz) = 0a7d8600c523ccd2d01a5bec2ef3a6482ada49794e67cf694d2bec796cb2c340
 SIZE (benhoyt-inih-r40_GH0.tar.gz) = 11436
 SHA256 (catchorg-Catch2-v2.1.1_GH0.tar.gz) = c40d3c8133c9274946067007e911a55b0d0ad3ed7c59a1f258dfcdb6836d8eff
@@ -15,6 +17,8 @@ SHA256 (fmtlib-fmt-4.0.0-510-g5859e58_GH0.tar.gz) = 6d719fe37c54ffcd6a7c1679a288
 SIZE (fmtlib-fmt-4.0.0-510-g5859e58_GH0.tar.gz) = 623334
 SHA256 (herumi-xbyak-v5.64_GH0.tar.gz) = e329c76774ef8e1e89b6407de70e29ed1f93ad4abbfc12437f5e2b74d69b3acf
 SIZE (herumi-xbyak-v5.64_GH0.tar.gz) = 212271
+SHA256 (kinetiknz-cubeb-cubeb-0.2-1039-g44341a1_GH0.tar.gz) = b3814177e98a26806a8c224b1994c7d2026708d149a3fc835d020595c88d32e1
+SIZE (kinetiknz-cubeb-cubeb-0.2-1039-g44341a1_GH0.tar.gz) = 194990
 SHA256 (lsalzman-enet-39a72ab_GH0.tar.gz) = cdeec4d447266d93dbd56564b260c57e411dc681caba6887a7e3f152009e6be1
 SIZE (lsalzman-enet-39a72ab_GH0.tar.gz) = 79471
 SHA256 (neobrain-nihstro-fd69de1_GH0.tar.gz) = cebeb307aad4b9fbc4d26eb54c01c90e118bc6287ab65688a50303a59272be5a
diff --git a/emulators/citra/files/patch-externals_CMakeLists.txt b/emulators/citra/files/patch-externals_CMakeLists.txt
new file mode 100644
index 000000000000..0fe1f4210a30
--- /dev/null
+++ b/emulators/citra/files/patch-externals_CMakeLists.txt
@@ -0,0 +1,21 @@
+[0/1] cd /usr/ports/emulators/citra/work/.build && /usr/local/bin/cmake -P cmake_install.cmake
+-- Install configuration: "Release"
+-- Up-to-date: /usr/ports/emulators/citra/work/stage/usr/local/man/man6/citra.6
+CMake Error at externals/cubeb/cmake_install.cmake:44 (file):
+  file INSTALL cannot find
+  "/usr/ports/emulators/citra/work/citra-08b119153/include".
+Call Stack (most recent call first):
+  externals/cmake_install.cmake:46 (include)
+  cmake_install.cmake:49 (include)
+
+FAILED: CMakeFiles/install.util
+
+--- externals/CMakeLists.txt.orig	2018-06-01 11:24:28 UTC
++++ externals/CMakeLists.txt
+@@ -81,5 +81,5 @@ endif()
+ # Cubeb
+ if(ENABLE_CUBEB)
+     set(BUILD_TESTS OFF CACHE BOOL "")
+-    add_subdirectory(cubeb)
++    add_subdirectory(cubeb EXCLUDE_FROM_ALL)
+ endif()
diff --git a/emulators/citra/files/patch-externals_cryptopp_CMakeLists.txt b/emulators/citra/files/patch-externals_cryptopp_CMakeLists.txt
deleted file mode 100644
index eaa1f9bf0cbe..000000000000
--- a/emulators/citra/files/patch-externals_cryptopp_CMakeLists.txt
+++ /dev/null
@@ -1,68 +0,0 @@
-https://github.com/citra-emu/citra/pull/3790
-
---- externals/cryptopp/CMakeLists.txt.orig	2018-05-30 05:54:21 UTC
-+++ externals/cryptopp/CMakeLists.txt
-@@ -133,6 +133,7 @@ set(cryptopp_SOURCES
-         cryptopp/authenc.cpp
-         cryptopp/basecode.cpp
-         cryptopp/ccm.cpp
-+        cryptopp/crc-simd.cpp
-         cryptopp/des.cpp
-         cryptopp/dessp.cpp
-         cryptopp/dll.cpp
-@@ -140,6 +141,7 @@ set(cryptopp_SOURCES
-         cryptopp/ecp.cpp
-         cryptopp/filters.cpp
-         cryptopp/fips140.cpp
-+        cryptopp/gcm-simd.cpp
-         cryptopp/gf2n.cpp
-         cryptopp/gfpcrypt.cpp
-         cryptopp/hex.cpp
-@@ -151,6 +153,7 @@ set(cryptopp_SOURCES
-         cryptopp/modes.cpp
-         cryptopp/mqueue.cpp
-         cryptopp/nbtheory.cpp
-+        cryptopp/neon-simd.cpp
-         cryptopp/oaep.cpp
-         cryptopp/osrng.cpp
-         cryptopp/pubkey.cpp
-@@ -190,18 +193,39 @@ endif()
- 
- if ((CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND NOT CRYPTOPP_DISABLE_ASM)
-     check_cxx_compiler_flag(-msse2 CRYPTOPP_HAS_MSSE2)
-+    check_cxx_compiler_flag(-mssse3 CRYPTOPP_HAS_MSSSE3)
-     check_cxx_compiler_flag(-msse4.1 CRYPTOPP_HAS_MSSE41)
-     check_cxx_compiler_flag(-msse4.2 CRYPTOPP_HAS_MSSE42)
-     check_cxx_compiler_flag(-maes CRYPTOPP_HAS_MAES)
-+    check_cxx_compiler_flag(-mpclmul CRYPTOPP_HAS_PCLMUL)
-     check_cxx_compiler_flag(-msha CRYPTOPP_HAS_MSHA)
-+    check_cxx_compiler_flag(-march=armv8-a+crc CRYPTOPP_HAS_ARMV8_CRC32)
-+    check_cxx_compiler_flag(-march=armv8-a+crypto CRYPTOPP_HAS_ARMV8_CRYPTO)
-     if (CRYPTOPP_HAS_MSSE2)
-         set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/cryptopp/sse-simd.cpp PROPERTIES COMPILE_FLAGS "-msse2")
-     endif()
-+    if (CRYPTOPP_HAS_MSSSE3 AND CRYPTOPP_HAS_MAES AND CRYPTOPP_HAS_PCLMUL)
-+        set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/cryptopp/gcm-simd.cpp
-+                                    PROPERTIES COMPILE_FLAGS "-mssse3 -maes -mpclmul")
-+    endif()
-     if (CRYPTOPP_HAS_MSSE41 AND CRYPTOPP_HAS_MAES)
-         set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/cryptopp/rijndael-simd.cpp PROPERTIES COMPILE_FLAGS "-msse4.1 -maes")
-     endif()
-+    if (CRYPTOPP_HAS_MSSE42)
-+        set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/cryptopp/crc-simd.cpp
-+                                    PROPERTIES COMPILE_FLAGS "-msse4.2")
-+    endif()
-     if (CRYPTOPP_HAS_MSSE42 AND CRYPTOPP_HAS_MSHA)
-         set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/cryptopp/sha-simd.cpp PROPERTIES COMPILE_FLAGS "-msse4.2 -msha")
-+    endif()
-+    if (CRYPTOPP_HAS_ARMV8_CRC32)
-+        set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/cryptopp/crc-simd.cpp
-+                                    PROPERTIES COMPILE_FLAGS "-march=armv8-a+crc")
-+    endif()
-+    if (CRYPTOPP_HAS_ARMV8_CRYPTO)
-+        set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/cryptopp/rijndael-simd.cpp
-+                                    ${CMAKE_CURRENT_SOURCE_DIR}/cryptopp/sha-simd.cpp
-+                                    PROPERTIES COMPILE_FLAGS "-march=armv8-a+crypto")
-     endif()
- endif()
-