[gentoo-commits] repo/gentoo:master commit in: media-libs/coin/, media-libs/coin/files/
commit: 4485260386ba034842b54a812f87f7133ddbd88f Author: Maciej Mrozowski gentoo org> AuthorDate: Wed Oct 14 00:36:23 2020 + Commit: Maciej Mrozowski gentoo org> CommitDate: Wed Oct 14 00:36:23 2020 + 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 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..000 --- 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_
[gentoo-commits] repo/gentoo:master commit in: media-libs/coin/, media-libs/coin/files/
commit: 4dee204fba967426d5a3093d83a7d626b9fc4c30 Author: Peter Levine gmail com> AuthorDate: Wed Jul 19 05:46:56 2017 + Commit: Alexey Shvetsov gentoo org> CommitDate: Sun Jul 23 13:09:04 2017 + 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 000..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(key, obj); ++entry = new (this->memhandler) SbHashEntry(key, obj, this->memhandler); + entry->next = this->buckets[i]; + this->buckets[i] = entry; +
[gentoo-commits] repo/gentoo:master commit in: media-libs/coin/, media-libs/coin/files/
commit: 04543ee0267931b25ff408d04e3b9c9a99d5bb7d Author: Maciej Mrozowski gentoo org> AuthorDate: Sun May 6 07:57:54 2018 + Commit: Maciej Mrozowski gentoo org> CommitDate: Sun May 6 08:02:10 2018 + 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 000..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 000..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.0 +0200 my/src/3ds/SoStream.cpp2018-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); \ + \ +
[gentoo-commits] repo/gentoo:master commit in: media-libs/coin/, media-libs/coin/files/
commit: 4dee204fba967426d5a3093d83a7d626b9fc4c30 Author: Peter Levine gmail com> AuthorDate: Wed Jul 19 05:46:56 2017 + Commit: Alexey Shvetsov gentoo org> CommitDate: Sun Jul 23 13:09:04 2017 + 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 000..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(key, obj); ++entry = new (this->memhandler) SbHashEntry(key, obj, this->memhandler); + entry->next = this->buckets[i]; + this->buckets[i] = entry; +
[gentoo-commits] repo/gentoo:master commit in: media-libs/coin/, media-libs/coin/files/
commit: 04543ee0267931b25ff408d04e3b9c9a99d5bb7d Author: Maciej Mrozowski gentoo org> AuthorDate: Sun May 6 07:57:54 2018 + Commit: Maciej Mrozowski gentoo org> CommitDate: Sun May 6 08:02:10 2018 + 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 000..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 000..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.0 +0200 my/src/3ds/SoStream.cpp2018-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); \ + \ +
[gentoo-commits] repo/gentoo:master commit in: media-libs/coin/, media-libs/coin/files/
commit: 04543ee0267931b25ff408d04e3b9c9a99d5bb7d Author: Maciej Mrozowski gentoo org> AuthorDate: Sun May 6 07:57:54 2018 + Commit: Maciej Mrozowski gentoo org> CommitDate: Sun May 6 08:02:10 2018 + 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 000..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 000..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.0 +0200 my/src/3ds/SoStream.cpp2018-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); \ + \ +
[gentoo-commits] repo/gentoo:master commit in: media-libs/coin/, media-libs/coin/files/
commit: 4485260386ba034842b54a812f87f7133ddbd88f Author: Maciej Mrozowski gentoo org> AuthorDate: Wed Oct 14 00:36:23 2020 + Commit: Maciej Mrozowski gentoo org> CommitDate: Wed Oct 14 00:36:23 2020 + 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 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..000 --- 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_
[gentoo-commits] repo/gentoo:master commit in: media-libs/coin/, media-libs/coin/files/
commit: 4485260386ba034842b54a812f87f7133ddbd88f Author: Maciej Mrozowski gentoo org> AuthorDate: Wed Oct 14 00:36:23 2020 + Commit: Maciej Mrozowski gentoo org> CommitDate: Wed Oct 14 00:36:23 2020 + 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 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..000 --- 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_
[gentoo-commits] repo/gentoo:master commit in: media-libs/coin/, media-libs/coin/files/
commit: 4dee204fba967426d5a3093d83a7d626b9fc4c30 Author: Peter Levine gmail com> AuthorDate: Wed Jul 19 05:46:56 2017 + Commit: Alexey Shvetsov gentoo org> CommitDate: Sun Jul 23 13:09:04 2017 + 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 000..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(key, obj); ++entry = new (this->memhandler) SbHashEntry(key, obj, this->memhandler); + entry->next = this->buckets[i]; + this->buckets[i] = entry; +
[gentoo-commits] repo/gentoo:master commit in: media-libs/coin/, media-libs/coin/files/
commit: 4485260386ba034842b54a812f87f7133ddbd88f Author: Maciej Mrozowski gentoo org> AuthorDate: Wed Oct 14 00:36:23 2020 + Commit: Maciej Mrozowski gentoo org> CommitDate: Wed Oct 14 00:36:23 2020 + 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 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..000 --- 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_
[gentoo-commits] repo/gentoo:master commit in: media-libs/coin/, media-libs/coin/files/
commit: 4dee204fba967426d5a3093d83a7d626b9fc4c30 Author: Peter Levine gmail com> AuthorDate: Wed Jul 19 05:46:56 2017 + Commit: Alexey Shvetsov gentoo org> CommitDate: Sun Jul 23 13:09:04 2017 + 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 000..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(key, obj); ++entry = new (this->memhandler) SbHashEntry(key, obj, this->memhandler); + entry->next = this->buckets[i]; + this->buckets[i] = entry; +
[gentoo-commits] repo/gentoo:master commit in: media-libs/coin/, media-libs/coin/files/
commit: 04543ee0267931b25ff408d04e3b9c9a99d5bb7d Author: Maciej Mrozowski gentoo org> AuthorDate: Sun May 6 07:57:54 2018 + Commit: Maciej Mrozowski gentoo org> CommitDate: Sun May 6 08:02:10 2018 + 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 000..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 000..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.0 +0200 my/src/3ds/SoStream.cpp2018-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); \ + \ +
[gentoo-commits] repo/gentoo:master commit in: media-libs/coin/, media-libs/coin/files/
commit: 04543ee0267931b25ff408d04e3b9c9a99d5bb7d Author: Maciej Mrozowski gentoo org> AuthorDate: Sun May 6 07:57:54 2018 + Commit: Maciej Mrozowski gentoo org> CommitDate: Sun May 6 08:02:10 2018 + 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 000..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 000..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.0 +0200 my/src/3ds/SoStream.cpp2018-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); \ + \ +
[gentoo-commits] repo/gentoo:master commit in: media-libs/coin/, media-libs/coin/files/
commit: 4dee204fba967426d5a3093d83a7d626b9fc4c30 Author: Peter Levine gmail com> AuthorDate: Wed Jul 19 05:46:56 2017 + Commit: Alexey Shvetsov gentoo org> CommitDate: Sun Jul 23 13:09:04 2017 + 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 000..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(key, obj); ++entry = new (this->memhandler) SbHashEntry(key, obj, this->memhandler); + entry->next = this->buckets[i]; + this->buckets[i] = entry; +
[gentoo-commits] repo/gentoo:master commit in: media-libs/coin/, media-libs/coin/files/
commit: 4485260386ba034842b54a812f87f7133ddbd88f Author: Maciej Mrozowski gentoo org> AuthorDate: Wed Oct 14 00:36:23 2020 + Commit: Maciej Mrozowski gentoo org> CommitDate: Wed Oct 14 00:36:23 2020 + 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 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..000 --- 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_
[gentoo-commits] repo/gentoo:master commit in: media-libs/coin/, media-libs/coin/files/
commit: 4485260386ba034842b54a812f87f7133ddbd88f Author: Maciej Mrozowski gentoo org> AuthorDate: Wed Oct 14 00:36:23 2020 + Commit: Maciej Mrozowski gentoo org> CommitDate: Wed Oct 14 00:36:23 2020 + 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 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..000 --- 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_
[gentoo-commits] repo/gentoo:master commit in: media-libs/coin/, media-libs/coin/files/
commit: 04543ee0267931b25ff408d04e3b9c9a99d5bb7d Author: Maciej Mrozowski gentoo org> AuthorDate: Sun May 6 07:57:54 2018 + Commit: Maciej Mrozowski gentoo org> CommitDate: Sun May 6 08:02:10 2018 + 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 000..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 000..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.0 +0200 my/src/3ds/SoStream.cpp2018-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); \ + \ +
[gentoo-commits] repo/gentoo:master commit in: media-libs/coin/, media-libs/coin/files/
commit: 4dee204fba967426d5a3093d83a7d626b9fc4c30 Author: Peter Levine gmail com> AuthorDate: Wed Jul 19 05:46:56 2017 + Commit: Alexey Shvetsov gentoo org> CommitDate: Sun Jul 23 13:09:04 2017 + 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 000..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(key, obj); ++entry = new (this->memhandler) SbHashEntry(key, obj, this->memhandler); + entry->next = this->buckets[i]; + this->buckets[i] = entry; +
[gentoo-commits] repo/gentoo:master commit in: media-libs/coin/, media-libs/coin/files/
commit: 4485260386ba034842b54a812f87f7133ddbd88f Author: Maciej Mrozowski gentoo org> AuthorDate: Wed Oct 14 00:36:23 2020 + Commit: Maciej Mrozowski gentoo org> CommitDate: Wed Oct 14 00:36:23 2020 + 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 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..000 --- 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_
[gentoo-commits] repo/gentoo:master commit in: media-libs/coin/, media-libs/coin/files/
commit: 4485260386ba034842b54a812f87f7133ddbd88f Author: Maciej Mrozowski gentoo org> AuthorDate: Wed Oct 14 00:36:23 2020 + Commit: Maciej Mrozowski gentoo org> CommitDate: Wed Oct 14 00:36:23 2020 + 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 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..000 --- 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_
[gentoo-commits] repo/gentoo:master commit in: media-libs/coin/, media-libs/coin/files/
commit: 4dee204fba967426d5a3093d83a7d626b9fc4c30 Author: Peter Levine gmail com> AuthorDate: Wed Jul 19 05:46:56 2017 + Commit: Alexey Shvetsov gentoo org> CommitDate: Sun Jul 23 13:09:04 2017 + 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 000..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(key, obj); ++entry = new (this->memhandler) SbHashEntry(key, obj, this->memhandler); + entry->next = this->buckets[i]; + this->buckets[i] = entry; +
[gentoo-commits] repo/gentoo:master commit in: media-libs/coin/, media-libs/coin/files/
commit: 04543ee0267931b25ff408d04e3b9c9a99d5bb7d Author: Maciej Mrozowski gentoo org> AuthorDate: Sun May 6 07:57:54 2018 + Commit: Maciej Mrozowski gentoo org> CommitDate: Sun May 6 08:02:10 2018 + 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 000..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 000..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.0 +0200 my/src/3ds/SoStream.cpp2018-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); \ + \ +
[gentoo-commits] repo/gentoo:master commit in: media-libs/coin/, media-libs/coin/files/
commit: 4dee204fba967426d5a3093d83a7d626b9fc4c30 Author: Peter Levine gmail com> AuthorDate: Wed Jul 19 05:46:56 2017 + Commit: Alexey Shvetsov gentoo org> CommitDate: Sun Jul 23 13:09:04 2017 + 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 000..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(key, obj); ++entry = new (this->memhandler) SbHashEntry(key, obj, this->memhandler); + entry->next = this->buckets[i]; + this->buckets[i] = entry; +
[gentoo-commits] repo/gentoo:master commit in: media-libs/coin/, media-libs/coin/files/
commit: 04543ee0267931b25ff408d04e3b9c9a99d5bb7d Author: Maciej Mrozowski gentoo org> AuthorDate: Sun May 6 07:57:54 2018 + Commit: Maciej Mrozowski gentoo org> CommitDate: Sun May 6 08:02:10 2018 + 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 000..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 000..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.0 +0200 my/src/3ds/SoStream.cpp2018-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); \ + \ +
[gentoo-commits] repo/gentoo:master commit in: media-libs/coin/, media-libs/coin/files/
commit: 011fbde92eec2c2770e354b00f0ec4fa14a20025 Author: Maciej Mrozowski gentoo org> AuthorDate: Mon Oct 17 19:05:08 2022 + Commit: Maciej Mrozowski gentoo org> CommitDate: Mon Oct 17 19:10:29 2022 + 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 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 ..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.txt2019-12-23 20:47:44.0 +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()
[gentoo-commits] repo/gentoo:master commit in: media-libs/coin/, media-libs/coin/files/
commit: 7dda27837bbbc034c907e6c2cae6450b40fc Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Mar 25 11:40:10 2024 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Mar 25 12:38:06 2024 + 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 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.. --- 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=$(u