From owner-svn-ports-all@freebsd.org Thu Aug 15 14:37:14 2019 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 D5C89AB17D; Thu, 15 Aug 2019 14:37:14 +0000 (UTC) (envelope-from zeising@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) server-signature RSA-PSS (4096 bits) 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 468TYk5K4nz3QFD; Thu, 15 Aug 2019 14:37:14 +0000 (UTC) (envelope-from zeising@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 9846319F73; Thu, 15 Aug 2019 14:37:14 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x7FEbEqj023361; Thu, 15 Aug 2019 14:37:14 GMT (envelope-from zeising@FreeBSD.org) Received: (from zeising@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x7FEbDfW023358; Thu, 15 Aug 2019 14:37:13 GMT (envelope-from zeising@FreeBSD.org) Message-Id: <201908151437.x7FEbDfW023358@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: zeising set sender to zeising@FreeBSD.org using -f From: Niclas Zeising Date: Thu, 15 Aug 2019 14:37:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r508996 - in head/graphics/libGLw: . files X-SVN-Group: ports-head X-SVN-Commit-Author: zeising X-SVN-Commit-Paths: in head/graphics/libGLw: . files X-SVN-Commit-Revision: 508996 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.29 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: Thu, 15 Aug 2019 14:37:14 -0000 Author: zeising Date: Thu Aug 15 14:37:13 2019 New Revision: 508996 URL: https://svnweb.freebsd.org/changeset/ports/508996 Log: graphics/libGLw: Fix extern visibility Import upstream patches to graphics/libGLw to fix extern visibility of some symbols. While here, also add a patch to fix a typo. These patches pulls libGLw on par with upstream git master. PR: 237917 Reported by: Jason W. Bacon MFH: 2019Q3 (fixes issues in other ports) Added: head/graphics/libGLw/files/ head/graphics/libGLw/files/patch-b060a07.c (contents, props changed) head/graphics/libGLw/files/patch-c4f7cdf.c (contents, props changed) Modified: head/graphics/libGLw/Makefile Modified: head/graphics/libGLw/Makefile ============================================================================== --- head/graphics/libGLw/Makefile Thu Aug 15 14:33:59 2019 (r508995) +++ head/graphics/libGLw/Makefile Thu Aug 15 14:37:13 2019 (r508996) @@ -3,7 +3,7 @@ PORTNAME= libGLw PORTVERSION= 8.0.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= ftp://ftp.freedesktop.org/pub/mesa/glw/ DISTNAME= glw-${PORTVERSION} Added: head/graphics/libGLw/files/patch-b060a07.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/libGLw/files/patch-b060a07.c Thu Aug 15 14:37:13 2019 (r508996) @@ -0,0 +1,55 @@ +diff --git a/GLwDrawA.h b/GLwDrawA.h +index b9711c216bc458f7ec2d2055495045efef8903f0..316a70d5d2061af67d8307c74706208907c3ac6a 100644 +--- GLwDrawA.h ++++ GLwDrawA.h +@@ -131,12 +131,18 @@ + #define GLwNaccumAlphaSize "accumAlphaSize" + #define GLwCAccumAlphaSize "AccumAlphaSize" + ++#if (defined(__GNUC__) && __GNUC__ >= 4) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590)) ++# define GLAPIVAR extern __attribute__((visibility("default"))) ++#else ++# define GLAPIVAR extern ++#endif ++ + #ifdef __GLX_MOTIF + + typedef struct _GLwMDrawingAreaClassRec *GLwMDrawingAreaWidgetClass; + typedef struct _GLwMDrawingAreaRec *GLwMDrawingAreaWidget; + +-GLAPI WidgetClass glwMDrawingAreaWidgetClass; ++GLAPIVAR WidgetClass glwMDrawingAreaWidgetClass; + + + #else +@@ -144,7 +150,7 @@ GLAPI WidgetClass glwMDrawingAreaWidgetClass; + typedef struct _GLwDrawingAreaClassRec *GLwDrawingAreaWidgetClass; + typedef struct _GLwDrawingAreaRec *GLwDrawingAreaWidget; + +-GLAPI WidgetClass glwDrawingAreaWidgetClass; ++GLAPIVAR WidgetClass glwDrawingAreaWidgetClass; + + + #endif +diff --git a/GLwDrawAP.h b/GLwDrawAP.h +index 4ff21b426dd5912e007356160ef6fe5a41536c24..6d29849d4288f4affaa5ed3f5d5d5bc1668d4cd3 100644 +--- GLwDrawAP.h ++++ GLwDrawAP.h +@@ -59,7 +59,7 @@ typedef struct _GLwMDrawingAreaClassRec { + } GLwMDrawingAreaClassRec; + + +-GLAPI GLwMDrawingAreaClassRec glwMDrawingAreaClassRec; ++GLAPIVAR GLwMDrawingAreaClassRec glwMDrawingAreaClassRec; + + + /* XT */ +@@ -70,7 +70,7 @@ typedef struct _GLwDrawingAreaClassRec { + GLwDrawingAreaClassPart glwDrawingArea_class; + } GLwDrawingAreaClassRec; + +-GLAPI GLwDrawingAreaClassRec glwDrawingAreaClassRec; ++GLAPIVAR GLwDrawingAreaClassRec glwDrawingAreaClassRec; + + + #endif Added: head/graphics/libGLw/files/patch-c4f7cdf.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/libGLw/files/patch-c4f7cdf.c Thu Aug 15 14:37:13 2019 (r508996) @@ -0,0 +1,13 @@ +diff --git a/GLwDrawA.c b/GLwDrawA.c +index b9ef47b1ce505553120fa7556693b97e5d91b3c5..8ce12fba0f6ef4b092837ca0c2e6aa44f5de2dfa 100644 +--- GLwDrawA.c ++++ GLwDrawA.c +@@ -474,7 +474,7 @@ static void Initialize(GLwDrawingAreaWidget req,GLwDrawingAreaWidget neww,ArgLis + + /* fix size */ + if(req->core.width==0) neww->core.width=100; +- if(req->core.height==0) neww->core.width=100; ++ if(req->core.height==0) neww->core.height=100; + + /* create the attribute list if needed */ + neww->glwDrawingArea.myList=FALSE;