Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 27 Oct 2019 19:27:51 +0000 (UTC)
From:      Piotr Kubaj <pkubaj@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r515819 - head/graphics/osg-devel/files
Message-ID:  <201910271927.x9RJRpTr078283@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pkubaj
Date: Sun Oct 27 19:27:50 2019
New Revision: 515819
URL: https://svnweb.freebsd.org/changeset/ports/515819

Log:
  graphics/osg-devel: fix build on powerpc64 with clang
  
  char is unsigned on powerpc*.
  
  PR:		241158
  Approved by:	linimon (mentor), amdmi3 (maintainer timeout)

Added:
  head/graphics/osg-devel/files/patch-src_osgDB_ConvertBase64.cpp   (contents, props changed)
  head/graphics/osg-devel/files/patch-src_osgPlugins_osgjs_Base64   (contents, props changed)
  head/graphics/osg-devel/files/patch-src_osgPlugins_osgjs_Base64.cpp   (contents, props changed)

Added: head/graphics/osg-devel/files/patch-src_osgDB_ConvertBase64.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/osg-devel/files/patch-src_osgDB_ConvertBase64.cpp	Sun Oct 27 19:27:50 2019	(r515819)
@@ -0,0 +1,11 @@
+--- src/osgDB/ConvertBase64.cpp.orig	2019-10-09 09:44:59 UTC
++++ src/osgDB/ConvertBase64.cpp
+@@ -28,7 +28,7 @@ namespace osgDB
+ 
+     int base64_decode_value(char value_in)
+     {
+-        static const char decoding[] = {62,-1,-1,-1,63,52,53,54,55,56,57,58,59,60,61,-1,-1,-1,-2,-1,-1,-1,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,-1,-1,-1,-1,-1,-1,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51};
++        static const signed char decoding[] = {62,-1,-1,-1,63,52,53,54,55,56,57,58,59,60,61,-1,-1,-1,-2,-1,-1,-1,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,-1,-1,-1,-1,-1,-1,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51};
+         static const char decoding_size = sizeof(decoding);
+         value_in -= 43;
+         if (value_in < 0 || value_in > decoding_size) return -1;

Added: head/graphics/osg-devel/files/patch-src_osgPlugins_osgjs_Base64
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/osg-devel/files/patch-src_osgPlugins_osgjs_Base64	Sun Oct 27 19:27:50 2019	(r515819)
@@ -0,0 +1,11 @@
+--- src/osgPlugins/osgjs/Base64.orig	2019-10-09 12:55:34 UTC
++++ src/osgPlugins/osgjs/Base64
+@@ -61,7 +61,7 @@ namespace base64
+   extern const char* to_table;
+   extern const char* to_table_end;
+ 
+-  extern const char* from_table;
++  extern const signed char* from_table;
+ 
+ 
+   template <class InputIterator, class OutputIterator>

Added: head/graphics/osg-devel/files/patch-src_osgPlugins_osgjs_Base64.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/osg-devel/files/patch-src_osgPlugins_osgjs_Base64.cpp	Sun Oct 27 19:27:50 2019	(r515819)
@@ -0,0 +1,19 @@
+--- src/osgPlugins/osgjs/Base64.cpp.orig	2019-10-09 12:52:54 UTC
++++ src/osgPlugins/osgjs/Base64.cpp
+@@ -18,7 +18,7 @@ namespace base64
+   const char* to_table_end =
+     _to_table + sizeof(_to_table);
+ 
+-  const char _from_table[128] =
++  const signed char _from_table[128] =
+   {
+     -1, -1, -1, -1, -1, -1, -1, -1, // 0
+     -1, -1, -1, -1, -1, -1, -1, -1, // 8
+@@ -37,6 +37,6 @@ namespace base64
+     41, 42, 43, 44, 45, 46, 47, 48, // 112
+     49, 50, 51, -1, -1, -1, -1, -1  // 120
+   };
+-  const char* from_table = _from_table;
++  const signed char* from_table = _from_table;
+ }
+ 



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