From owner-svn-ports-all@freebsd.org Mon Aug 3 17:53:19 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 065703A33EF; Mon, 3 Aug 2020 17:53:18 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BL58Z4cSPz4BYP; Mon, 3 Aug 2020 17:53:18 +0000 (UTC) (envelope-from jkim@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 719EA1858A; Mon, 3 Aug 2020 17:53:18 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 073HrIdN046363; Mon, 3 Aug 2020 17:53:18 GMT (envelope-from jkim@FreeBSD.org) Received: (from jkim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 073HrIlT046362; Mon, 3 Aug 2020 17:53:18 GMT (envelope-from jkim@FreeBSD.org) Message-Id: <202008031753.073HrIlT046362@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jkim set sender to jkim@FreeBSD.org using -f From: Jung-uk Kim Date: Mon, 3 Aug 2020 17:53:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r544093 - branches/2020Q3/multimedia/gpac-libgpac/files X-SVN-Group: ports-branches X-SVN-Commit-Author: jkim X-SVN-Commit-Paths: branches/2020Q3/multimedia/gpac-libgpac/files X-SVN-Commit-Revision: 544093 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.33 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: Mon, 03 Aug 2020 17:53:19 -0000 Author: jkim Date: Mon Aug 3 17:53:17 2020 New Revision: 544093 URL: https://svnweb.freebsd.org/changeset/ports/544093 Log: MFH: r544089 Add an upstream patch to fix build without OpenGL. https://github.com/gpac/gpac/commit/d5eedf0d5c2261e2dd228ceab2eadffdaaec1d0c PR: 248418 Approved by: ports-secteam (blanket, build fix) Added: branches/2020Q3/multimedia/gpac-libgpac/files/patch-modules_x11__out_x11__out.c - copied unchanged from r544089, head/multimedia/gpac-libgpac/files/patch-modules_x11__out_x11__out.c Modified: Directory Properties: branches/2020Q3/ (props changed) Copied: branches/2020Q3/multimedia/gpac-libgpac/files/patch-modules_x11__out_x11__out.c (from r544089, head/multimedia/gpac-libgpac/files/patch-modules_x11__out_x11__out.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q3/multimedia/gpac-libgpac/files/patch-modules_x11__out_x11__out.c Mon Aug 3 17:53:17 2020 (r544093, copy of r544089, head/multimedia/gpac-libgpac/files/patch-modules_x11__out_x11__out.c) @@ -0,0 +1,17 @@ +--- modules/x11_out/x11_out.c.orig 2020-06-16 16:17:17 UTC ++++ modules/x11_out/x11_out.c +@@ -975,10 +975,14 @@ GF_Err X11_ProcessEvent (struct _video_out * vout, GF_ + case GF_EVENT_SET_GL: + if (!xWindow->output_3d) return GF_OK; + ++#ifdef GPAC_HAS_OPENGL + if ( ! glXMakeCurrent(xWindow->display, xWindow->fullscreen ? xWindow->full_wnd : xWindow->wnd, xWindow->glx_context) ) { + GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[X11] Cannot make context current\n")); + return GF_IO_ERR; + } ++#else ++ return GF_NOT_SUPPORTED; ++#endif + break; + } + } else {