svn commit: r471074 - in branches/2018Q2/emulators/ppsspp: . files

[Jan Beich]

Author: jbeich
Date: Tue May 29 02:35:54 2018
New Revision: 471074
URL: https://svnweb.freebsd.org/changeset/ports/471074

Log:
  MFH: r471073
  
  emulators/ppsspp: unbreak on armv6/armv7
  
  SDL/SDLGLGraphicsContext.cpp:88:2: error: use of undeclared identifier 'EGL_Init'
          EGL_Init();
          ^
  SDL/SDLGLGraphicsContext.cpp:122:18: error: use of undeclared identifier 'g_eglDisplay'
                  eglSwapBuffers(g_eglDisplay, g_eglSurface);
                                 ^
  SDL/SDLGLGraphicsContext.cpp:122:32: error: use of undeclared identifier 'g_eglSurface'
                  eglSwapBuffers(g_eglDisplay, g_eglSurface);
                                               ^
  SDL/SDLGLGraphicsContext.cpp:139:2: error: use of undeclared identifier 'EGL_Close'
          EGL_Close();
          ^
  
  Approved by:	ports-secteam blanket

Added:
  branches/2018Q2/emulators/ppsspp/files/patch-no-egl
     - copied unchanged from r471073, head/emulators/ppsspp/files/patch-no-egl
Modified:
  branches/2018Q2/emulators/ppsspp/Makefile
Directory Properties:
  branches/2018Q2/   (props changed)

Modified: branches/2018Q2/emulators/ppsspp/Makefile
==============================================================================
--- branches/2018Q2/emulators/ppsspp/Makefile	Tue May 29 02:33:58 2018	(r471073)
+++ branches/2018Q2/emulators/ppsspp/Makefile	Tue May 29 02:35:54 2018	(r471074)
@@ -36,7 +36,6 @@ EXTRACT_AFTER_ARGS=${EXCLUDE:S,^,--exclude ,}
 USE_GL=		gl glew glu
 USE_SDL=	sdl2 # joystick
 CMAKE_ON=	USE_SYSTEM_FFMPEG
-CMAKE_OFF=	USING_EGL
 SUB_FILES=	pkg-message
 PORTDATA=	assets ${PORTNAME}
 

Copied: branches/2018Q2/emulators/ppsspp/files/patch-no-egl (from r471073, head/emulators/ppsspp/files/patch-no-egl)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2018Q2/emulators/ppsspp/files/patch-no-egl	Tue May 29 02:35:54 2018	(r471074, copy of r471073, head/emulators/ppsspp/files/patch-no-egl)
@@ -0,0 +1,18 @@
+EGL hangs on X11 and doesn't build without GLESv2.
+https://github.com/hrydgard/ppsspp/issues/10626
+
+--- CMakeLists.txt.orig	2017-12-05 13:51:51 UTC
++++ CMakeLists.txt
+@@ -56,12 +56,6 @@ include(ccache)
+ # Remove soon?
+ set(USE_FFMPEG ON)
+ 
+-if(NOT ANDROID AND NOT IOS)
+-	if(ARM OR SIMULATOR)
+-		set(USING_EGL ON)
+-	endif()
+-endif()
+-
+ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+ 	set(LINUX ON)
+ 	add_definitions(-D__STDC_CONSTANT_MACROS)