commit: 281dc01736167c0e29a459a7380ec34666c7712f Author: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org> AuthorDate: Mon Aug 10 22:43:47 2020 +0000 Commit: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org> CommitDate: Mon Aug 10 22:44:47 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=281dc017
media-libs/coin: Version bump 4.0.0 Closes: https://bugs.gentoo.org/712574 Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Maciej Mrozowski <reavertm <AT> gentoo.org> media-libs/coin/Manifest | 2 +- ...4.0.0a_pre20191109.ebuild => coin-4.0.0.ebuild} | 23 ++-- .../coin-4.0.0-0001-updated-to-cmake-3.14.patch | 25 +++++ .../coin-4.0.0-0002-cpack.d-is-now-optional.patch | 32 ++++++ ...ncorporating-coin4.0.0a-patch-from-gentoo.patch | 123 +++++++++++++++++++++ .../coin-4.0.0-0004-Added-coin-default.cfg.patch | 63 +++++++++++ ...4.0.0-0005-Slightly-fix-coin.cfg.cmake.in.patch | 45 ++++++++ ...n-4.0.0-0006-Fix-underlinking-against-X11.patch | 28 +++++ media-libs/coin/files/coin-4.0.0a-cmake.patch | 96 ---------------- 9 files changed, 331 insertions(+), 106 deletions(-) diff --git a/media-libs/coin/Manifest b/media-libs/coin/Manifest index 23c548ebe1e..0da91a6dc58 100644 --- a/media-libs/coin/Manifest +++ b/media-libs/coin/Manifest @@ -1,2 +1,2 @@ DIST Coin-3.1.3.tar.gz 5981534 BLAKE2B 33f88149cf0bf7daeb32226e2deb29f9f36f2a29ca9fcf025f39bb50d3eb0bfc85113a1e96cf980c97d037419c3a263bcf6eccaeb2f289517304c59d4c9de919 SHA512 d6fd47ecc74e96fc4de46e3a683f038f1907b96db2bbe935fb49f2d59190bd18f3f439dc0e4cb435360e74e1d65994a32b21f670d5a76394692616625cb14394 -DIST Coin3D-coin-a4ce638f43bd.tar.bz2 4942450 BLAKE2B b974b8a39d8ef07a2b3465e131bb5ca08d249a99a9ccdd7f9a87bd26c8c901c7042211edf7acf097e56afc0ba80bf156c6864a831fbed4cac18c7ac7495601ff SHA512 90b7697649e18af77805d9aae918ba77958952839375812272d796c4cda4d887465fb9bb94f215509ae969cddf54fb92f38deb961cdd24e24c67b20ffc0f1adf +DIST coin-4.0.0-src.tar.gz 6824162 BLAKE2B 9dee9397bb63c0da02214d33f2661051a3fd99689956a6de5c2cf806dd05944038b87b690f954f35711ee5e4ab07f04685681b822d0bbab0d7941bef551202dc SHA512 e036276a243bfe252569cee1b67d38b8633fcf35bdf4e366a92ca67e23799d54d91fe272c23b383c451d330cee284809f28f237857493948149e0da1ebd64fae diff --git a/media-libs/coin/coin-4.0.0a_pre20191109.ebuild b/media-libs/coin/coin-4.0.0.ebuild similarity index 76% rename from media-libs/coin/coin-4.0.0a_pre20191109.ebuild rename to media-libs/coin/coin-4.0.0.ebuild index 0397a3a736d..3a0b364937c 100644 --- a/media-libs/coin/coin-4.0.0a_pre20191109.ebuild +++ b/media-libs/coin/coin-4.0.0.ebuild @@ -1,15 +1,15 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit cmake-utils flag-o-matic +inherit cmake flag-o-matic -MY_P=Coin3D-coin-a4ce638f43bd +MY_P=${P/coin/Coin} DESCRIPTION="A high-level 3D graphics toolkit, fully compatible with SGI Open Inventor 2.1" -HOMEPAGE="https://bitbucket.org/Coin3D/coin/wiki/Home"; -SRC_URI="https://dev.gentoo.org/~reavertm/${MY_P}.tar.bz2"; +HOMEPAGE="https://github.com/coin3d/coin/wiki"; +SRC_URI="https://github.com/coin3d/coin/releases/download/${MY_P}/${P}-src.tar.gz"; LICENSE="|| ( GPL-2 PEL )" KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" @@ -47,10 +47,15 @@ DEPEND="${RDEPEND} ) " -S="${WORKDIR}/${MY_P}" +S="${WORKDIR}/${PN}" PATCHES=( - "${FILESDIR}"/${PN}-4.0.0a-cmake.patch + "${FILESDIR}"/${P}-0001-updated-to-cmake-3.14.patch + "${FILESDIR}"/${P}-0002-cpack.d-is-now-optional.patch + "${FILESDIR}"/${P}-0003-Partially-incorporating-coin4.0.0a-patch-from-gentoo.patch + "${FILESDIR}"/${P}-0004-Added-coin-default.cfg.patch + "${FILESDIR}"/${P}-0005-Slightly-fix-coin.cfg.cmake.in.patch + "${FILESDIR}"/${P}-0006-Fix-underlinking-against-X11.patch ) DOCS=( @@ -94,12 +99,12 @@ src_configure() { -DSPIDERMONKEY_RUNTIME_LINKING=ON -DCOIN_VERBOSE=$(usex debug) - -DHAVE_MULTIPLE_VERSION=ON + -DHAVE_MULTIPLE_VERSION=OFF -DCOIN_BUILD_SINGLE_LIB=ON ) - cmake-utils_src_configure + cmake_src_configure } src_test() { diff --git a/media-libs/coin/files/coin-4.0.0-0001-updated-to-cmake-3.14.patch b/media-libs/coin/files/coin-4.0.0-0001-updated-to-cmake-3.14.patch new file mode 100644 index 00000000000..c33cf4e2b8b --- /dev/null +++ b/media-libs/coin/files/coin-4.0.0-0001-updated-to-cmake-3.14.patch @@ -0,0 +1,25 @@ +From 962e613609ba93301999f83e283b7f489dfac503 Mon Sep 17 00:00:00 2001 +From: Giampiero Gabbiani <giampi...@gabbiani.org> +Date: Fri, 10 Jan 2020 14:47:38 +0100 +Subject: [PATCH] updated to cmake 3.14 + +--- + CMakeLists.txt | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f32f6ffe3..3ce3a0d3a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,3 +1,8 @@ ++if (POLICY CMP0054) ++ # CMake version 3.14.5 warns when the policy is not set and uses OLD behaviour ++ cmake_policy(SET CMP0054 NEW) ++endif() ++ + cmake_minimum_required(VERSION 3.0) + + set(COIN_MAJOR_VERSION 4) +-- +2.26.2 + diff --git a/media-libs/coin/files/coin-4.0.0-0002-cpack.d-is-now-optional.patch b/media-libs/coin/files/coin-4.0.0-0002-cpack.d-is-now-optional.patch new file mode 100644 index 00000000000..82fceadbd88 --- /dev/null +++ b/media-libs/coin/files/coin-4.0.0-0002-cpack.d-is-now-optional.patch @@ -0,0 +1,32 @@ +From be8e3d57aeb5b4df6abb52c5fa88666d48e7d7a0 Mon Sep 17 00:00:00 2001 +From: Giampiero Gabbiani <giampi...@gabbiani.org> +Date: Tue, 14 Jan 2020 22:03:51 +0100 +Subject: [PATCH] cpack.d is now optional + +--- + CMakeLists.txt | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3ce3a0d3a..755bd9d59 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -95,6 +95,7 @@ option(SPIDERMONKEY_RUNTIME_LINKING "Enable SpiderMonkey runtime linking when ON + + option(COIN_VERBOSE "Add verbose debugging information during the configure process." OFF) + option(HAVE_MULTIPLE_VERSION "Forces versioned paths for includes and documentation when ON, usual behaviour otherwise." OFF) ++option(COIN_USE_CPACK "If enabled the cpack subrepo is mandatory" OFF) + + cmake_dependent_option(COIN_BUILD_MAC_FRAMEWORK "Build framework instead of dylib on Mac OS X when ON. Only valid if COIN_BUILD_SHARED_LIBS is ON." OFF "APPLE;NOT IOS;COIN_BUILD_SHARED_LIBS" OFF) + cmake_dependent_option(COIN_BUILD_MAC_X11 "Build for X11 on Mac OS X when ON. Default is OFF." OFF "APPLE" OFF) +@@ -820,4 +821,6 @@ endif() + + # ############################################################################ + # New CPACK section, please see the README file inside cpack.d directory. +-add_subdirectory(cpack.d) ++if (COIN_USE_CPACK) ++ add_subdirectory(cpack.d) ++endif() +-- +2.26.2 + diff --git a/media-libs/coin/files/coin-4.0.0-0003-Partially-incorporating-coin4.0.0a-patch-from-gentoo.patch b/media-libs/coin/files/coin-4.0.0-0003-Partially-incorporating-coin4.0.0a-patch-from-gentoo.patch new file mode 100644 index 00000000000..fb1c0d25a81 --- /dev/null +++ b/media-libs/coin/files/coin-4.0.0-0003-Partially-incorporating-coin4.0.0a-patch-from-gentoo.patch @@ -0,0 +1,123 @@ +From 9a36b15d66c5e340cd8695415ce5867ad07ee2bb Mon Sep 17 00:00:00 2001 +From: Volker Enderlein <volkerenderl...@hotmail.com> +Date: Sun, 8 Mar 2020 14:24:29 +0100 +Subject: [PATCH] Partially incorporating coin4.0.0a-patch from gentoo + +--- + CMakeLists.txt | 63 ++++++++++++++++++++++++++------------------------ + 1 file changed, 33 insertions(+), 30 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 755bd9d59..d23f5bc0e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,8 +1,3 @@ +-if (POLICY CMP0054) +- # CMake version 3.14.5 warns when the policy is not set and uses OLD behaviour +- cmake_policy(SET CMP0054 NEW) +-endif() +- + cmake_minimum_required(VERSION 3.0) + + set(COIN_MAJOR_VERSION 4) +@@ -22,6 +17,11 @@ math(EXPR COIN_SO_VERSION ${PROJECT_VERSION_MAJOR}*20) + set(PROJECT_DESCRIPTION "A high-level 3D visualization library with Open Inventor 2.1 API") + # ############################################################################ + ++if(POLICY CMP0054) ++ # CMake version 3.14.5 warns when the policy is not set and uses OLD behaviour ++ cmake_policy(SET CMP0054 NEW) ++endif() ++ + if(POLICY CMP0072) + # get rid of OpenGL GLVND warning from CMake 3.11 + cmake_policy(SET CMP0072 NEW) +@@ -103,8 +103,8 @@ cmake_dependent_option(COIN_BUILD_MAC_AGL "Build for AGL on Mac OS X when ON. De + + 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 +@@ -113,29 +113,29 @@ report_prepare( + 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 + ) +@@ -147,8 +147,8 @@ if(HAVE_MULTIPLE_VERSION) + 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() +@@ -534,9 +534,12 @@ else() + if(HAVE_MACH_O_DYLD_H) + check_symbol_exists(NSLookupAndBindSymbol mach-o/dyld.h HAVE_DYLD_RUNTIME_BINDING) + endif() +- check_library_exists(dl dlopen "" HAVE_DL_LIB) +- if(HAVE_DL_LIB) +- check_include_file(dlfcn.h HAVE_DLFCN_H) ++ # On FreeBSD, NetBSD and OpenBSD there is no libdl, as the required ++ # functionality is already built into libc. So use ${CMAKE_DL_LIBS} instead. ++ check_include_file(dlfcn.h HAVE_DLFCN_H) ++ if(HAVE_DLFCN_H) ++ set(HAVE_DL_LIB 1) ++ list(APPEND COIN_TARGET_LINK_LIBRARIES ${CMAKE_DL_LIBS}) + endif() + check_library_exists(dld shl_load "" HAVE_DLD_LIB) + endif() +-- +2.26.2 + diff --git a/media-libs/coin/files/coin-4.0.0-0004-Added-coin-default.cfg.patch b/media-libs/coin/files/coin-4.0.0-0004-Added-coin-default.cfg.patch new file mode 100644 index 00000000000..d57f8f3b945 --- /dev/null +++ b/media-libs/coin/files/coin-4.0.0-0004-Added-coin-default.cfg.patch @@ -0,0 +1,63 @@ +From fd8057eb54fee8aa457cc47abb0004f2b71d1e63 Mon Sep 17 00:00:00 2001 +From: Volker Enderlein <volkerenderl...@hotmail.com> +Date: Sun, 10 May 2020 15:24:20 +0200 +Subject: [PATCH] Added coin-default.cfg. + +--- + coin.cfg.cmake.in | 24 ++++++++++++++++++++++++ + src/CMakeLists.txt | 8 +++++--- + 2 files changed, 29 insertions(+), 3 deletions(-) + create mode 100644 coin.cfg.cmake.in + +diff --git a/coin.cfg.cmake.in b/coin.cfg.cmake.in +new file mode 100644 +index 000000000..6f41c61c7 +--- /dev/null ++++ b/coin.cfg.cmake.in +@@ -0,0 +1,24 @@ ++# prefix is determined in coin-config, making the package "movable" ++# prefix="@prefix@" ++host="@host@" ++exec_prefix="@exec_prefix@" ++version="@COIN_VERSION@" ++cflags="@COIN_EXTRA_CFLAGS@" ++cppflags="@COIN_EXTRA_CPPFLAGS@" ++cxxflags="@COIN_EXTRA_CXXFLAGS@" ++ldflags="@COIN_EXTRA_LDFLAGS@" ++libs="@COIN_EXTRA_LIBS@" ++msvcrt="@COIN_MSVC_LIBC@" ++datadir="@datarootdir@" ++includedir="@includedir@" ++frameworkdir="@frameworkdir@" ++htmldir="@htmldir@" ++compiler="@COIN_COMPILER@" ++objext="@OBJEXT@" ++have_3ds_import=@HAVE_3DS_IMPORT_CAPABILITIES@ ++have_vrml97=@HAVE_VRML97@ ++have_sound=@HAVE_SOUND@ ++have_superglu=@HAVE_SUPERGLU@ ++have_threads=@HAVE_THREADS@ ++have_threadsafe=@HAVE_THREADSAFE@ ++compiler_is_gcc=@ac_compiler_gnu@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 4ddc1ecd4..6132335b3 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -388,9 +388,11 @@ else() + set(COIN_CONFIG_PACKAGE_LOCATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}-${PROJECT_VERSION}) + string(TOLOWER ${PROJECT_NAME} COIN_CONFIG_PACKAGE_BASENAME) + if(UNIX OR MINGW) +- configure_file(${CMAKE_SOURCE_DIR}/${PROJECT_NAME}.pc.cmake.in ${CMAKE_BINARY_DIR}/${PROJECT_NAME}.pc @ONLY) +- install(FILES ${CMAKE_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) +- install(FILES ${CMAKE_SOURCE_DIR}/bin/coin-config DESTINATION ${CMAKE_INSTALL_BINDIR}) ++ configure_file("${CMAKE_SOURCE_DIR}/${PROJECT_NAME}.pc.cmake.in" "${CMAKE_BINARY_DIR}/${PROJECT_NAME}.pc" @ONLY) ++ install(FILES "${CMAKE_BINARY_DIR}/${PROJECT_NAME}.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") ++ install(PROGRAMS "${CMAKE_SOURCE_DIR}/bin/coin-config" DESTINATION ${CMAKE_INSTALL_BINDIR}) ++ configure_file("${CMAKE_SOURCE_DIR}/coin.cfg.cmake.in" "${CMAKE_BINARY_DIR}/${PROJECT_NAME_LOWER}-default.cfg" @ONLY) ++ install(FILES "${CMAKE_BINARY_DIR}/${PROJECT_NAME_LOWER}-default.cfg" DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/Coin/conf) + endif() + endif() + +-- +2.26.2 + diff --git a/media-libs/coin/files/coin-4.0.0-0005-Slightly-fix-coin.cfg.cmake.in.patch b/media-libs/coin/files/coin-4.0.0-0005-Slightly-fix-coin.cfg.cmake.in.patch new file mode 100644 index 00000000000..ae218124618 --- /dev/null +++ b/media-libs/coin/files/coin-4.0.0-0005-Slightly-fix-coin.cfg.cmake.in.patch @@ -0,0 +1,45 @@ +From d36ee28712eae2f94998845926c6880d6e5a990c Mon Sep 17 00:00:00 2001 +From: Maciej Mrozowski <reave...@gmail.com> +Date: Wed, 5 Aug 2020 02:03:52 +0200 +Subject: [PATCH] Slightly fix coin.cfg.cmake.in + +--- + coin.cfg.cmake.in | 20 ++++++++++---------- + 1 file changed, 10 insertions(+), 10 deletions(-) + +diff --git a/coin.cfg.cmake.in b/coin.cfg.cmake.in +index 6f41c61c7..6ed041ef4 100644 +--- a/coin.cfg.cmake.in ++++ b/coin.cfg.cmake.in +@@ -7,18 +7,18 @@ cflags="@COIN_EXTRA_CFLAGS@" + cppflags="@COIN_EXTRA_CPPFLAGS@" + cxxflags="@COIN_EXTRA_CXXFLAGS@" + ldflags="@COIN_EXTRA_LDFLAGS@" +-libs="@COIN_EXTRA_LIBS@" ++libs="@CMAKE_INSTALL_FULL_LIBDIR@" + msvcrt="@COIN_MSVC_LIBC@" +-datadir="@datarootdir@" +-includedir="@includedir@" ++datadir="@CMAKE_INSTALL_FULL_DATADIR@" ++includedir="@CMAKE_INSTALL_FULL_INCLUDEDIR@" + frameworkdir="@frameworkdir@" +-htmldir="@htmldir@" ++htmldir="@CMAKE_INSTALL_FULL_DOCDIR@" + compiler="@COIN_COMPILER@" + objext="@OBJEXT@" +-have_3ds_import=@HAVE_3DS_IMPORT_CAPABILITIES@ +-have_vrml97=@HAVE_VRML97@ +-have_sound=@HAVE_SOUND@ +-have_superglu=@HAVE_SUPERGLU@ +-have_threads=@HAVE_THREADS@ +-have_threadsafe=@HAVE_THREADSAFE@ ++have_3ds_import=@FEAT_HAVE_3DS@ ++have_vrml97=@FEAT_HAVE_VRML97@ ++have_sound=@FEAT_HAVE_SOUND@ ++have_superglu=@FEAT_HAVE_SUPERGLU@ ++have_threads=@FEAT_HAVE_THREADS@ ++have_threadsafe=@FEAT_HAVE_SAFETHREAD@ + compiler_is_gcc=@ac_compiler_gnu@ +-- +2.26.2 + diff --git a/media-libs/coin/files/coin-4.0.0-0006-Fix-underlinking-against-X11.patch b/media-libs/coin/files/coin-4.0.0-0006-Fix-underlinking-against-X11.patch new file mode 100644 index 00000000000..3a81b380dc7 --- /dev/null +++ b/media-libs/coin/files/coin-4.0.0-0006-Fix-underlinking-against-X11.patch @@ -0,0 +1,28 @@ +From 58a1b4c3e968f96d3a2091fa5cb625f360ce6811 Mon Sep 17 00:00:00 2001 +From: Maciej Mrozowski <reave...@gmail.com> +Date: Wed, 5 Aug 2020 02:57:28 +0200 +Subject: [PATCH] Fix underlinking against X11 + +--- + CMakeLists.txt | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3818da7ff..eda2cd2c0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -195,6 +195,11 @@ if(COIN_BUILD_MAC_X11) + list(APPEND COIN_TARGET_LINK_LIBRARIES ${X11_LIBRARIES} ${X11_GL_LIB} ${X11_GLU_LIB}) + endif() + else() ++ if(UNIX AND NOT APPLE) ++ find_package(X11 REQUIRED) ++ list(APPEND COIN_TARGET_INCLUDE_DIRECTORIES ${X11_INCLUDE_DIR}) ++ list(APPEND COIN_TARGET_LINK_LIBRARIES ${X11_LIBRARIES}) ++ endif() + find_package(OpenGL REQUIRED) + if(OPENGL_FOUND) + set(HAVE_OPENGL 1) +-- +2.26.2 + diff --git a/media-libs/coin/files/coin-4.0.0a-cmake.patch b/media-libs/coin/files/coin-4.0.0a-cmake.patch deleted file mode 100644 index f47bf9bfb84..00000000000 --- a/media-libs/coin/files/coin-4.0.0a-cmake.patch +++ /dev/null @@ -1,96 +0,0 @@ -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)
