diff options
Diffstat (limited to 'gnu/packages/graphics.scm')
| -rw-r--r-- | gnu/packages/graphics.scm | 52 |
1 files changed, 34 insertions, 18 deletions
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 25fe072936..37eb060a8f 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -205,7 +205,8 @@ framebuffer graphics, audio output and input event.") (base32 "0bs3yzb7hy3mgydrj8ycg7pllrd2b6j0gxj596inyr7ihssr3i0y")))) (build-system gnu-build-system) (arguments - `(#:configure-flags + `(#:parallel-build? #f + #:configure-flags '("CFLAGS=-g -O2 -Wno-error=incompatible-pointer-types") #:phases (modify-phases %standard-phases @@ -634,7 +635,8 @@ Please note that this version requires a processor with SSE2 support.")))) "0r6q7bl8513ggrvx3n73j1s3f7n5x1rxy5xi471qyrya95gy6c60")))) (build-system cmake-build-system) (arguments - `(#:configure-flags + `(#:tests? #f + #:configure-flags (list (string-append "-DCMAKE_EXE_LINKER_FLAGS=-Wl,-rpath=" (assoc-ref %outputs "out") "/lib")))) (inputs @@ -802,6 +804,18 @@ and export to various formats including the format used by Magicavoxel.") (sha256 (base32 "097fxq0frb2nl6bp8wz7kjx6vq4i4117wwq9fnxzkiij9xwv3cq9")))) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'enable-testing + (lambda _ + (substitute* "CMakeLists.txt" + (("IF \\( ASSIMP_BUILD_TESTS \\)" all) + (string-append all "\n enable_testing()"))) + (substitute* "test/CMakeLists.txt" + ;; Leave the test binary where ctest will look for it. + (("TARGET_USE_COMMON_OUTPUT_DIRECTORY\\(unit\\)") + ""))))))) (build-system cmake-build-system) (inputs (list zlib)) @@ -1645,7 +1659,7 @@ with strong support for multi-part, multi-channel use cases.") (define-public openimageio (package (name "openimageio") - (version "2.5.13.0") + (version "2.5.19.0") (source (origin (method git-fetch) @@ -1655,7 +1669,7 @@ with strong support for multi-part, multi-channel use cases.") (file-name (git-file-name name version)) (sha256 (base32 - "0bqalfcfjjk31a7zv2hyx0jz8jpdhpsmc3sqwmfl4zf431g45hpb")))) + "1s4275iik6gpbyzh703acm440csg9ff8w5l5drnz1gl6mx5946kz")))) (build-system cmake-build-system) (arguments (list #:tests? #f ; half the tests require online data or use redirection @@ -1907,7 +1921,7 @@ in Julia).") libjpeg-turbo libpng libtiff - openexr-2 + openexr sdl zlib)) (arguments @@ -1947,7 +1961,7 @@ realistic reflections, shading, perspective and other effects.") (define-public ctl (package (name "ctl") - (version "1.5.3") + (version "1.5.4") (source (origin (method git-fetch) (uri (git-reference @@ -1956,11 +1970,11 @@ realistic reflections, shading, perspective and other effects.") (file-name (git-file-name name version)) (sha256 (base32 - "1qhfp9b90czvxjkf66sbnqyw3wvmdvl1pkh6201fxhqg7grbfvwc")))) + "02fxvwm883wgzhf87harbvmfqvm2ry71cxr768jb8kxdnal5gyy4")))) (build-system cmake-build-system) ;; Headers include OpenEXR and IlmBase headers. - (propagated-inputs (list openexr-2)) + (propagated-inputs (list openexr)) (inputs (list libtiff)) (home-page "https://ampasctl.sourceforge.net") @@ -2787,11 +2801,15 @@ Some feature highlights: (url "https://github.com/KhronosGroup/OpenXR-SDK") (commit (string-append "release-" version)))) (file-name (git-file-name name version)) - (modules '((guix build utils))) - (snippet - '(begin - ;; Delete bundled jsoncpp. - (delete-file-recursively "src/external/jsoncpp"))) + ;; When compiling against jsoncpp 1.9.6 the build fails with + ;; 'Unknown CMake command "check_required_components"' + ;; (see https://github.com/open-source-parsers/jsoncpp/issues/1568). + ;; When fixed uncomment the snippet and re-add jsoncpp as an input. + ;(modules '((guix build utils))) + ;(snippet + ; '(begin + ; ;; Delete bundled jsoncpp. + ; (delete-file-recursively "src/external/jsoncpp"))) (sha256 (base32 "0s66xgwkdj5vn05l493hqydrxfpxxidd6mcb8l7l5awhn88cy16f")))) (build-system cmake-build-system) @@ -2800,7 +2818,7 @@ Some feature highlights: (native-inputs (list pkg-config python shaderc vulkan-headers)) (inputs - (list jsoncpp mesa vulkan-loader wayland)) + (list mesa vulkan-loader wayland)) (home-page "https://www.khronos.org/openxr/") (synopsis "Generated headers and sources for OpenXR loader") (description "This package contains OpenXR headers, as well as source code @@ -2811,7 +2829,7 @@ and build scripts for the OpenXR loader.") (define-public tinygltf (package (name "tinygltf") - (version "2.9.5") + (version "2.9.6") (source (origin (method git-fetch) @@ -2820,7 +2838,7 @@ and build scripts for the OpenXR loader.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0gx4wa0kxhig3wjn8v14dbjxl15xn0srkfxb5szzhrl06dv0nszc")) + (base32 "0xh94bnxz5dffq9g2fdfhxfy0lkyb9qhbnh583gbqkfysmyp3l6x")) (modules '((guix build utils))) (snippet #~(begin (for-each delete-file-recursively @@ -3067,7 +3085,6 @@ generated discrete signed distance field using the cubic spline kernel. (string-append "-DCMAKE_INSTALL_MANDIR=" #$output "/share/man") "-DBUILD_SHARED_LIBS=ON" "-DBUILD_DOC=ON" - "-DBUILD_TESTING=ON" ;; The longer tests are for continuous integration and ;; depend on input data which must be downloaded. "-DONLY_VERY_SHORT_TESTS=ON" @@ -3293,7 +3310,6 @@ desired local properties.") #:configure-flags #~(list (string-append "-DCMAKE_INSTALL_DOCDIR=" #$output "/share/doc/" #$name "-" #$version) - "-DBUILD_TESTING=OFF" "-DF3D_LINUX_GENERATE_MAN=ON" "-DF3D_USE_EXTERNAL_CXXOPTS=ON" "-DF3D_USE_EXTERNAL_NLOHMANN_JSON=ON" |