From owner-svn-ports-all@freebsd.org Sat Jun 2 16:50:03 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id F3EE4FCAE9B; Sat, 2 Jun 2018 16:50:02 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A1D986BF32; Sat, 2 Jun 2018 16:50:02 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 82BF712614; Sat, 2 Jun 2018 16:50:02 +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 w52Go2Gg057056; Sat, 2 Jun 2018 16:50:02 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w52Go2BJ057055; Sat, 2 Jun 2018 16:50:02 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201806021650.w52Go2BJ057055@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sat, 2 Jun 2018 16:50:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r471379 - head/emulators/citra X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: head/emulators/citra X-SVN-Commit-Revision: 471379 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.26 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: Sat, 02 Jun 2018 16:50:03 -0000 Author: jbeich Date: Sat Jun 2 16:50:02 2018 New Revision: 471379 URL: https://svnweb.freebsd.org/changeset/ports/471379 Log: emulators/citra: fix minor issues - Actually disable SNDIO=off if sndio is installed - Drop cruft from OPTIONS_GROUP = CUBEB - Consistently sort _CMAKE_BOOL after _DEPENDS Modified: head/emulators/citra/Makefile (contents, props changed) Modified: head/emulators/citra/Makefile ============================================================================== --- head/emulators/citra/Makefile Sat Jun 2 16:45:10 2018 (r471378) +++ head/emulators/citra/Makefile Sat Jun 2 16:50:02 2018 (r471379) @@ -52,11 +52,9 @@ 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 +ALSA_CMAKE_BOOL= USE_ALSA JACK_BUILD_DEPENDS= jackit>0:audio/jack JACK_CMAKE_BOOL= USE_JACK @@ -65,7 +63,7 @@ PULSEAUDIO_BUILD_DEPENDS=pulseaudio>0.:audio/pulseaudi PULSEAUDIO_CMAKE_BOOL= USE_PULSE SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio -SNDIO_CMAKE_BOOL= USE_ +SNDIO_CMAKE_BOOL= USE_SNDIO SDL_CMAKE_BOOL= ENABLE_SDL2 SDL_PLIST_FILES=bin/${PORTNAME} \