From: "Maciej Mrozowski" <reavertm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/coin/files/, media-libs/coin/
Date: Thu, 21 Nov 2019 21:24:19 +0000 (UTC) [thread overview]
Message-ID: <1574371413.6bd833127a8fe0674efc5386f2cffc7420e46506.reavertm@gentoo> (raw)
commit: 6bd833127a8fe0674efc5386f2cffc7420e46506
Author: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 21 00:01:30 2019 +0000
Commit: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
CommitDate: Thu Nov 21 21:23:33 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6bd83312
media-libs/coin: version bump to latest snapshot, also fix linking
Bug: https://bugs.gentoo.org/700786
Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Maciej Mrozowski <reavertm <AT> gentoo.org>
media-libs/coin/Manifest | 2 +-
...80416.ebuild => coin-4.0.0a_pre20191109.ebuild} | 66 ++++++++++-----
media-libs/coin/files/coin-4.0.0a-cmake.patch | 96 ++++++++++++++++++++++
media-libs/coin/files/coin-4.0.0a-gcc-7.patch | 21 -----
media-libs/coin/metadata.xml | 2 +
5 files changed, 144 insertions(+), 43 deletions(-)
diff --git a/media-libs/coin/Manifest b/media-libs/coin/Manifest
index 3b1f98ce483..23c548ebe1e 100644
--- a/media-libs/coin/Manifest
+++ b/media-libs/coin/Manifest
@@ -1,2 +1,2 @@
DIST Coin-3.1.3.tar.gz 5981534 BLAKE2B 33f88149cf0bf7daeb32226e2deb29f9f36f2a29ca9fcf025f39bb50d3eb0bfc85113a1e96cf980c97d037419c3a263bcf6eccaeb2f289517304c59d4c9de919 SHA512 d6fd47ecc74e96fc4de46e3a683f038f1907b96db2bbe935fb49f2d59190bd18f3f439dc0e4cb435360e74e1d65994a32b21f670d5a76394692616625cb14394
-DIST Coin3D-coin-8d1ca1a6ea23.tar.bz2 4925310 BLAKE2B 3c9aab5e68b79db4878e5d27773537acb7d658580a8deea059565dfa78ee791cb7ee23f159e077408c3307e2647e628357daaa4f2f5a4fc4a125c8d1663ee718 SHA512 f0c4d39a89b1dc3e183c2c8cffad6be30f9d27e50b3735c1b261addc55376aceb8f81c916fbdfeb42b852071692febaf6e3839373095bcf2b7046c773fcc809c
+DIST Coin3D-coin-a4ce638f43bd.tar.bz2 4942450 BLAKE2B b974b8a39d8ef07a2b3465e131bb5ca08d249a99a9ccdd7f9a87bd26c8c901c7042211edf7acf097e56afc0ba80bf156c6864a831fbed4cac18c7ac7495601ff SHA512 90b7697649e18af77805d9aae918ba77958952839375812272d796c4cda4d887465fb9bb94f215509ae969cddf54fb92f38deb961cdd24e24c67b20ffc0f1adf
diff --git a/media-libs/coin/coin-4.0.0a_pre20180416.ebuild b/media-libs/coin/coin-4.0.0a_pre20191109.ebuild
similarity index 60%
rename from media-libs/coin/coin-4.0.0a_pre20180416.ebuild
rename to media-libs/coin/coin-4.0.0a_pre20191109.ebuild
index 815c8aa67e8..1b5d6a621a8 100644
--- a/media-libs/coin/coin-4.0.0a_pre20180416.ebuild
+++ b/media-libs/coin/coin-4.0.0a_pre20191109.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit cmake-utils flag-o-matic
-MY_P=Coin3D-coin-8d1ca1a6ea23
+MY_P=Coin3D-coin-a4ce638f43bd
DESCRIPTION="A high-level 3D graphics toolkit, fully compatible with SGI Open Inventor 2.1"
HOMEPAGE="https://bitbucket.org/Coin3D/coin/wiki/Home"
@@ -14,13 +14,19 @@ 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"
+IUSE="debug doc +exceptions javascript man openal qthelp test threads"
+
+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
@@ -28,25 +34,26 @@ RDEPEND="
x11-libs/libSM
x11-libs/libX11
x11-libs/libXext
- javascript? ( dev-lang/spidermonkey:0 )
+ javascript? ( dev-lang/spidermonkey:60 )
openal? ( media-libs/openal )
- simage? ( media-libs/simage )
"
DEPEND="${RDEPEND}
+ dev-libs/boost:0
x11-base/xorg-proto
doc? (
app-doc/doxygen
qthelp? ( dev-qt/qthelp:5 )
)
"
+
S="${WORKDIR}/${MY_P}"
PATCHES=(
- "${FILESDIR}"/${PN}-4.0.0a-gcc-7.patch
+ "${FILESDIR}"/${PN}-4.0.0a-cmake.patch
)
DOCS=(
- AUTHORS FAQ FAQ.legal NEWS README RELNOTES THANKS docs/HACKING
+ AUTHORS FAQ FAQ.legal NEWS THANKS docs/HACKING
)
src_configure() {
@@ -54,31 +61,48 @@ src_configure() {
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_BUILD_DOCUMENTATION=$(usex doc)
+
+ -DCOIN_BUILD_INTERNAL_DOCUMENTATION=OFF
+ -DCOIN_BUILD_DOCUMENTATION_MAN=$(usex man)
+ -DCOIN_BUILD_DOCUMENTATION_QTHELP=$(usex qthelp)
+ -DCOIN_BUILD_DOCUMENTATION_CHM=OFF
+
-DCOIN_THREADSAFE=$(usex threads)
- -DCOIN_VERBOSE=$(usex debug)
- -DHAVE_3DS_IMPORT_CAPABILITIES=ON
+ -DHAVE_VRML97=ON
+ -DCOIN_HAVE_JAVASCRIPT=$(usex javascript)
+ -DHAVE_NODEKITS=ON
-DHAVE_DRAGGERS=ON
- -DHAVE_MAN=OFF
-DHAVE_MANIPULATORS=ON
- -DHAVE_NODEKITS=ON
-DHAVE_SOUND=$(usex openal)
- -DHAVE_VRML97=ON
- -DSIMAGE_RUNTIME_LINKING=OFF
+ -DHAVE_3DS_IMPORT_CAPABILITIES=ON
-DUSE_EXTERNAL_EXPAT=ON
+ -DUSE_EXCEPTIONS=$(usex exceptions)
+ -DUSE_SUPERGLU=OFF
+
+ -DFONTCONFIG_RUNTIME_LINKING=OFF
+ -DFREETYPE_RUNTIME_LINKING=OFF
+ -DLIBBZIP2_RUNTIME_LINKING=OFF
+ -DOPENAL_RUNTIME_LINKING=OFF
+ -DSIMAGE_RUNTIME_LINKING=OFF
+ -DZLIB_RUNTIME_LINKING=OFF
+ -DGLU_RUNTIME_LINKING=OFF
+ -DSPIDERMONKEY_RUNTIME_LINKING=ON
+
+ -DCOIN_VERBOSE=$(usex debug)
+ -DHAVE_MULTIPLE_VERSION=ON
+
+ -DCOIN_BUILD_SINGLE_LIB=ON
)
cmake-utils_src_configure
}
src_test() {
- pushd "${BUILD_DIR}/testsuite" > /dev/null || die
- ./CoinTests || die "Tests failed."
+ pushd "${BUILD_DIR}/bin" > /dev/null || die
+ ./CoinTests -r detailed || die "Tests failed."
popd > /dev/null || die
}
diff --git a/media-libs/coin/files/coin-4.0.0a-cmake.patch b/media-libs/coin/files/coin-4.0.0a-cmake.patch
new file mode 100644
index 00000000000..f47bf9bfb84
--- /dev/null
+++ b/media-libs/coin/files/coin-4.0.0a-cmake.patch
@@ -0,0 +1,96 @@
+diff -ruN Coin3D-coin-a4ce638f43bd/CMakeLists.txt my/CMakeLists.txt
+--- Coin3D-coin-a4ce638f43bd/CMakeLists.txt 2019-11-09 14:39:34.000000000 +0100
++++ my/CMakeLists.txt 2019-11-21 00:19:43.563521948 +0100
+@@ -97,8 +97,8 @@
+
+ report_prepare(
+ COIN_BUILD_SHARED_LIBS
+- COIN_BUILD_TESTS
+- COIN_BUILD_DOCUMENTATION
++ COIN_BUILD_TESTS
++ COIN_BUILD_DOCUMENTATION
+ COIN_BUILD_INTERNAL_DOCUMENTATION
+ COIN_BUILD_DOCUMENTATION_MAN
+ COIN_BUILD_DOCUMENTATION_QTHELP
+@@ -107,29 +107,29 @@
+ HAVE_VRML97
+ COIN_HAVE_JAVASCRIPT
+ HAVE_NODEKITS
+- HAVE_DRAGGERS
+- HAVE_MANIPULATORS
+- HAVE_SOUND
++ HAVE_DRAGGERS
++ HAVE_MANIPULATORS
++ HAVE_SOUND
+ HAVE_3DS_IMPORT_CAPABILITIES
+ USE_EXTERNAL_EXPAT
+- USE_EXCEPTIONS
+- USE_SUPERGLU
+- FONTCONFIG_RUNTIME_LINKING
+- FREETYPE_RUNTIME_LINKING
+- LIBBZIP2_RUNTIME_LINKING
+- OPENAL_RUNTIME_LINKING
+- SIMAGE_RUNTIME_LINKING
+- ZLIB_RUNTIME_LINKING
+- GLU_RUNTIME_LINKING
+- SPIDERMONKEY_RUNTIME_LINKING
+- HAVE_MULTIPLE_VERSION
++ USE_EXCEPTIONS
++ USE_SUPERGLU
++ FONTCONFIG_RUNTIME_LINKING
++ FREETYPE_RUNTIME_LINKING
++ LIBBZIP2_RUNTIME_LINKING
++ OPENAL_RUNTIME_LINKING
++ SIMAGE_RUNTIME_LINKING
++ ZLIB_RUNTIME_LINKING
++ GLU_RUNTIME_LINKING
++ SPIDERMONKEY_RUNTIME_LINKING
++ HAVE_MULTIPLE_VERSION
+ IF_APPLE
+- COIN_BUILD_MAC_FRAMEWORK
+- COIN_BUILD_MAC_X11
+- COIN_BUILD_MAC_AGL
++ COIN_BUILD_MAC_FRAMEWORK
++ COIN_BUILD_MAC_X11
++ COIN_BUILD_MAC_AGL
+ IF_MSVC
+ COIN_BUILD_MSVC_STATIC_RUNTIME
+- COIN_BUILD_SINGLE_LIB
++ COIN_BUILD_SINGLE_LIB
+ MSVC_VERSION
+ COIN_BUILD_MSVC_MP
+ )
+@@ -141,8 +141,8 @@
+ CMAKE_INSTALL_DATADIR
+ CMAKE_INSTALL_FULL_DATADIR
+ CMAKE_INSTALL_INCLUDEDIR
+- CMAKE_INSTALL_FULL_INCLUDEDIR
+- CMAKE_INSTALL_DOCDIR
++ CMAKE_INSTALL_FULL_INCLUDEDIR
++ CMAKE_INSTALL_DOCDIR
+ CMAKE_INSTALL_FULL_DOCDIR
+ )
+ else()
+@@ -165,7 +165,7 @@
+ list(APPEND COIN_TARGET_LINK_LIBRARIES Boost::boost)
+ endif()
+
+-if(COIN_BUILD_MAC_X11)
++if(COIN_BUILD_MAC_X11 OR UNIX)
+ find_package(X11 REQUIRED)
+ # On Mac OS X, GLX is provided as a separate OpenGL implementation, different
+ # from the standard OpenGL framework which provides support for GLUT and native
+@@ -530,6 +530,7 @@
+ endif()
+ check_library_exists(dl dlopen "" HAVE_DL_LIB)
+ if(HAVE_DL_LIB)
++ list(APPEND COIN_TARGET_LINK_LIBRARIES dl)
+ check_include_file(dlfcn.h HAVE_DLFCN_H)
+ endif()
+ check_library_exists(dld shl_load "" HAVE_DLD_LIB)
+@@ -815,4 +816,4 @@
+
+ # ############################################################################
+ # New CPACK section, please see the README file inside cpack.d directory.
+-add_subdirectory(cpack.d)
++# not needed add_subdirectory(cpack.d)
diff --git a/media-libs/coin/files/coin-4.0.0a-gcc-7.patch b/media-libs/coin/files/coin-4.0.0a-gcc-7.patch
deleted file mode 100644
index 89829b59b27..00000000000
--- a/media-libs/coin/files/coin-4.0.0a-gcc-7.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ruN Coin3D-coin-8d1ca1a6ea23/src/3ds/SoStream.cpp my/src/3ds/SoStream.cpp
---- Coin3D-coin-8d1ca1a6ea23/src/3ds/SoStream.cpp 2018-04-16 23:14:36.000000000 +0200
-+++ my/src/3ds/SoStream.cpp 2018-05-06 06:56:42.104728484 +0200
-@@ -185,7 +185,7 @@
- if (!gotNum) { setBadBit(); return FALSE; } \
- \
- char *ce; \
-- *s = '\0'; \
-+ *s = NULL; \
- _convertType_ tempVal = _convertFunc_(buf, &ce, 0); \
- \
- if (ce != s) \
-@@ -282,7 +282,7 @@
- gotAll: \
- \
- char *ce; \
-- *s = '\0'; \
-+ *s = NULL; \
- double tempVal = _convertFunc_(buf, &ce); \
- \
- if (ce != s) \
diff --git a/media-libs/coin/metadata.xml b/media-libs/coin/metadata.xml
index aa4affdefe9..11c05aeb817 100644
--- a/media-libs/coin/metadata.xml
+++ b/media-libs/coin/metadata.xml
@@ -5,6 +5,8 @@
<email>reavertm@gentoo.org</email>
</maintainer>
<use>
+ <flag name="exceptions">Compile with C++ exceptions</flag>
+ <flag name="man">Build and install man pages</flag>
<flag name="qthelp">Build API documentation in QtHelp format</flag>
<flag name="simage">Texture loading via <pkg>media-libs/simage</pkg> library</flag>
</use>
next reply other threads:[~2019-11-21 21:24 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-21 21:24 Maciej Mrozowski [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-08-10 22:45 [gentoo-commits] repo/gentoo:master commit in: media-libs/coin/files/, media-libs/coin/ Maciej Mrozowski
2017-07-23 13:09 Alexey Shvetsov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1574371413.6bd833127a8fe0674efc5386f2cffc7420e46506.reavertm@gentoo \
--to=reavertm@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox