reinit the tree, so we can have metadata

6 files changed, 133 insertions, 0 deletions

diff --git a/media-libs/coin/files/coin-3.1.0-javascript.patch b/media-libs/coin/files/coin-3.1.0-javascript.patch
new file mode 100644
index 000000000000..f45d9cd78cf6
--- /dev/null
+++ b/media-libs/coin/files/coin-3.1.0-javascript.patch
@@ -0,0 +1,38 @@
+Index: src/vrml97/JS_VRMLClasses.h
+===================================================================
+--- src/vrml97/JS_VRMLClasses.h	(revision 13505)
++++ src/vrml97/JS_VRMLClasses.h	(revision 13506)
+@@ -28,6 +28,7 @@
+ #error this is a private header file
+ #endif /* ! COIN_INTERNAL */
+ 
++#if defined(HAVE_VRML97) && defined(COIN_HAVE_JAVASCRIPT)
+ /* ********************************************************************** */
+ 
+ class SoJavaScriptEngine;
+@@ -37,5 +38,6 @@
+ void JS_addVRMLclasses(SoJavaScriptEngine * engine);
+ 
+ /* ********************************************************************** */
++#endif // HAVE_VRML97 && COIN_HAVE_JAVASCRIPT
+ 
+ #endif /* !COIN_JS_VRMLCLASSES_H */
+Index: src/vrml97/JS_VRMLClasses.cpp
+===================================================================
+--- src/vrml97/JS_VRMLClasses.cpp	(revision 13505)
++++ src/vrml97/JS_VRMLClasses.cpp	(revision 13506)
+@@ -2,7 +2,7 @@
+ #include "config.h"
+ #endif // HAVE_CONFIG_H
+ 
+-#ifdef HAVE_VRML97
++#if defined(HAVE_VRML97) && defined(COIN_HAVE_JAVASCRIPT)
+ 
+ /**************************************************************************\
+  *
+@@ -2097,4 +2097,4 @@
+     MFVec3dHandler::jsval2field);
+ }
+ 
+-#endif // HAVE_VRML97
++#endif // HAVE_VRML97 && COIN_HAVE_JAVASCRIPT
diff --git a/media-libs/coin/files/coin-3.1.3-freetype251.patch b/media-libs/coin/files/coin-3.1.3-freetype251.patch
new file mode 100644
index 000000000000..44e8eefb1f63
--- /dev/null
+++ b/media-libs/coin/files/coin-3.1.3-freetype251.patch
@@ -0,0 +1,28 @@
+--- Coin-3.1.3/src/glue/freetype.cpp
++++ Coin-3.1.3/src/glue/freetype.cpp
+@@ -52,9 +52,9 @@
+ #ifdef HAVE_FREETYPE /* In case we're _not_ doing runtime linking. */
+ #define FREETYPEGLUE_ASSUME_FREETYPE 1
+ #include <ft2build.h>
+-#include <freetype/freetype.h>
+-#include <freetype/ftglyph.h>
+-#include <freetype/ftoutln.h>
++#include FT_FREETYPE_H
++#include FT_GLYPH_H
++#include FT_OUTLINE_H
+ #endif /* FREETYPEGLUE_ASSUME_FREETYPE */
+ 
+ #include <Inventor/C/basic.h>
+--- Coin-3.1.3/src/glue/freetype.h
++++ Coin-3.1.3/src/glue/freetype.h
+@@ -87,8 +87,8 @@
+ 
+ #ifdef HAVE_FREETYPE
+ #include <ft2build.h>
+-#include <freetype/freetype.h>
+-#include <freetype/ftglyph.h>
++#include FT_FREETYPE_H
++#include FT_GLYPH_H
+ #else /* HAVE_FREETYPE */
+ 
+ #include <Inventor/C/basic.h>
diff --git a/media-libs/coin/files/coin-3.1.3-gcc-4.7.patch b/media-libs/coin/files/coin-3.1.3-gcc-4.7.patch
new file mode 100644
index 000000000000..fd2430903802
--- /dev/null
+++ b/media-libs/coin/files/coin-3.1.3-gcc-4.7.patch
@@ -0,0 +1,10 @@
+--- coin3-3.1.3.orig/include/Inventor/SbBasic.h
++++ coin3-3.1.3/include/Inventor/SbBasic.h
+@@ -24,6 +24,7 @@
+  *
+ \**************************************************************************/
+ 
++#include <Inventor/C/errors/debugerror.h>
+ #include <Inventor/C/basic.h>
+ 
+ /* ********************************************************************** */
diff --git a/media-libs/coin/files/coin-3.1.3-gcc-7.patch b/media-libs/coin/files/coin-3.1.3-gcc-7.patch
new file mode 100644
index 000000000000..c1f1f560d851
--- /dev/null
+++ b/media-libs/coin/files/coin-3.1.3-gcc-7.patch
@@ -0,0 +1,21 @@
+diff -urN Coin-3.1.3.orig/src/3ds/SoStream.cpp Coin-3.1.3/src/3ds/SoStream.cpp
+--- Coin-3.1.3.orig/src/3ds/SoStream.cpp	2010-03-02 16:20:09.000000000 +0300
++++ Coin-3.1.3/src/3ds/SoStream.cpp	2017-07-23 15:04:43.808204691 +0300
+@@ -176,7 +176,7 @@
+   if (!gotNum) { setBadBit(); return FALSE; } \
+  \
+   char *ce; \
+-  s = '\0'; \
++  s = NULL; \
+   _convertType_ tempVal = _convertFunc_(buf, &ce, 0); \
+  \
+   if (ce != s) \
+@@ -273,7 +273,7 @@
+ gotAll: \
+   \
+   char *ce; \
+-  s = '\0'; \
++  s = NULL; \
+   double tempVal = _convertFunc_(buf, &ce); \
+  \
+   if (ce != s) \
diff --git a/media-libs/coin/files/coin-3.1.3-memhandler-initialization.patch b/media-libs/coin/files/coin-3.1.3-memhandler-initialization.patch
new file mode 100644
index 000000000000..892882b6a3db
--- /dev/null
+++ b/media-libs/coin/files/coin-3.1.3-memhandler-initialization.patch
@@ -0,0 +1,23 @@
+Bug: https://bugs.gentoo.org/show_bug.cgi?id=619378
+Patch http://pkgs.fedoraproject.org/cgit/rpms/Coin3.git/tree/0012-memhandler-initialization.patch?id=ca89ec7227943bdec800ee51b920f578fab87b05
+
+--- a/src/misc/SbHash.h
++++ b/src/misc/SbHash.h
+@@ -89,6 +89,8 @@
+     cc_memalloc_deallocate(entry->memhandler, ptr);
+   }
+   SbHashEntry(const Key & key, const Type & obj) : key(key), obj(obj) {}
++  SbHashEntry(const Key & key, const Type & obj, cc_memalloc *memhandler)
++		: key(key), obj(obj), memhandler(memhandler) {}
+
+   Key key;
+   Type obj;
+@@ -218,7 +220,7 @@
+     /* Key not already in the hash table; insert a new
+      * entry as the first element in the bucket
+      */
+-    entry = new (this->memhandler) SbHashEntry<Type, Key>(key, obj);
++    entry = new (this->memhandler) SbHashEntry<Type, Key>(key, obj, this->memhandler);
+     entry->next = this->buckets[i];
+     this->buckets[i] = entry;
+
diff --git a/media-libs/coin/files/coin-3.1.3-pkgconfig-partial.patch b/media-libs/coin/files/coin-3.1.3-pkgconfig-partial.patch
new file mode 100644
index 000000000000..3fd3bca726d4
--- /dev/null
+++ b/media-libs/coin/files/coin-3.1.3-pkgconfig-partial.patch
@@ -0,0 +1,13 @@
+diff -ru ../Coin-3.1.3/Coin.pc.in ./Coin.pc.in
+--- Coin.pc.in	2010-03-02 14:20:09.000000000 +0100
++++ Coin.pc.in	2010-06-28 19:27:59.634534460 +0200
+@@ -10,7 +10,8 @@
+ Version: @COIN_VERSION@
+ Requires:
+ Conflicts:
+-Libs: -L${libdir} @COIN_EXTRA_LDFLAGS@ @COIN_EXTRA_LIBS@
++Libs: -L${libdir} -lCoin
++Libs.private: -L${libdir} @COIN_EXTRA_LIBS@
+ Cflags: -I${includedir} @COIN_EXTRA_CFLAGS@ @COIN_EXTRA_CPPFLAGS@
+ 
+ coin_host=@host@