summaryrefslogtreecommitdiffstats
path: root/graphics-libs
diff options
context:
space:
mode:
Diffstat (limited to 'graphics-libs')
-rw-r--r--graphics-libs/coin/0001-use-clang.patch92
-rwxr-xr-xgraphics-libs/coin/BUILD9
-rwxr-xr-xgraphics-libs/coin/CONFIGURE15
-rwxr-xr-xgraphics-libs/coin/DEPENDS27
-rwxr-xr-xgraphics-libs/coin/DETAILS9
-rw-r--r--graphics-libs/coin/HISTORY6
-rwxr-xr-xgraphics-libs/coin/PRE_BUILD1
7 files changed, 34 insertions, 125 deletions
diff --git a/graphics-libs/coin/0001-use-clang.patch b/graphics-libs/coin/0001-use-clang.patch
deleted file mode 100644
index fcd3a6b9f5..0000000000
--- a/graphics-libs/coin/0001-use-clang.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From f7a217352af5baac49ebae46995d6114cefaf2ec Mon Sep 17 00:00:00 2001
-From: Florian Franzmann <bwlf@bandrate.org>
-Date: Fri, 20 Jan 2017 10:53:37 +0100
-Subject: [PATCH] use clang
-
----
- configure | 20 ++++++++++----------
- 1 file changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/configure b/configure
-index ef1131f..02ff22a 100755
---- a/configure
-+++ b/configure
-@@ -3611,7 +3611,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
--set dummy ${ac_tool_prefix}gcc; ac_word=$2
-+set dummy ${ac_tool_prefix}clang; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_CC+set}" = set; then :
-@@ -3627,7 +3627,7 @@ do
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_prog_CC="${ac_tool_prefix}gcc"
-+ ac_cv_prog_CC="${ac_tool_prefix}clang"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-@@ -3667,7 +3667,7 @@ do
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_prog_ac_ct_CC="gcc"
-+ ac_cv_prog_ac_ct_CC="clang"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-@@ -5229,7 +5229,7 @@ if test -z "$CXX"; then
- CXX=$CCC
- else
- if test -n "$ac_tool_prefix"; then
-- for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
-+ for ac_prog in clang++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
- do
- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
- set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-@@ -5273,7 +5273,7 @@ fi
- fi
- if test -z "$CXX"; then
- ac_ct_CXX=$CXX
-- for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
-+ for ac_prog in clang++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
- do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
-@@ -5316,7 +5316,7 @@ fi
- done
-
- if test "x$ac_ct_CXX" = x; then
-- CXX="g++"
-+ CXX="clang++"
- else
- case $cross_compiling:$ac_tool_warned in
- yes:)
-@@ -7039,8 +7039,8 @@ done
-
-
- if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-- (test "X$CXX" != "Xg++"))) ; then
-+ ( (test "X$CXX" = "Xclang++" && `clang++ -v >/dev/null 2>&1` ) ||
-+ (test "X$CXX" != "Xclang++"))) ; then
- ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -11834,8 +11834,8 @@ $as_echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
- case $tagname in
- CXX)
- if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-- (test "X$CXX" != "Xg++"))) ; then
-+ ( (test "X$CXX" = "Xclang++" && `clang++ -v >/dev/null 2>&1` ) ||
-+ (test "X$CXX" != "Xclang++"))) ; then
- ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
---
-2.11.0
-
diff --git a/graphics-libs/coin/BUILD b/graphics-libs/coin/BUILD
index 8f7d211325..752b0edbeb 100755
--- a/graphics-libs/coin/BUILD
+++ b/graphics-libs/coin/BUILD
@@ -1,7 +1,4 @@
-OPTS="$OPTS $COIN_OPTS --with-glu=$INSTALL_ROOT/usr" &&
-OPTS="$OPTS --enable-optimization" &&
-OPTS="$OPTS --enable-exceptions" &&
-OPTS="$OPTS --enable-debug" &&
-OPTS="$OPTS --enable-shared" &&
+OPTS="$OPTS -DUSE_EXCEPTIONS=true" &&
+OPTS="$OPTS -DCOIN_BUILD_SHARED_LIBS=true" &&
-default_build
+cmake_build
diff --git a/graphics-libs/coin/CONFIGURE b/graphics-libs/coin/CONFIGURE
index 535b8df96a..6878702c50 100755
--- a/graphics-libs/coin/CONFIGURE
+++ b/graphics-libs/coin/CONFIGURE
@@ -1,14 +1,13 @@
+source $GRIMOIRE/CMAKE_CONFIGURE
config_query_option COIN_OPTS "Enable 3ds import capabilities?" y \
- "--enable-3ds-import" "--disable-3ds-import" &&
+ "-DHAVE_3DS_IMPORT_CAPABILITIES=true" "-DHAVE_3DS_IMPORT_CAPABILITIES=false" &&
config_query_option COIN_OPTS "Enable nodekit support?" y \
- "--enable-nodekits" "--disable-nodekits" &&
+ "-DHAVE_NODEKITS=true" "-DHAVE_NODEKITS=false" &&
config_query_option COIN_OPTS "Enable dragger support?" y \
- "--enable-draggers" "--disable-draggers" &&
+ "-DHAVE_DRAGGERS=true" "-DHAVE_DRAGGERS=false" &&
config_query_option COIN_OPTS "Enable manipulators?" y \
- "--enable-manipulators" "--disable-manipulators" &&
+ "-DHAVE_MANIPULATORS=true" "-DHAVE_MANIPULATORS=false" &&
config_query_option COIN_OPTS "Enable VRML97 support?" y \
- "--enable-vrml97" "--disable-vrml97" &&
-config_query_option COIN_OPTS "Enable multithreading?" y \
- "--enable-threads" "--disable-threads"
+ "-DHAVE_VRML97=true" "-DHAVE_VRML97=false" &&
config_query_option COIN_OPTS "Enable thread safe traversals?" y \
- "--enable-threadsafe" "--disable-threadsafe"
+ "-DCOIN_THREADSAFE=true" "-DCOIN_THREADSAFE=false"
diff --git a/graphics-libs/coin/DEPENDS b/graphics-libs/coin/DEPENDS
index 74aea80439..710f08ea09 100755
--- a/graphics-libs/coin/DEPENDS
+++ b/graphics-libs/coin/DEPENDS
@@ -1,20 +1,19 @@
-depends -sub CLANG llvm &&
-
-depends OPENGL "--with-mesa" &&
+source $GRIMOIRE/CMAKE_DEPENDS &&
+depends OPENGL &&
depends libx11 &&
depends libxext &&
depends libsm &&
depends libice &&
+depends boost &&
+depends simage "-DSIMAGE_RUNTIME_LINKING=true" &&
+depends OPENAL "-DOPENAL_RUNTIME_LINKING=true" &&
+depends fontconfig "-DFONTCONFIG_RUNTIME_LINKING=true" &&
+depends freetype2 "-DFREETYPE_RUNTIME_LINKING=true" &&
+depends expat "-DUSE_EXTERNAL_EXPAT=true" &&
+depends zlib "-DZLIB_RUNTIME_LINKING=true" &&
+depends bzip2 "-DLIBBZIP2_RUNTIME_LINKING=true" &&
-optional_depends spidermonkey "--enable-javascript-api" \
- "--disable-javascript-api" \
+optional_depends spidermonkey "-DCOIN_HAVE_JAVASCRIPT=true" \
+ "-DCOIN_HAVE_JAVASCRIPT=true" \
"for JavaScript capabilities" &&
-optional_depends simage "" "--disable-dl-simage" \
- "use rutime dynamic linking for libsimage" &&
-optional_depends openal "" "--disable-dl-openal" "" &&
-optional_depends fontconfig "" "--with-fontconfig --disable-dl-fontconfig" "" &&
-optional_depends freetype2 "" "--with-freetype --disable-dl-freetype" "" &&
-optional_depends zlib "" "--disable-dl-zlib" "" &&
-optional_depends bzip2 "" "--disable-dl-libbzip2" "" &&
-optional_depends expat "--enable-system-expat" "" &&
-optional_depends doxygen "--enable-man --enable-html" ""
+optional_depends doxygen "-DCOIN_BUILD_DOCUMENTATION=true" "-DCOIN_BUILD_DOCUMENTATION=false" "build documentation?"
diff --git a/graphics-libs/coin/DETAILS b/graphics-libs/coin/DETAILS
index 4e4457281b..7c5cc34b88 100755
--- a/graphics-libs/coin/DETAILS
+++ b/graphics-libs/coin/DETAILS
@@ -1,9 +1,10 @@
+source $GRIMOIRE/CMAKE_FUNCTIONS
SPELL=coin
- VERSION=3.1.3
- SOURCE=Coin-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/Coin-$VERSION
+ VERSION=4.0.0
+ SOURCE=coin-$VERSION-src.zip
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/coin-6enkw
SOURCE_URL[0]=https://bitbucket.org/Coin3D/coin/downloads/${SOURCE}
- SOURCE_HASH=sha512:d6fd47ecc74e96fc4de46e3a683f038f1907b96db2bbe935fb49f2d59190bd18f3f439dc0e4cb435360e74e1d65994a32b21f670d5a76394692616625cb14394
+ SOURCE_HASH=sha512:f4ca6188bed8b9f728128072ca042f69d84c38f53d9e29bd91335d5ba01535e1d337845d5370ea82cdeddd870b3317d4cc779136237e4c28a639b18c33a7783a
LICENSE[0]=GPL
WEB_SITE=http://www.coin3d.org/
PATCHLEVEL=1
diff --git a/graphics-libs/coin/HISTORY b/graphics-libs/coin/HISTORY
index f4239cb792..8430b50706 100644
--- a/graphics-libs/coin/HISTORY
+++ b/graphics-libs/coin/HISTORY
@@ -1,3 +1,9 @@
+2019-09-19 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * DETAILS: version 4.0.0
+ * BUILD, CONFIGURE, DEPENDS: use cmake
+ * PRE_BUILD, 0001-use-clang.patch: remove obsolete patch
+ * DEPENDS: add dependency on boost
+
2017-01-20 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
* DEPENDS, PRE_BUILD, 0001-use-clang.patch: build with clang to avoid broken
code generated by gcc 6.3, cf.
diff --git a/graphics-libs/coin/PRE_BUILD b/graphics-libs/coin/PRE_BUILD
index 6fad53b1f5..7c0b291a28 100755
--- a/graphics-libs/coin/PRE_BUILD
+++ b/graphics-libs/coin/PRE_BUILD
@@ -1,5 +1,4 @@
default_pre_build &&
cd "${SOURCE_DIRECTORY}" &&
-patch -p1 < "${SPELL_DIRECTORY}/0001-use-clang.patch" &&
patch -p1 < "${SPELL_DIRECTORY}/0001-fix-compile-error.patch"