From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/coin/, media-libs/coin/files/
Date: Mon, 25 Mar 2024 12:38:29 +0000 (UTC) [thread overview]
Message-ID: <1711370286.7dda27837bbbc034c907e6c2cae6ffff450b40fc.asturm@gentoo> (raw)
commit: 7dda27837bbbc034c907e6c2cae6ffff450b40fc
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 25 11:40:10 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Mar 25 12:38:06 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7dda2783
media-libs/coin: drop 4.0.0, 4.0.1
Closes: https://bugs.gentoo.org/926343
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-libs/coin/Manifest | 2 -
media-libs/coin/coin-4.0.0.ebuild | 120 --------------------
media-libs/coin/coin-4.0.1.ebuild | 109 ------------------
.../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 -----
9 files changed, 547 deletions(-)
diff --git a/media-libs/coin/Manifest b/media-libs/coin/Manifest
index 3a046dd1a6bc..b5002705981d 100644
--- a/media-libs/coin/Manifest
+++ b/media-libs/coin/Manifest
@@ -1,3 +1 @@
-DIST coin-4.0.0-src.tar.gz 6824162 BLAKE2B 9dee9397bb63c0da02214d33f2661051a3fd99689956a6de5c2cf806dd05944038b87b690f954f35711ee5e4ab07f04685681b822d0bbab0d7941bef551202dc SHA512 e036276a243bfe252569cee1b67d38b8633fcf35bdf4e366a92ca67e23799d54d91fe272c23b383c451d330cee284809f28f237857493948149e0da1ebd64fae
-DIST coin-4.0.1-src.tar.gz 7125456 BLAKE2B 1f1b760a200c7086c6bf18e8b80882576495280900d9054ab61930327940b46f56789c01ec2a975ac04a1cb106f33d0a87f71d0f705159c84e8b2164d49949fc SHA512 4d18e2db854334244ab94fb206c001cd7ef3d9281eb4f24d52d5878a179ed0389da5721a74c51c30ec7bc7b01c2c091f0a09d63636a35fa064cdbcaca0770256
DIST coin-4.0.2-src.tar.gz 7160869 BLAKE2B a434ea2a550557024c665e392aa189e991296b5f8c9cd2c0dc5bb71d41a948ed9d9b34eac69dc9a651f70abf8ec1f188cb8df6534d6e31b6e4e1a6ec4acaffcd SHA512 31fcb69627e466c89bb640c5b2351db4e51772408a4ce56cae7d6f550ddf19adf9b121252479297d5c2a208032194d8f4e7bf97686b0611df1ac45231e09baad
diff --git a/media-libs/coin/coin-4.0.0.ebuild b/media-libs/coin/coin-4.0.0.ebuild
deleted file mode 100644
index d4fd74cb4328..000000000000
--- a/media-libs/coin/coin-4.0.0.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake flag-o-matic
-
-MY_P=${P/coin/Coin}
-
-DESCRIPTION="A high-level 3D graphics toolkit, fully compatible with SGI Open Inventor 2.1"
-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 ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE="debug doc +exceptions javascript man openal qthelp test threads"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
- man? ( doc )
- qthelp? ( doc )
-"
-
-RDEPEND="
- app-arch/bzip2
- dev-libs/expat
- media-libs/fontconfig
- media-libs/freetype:2
- media-libs/simage
- sys-libs/zlib
- virtual/opengl
- virtual/glu
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libXext
- javascript? ( dev-lang/spidermonkey:60 )
- openal? ( media-libs/openal )
-"
-DEPEND="${RDEPEND}
- dev-libs/boost:0
- x11-base/xorg-proto
- doc? (
- app-text/doxygen
- qthelp? ( dev-qt/qthelp:5 )
- )
-"
-
-S="${WORKDIR}/${PN}"
-
-PATCHES=(
- "${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
- "${FILESDIR}"/${P}-0007-Locate-slotted-qhelpgenerator.patch
-)
-
-DOCS=(
- AUTHORS FAQ FAQ.legal NEWS THANKS docs/HACKING
-)
-
-src_configure() {
- # -Werror=odr
- # https://bugs.gentoo.org/859832
- # https://github.com/coin3d/coin/issues/521
- filter-lto
-
- use debug && append-cppflags -DCOIN_DEBUG=1
-
- local mycmakeargs=(
- -DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
-
- -DCOIN_BUILD_SHARED_LIBS=ON
- -DCOIN_BUILD_TESTS=$(usex test)
- -DCOIN_BUILD_DOCUMENTATION=$(usex doc)
-
- -DCOIN_BUILD_INTERNAL_DOCUMENTATION=OFF
- -DCOIN_BUILD_DOCUMENTATION_MAN=$(usex man)
- -DCOIN_BUILD_DOCUMENTATION_QTHELP=$(usex qthelp)
- -DCOIN_BUILD_DOCUMENTATION_CHM=OFF
-
- -DCOIN_THREADSAFE=$(usex threads)
- -DHAVE_VRML97=ON
- -DCOIN_HAVE_JAVASCRIPT=$(usex javascript)
- -DHAVE_NODEKITS=ON
- -DHAVE_DRAGGERS=ON
- -DHAVE_MANIPULATORS=ON
- -DHAVE_SOUND=$(usex openal)
- -DHAVE_3DS_IMPORT_CAPABILITIES=ON
- -DUSE_EXTERNAL_EXPAT=ON
- -DUSE_EXCEPTIONS=$(usex exceptions)
- -DUSE_SUPERGLU=OFF
-
- -DFONTCONFIG_RUNTIME_LINKING=OFF
- -DFREETYPE_RUNTIME_LINKING=OFF
- -DLIBBZIP2_RUNTIME_LINKING=OFF
- -DOPENAL_RUNTIME_LINKING=OFF
- -DSIMAGE_RUNTIME_LINKING=OFF
- -DZLIB_RUNTIME_LINKING=OFF
- -DGLU_RUNTIME_LINKING=OFF
- -DSPIDERMONKEY_RUNTIME_LINKING=ON
-
- -DCOIN_VERBOSE=$(usex debug)
- -DHAVE_MULTIPLE_VERSION=OFF
-
- -DCOIN_BUILD_SINGLE_LIB=ON
- )
-
- cmake_src_configure
-}
-
-src_test() {
- pushd "${BUILD_DIR}/bin" > /dev/null || die
- ./CoinTests -r detailed || die "Tests failed."
- popd > /dev/null || die
-}
diff --git a/media-libs/coin/coin-4.0.1.ebuild b/media-libs/coin/coin-4.0.1.ebuild
deleted file mode 100644
index 364c7446ee9c..000000000000
--- a/media-libs/coin/coin-4.0.1.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic
-
-DESCRIPTION="A high-level 3D graphics toolkit, fully compatible with SGI Open Inventor 2.1"
-HOMEPAGE="https://github.com/coin3d/coin/wiki"
-SRC_URI="https://github.com/coin3d/coin/releases/download/v${PV}/${P}-src.tar.gz"
-S="${WORKDIR}/${PN}"
-
-LICENSE="|| ( GPL-2 PEL )"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE="debug doc +exceptions javascript man openal qthelp test threads"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
- man? ( doc )
- qthelp? ( doc )
-"
-
-RDEPEND="
- app-arch/bzip2
- dev-libs/expat
- media-libs/fontconfig
- media-libs/freetype:2
- media-libs/simage
- sys-libs/zlib
- virtual/opengl
- virtual/glu
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libXext
- javascript? ( dev-lang/spidermonkey:60 )
- openal? ( media-libs/openal )
-"
-DEPEND="${RDEPEND}
- dev-libs/boost:0
- x11-base/xorg-proto
- doc? ( qthelp? ( dev-qt/qthelp:5 ) )
-"
-BDEPEND="doc? ( app-text/doxygen )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-4.0.0-0007-Locate-slotted-qhelpgenerator.patch
-)
-
-DOCS=(
- AUTHORS FAQ FAQ.legal NEWS THANKS docs/HACKING
-)
-
-src_configure() {
- # -Werror=odr
- # https://bugs.gentoo.org/859832
- # https://github.com/coin3d/coin/issues/521
- filter-lto
-
- use debug && append-cppflags -DCOIN_DEBUG=1
-
- local mycmakeargs=(
- -DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
-
- -DCOIN_BUILD_SHARED_LIBS=ON
- -DCOIN_BUILD_TESTS=$(usex test)
- -DCOIN_BUILD_DOCUMENTATION=$(usex doc)
-
- -DCOIN_BUILD_INTERNAL_DOCUMENTATION=OFF
- -DCOIN_BUILD_DOCUMENTATION_MAN=$(usex man)
- -DCOIN_BUILD_DOCUMENTATION_QTHELP=$(usex qthelp)
- -DCOIN_BUILD_DOCUMENTATION_CHM=OFF
-
- -DCOIN_THREADSAFE=$(usex threads)
- -DHAVE_VRML97=ON
- -DCOIN_HAVE_JAVASCRIPT=$(usex javascript)
- -DHAVE_NODEKITS=ON
- -DHAVE_DRAGGERS=ON
- -DHAVE_MANIPULATORS=ON
- -DHAVE_SOUND=$(usex openal)
- -DHAVE_3DS_IMPORT_CAPABILITIES=ON
- -DUSE_EXTERNAL_EXPAT=ON
- -DUSE_EXCEPTIONS=$(usex exceptions)
- -DUSE_SUPERGLU=OFF
-
- -DFONTCONFIG_RUNTIME_LINKING=OFF
- -DFREETYPE_RUNTIME_LINKING=OFF
- -DLIBBZIP2_RUNTIME_LINKING=OFF
- -DOPENAL_RUNTIME_LINKING=OFF
- -DSIMAGE_RUNTIME_LINKING=OFF
- -DZLIB_RUNTIME_LINKING=OFF
- -DGLU_RUNTIME_LINKING=OFF
- -DSPIDERMONKEY_RUNTIME_LINKING=ON
-
- -DCOIN_VERBOSE=$(usex debug)
- -DHAVE_MULTIPLE_VERSION=OFF
-
- -DCOIN_BUILD_SINGLE_LIB=ON
- )
-
- cmake_src_configure
-}
-
-src_test() {
- pushd "${BUILD_DIR}/bin" > /dev/null || die
- ./CoinTests -r detailed || die "Tests failed."
- popd > /dev/null || die
-}
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
deleted file mode 100644
index c33cf4e2b8b1..000000000000
--- a/media-libs/coin/files/coin-4.0.0-0001-updated-to-cmake-3.14.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 962e613609ba93301999f83e283b7f489dfac503 Mon Sep 17 00:00:00 2001
-From: Giampiero Gabbiani <giampiero@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
deleted file mode 100644
index 82fceadbd886..000000000000
--- a/media-libs/coin/files/coin-4.0.0-0002-cpack.d-is-now-optional.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From be8e3d57aeb5b4df6abb52c5fa88666d48e7d7a0 Mon Sep 17 00:00:00 2001
-From: Giampiero Gabbiani <giampiero@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
deleted file mode 100644
index fb1c0d25a814..000000000000
--- a/media-libs/coin/files/coin-4.0.0-0003-Partially-incorporating-coin4.0.0a-patch-from-gentoo.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-From 9a36b15d66c5e340cd8695415ce5867ad07ee2bb Mon Sep 17 00:00:00 2001
-From: Volker Enderlein <volkerenderlein@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
deleted file mode 100644
index d57f8f3b945e..000000000000
--- a/media-libs/coin/files/coin-4.0.0-0004-Added-coin-default.cfg.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From fd8057eb54fee8aa457cc47abb0004f2b71d1e63 Mon Sep 17 00:00:00 2001
-From: Volker Enderlein <volkerenderlein@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
deleted file mode 100644
index ae218124618a..000000000000
--- a/media-libs/coin/files/coin-4.0.0-0005-Slightly-fix-coin.cfg.cmake.in.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From d36ee28712eae2f94998845926c6880d6e5a990c Mon Sep 17 00:00:00 2001
-From: Maciej Mrozowski <reavertm@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
deleted file mode 100644
index 3a81b380dc79..000000000000
--- a/media-libs/coin/files/coin-4.0.0-0006-Fix-underlinking-against-X11.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 58a1b4c3e968f96d3a2091fa5cb625f360ce6811 Mon Sep 17 00:00:00 2001
-From: Maciej Mrozowski <reavertm@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
-
next reply other threads:[~2024-03-25 12:38 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-25 12:38 Andreas Sturmlechner [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-12-18 0:15 [gentoo-commits] repo/gentoo:master commit in: media-libs/coin/, media-libs/coin/files/ Andreas Sturmlechner
2024-10-21 14:42 Andreas Sturmlechner
2022-10-17 19:11 Maciej Mrozowski
2020-10-14 0:37 Maciej Mrozowski
2018-05-06 8:02 Maciej Mrozowski
2017-07-23 13:09 Alexey Shvetsov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1711370286.7dda27837bbbc034c907e6c2cae6ffff450b40fc.asturm@gentoo \
--to=asturm@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox