diff options
| author |   Maciej Mrozowski <reavertm@gentoo.org> | 2019-11-21 01:01:30 +0100 |
|---|---|---|
| committer | Maciej Mrozowski <reavertm@gentoo.org> | 2019-11-21 22:23:33 +0100 |
| commit | 6bd833127a8fe0674efc5386f2cffc7420e46506 (patch) | |
| tree | 72d21339717992f18ab78c9ddc5f70fe97d347a4 /media-libs/coin/files | |
| parent | dev-lang/gnat-gpl: sync patches with gcc-8.3 (diff) | |
| download | gentoo-6bd833127a8fe0674efc5386f2cffc7420e46506.tar.gz gentoo-6bd833127a8fe0674efc5386f2cffc7420e46506.tar.bz2 gentoo-6bd833127a8fe0674efc5386f2cffc7420e46506.zip | |
media-libs/coin: version bump to latest snapshot, also fix linking
Bug: https://bugs.gentoo.org/700786
Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Maciej Mrozowski <reavertm@gentoo.org>
Diffstat (limited to 'media-libs/coin/files')
| -rw-r--r-- | media-libs/coin/files/coin-4.0.0a-cmake.patch | 96 | ||||
| -rw-r--r-- | media-libs/coin/files/coin-4.0.0a-gcc-7.patch | 21 |
2 files changed, 96 insertions, 21 deletions
diff --git a/media-libs/coin/files/coin-4.0.0a-cmake.patch b/media-libs/coin/files/coin-4.0.0a-cmake.patch new file mode 100644 index 000000000000..f47bf9bfb844 --- /dev/null +++ b/media-libs/coin/files/coin-4.0.0a-cmake.patch @@ -0,0 +1,96 @@ +diff -ruN Coin3D-coin-a4ce638f43bd/CMakeLists.txt my/CMakeLists.txt +--- Coin3D-coin-a4ce638f43bd/CMakeLists.txt 2019-11-09 14:39:34.000000000 +0100 ++++ my/CMakeLists.txt 2019-11-21 00:19:43.563521948 +0100 +@@ -97,8 +97,8 @@ + + report_prepare( + COIN_BUILD_SHARED_LIBS +- COIN_BUILD_TESTS +- COIN_BUILD_DOCUMENTATION ++ COIN_BUILD_TESTS ++ COIN_BUILD_DOCUMENTATION + COIN_BUILD_INTERNAL_DOCUMENTATION + COIN_BUILD_DOCUMENTATION_MAN + COIN_BUILD_DOCUMENTATION_QTHELP +@@ -107,29 +107,29 @@ + HAVE_VRML97 + COIN_HAVE_JAVASCRIPT + HAVE_NODEKITS +- HAVE_DRAGGERS +- HAVE_MANIPULATORS +- HAVE_SOUND ++ HAVE_DRAGGERS ++ HAVE_MANIPULATORS ++ HAVE_SOUND + HAVE_3DS_IMPORT_CAPABILITIES + USE_EXTERNAL_EXPAT +- USE_EXCEPTIONS +- USE_SUPERGLU +- FONTCONFIG_RUNTIME_LINKING +- FREETYPE_RUNTIME_LINKING +- LIBBZIP2_RUNTIME_LINKING +- OPENAL_RUNTIME_LINKING +- SIMAGE_RUNTIME_LINKING +- ZLIB_RUNTIME_LINKING +- GLU_RUNTIME_LINKING +- SPIDERMONKEY_RUNTIME_LINKING +- HAVE_MULTIPLE_VERSION ++ USE_EXCEPTIONS ++ USE_SUPERGLU ++ FONTCONFIG_RUNTIME_LINKING ++ FREETYPE_RUNTIME_LINKING ++ LIBBZIP2_RUNTIME_LINKING ++ OPENAL_RUNTIME_LINKING ++ SIMAGE_RUNTIME_LINKING ++ ZLIB_RUNTIME_LINKING ++ GLU_RUNTIME_LINKING ++ SPIDERMONKEY_RUNTIME_LINKING ++ HAVE_MULTIPLE_VERSION + IF_APPLE +- COIN_BUILD_MAC_FRAMEWORK +- COIN_BUILD_MAC_X11 +- COIN_BUILD_MAC_AGL ++ COIN_BUILD_MAC_FRAMEWORK ++ COIN_BUILD_MAC_X11 ++ COIN_BUILD_MAC_AGL + IF_MSVC + COIN_BUILD_MSVC_STATIC_RUNTIME +- COIN_BUILD_SINGLE_LIB ++ COIN_BUILD_SINGLE_LIB + MSVC_VERSION + COIN_BUILD_MSVC_MP + ) +@@ -141,8 +141,8 @@ + CMAKE_INSTALL_DATADIR + CMAKE_INSTALL_FULL_DATADIR + CMAKE_INSTALL_INCLUDEDIR +- CMAKE_INSTALL_FULL_INCLUDEDIR +- CMAKE_INSTALL_DOCDIR ++ CMAKE_INSTALL_FULL_INCLUDEDIR ++ CMAKE_INSTALL_DOCDIR + CMAKE_INSTALL_FULL_DOCDIR + ) + else() +@@ -165,7 +165,7 @@ + list(APPEND COIN_TARGET_LINK_LIBRARIES Boost::boost) + endif() + +-if(COIN_BUILD_MAC_X11) ++if(COIN_BUILD_MAC_X11 OR UNIX) + find_package(X11 REQUIRED) + # On Mac OS X, GLX is provided as a separate OpenGL implementation, different + # from the standard OpenGL framework which provides support for GLUT and native +@@ -530,6 +530,7 @@ + endif() + check_library_exists(dl dlopen "" HAVE_DL_LIB) + if(HAVE_DL_LIB) ++ list(APPEND COIN_TARGET_LINK_LIBRARIES dl) + check_include_file(dlfcn.h HAVE_DLFCN_H) + endif() + check_library_exists(dld shl_load "" HAVE_DLD_LIB) +@@ -815,4 +816,4 @@ + + # ############################################################################ + # New CPACK section, please see the README file inside cpack.d directory. +-add_subdirectory(cpack.d) ++# not needed add_subdirectory(cpack.d) diff --git a/media-libs/coin/files/coin-4.0.0a-gcc-7.patch b/media-libs/coin/files/coin-4.0.0a-gcc-7.patch deleted file mode 100644 index 89829b59b27d..000000000000 --- a/media-libs/coin/files/coin-4.0.0a-gcc-7.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -ruN Coin3D-coin-8d1ca1a6ea23/src/3ds/SoStream.cpp my/src/3ds/SoStream.cpp ---- Coin3D-coin-8d1ca1a6ea23/src/3ds/SoStream.cpp 2018-04-16 23:14:36.000000000 +0200 -+++ my/src/3ds/SoStream.cpp 2018-05-06 06:56:42.104728484 +0200 -@@ -185,7 +185,7 @@ - if (!gotNum) { setBadBit(); return FALSE; } \ - \ - char *ce; \ -- *s = '\0'; \ -+ *s = NULL; \ - _convertType_ tempVal = _convertFunc_(buf, &ce, 0); \ - \ - if (ce != s) \ -@@ -282,7 +282,7 @@ - gotAll: \ - \ - char *ce; \ -- *s = '\0'; \ -+ *s = NULL; \ - double tempVal = _convertFunc_(buf, &ce); \ - \ - if (ce != s) \ |