* [gentoo-commits] repo/gentoo:master commit in: media-libs/coin/, media-libs/coin/files/
@ 2017-07-23 13:09 Alexey Shvetsov
0 siblings, 0 replies; 7+ messages in thread
From: Alexey Shvetsov @ 2017-07-23 13:09 UTC (permalink / raw
To: gentoo-commits
commit: 4dee204fba967426d5a3093d83a7d626b9fc4c30
Author: Peter Levine <plevine457 <AT> gmail <DOT> com>
AuthorDate: Wed Jul 19 05:46:56 2017 +0000
Commit: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Sun Jul 23 13:09:04 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4dee204f
media-libs/coin: Fix segfault with GCC-6
Bug: https://bugs.gentoo.org/show_bug.cgi?id=619378
Package-Manager: Portage-2.3.6, Repoman-2.3.2
media-libs/coin/coin-3.1.3-r2.ebuild | 1 +
.../coin-3.1.3-memhandler-initialization.patch | 23 ++++++++++++++++++++++
2 files changed, 24 insertions(+)
diff --git a/media-libs/coin/coin-3.1.3-r2.ebuild b/media-libs/coin/coin-3.1.3-r2.ebuild
index c9686db8c42..5edce05a9cb 100644
--- a/media-libs/coin/coin-3.1.3-r2.ebuild
+++ b/media-libs/coin/coin-3.1.3-r2.ebuild
@@ -45,6 +45,7 @@ PATCHES=(
"${FILESDIR}"/${P}-pkgconfig-partial.patch
"${FILESDIR}"/${P}-gcc-4.7.patch
"${FILESDIR}"/${P}-freetype251.patch
+ "${FILESDIR}"/${P}-memhandler-initialization.patch
)
DOCS=(
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 00000000000..892882b6a3d
--- /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;
+
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/coin/, media-libs/coin/files/
@ 2018-05-06 8:02 Maciej Mrozowski
0 siblings, 0 replies; 7+ messages in thread
From: Maciej Mrozowski @ 2018-05-06 8:02 UTC (permalink / raw
To: gentoo-commits
commit: 04543ee0267931b25ff408d04e3b9c9a99d5bb7d
Author: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
AuthorDate: Sun May 6 07:57:54 2018 +0000
Commit: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
CommitDate: Sun May 6 08:02:10 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04543ee0
media-libs/coin: Version bump 4.0.0a (SCM snapshot)
media-libs/coin/Manifest | 1 +
media-libs/coin/coin-4.0.0a_pre20180416.ebuild | 84 ++++++++++++++++++++++++++
media-libs/coin/files/coin-4.0.0a-gcc-7.patch | 21 +++++++
media-libs/coin/metadata.xml | 1 +
4 files changed, 107 insertions(+)
diff --git a/media-libs/coin/Manifest b/media-libs/coin/Manifest
index cc20a719a7d..3b1f98ce483 100644
--- a/media-libs/coin/Manifest
+++ b/media-libs/coin/Manifest
@@ -1 +1,2 @@
DIST Coin-3.1.3.tar.gz 5981534 BLAKE2B 33f88149cf0bf7daeb32226e2deb29f9f36f2a29ca9fcf025f39bb50d3eb0bfc85113a1e96cf980c97d037419c3a263bcf6eccaeb2f289517304c59d4c9de919 SHA512 d6fd47ecc74e96fc4de46e3a683f038f1907b96db2bbe935fb49f2d59190bd18f3f439dc0e4cb435360e74e1d65994a32b21f670d5a76394692616625cb14394
+DIST Coin3D-coin-8d1ca1a6ea23.tar.bz2 4925310 BLAKE2B 3c9aab5e68b79db4878e5d27773537acb7d658580a8deea059565dfa78ee791cb7ee23f159e077408c3307e2647e628357daaa4f2f5a4fc4a125c8d1663ee718 SHA512 f0c4d39a89b1dc3e183c2c8cffad6be30f9d27e50b3735c1b261addc55376aceb8f81c916fbdfeb42b852071692febaf6e3839373095bcf2b7046c773fcc809c
diff --git a/media-libs/coin/coin-4.0.0a_pre20180416.ebuild b/media-libs/coin/coin-4.0.0a_pre20180416.ebuild
new file mode 100644
index 00000000000..da490ba09d2
--- /dev/null
+++ b/media-libs/coin/coin-4.0.0a_pre20180416.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils flag-o-matic
+
+MY_P=Coin3D-coin-8d1ca1a6ea23
+
+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"
+
+LICENSE="|| ( GPL-2 PEL )"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+IUSE="debug doc javascript openal qthelp simage test threads"
+
+RDEPEND="
+ app-arch/bzip2
+ dev-libs/expat
+ media-libs/fontconfig
+ media-libs/freetype:2
+ sys-libs/zlib
+ virtual/opengl
+ virtual/glu
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ x11-libs/libXext
+ javascript? ( dev-lang/spidermonkey:0 )
+ openal? ( media-libs/openal )
+ simage? ( media-libs/simage )
+"
+DEPEND="${RDEPEND}
+ x11-proto/xextproto
+ doc? (
+ app-doc/doxygen
+ qthelp? ( dev-qt/qthelp:5 )
+ )
+"
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-4.0.0a-gcc-7.patch
+)
+
+DOCS=(
+ AUTHORS FAQ FAQ.legal NEWS README RELNOTES THANKS docs/HACKING
+)
+
+src_configure() {
+ use debug && append-cppflags -DCOIN_DEBUG=1
+
+ local mycmakeargs=(
+ -DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+ -DCOIN_BUILD_DOCUMENTATION=$(usex doc)
+ -DCOIN_BUILD_SHARED_LIBS=ON
+ -DCOIN_BUILD_SINGLE_LIB=ON
+ -DCOIN_BUILD_TESTS=$(usex test)
+ -DCOIN_HAVE_JAVASCRIPT=$(usex javascript)
+ -DCOIN_MULTIPLE_VERSION=OFF
+ -DCOIN_QT_HELP=$(usex doc)
+ -DCOIN_THREADSAFE=$(usex threads)
+ -DCOIN_VERBOSE=$(usex debug)
+ -DHAVE_3DS_IMPORT_CAPABILITIES=ON
+ -DHAVE_DRAGGERS=ON
+ -DHAVE_MAN=OFF
+ -DHAVE_MANIPULATORS=ON
+ -DHAVE_NODEKITS=ON
+ -DHAVE_SOUND=$(usex openal)
+ -DHAVE_VRML97=ON
+ -DSIMAGE_RUNTIME_LINKING=OFF
+ -DUSE_EXTERNAL_EXPAT=ON
+ )
+
+ cmake-utils_src_configure
+}
+
+src_test() {
+ pushd "${BUILD_DIR}/testsuite" > /dev/null || die
+ ./CoinTests || die "Tests failed."
+ popd > /dev/null || die
+}
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
new file mode 100644
index 00000000000..89829b59b27
--- /dev/null
+++ b/media-libs/coin/files/coin-4.0.0a-gcc-7.patch
@@ -0,0 +1,21 @@
+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) \
diff --git a/media-libs/coin/metadata.xml b/media-libs/coin/metadata.xml
index b9eaa9f2655..aa4affdefe9 100644
--- a/media-libs/coin/metadata.xml
+++ b/media-libs/coin/metadata.xml
@@ -5,6 +5,7 @@
<email>reavertm@gentoo.org</email>
</maintainer>
<use>
+ <flag name="qthelp">Build API documentation in QtHelp format</flag>
<flag name="simage">Texture loading via <pkg>media-libs/simage</pkg> library</flag>
</use>
<upstream>
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/coin/, media-libs/coin/files/
@ 2020-10-14 0:37 Maciej Mrozowski
0 siblings, 0 replies; 7+ messages in thread
From: Maciej Mrozowski @ 2020-10-14 0:37 UTC (permalink / raw
To: gentoo-commits
commit: 4485260386ba034842b54a812f87f7133ddbd88f
Author: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 14 00:36:23 2020 +0000
Commit: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
CommitDate: Wed Oct 14 00:36:23 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44852603
media-libs/coin: remove old, update remote-id in metadata.xml
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Maciej Mrozowski <reavertm <AT> gentoo.org>
media-libs/coin/Manifest | 1 -
media-libs/coin/coin-3.1.3-r2.ebuild | 100 ---------------------
media-libs/coin/files/coin-3.1.0-javascript.patch | 38 --------
media-libs/coin/files/coin-3.1.3-freetype251.patch | 28 ------
media-libs/coin/files/coin-3.1.3-gcc-4.7.patch | 10 ---
media-libs/coin/files/coin-3.1.3-gcc-7.patch | 21 -----
.../coin-3.1.3-memhandler-initialization.patch | 23 -----
.../coin/files/coin-3.1.3-pkgconfig-partial.patch | 13 ---
media-libs/coin/metadata.xml | 3 +-
9 files changed, 1 insertion(+), 236 deletions(-)
diff --git a/media-libs/coin/Manifest b/media-libs/coin/Manifest
index 0da91a6dc58..05545c81b61 100644
--- a/media-libs/coin/Manifest
+++ b/media-libs/coin/Manifest
@@ -1,2 +1 @@
-DIST Coin-3.1.3.tar.gz 5981534 BLAKE2B 33f88149cf0bf7daeb32226e2deb29f9f36f2a29ca9fcf025f39bb50d3eb0bfc85113a1e96cf980c97d037419c3a263bcf6eccaeb2f289517304c59d4c9de919 SHA512 d6fd47ecc74e96fc4de46e3a683f038f1907b96db2bbe935fb49f2d59190bd18f3f439dc0e4cb435360e74e1d65994a32b21f670d5a76394692616625cb14394
DIST coin-4.0.0-src.tar.gz 6824162 BLAKE2B 9dee9397bb63c0da02214d33f2661051a3fd99689956a6de5c2cf806dd05944038b87b690f954f35711ee5e4ab07f04685681b822d0bbab0d7941bef551202dc SHA512 e036276a243bfe252569cee1b67d38b8633fcf35bdf4e366a92ca67e23799d54d91fe272c23b383c451d330cee284809f28f237857493948149e0da1ebd64fae
diff --git a/media-libs/coin/coin-3.1.3-r2.ebuild b/media-libs/coin/coin-3.1.3-r2.ebuild
deleted file mode 100644
index 6e2dfe73f61..00000000000
--- a/media-libs/coin/coin-3.1.3-r2.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils flag-o-matic
-
-MY_P=${P/c/C}
-
-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://bitbucket.org/Coin3D/coin/downloads/${MY_P}.tar.gz"
-
-LICENSE="|| ( GPL-2 PEL )"
-KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE="bzip2 debug doc javascript openal simage static-libs threads zlib"
-
-# NOTE: expat is not really needed as --enable-system-expat is broken
-RDEPEND="
- dev-libs/expat
- media-libs/fontconfig
- media-libs/freetype:2
- virtual/opengl
- virtual/glu
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libXext
- bzip2? ( app-arch/bzip2 )
- javascript? ( dev-lang/spidermonkey:0 )
- openal? ( media-libs/openal )
- simage? ( media-libs/simage )
- zlib? ( sys-libs/zlib )
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- x11-base/xorg-proto
- doc? ( app-doc/doxygen )
-"
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.1.0-javascript.patch
- "${FILESDIR}"/${P}-pkgconfig-partial.patch
- "${FILESDIR}"/${P}-gcc-4.7.patch
- "${FILESDIR}"/${P}-freetype251.patch
- "${FILESDIR}"/${P}-memhandler-initialization.patch
- "${FILESDIR}"/${P}-gcc-7.patch
-)
-
-DOCS=(
- AUTHORS FAQ FAQ.legal NEWS README RELNOTES THANKS
- docs/{ChangeLog.v${PV},HACKING,oiki-launch.txt}
-)
-
-src_configure() {
- append-cppflags -I"${EPREFIX}/usr/include/freetype2"
- # Prefer link-time linking over dlopen
- local myeconfargs=(
- htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
- --disable-dl-fontconfig
- --disable-dl-freetype
- --disable-dl-libbzip2
- --disable-dl-openal
- --disable-dl-simage
- --disable-dl-zlib
- --disable-dyld
- --disable-loadlibrary
- --disable-man
- --disable-java-wrapper
- --enable-3ds-import
- --enable-compact
- --enable-dl-glu
- --enable-dl-spidermonkey
- --enable-system-expat
- --includedir="${EPREFIX}/usr/include/${PN}"
- --with-fontconfig
- --with-freetype
- $(use_with bzip2)
- $(use_enable debug)
- $(use_enable debug symbols)
- $(use_enable doc html)
- $(use_enable javascript javascript-api)
- $(use_with javascript spidermonkey)
- $(use_enable openal sound)
- $(use_with openal)
- $(use_with simage)
- $(use_enable threads threadsafe)
- $(use_with zlib)
- )
- autotools-utils_src_configure
-}
-
-src_install() {
- # Remove Coin from Libs.private
- sed -e '/Libs.private/s/ -lCoin//' -i "${BUILD_DIR}"/Coin.pc || die
-
- autotools-utils_src_install
-}
diff --git a/media-libs/coin/files/coin-3.1.0-javascript.patch b/media-libs/coin/files/coin-3.1.0-javascript.patch
deleted file mode 100644
index f45d9cd78cf..00000000000
--- a/media-libs/coin/files/coin-3.1.0-javascript.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-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
deleted file mode 100644
index 44e8eefb1f6..00000000000
--- a/media-libs/coin/files/coin-3.1.3-freetype251.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- 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
deleted file mode 100644
index fd243090380..00000000000
--- a/media-libs/coin/files/coin-3.1.3-gcc-4.7.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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
deleted file mode 100644
index c1f1f560d85..00000000000
--- a/media-libs/coin/files/coin-3.1.3-gcc-7.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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
deleted file mode 100644
index 892882b6a3d..00000000000
--- a/media-libs/coin/files/coin-3.1.3-memhandler-initialization.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-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
deleted file mode 100644
index 3fd3bca726d..00000000000
--- a/media-libs/coin/files/coin-3.1.3-pkgconfig-partial.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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@
diff --git a/media-libs/coin/metadata.xml b/media-libs/coin/metadata.xml
index 11c05aeb817..f76f33813aa 100644
--- a/media-libs/coin/metadata.xml
+++ b/media-libs/coin/metadata.xml
@@ -8,9 +8,8 @@
<flag name="exceptions">Compile with C++ exceptions</flag>
<flag name="man">Build and install man pages</flag>
<flag name="qthelp">Build API documentation in QtHelp format</flag>
- <flag name="simage">Texture loading via <pkg>media-libs/simage</pkg> library</flag>
</use>
<upstream>
- <remote-id type="bitbucket">Coin3D/coin</remote-id>
+ <remote-id type="github">coin3d/coin</remote-id>
</upstream>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/coin/, media-libs/coin/files/
@ 2022-10-17 19:11 Maciej Mrozowski
0 siblings, 0 replies; 7+ messages in thread
From: Maciej Mrozowski @ 2022-10-17 19:11 UTC (permalink / raw
To: gentoo-commits
commit: 011fbde92eec2c2770e354b00f0ec4fa14a20025
Author: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 17 19:05:08 2022 +0000
Commit: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
CommitDate: Mon Oct 17 19:10:29 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=011fbde9
media-libs/coin: locate qhelpgenerator more reliably
Bug: https://bugs.gentoo.org/863773
Signed-off-by: Maciej Mrozowski <reavertm <AT> gentoo.org>
media-libs/coin/coin-4.0.0.ebuild | 3 ++-
.../coin-4.0.0-0007-Locate-slotted-qhelpgenerator.patch | 13 +++++++++++++
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/media-libs/coin/coin-4.0.0.ebuild b/media-libs/coin/coin-4.0.0.ebuild
index 90ef8396eb87..41f77c0f06e4 100644
--- a/media-libs/coin/coin-4.0.0.ebuild
+++ b/media-libs/coin/coin-4.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -56,6 +56,7 @@ PATCHES=(
"${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=(
diff --git a/media-libs/coin/files/coin-4.0.0-0007-Locate-slotted-qhelpgenerator.patch b/media-libs/coin/files/coin-4.0.0-0007-Locate-slotted-qhelpgenerator.patch
new file mode 100644
index 000000000000..7c53c4e12952
--- /dev/null
+++ b/media-libs/coin/files/coin-4.0.0-0007-Locate-slotted-qhelpgenerator.patch
@@ -0,0 +1,13 @@
+diff -ruN coin/src/doc/CMakeLists.txt my/src/doc/CMakeLists.txt
+--- coin/src/doc/CMakeLists.txt 2019-12-23 20:47:44.000000000 +0100
++++ my/src/doc/CMakeLists.txt 2022-10-17 21:02:17.868469249 +0200
+@@ -30,7 +30,8 @@
+ endif()
+ endif()
+ if(COIN_BUILD_DOCUMENTATION_QTHELP)
+- find_program(QHG_LOCATION NAMES qhelpgenerator qhelpgenerator-qt5 DOC "Qt qhelpgenerator")
++ find_package(Qt5Help REQUIRED)
++ get_target_property(QHG_LOCATION Qt5::qhelpgenerator LOCATION)
+ if(NOT QHG_LOCATION)
+ message(FATAL_ERROR "Missing program Qt qhelpgenerator")
+ else()
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/coin/, media-libs/coin/files/
@ 2024-03-25 12:38 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2024-03-25 12:38 UTC (permalink / raw
To: gentoo-commits
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
-
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/coin/, media-libs/coin/files/
@ 2024-10-21 14:42 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2024-10-21 14:42 UTC (permalink / raw
To: gentoo-commits
commit: a04bde8fe68ac692e406120ecf2cb81b0b9b186d
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 13 18:46:39 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Oct 21 14:41:57 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a04bde8f
media-libs/coin: add 4.0.3
- Accept dev-qt/qttools:6[assistant] alternatively to dev-qt/qthelp:5
- Rename IUSE qthelp to qch (same as dev-qt/qt-docs), if it must be !doc
- Drop IUSE man (saves no deps, just brings bad REQUIRED_USE UX)
- Enable COIN_BUILD_AWESOME_DOCUMENTATION (we already depend on Doxygen)
- Drop IUSE javascript
- ebuild style
Closes: https://bugs.gentoo.org/884219
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-libs/coin/Manifest | 1 +
media-libs/coin/coin-4.0.3.ebuild | 110 +++++++++++++++++++++
.../files/coin-4.0.3-find-qhelpgenerator.patch | 23 +++++
media-libs/coin/metadata.xml | 1 +
4 files changed, 135 insertions(+)
diff --git a/media-libs/coin/Manifest b/media-libs/coin/Manifest
index b5002705981d..68be7c500f65 100644
--- a/media-libs/coin/Manifest
+++ b/media-libs/coin/Manifest
@@ -1 +1,2 @@
DIST coin-4.0.2-src.tar.gz 7160869 BLAKE2B a434ea2a550557024c665e392aa189e991296b5f8c9cd2c0dc5bb71d41a948ed9d9b34eac69dc9a651f70abf8ec1f188cb8df6534d6e31b6e4e1a6ec4acaffcd SHA512 31fcb69627e466c89bb640c5b2351db4e51772408a4ce56cae7d6f550ddf19adf9b121252479297d5c2a208032194d8f4e7bf97686b0611df1ac45231e09baad
+DIST coin-4.0.3-src.tar.gz 13099754 BLAKE2B c56f9e7b837bad76996a78ba3351c43b78b082c6250735e678ca9af79b3518d369e223a1625d74c8d007fff814f32e6bd6fe04c4dd5df9dd999f6afed767afeb SHA512 b661bf2124b0de1b46e76a6699b0975abb3aed4dc9019bf32531c535179dc84a90fe4e19def6f6cda7b175470636040d0e58812d532198cf207296d37c539915
diff --git a/media-libs/coin/coin-4.0.3.ebuild b/media-libs/coin/coin-4.0.3.ebuild
new file mode 100644
index 000000000000..75d11ab2481a
--- /dev/null
+++ b/media-libs/coin/coin-4.0.3.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic
+
+DESCRIPTION="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 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug doc +exceptions openal qch test threads"
+
+REQUIRED_USE="qch? ( doc )"
+RESTRICT="!test? ( test )"
+
+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
+ openal? ( media-libs/openal )
+"
+DEPEND="${RDEPEND}
+ dev-libs/boost:0
+ x11-base/xorg-proto
+"
+BDEPEND="
+ doc? (
+ app-text/doxygen
+ qch? ( || (
+ dev-qt/qttools:6[assistant]
+ dev-qt/qthelp:5
+ ) )
+ )
+"
+
+PATCHES=( "${FILESDIR}"/${P}-find-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_AWESOME_DOCUMENTATION=$(usex doc)
+ -DCOIN_BUILD_DOCUMENTATION_MAN=$(usex doc)
+ -DCOIN_BUILD_DOCUMENTATION_QTHELP=$(usex qch)
+ -DCOIN_BUILD_DOCUMENTATION_CHM=OFF
+
+ -DCOIN_THREADSAFE=$(usex threads)
+ -DHAVE_VRML97=ON
+ -DCOIN_HAVE_JAVASCRIPT=OFF
+ -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
+ )
+ use doc && mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Git=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.3-find-qhelpgenerator.patch b/media-libs/coin/files/coin-4.0.3-find-qhelpgenerator.patch
new file mode 100644
index 000000000000..1ac924a5c28b
--- /dev/null
+++ b/media-libs/coin/files/coin-4.0.3-find-qhelpgenerator.patch
@@ -0,0 +1,23 @@
+--- a/src/doc/CMakeLists.txt 2024-09-06 07:36:34.000000000 +0200
++++ b/src/doc/CMakeLists.txt 2024-10-13 20:41:26.450802361 +0200
+@@ -32,13 +32,15 @@
+ endif()
+ endif()
+ if(COIN_BUILD_DOCUMENTATION_QTHELP)
+- find_program(QHG_LOCATION NAMES qhelpgenerator qhelpgenerator-qt5 DOC "Qt qhelpgenerator")
+- if(NOT QHG_LOCATION)
+- message(FATAL_ERROR "Missing program Qt qhelpgenerator")
++ find_package(Qt6Tools QUIET COMPONENTS Help)
++ if(Qt6Tools_FOUND)
++ get_target_property(QHG_LOCATION Qt6::qhelpgenerator LOCATION)
+ else()
+- set(GENERATE_QHP YES)
+- mark_as_advanced(QHG_LOCATION)
++ find_package(Qt5Help REQUIRED)
++ get_target_property(QHG_LOCATION Qt5::qhelpgenerator LOCATION)
+ endif()
++ set(GENERATE_QHP YES)
++ mark_as_advanced(QHG_LOCATION)
+ endif()
+
+ # Add default files
diff --git a/media-libs/coin/metadata.xml b/media-libs/coin/metadata.xml
index bcd622631c00..8ab9e491c2ab 100644
--- a/media-libs/coin/metadata.xml
+++ b/media-libs/coin/metadata.xml
@@ -6,6 +6,7 @@
</maintainer>
<use>
<flag name="exceptions">Compile with C++ exceptions</flag>
+ <flag name="qch">Install API documentation in QCH format</flag>
<flag name="qthelp">Build API documentation in QtHelp format</flag>
</use>
<upstream>
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/coin/, media-libs/coin/files/
@ 2024-12-18 0:15 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2024-12-18 0:15 UTC (permalink / raw
To: gentoo-commits
commit: 19c2b0ed7f4f20174621847f60d35032472552ff
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 17 19:09:40 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Dec 18 00:14:46 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19c2b0ed
media-libs/coin: drop 4.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-libs/coin/Manifest | 1 -
media-libs/coin/coin-4.0.2.ebuild | 109 ---------------------
...-4.0.0-0007-Locate-slotted-qhelpgenerator.patch | 13 ---
media-libs/coin/metadata.xml | 1 -
4 files changed, 124 deletions(-)
diff --git a/media-libs/coin/Manifest b/media-libs/coin/Manifest
index 68be7c500f65..e7fd0dddcccf 100644
--- a/media-libs/coin/Manifest
+++ b/media-libs/coin/Manifest
@@ -1,2 +1 @@
-DIST coin-4.0.2-src.tar.gz 7160869 BLAKE2B a434ea2a550557024c665e392aa189e991296b5f8c9cd2c0dc5bb71d41a948ed9d9b34eac69dc9a651f70abf8ec1f188cb8df6534d6e31b6e4e1a6ec4acaffcd SHA512 31fcb69627e466c89bb640c5b2351db4e51772408a4ce56cae7d6f550ddf19adf9b121252479297d5c2a208032194d8f4e7bf97686b0611df1ac45231e09baad
DIST coin-4.0.3-src.tar.gz 13099754 BLAKE2B c56f9e7b837bad76996a78ba3351c43b78b082c6250735e678ca9af79b3518d369e223a1625d74c8d007fff814f32e6bd6fe04c4dd5df9dd999f6afed767afeb SHA512 b661bf2124b0de1b46e76a6699b0975abb3aed4dc9019bf32531c535179dc84a90fe4e19def6f6cda7b175470636040d0e58812d532198cf207296d37c539915
diff --git a/media-libs/coin/coin-4.0.2.ebuild b/media-libs/coin/coin-4.0.2.ebuild
deleted file mode 100644
index f29e2b744391..000000000000
--- a/media-libs/coin/coin-4.0.2.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-0007-Locate-slotted-qhelpgenerator.patch b/media-libs/coin/files/coin-4.0.0-0007-Locate-slotted-qhelpgenerator.patch
deleted file mode 100644
index 7c53c4e12952..000000000000
--- a/media-libs/coin/files/coin-4.0.0-0007-Locate-slotted-qhelpgenerator.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ruN coin/src/doc/CMakeLists.txt my/src/doc/CMakeLists.txt
---- coin/src/doc/CMakeLists.txt 2019-12-23 20:47:44.000000000 +0100
-+++ my/src/doc/CMakeLists.txt 2022-10-17 21:02:17.868469249 +0200
-@@ -30,7 +30,8 @@
- endif()
- endif()
- if(COIN_BUILD_DOCUMENTATION_QTHELP)
-- find_program(QHG_LOCATION NAMES qhelpgenerator qhelpgenerator-qt5 DOC "Qt qhelpgenerator")
-+ find_package(Qt5Help REQUIRED)
-+ get_target_property(QHG_LOCATION Qt5::qhelpgenerator LOCATION)
- if(NOT QHG_LOCATION)
- message(FATAL_ERROR "Missing program Qt qhelpgenerator")
- else()
diff --git a/media-libs/coin/metadata.xml b/media-libs/coin/metadata.xml
index 8ab9e491c2ab..073c629215f8 100644
--- a/media-libs/coin/metadata.xml
+++ b/media-libs/coin/metadata.xml
@@ -7,7 +7,6 @@
<use>
<flag name="exceptions">Compile with C++ exceptions</flag>
<flag name="qch">Install API documentation in QCH format</flag>
- <flag name="qthelp">Build API documentation in QtHelp format</flag>
</use>
<upstream>
<remote-id type="github">coin3d/coin</remote-id>
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2024-12-18 0:15 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-10-17 19:11 [gentoo-commits] repo/gentoo:master commit in: media-libs/coin/, media-libs/coin/files/ Maciej Mrozowski
-- strict thread matches above, loose matches on Subject: below --
2024-12-18 0:15 Andreas Sturmlechner
2024-10-21 14:42 Andreas Sturmlechner
2024-03-25 12:38 Andreas Sturmlechner
2020-10-14 0:37 Maciej Mrozowski
2018-05-06 8:02 Maciej Mrozowski
2017-07-23 13:09 Alexey Shvetsov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox