Skip site navigation (1)Skip section navigation (2) 
Date:      Thu, 15 Aug 2019 14:37:13 +0000 (UTC)
From:      Niclas Zeising <zeising@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r508996 - in head/graphics/libGLw: . files
Message-ID:  <201908151437.x7FEbDfW023358@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
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;

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