diff options
| author | jbeich <jbeich@FreeBSD.org> | 2017-08-10 02:41:01 +0800 |
|---|---|---|
| committer | Koop Mast <kwm@rainbow-runner.nl> | 2018-02-04 05:20:03 +0800 |
| commit | fed5870186d6d34a4f525c12d0029de2ef0ae43a (patch) | |
| tree | 273fe32f9d22db6e49d5f7848b058b8c94593aa7 /emulators | |
| parent | 62d1ac05df64ca1e368b809a1aeafdf68db16143 (diff) | |
| download | freebsd-ports-gnome-fed5870186d6d34a4f525c12d0029de2ef0ae43a.tar.gz freebsd-ports-gnome-fed5870186d6d34a4f525c12d0029de2ef0ae43a.tar.zst freebsd-ports-gnome-fed5870186d6d34a4f525c12d0029de2ef0ae43a.zip | |
emulators/citra-qt5: unbreak audio and input
Diffstat (limited to 'emulators')
| -rw-r--r-- | emulators/citra-qt5/Makefile | 2 | ||||
| -rw-r--r-- | emulators/citra/Makefile | 2 | ||||
| -rw-r--r-- | emulators/citra/files/patch-CMakeLists.txt | 28 |
3 files changed, 30 insertions, 2 deletions
diff --git a/emulators/citra-qt5/Makefile b/emulators/citra-qt5/Makefile index 690002e635c2..ac7516fe5ba0 100644 --- a/emulators/citra-qt5/Makefile +++ b/emulators/citra-qt5/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTREVISION= 0 +PORTREVISION= 1 PKGNAMESUFFIX= -qt5 MASTERDIR= ${.CURDIR}/../citra diff --git a/emulators/citra/Makefile b/emulators/citra/Makefile index 2d8538f04eed..d8a79bc97647 100644 --- a/emulators/citra/Makefile +++ b/emulators/citra/Makefile @@ -38,6 +38,7 @@ GH_TUPLE= citra-emu:ext-soundtouch:5274ec4:soundtouch/externals/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 diff --git a/emulators/citra/files/patch-CMakeLists.txt b/emulators/citra/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..4052df279513 --- /dev/null +++ b/emulators/citra/files/patch-CMakeLists.txt @@ -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) |