From owner-svn-ports-all@freebsd.org Fri Oct 27 18:43:26 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 B3966E4E4E5; Fri, 27 Oct 2017 18:43:26 +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 79249735F9; Fri, 27 Oct 2017 18:43:26 +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 v9RIhPqY006245; Fri, 27 Oct 2017 18:43:25 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9RIhPvS006243; Fri, 27 Oct 2017 18:43:25 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201710271843.v9RIhPvS006243@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Fri, 27 Oct 2017 18:43:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r453021 - in branches/2017Q4/emulators: ppsspp ppsspp-devel ppsspp-devel/files X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in branches/2017Q4/emulators: ppsspp ppsspp-devel ppsspp-devel/files X-SVN-Commit-Revision: 453021 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: Fri, 27 Oct 2017 18:43:26 -0000 Author: jbeich Date: Fri Oct 27 18:43:25 2017 New Revision: 453021 URL: https://svnweb.freebsd.org/changeset/ports/453021 Log: MFH: r451584 emulators/ppsspp-devel: restore OLDJOY after r451582/r453020 Recently added fallback mappings are different from v1.3, and some buttons can no longer be bound. So keep the option for a bit longer. Approved by: ports-secteam (swills, implicit for r452123) Added: branches/2017Q4/emulators/ppsspp-devel/files/ - copied from r451584, head/emulators/ppsspp-devel/files/ Modified: branches/2017Q4/emulators/ppsspp-devel/Makefile branches/2017Q4/emulators/ppsspp/Makefile Directory Properties: branches/2017Q4/ (props changed) Modified: branches/2017Q4/emulators/ppsspp-devel/Makefile ============================================================================== --- branches/2017Q4/emulators/ppsspp-devel/Makefile Fri Oct 27 18:36:14 2017 (r453020) +++ branches/2017Q4/emulators/ppsspp-devel/Makefile Fri Oct 27 18:43:25 2017 (r453021) @@ -14,4 +14,6 @@ GH_TUPLE= hrydgard:glslang:136b1e2d:glslang/ext/glslan MASTERDIR= ${.CURDIR}/../ppsspp DISTINFO_FILE= ${.CURDIR}/distinfo +OLDJOY_EXTRA_PATCHES= ${.CURDIR}/files/extra-patch-old-joy + .include "${MASTERDIR}/Makefile" Modified: branches/2017Q4/emulators/ppsspp/Makefile ============================================================================== --- branches/2017Q4/emulators/ppsspp/Makefile Fri Oct 27 18:36:14 2017 (r453020) +++ branches/2017Q4/emulators/ppsspp/Makefile Fri Oct 27 18:43:25 2017 (r453021) @@ -51,18 +51,14 @@ DESKTOP_ENTRIES="PPSSPP" \ "Game;Emulator;" \ "" -.if !defined(PKGNAMESUFFIX) || ${PKGNAMESUFFIX:N*-devel} OPTIONS_DEFINE= OLDJOY -.endif OPTIONS_SINGLE= GUI OPTIONS_SINGLE_GUI= QT5 SDL OPTIONS_SLAVE?= SDL OPTIONS_EXCLUDE:= ${OPTIONS_SINGLE_GUI} -.if !defined(PKGNAMESUFFIX) || ${PKGNAMESUFFIX:N*-devel} OLDJOY_DESC= Old joystick support with fixed button mappings (deprecated) -OLDJOY_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-old-joy -.endif +OLDJOY_EXTRA_PATCHES?= ${PATCHDIR}/extra-patch-old-joy QT5_USE= QT5=qmake_build,buildtools_build,linguisttools_build,gui,opengl,widgets QT5_CMAKE_BOOL= USING_QT_UI QT5_VARS= EXENAME=PPSSPPQt