From owner-svn-ports-all@freebsd.org Wed Aug 9 18:44:17 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E3883DD3455; Wed, 9 Aug 2017 18:44:17 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BF50680DA9; Wed, 9 Aug 2017 18:44:17 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v79IiGXV045135; Wed, 9 Aug 2017 18:44:16 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v79IiGLu045132; Wed, 9 Aug 2017 18:44:16 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201708091844.v79IiGLu045132@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Wed, 9 Aug 2017 18:44:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r447639 - in branches/2017Q3/emulators: citra citra-qt5 citra/files X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in branches/2017Q3/emulators: citra citra-qt5 citra/files X-SVN-Commit-Revision: 447639 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Aug 2017 18:44:18 -0000 Author: jbeich Date: Wed Aug 9 18:44:16 2017 New Revision: 447639 URL: https://svnweb.freebsd.org/changeset/ports/447639 Log: MFH: r447637 emulators/citra-qt5: unbreak audio and input Approved by: ports-secteam blanket Added: branches/2017Q3/emulators/citra/files/patch-CMakeLists.txt - copied unchanged from r447637, head/emulators/citra/files/patch-CMakeLists.txt Modified: branches/2017Q3/emulators/citra-qt5/Makefile branches/2017Q3/emulators/citra/Makefile Directory Properties: branches/2017Q3/ (props changed) Modified: branches/2017Q3/emulators/citra-qt5/Makefile ============================================================================== --- branches/2017Q3/emulators/citra-qt5/Makefile Wed Aug 9 18:41:26 2017 (r447638) +++ branches/2017Q3/emulators/citra-qt5/Makefile Wed Aug 9 18:44:16 2017 (r447639) @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTREVISION= 0 +PORTREVISION= 1 PKGNAMESUFFIX= -qt5 MASTERDIR= ${.CURDIR}/../citra Modified: branches/2017Q3/emulators/citra/Makefile ============================================================================== --- branches/2017Q3/emulators/citra/Makefile Wed Aug 9 18:41:26 2017 (r447638) +++ branches/2017Q3/emulators/citra/Makefile Wed Aug 9 18:44:16 2017 (r447639) @@ -42,6 +42,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 FAVORITE_COMPILER= ${COMPILER_TYPE} # c++14-lib CMAKE_ARGS= -DENABLE_WEB_SERVICE=off # XXX unbundle curl-7.52.1 CXXFLAGS+= -D_GLIBCXX_USE_C99 -D_GLIBCXX_USE_C99_MATH_TR1 \ @@ -52,7 +53,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 Copied: branches/2017Q3/emulators/citra/files/patch-CMakeLists.txt (from r447637, head/emulators/citra/files/patch-CMakeLists.txt) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q3/emulators/citra/files/patch-CMakeLists.txt Wed Aug 9 18:44:16 2017 (r447639, copy of r447637, head/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)