Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 3 Aug 2020 17:53:18 +0000 (UTC)
From:      Jung-uk Kim <jkim@FreeBSD.org>
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
Message-ID:  <202008031753.073HrIlT046362@repo.freebsd.org>

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



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