From f2c5482af4550e4506893db52f66e24c3d93d163 Mon Sep 17 00:00:00 2001 From: Jean-Pierre De Jesus DIAZ Date: Tue, 9 Apr 2024 12:22:34 +0200 Subject: gnu: coin3D: Rename to coin3d. * gnu/packages/graphics.scm (coin3d): New Variable. (coin3D): Define as deprecated. (coin3D-4): Point to coin3d. * gnu/packages/engineering.scm (freecad): Use coin3d instead of coin3D. * gnu/packages/python-xyz.scm (python-pivy): Ditto. * gnu/packages/qt.scm (soqt): Ditto. Change-Id: I4e83e25e80c512350f38024847891eac14723f26 Signed-off-by: Christopher Baines --- gnu/packages/graphics.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'gnu/packages/graphics.scm') diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index a63629823a..ebbc705cfc 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -1951,9 +1951,9 @@ or by subtracting one shape from the other.") (home-page "https://www.opencsg.org/") (license license:gpl2)))) -(define-public coin3D +(define-public coin3d (package - (name "coin3D") + (name "coin3d") (version "4.0.0") (source (origin @@ -2001,7 +2001,10 @@ library for 3D visualization and visual simulation software in the scientific and engineering community.") (license license:bsd-3))) -(define-deprecated coin3D-4 coin3D) +(define-deprecated coin3D coin3d) +(export coin3D) + +(define-deprecated coin3D-4 coin3d) (export coin3D-4) (define-public skia -- cgit v1.2.3 From 94fa92cc8ebcaa7ea8a401d34fc9d5ed9bd3aa9e Mon Sep 17 00:00:00 2001 From: Jean-Pierre De Jesus DIAZ Date: Tue, 9 Apr 2024 12:22:35 +0200 Subject: gnu: coin3d: Use G-Expressions. * gnu/packages/graphics.scm (coin3d) , : Use G-Expressions. Change-Id: I79a77bda6fc919d9c3b80e77e38855824e81f6e6 Signed-off-by: Christopher Baines --- gnu/packages/graphics.scm | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) (limited to 'gnu/packages/graphics.scm') diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index ebbc705cfc..f866318289 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -1967,28 +1967,26 @@ or by subtracting one shape from the other.") (base32 "1ayg0hl8wanhadahm5xbghghxw1qjwqbrs3dl3ngnff027hsyf8p")) (modules '((guix build utils))) (snippet - '(begin - ;; Delete binaries - (for-each delete-file - '("cfg/csubst.exe" - "cfg/wrapmsvc.exe")) - ;; Delete references to packaging tool cpack. Otherwise the build - ;; fails with "add_subdirectory given source "cpack.d" which is not - ;; an existing directory." - (substitute* "CMakeLists.txt" - ((".*cpack.d.*") "")) - #t)))) + #~(begin + ;; Delete binaries + (for-each delete-file + '("cfg/csubst.exe" + "cfg/wrapmsvc.exe")) + ;; Delete references to packaging tool cpack. Otherwise the build + ;; fails with "add_subdirectory given source "cpack.d" which is not + ;; an existing directory." + (substitute* "CMakeLists.txt" + ((".*cpack.d.*") "")))))) (build-system cmake-build-system) + (arguments + (list #:configure-flags + #~(list "-DCOIN_BUILD_DOCUMENTATION_MAN=ON" + (string-append "-DBOOST_ROOT=" + #$(this-package-input "boost"))))) (native-inputs (list doxygen graphviz)) (inputs (list boost freeglut glew)) - (arguments - `(#:configure-flags - (list - "-DCOIN_BUILD_DOCUMENTATION_MAN=ON" - (string-append "-DBOOST_ROOT=" - (assoc-ref %build-inputs "boost"))))) (home-page "https://github.com/coin3d/coin") (synopsis "High-level 3D visualization library with Open Inventor 2.1 API") -- cgit v1.2.3 From 949c3682b7e4ba29c47c1fd92aecbca815b19d68 Mon Sep 17 00:00:00 2001 From: Jean-Pierre De Jesus DIAZ Date: Tue, 9 Apr 2024 12:22:36 +0200 Subject: gnu: coin3d: Use system expat. * gnu/packages/graphics.scm (coin3d): Remove bundled expat and use the system one. Change-Id: Ief176e320b7f57c5c3f349f244ed7d76e54f8281 Signed-off-by: Christopher Baines --- gnu/packages/graphics.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'gnu/packages/graphics.scm') diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index f866318289..7f704c3e58 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -1972,6 +1972,10 @@ or by subtracting one shape from the other.") (for-each delete-file '("cfg/csubst.exe" "cfg/wrapmsvc.exe")) + ;; Unbundle expat. + (delete-file-recursively "src/xml/expat") + (substitute* "src/xml/document.cpp" + (("expat/expat\\.h") "expat.h")) ;; Delete references to packaging tool cpack. Otherwise the build ;; fails with "add_subdirectory given source "cpack.d" which is not ;; an existing directory." @@ -1981,12 +1985,13 @@ or by subtracting one shape from the other.") (arguments (list #:configure-flags #~(list "-DCOIN_BUILD_DOCUMENTATION_MAN=ON" + "-DUSE_EXTERNAL_EXPAT=ON" (string-append "-DBOOST_ROOT=" #$(this-package-input "boost"))))) (native-inputs (list doxygen graphviz)) (inputs - (list boost freeglut glew)) + (list boost expat freeglut glew)) (home-page "https://github.com/coin3d/coin") (synopsis "High-level 3D visualization library with Open Inventor 2.1 API") -- cgit v1.2.3 From 39689ffd30f566cdc91704825389e1897e002e20 Mon Sep 17 00:00:00 2001 From: Jean-Pierre De Jesus DIAZ Date: Tue, 9 Apr 2024 12:22:37 +0200 Subject: gnu: coin3d: Avoid use of dlopen. * gnu/packages/graphics.scm (coin3d): Avoid use of dlopen and add missing inputs. Change-Id: I48d93218bd93f6ef4f10fb1c4f1cc22396040d7d Signed-off-by: Christopher Baines --- gnu/packages/graphics.scm | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) (limited to 'gnu/packages/graphics.scm') diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 7f704c3e58..5d7c95a2a9 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -81,6 +81,7 @@ #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages gnunet) + #:use-module (gnu packages gnuzilla) #:use-module (gnu packages graphviz) #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) @@ -1986,12 +1987,31 @@ or by subtracting one shape from the other.") (list #:configure-flags #~(list "-DCOIN_BUILD_DOCUMENTATION_MAN=ON" "-DUSE_EXTERNAL_EXPAT=ON" + ;; Disable "runtime linking" of libraries, i.e. `dlopen`, + ;; force to use libraries at build time. + "-DFONTCONFIG_RUNTIME_LINKING=OFF" + "-DFREETYPE_RUNTIME_LINKING=OFF" + "-DLIBBZIP2_RUNTIME_LINKING=OFF" + "-DOPENAL_RUNTIME_LINKING=OFF" + ;"-DSIMAGE_RUNTIME_LINKING=OFF" -- Not packaged yet. + "-DZLIB_RUNTIME_LINKING=OFF" + "-DGLU_RUNTIME_LINKING=OFF" + ;"-DSPIDERMONKEY_RUNTIME_LINKING=OFF" -- Can't find mozjs. (string-append "-DBOOST_ROOT=" #$(this-package-input "boost"))))) (native-inputs (list doxygen graphviz)) (inputs - (list boost expat freeglut glew)) + (list boost + bzip2 + expat + fontconfig + freeglut + freetype + glew + libx11 + openal + zlib)) (home-page "https://github.com/coin3d/coin") (synopsis "High-level 3D visualization library with Open Inventor 2.1 API") -- cgit v1.2.3 From 37579d04dc76c2badd1b7feca6d6cdfadd4e61d3 Mon Sep 17 00:00:00 2001 From: Jean-Pierre De Jesus DIAZ Date: Tue, 9 Apr 2024 12:22:38 +0200 Subject: gnu: coin3d: Update to 4.0.2. * gnu/packages/graphics.scm (coin3d): Update to 4.0.2. Change-Id: I0ca8cd6eff933a764005447d648ca2f020d8ee7f Signed-off-by: Christopher Baines --- gnu/packages/graphics.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/graphics.scm') diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 5d7c95a2a9..85e4eed3b1 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -1955,17 +1955,17 @@ or by subtracting one shape from the other.") (define-public coin3d (package (name "coin3d") - (version "4.0.0") + (version "4.0.2") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/coin3d/coin") - (commit (string-append "Coin-" version)) + (commit (string-append "v" version)) (recursive? #t))) (file-name (git-file-name name version)) (sha256 - (base32 "1ayg0hl8wanhadahm5xbghghxw1qjwqbrs3dl3ngnff027hsyf8p")) + (base32 "1p59q67zc45pwicknsccvmby09snhz35725wr3xsh2v6kxza76a4")) (modules '((guix build utils))) (snippet #~(begin -- cgit v1.2.3