coin3: update to 4.0.0
This commit is contained in:
yopito
@@ -2708,7 +2708,7 @@ libKF5DNSSD.so.5 kdnssd-5.26.0_1
|
||||
libtwaindsm.so.2 twaindsm-2.3.0_1
|
||||
libspnav.so.0 libspnav-0.2.3_1
|
||||
libsimage.so.20 simage-1.7.0_1
|
||||
libCoin.so.60 coin3-3.1.3_1
|
||||
libCoin.so.80 coin3-4.0.0_1
|
||||
libgl2ps.so.1 gl2ps-1.3.9_1
|
||||
libFWOSPlugin.so.11 oce-0.18_1
|
||||
libPTKernel.so.11 oce-0.18_1
|
||||
|
||||
@@ -1,28 +0,0 @@
|
||||
Source: http://pkgs.fedoraproject.org/cgit/rpms/Coin3.git/plain/0005-gcc-4.7.patch
|
||||
|
||||
From a5bf6656215837a9bdf4d70cdce4be0fedd522e0 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= <corsepiu@corsepiu.home>
|
||||
Date: Fri, 4 May 2012 13:30:20 +0200
|
||||
Subject: [PATCH 05/10] gcc-4.7.
|
||||
|
||||
---
|
||||
include/Inventor/SbBasic.h | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/include/Inventor/SbBasic.h b/include/Inventor/SbBasic.h
|
||||
index d038bb1..2ee6b70 100644
|
||||
--- a/include/Inventor/SbBasic.h
|
||||
+++ b/include/Inventor/SbBasic.h
|
||||
@@ -25,6 +25,9 @@
|
||||
\**************************************************************************/
|
||||
|
||||
#include <Inventor/C/basic.h>
|
||||
+#ifndef NDEBUG
|
||||
+#include <Inventor/C/errors/debugerror.h>
|
||||
+#endif // !NDEBUG
|
||||
|
||||
/* ********************************************************************** */
|
||||
/* Trap people trying to use Inventor headers while compiling C source code.
|
||||
--
|
||||
1.8.1.4
|
||||
|
||||
@@ -1,40 +0,0 @@
|
||||
Source: http://pkgs.fedoraproject.org/cgit/rpms/Coin3.git/plain/0010-GCC-4.8.0-fixes.patch
|
||||
|
||||
From 9f5d96a2b9a71ab539237d2dab4c54fc46fc5c5b Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= <corsepiu@corsepiu.home>
|
||||
Date: Thu, 18 Apr 2013 19:17:06 +0200
|
||||
Subject: [PATCH 10/10] GCC-4.8.0 fixes
|
||||
|
||||
---
|
||||
src/fonts/freetype.cpp | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/fonts/freetype.cpp b/src/fonts/freetype.cpp
|
||||
index 760b88b..e705d3a 100644
|
||||
--- a/src/fonts/freetype.cpp
|
||||
+++ b/src/fonts/freetype.cpp
|
||||
@@ -32,18 +32,18 @@
|
||||
|
||||
20050613 mortene. */
|
||||
|
||||
-#include "fonts/freetype.h"
|
||||
-
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
#endif /* HAVE_CONFIG_H */
|
||||
|
||||
-#include <stdlib.h>
|
||||
+#include <cstdlib>
|
||||
#include <assert.h>
|
||||
|
||||
#include "glue/freetype.h"
|
||||
#include "glue/GLUWrapper.h"
|
||||
|
||||
+#include "fonts/freetype.h"
|
||||
+
|
||||
/* ************************************************************************* */
|
||||
|
||||
#ifdef __cplusplus
|
||||
--
|
||||
1.8.1.4
|
||||
|
||||
@@ -1,22 +0,0 @@
|
||||
Source: http://pkgs.fedoraproject.org/cgit/rpms/Coin3.git/plain/0012-memhandler-initialization.patch
|
||||
Additional information: https://bugzilla.redhat.com/show_bug.cgi?id=1323159
|
||||
--- Coin-3.1.3/src/misc/SbHash.h.init 2010-03-02 22:20:09.000000000 +0900
|
||||
+++ Coin-3.1.3/src/misc/SbHash.h 2016-04-22 16:52:39.888883757 +0900
|
||||
@@ -89,6 +89,8 @@
|
||||
cc_memalloc_deallocate(entry->memhandler, ptr);
|
||||
}
|
||||
SbHashEntry(const Key & key, const Type & obj) : key(key), obj(obj) {}
|
||||
+ SbHashEntry(const Key & key, const Type & obj, cc_memalloc *memhandler)
|
||||
+ : key(key), obj(obj), memhandler(memhandler) {}
|
||||
|
||||
Key key;
|
||||
Type obj;
|
||||
@@ -218,7 +220,7 @@
|
||||
/* Key not already in the hash table; insert a new
|
||||
* entry as the first element in the bucket
|
||||
*/
|
||||
- entry = new (this->memhandler) SbHashEntry<Type, Key>(key, obj);
|
||||
+ entry = new (this->memhandler) SbHashEntry<Type, Key>(key, obj, this->memhandler);
|
||||
entry->next = this->buckets[i];
|
||||
this->buckets[i] = entry;
|
||||
|
||||
@@ -1,20 +0,0 @@
|
||||
--- ./src/3ds/SoStream.cpp.orig 2018-01-16 11:18:58.965420684 +0100
|
||||
+++ ./src/3ds/SoStream.cpp 2018-01-16 11:18:23.140563596 +0100
|
||||
@@ -176,7 +176,7 @@ do { \
|
||||
if (!gotNum) { setBadBit(); return FALSE; } \
|
||||
\
|
||||
char *ce; \
|
||||
- s = '\0'; \
|
||||
+ *s = '\0'; \
|
||||
_convertType_ tempVal = _convertFunc_(buf, &ce, 0); \
|
||||
\
|
||||
if (ce != s) \
|
||||
@@ -273,7 +273,7 @@ do { \
|
||||
gotAll: \
|
||||
\
|
||||
char *ce; \
|
||||
- s = '\0'; \
|
||||
+ *s = '\0'; \
|
||||
double tempVal = _convertFunc_(buf, &ce); \
|
||||
\
|
||||
if (ce != s) \
|
||||
8
srcpkgs/coin3/patches/no-cpack.patch
Normal file
8
srcpkgs/coin3/patches/no-cpack.patch
Normal file
@@ -0,0 +1,8 @@
|
||||
--- CMakeLists.txt.ORIG
|
||||
+++ CMakeLists.txt
|
||||
@@ -815,4 +815,4 @@
|
||||
|
||||
# ############################################################################
|
||||
# New CPACK section, please see the README file inside cpack.d directory.
|
||||
-add_subdirectory(cpack.d)
|
||||
+#add_subdirectory(cpack.d)
|
||||
@@ -1,55 +1,30 @@
|
||||
# Template file for 'coin3'
|
||||
pkgname=coin3
|
||||
version=3.1.3
|
||||
revision=5
|
||||
wrksrc="Coin-${version}"
|
||||
build_style=gnu-configure
|
||||
configure_args="--includedir=/usr/include/Coin3 --disable-dependency-tracking
|
||||
--disable-static --enable-threadsafe --enable-exceptions
|
||||
--disable-dl-simage --disable-dl-glu --disable-dl-libbzip2
|
||||
--disable-dl-zlib --disable-dl-freetype --disable-dl-fontconfig
|
||||
--enable-3ds-import --enable-html
|
||||
sim_ac_simage_configcmd=$XBPS_CROSS_BASE/usr/bin/simage-config"
|
||||
hostmakedepends="pkg-config doxygen perl"
|
||||
makedepends="freetype-devel glu-devel zlib-devel bzip2-devel
|
||||
fontconfig-devel boost-devel simage-devel"
|
||||
version=4.0.0
|
||||
revision=1
|
||||
wrksrc="coin-Coin-${version}"
|
||||
build_style=cmake
|
||||
configure_args="-DCMAKE_INSTALL_INCLUDEDIR=/usr/include/Coin3
|
||||
-DCMAKE_BUILD_TYPE=Release -DCOIN_BUILD_TESTS=OFF -DCOIN_BUILD_DOCUMENTATION=ON"
|
||||
hostmakedepends="doxygen graphviz"
|
||||
makedepends="boost-devel glu-devel"
|
||||
short_desc="High-level 3D graphics toolkit"
|
||||
maintainer="yopito <pierre.bourgin@free.fr>"
|
||||
# HomePage tells BSD 3-Clause license, but tarball is GPLv2
|
||||
license="GPL-2.0-only"
|
||||
homepage="https://bitbucket.org/Coin3D/coin/wiki/Home"
|
||||
distfiles="https://bitbucket.org/Coin3D/coin/downloads/Coin-${version}.tar.gz"
|
||||
checksum=583478c581317862aa03a19f14c527c3888478a06284b9a46a0155fa5886d417
|
||||
patch_args="-Np1"
|
||||
license="BSD-3-Clause"
|
||||
homepage="https://coin3d.github.io/"
|
||||
distfiles="https://github.com/coin3d/coin/archive/Coin-${version}.tar.gz"
|
||||
checksum=b00d2a8e9d962397cf9bf0d9baa81bcecfbd16eef675a98c792f5cf49eb6e805
|
||||
|
||||
post_extract() {
|
||||
# remove bundled boost headers
|
||||
rm -rf ${wrksrc}/include/boost
|
||||
}
|
||||
|
||||
do_configure() {
|
||||
# only way to compute and point freetype2 stuff to configure
|
||||
: ${configure_script:=./configure}
|
||||
CPPFLAGS+="$(pkg-config --cflags freetype2)" ${configure_script} ${configure_args}
|
||||
}
|
||||
|
||||
post_configure() {
|
||||
case "$XBPS_TARGET_MACHINE" in
|
||||
*-musl)
|
||||
# configure checks are awfull
|
||||
sed -i -e 's,^#define SIM_TIMEVAL_TV_SEC_T { },#define SIM_TIMEVAL_TV_SEC_T time_t,' \
|
||||
-e 's,^#define SIM_TIMEVAL_TV_USEC_T { },#define SIM_TIMEVAL_TV_USEC_T suseconds_t,' \
|
||||
${wrksrc}/src/config.h
|
||||
;;
|
||||
esac
|
||||
}
|
||||
if [ "$CROSS_BUILD" ]; then
|
||||
# bypass runtime test (quote hashing is fine with gcc 9.3)
|
||||
configure_args+=" -DHAVE_HASH_QUOTING_EXITCODE=0"
|
||||
configure_args+=" -DHAVE_HASH_QUOTING_EXITCODE__TRYRUN_OUTPUT=''"
|
||||
fi
|
||||
|
||||
post_install() {
|
||||
if [ "$CROSS_BUILD" ]; then
|
||||
sed -i -e "s,$XBPS_CROSS_BASE,,g" \
|
||||
$DESTDIR/usr/share/Coin/conf/coin-default.cfg \
|
||||
$DESTDIR/usr/lib/pkgconfig/Coin.pc
|
||||
fi
|
||||
# coin-config is superseeded by cmake support
|
||||
rm $DESTDIR/usr/bin/coin-config
|
||||
vlicense COPYING
|
||||
}
|
||||
|
||||
coin3-devel_package() {
|
||||
@@ -57,17 +32,14 @@ coin3-devel_package() {
|
||||
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
|
||||
pkg_install() {
|
||||
vmove usr/include
|
||||
vmove usr/bin/coin-config
|
||||
vmove usr/lib/cmake
|
||||
vmove "usr/lib/*.so"
|
||||
vmove usr/lib/pkgconfig
|
||||
vmove usr/share/aclocal
|
||||
vmove usr/share/man
|
||||
}
|
||||
}
|
||||
|
||||
coin3-doc_package() {
|
||||
short_desc+=" - documentation"
|
||||
archs=noarch
|
||||
pkg_install() {
|
||||
vmove usr/share/doc
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user