Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 27 Oct 2017 18:43:25 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
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
Message-ID:  <201710271843.v9RIhPvS006243@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201710271843.v9RIhPvS006243>