svn commit: r447637 - in head/emulators: citra citra-qt5 citra/files

[Jan Beich]

Author: jbeich
Date: Wed Aug  9 18:41:01 2017
New Revision: 447637
URL: https://svnweb.freebsd.org/changeset/ports/447637

Log:
  emulators/citra-qt5: unbreak audio and input

Added:
  head/emulators/citra/files/patch-CMakeLists.txt   (contents, props changed)
Modified:
  head/emulators/citra-qt5/Makefile   (contents, props changed)
  head/emulators/citra/Makefile   (contents, props changed)

Modified: head/emulators/citra-qt5/Makefile
==============================================================================
--- head/emulators/citra-qt5/Makefile	Wed Aug  9 18:24:11 2017	(r447636)
+++ head/emulators/citra-qt5/Makefile	Wed Aug  9 18:41:01 2017	(r447637)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 PKGNAMESUFFIX=	-qt5
 
 MASTERDIR=	${.CURDIR}/../citra

Modified: head/emulators/citra/Makefile
==============================================================================
--- head/emulators/citra/Makefile	Wed Aug  9 18:24:11 2017	(r447636)
+++ head/emulators/citra/Makefile	Wed Aug  9 18:41:01 2017	(r447637)
@@ -38,6 +38,7 @@ GH_TUPLE=	citra-emu:ext-soundtouch:5274ec4:soundtouch/
 		weidai11:cryptopp:CRYPTOPP_5_6_5-164-g841c37e:cryptopp/externals/cryptopp/cryptopp
 
 USES=		cmake:outsource compiler:c++14-lang iconv localbase:ldflags
+USE_SDL=	sdl2
 CMAKE_ARGS=	-DENABLE_WEB_SERVICE=off # XXX unbundle curl-7.52.1
 CXXFLAGS+=	-D_GLIBCXX_USE_C99 -D_GLIBCXX_USE_C99_MATH_TR1 \
 		-D_DECLARE_C99_LDBL_MATH # XXX ports/193528
@@ -47,7 +48,6 @@ OPTIONS_MULTI_GUI=	QT5 SDL
 OPTIONS_SLAVE?=	SDL
 OPTIONS_EXCLUDE:=	${OPTIONS_MULTI_GUI}
 
-SDL_USE=	SDL=sdl2
 SDL_CMAKE_BOOL=	ENABLE_SDL2
 SDL_PLIST_FILES=bin/${PORTNAME} \
 		man/man6/${PORTNAME}.6.gz

Added: head/emulators/citra/files/patch-CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/emulators/citra/files/patch-CMakeLists.txt	Wed Aug  9 18:41:01 2017	(r447637)
@@ -0,0 +1,28 @@
+citra-qt currently needs SDL for audio and input
+
+--- CMakeLists.txt.orig	2017-08-09 15:54:29 UTC
++++ CMakeLists.txt
+@@ -207,15 +207,15 @@ if (ENABLE_SDL2)
+     else()
+         find_package(SDL2 REQUIRED)
+     endif()
+-
+-    if (SDL2_FOUND)
+-        # TODO(yuriks): Make FindSDL2.cmake export an IMPORTED library instead
+-        add_library(SDL2 INTERFACE)
+-        target_link_libraries(SDL2 INTERFACE "${SDL2_LIBRARY}")
+-        target_include_directories(SDL2 INTERFACE "${SDL2_INCLUDE_DIR}")
+-    endif()
+ else()
+-    set(SDL2_FOUND NO)
++    find_package(SDL2)
++endif()
++
++if (SDL2_FOUND)
++  # TODO(yuriks): Make FindSDL2.cmake export an IMPORTED library instead
++  add_library(SDL2 INTERFACE)
++  target_link_libraries(SDL2 INTERFACE "${SDL2_LIBRARY}")
++  target_include_directories(SDL2 INTERFACE "${SDL2_INCLUDE_DIR}")
+ endif()
+ 
+ if (ENABLE_QT)