From owner-svn-ports-branches@freebsd.org Tue May 29 02:35:55 2018 Return-Path: Delivered-To: svn-ports-branches@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 B509AF7A353; Tue, 29 May 2018 02:35:55 +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 6B0387160C; Tue, 29 May 2018 02:35:55 +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 4AD8815F82; Tue, 29 May 2018 02:35:55 +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 w4T2ZtjU002561; Tue, 29 May 2018 02:35:55 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4T2Zsio002559; Tue, 29 May 2018 02:35:54 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201805290235.w4T2Zsio002559@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Tue, 29 May 2018 02:35:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r471074 - in branches/2018Q2/emulators/ppsspp: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in branches/2018Q2/emulators/ppsspp: . files X-SVN-Commit-Revision: 471074 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 May 2018 02:35:56 -0000 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)