Caleb Maclennan pushed to branch main at Arch Linux / Packaging / Packages / f3d
Commits: d5b07cfa by loqs at 2025-01-14T22:03:54+00:00 Fix compatibility with vtk 9.4 Fix detection of VTK as headless which breaks interactive rendering. Related upstream commit https://github.com/f3d-app/f3d/commit/d9fa161e99817028a16b9db371c0369d44b8022e. Fixes https://gitlab.archlinux.org/archlinux/packaging/packages/f3d/-/issues/4. - - - - - 2 changed files: - PKGBUILD - + f3d-2.5.4-vtk9.4-compat.patch Changes: ===================================== PKGBUILD ===================================== @@ -37,8 +37,15 @@ makedepends=('cmake' 'pybind11' 'python' 'utf8cpp') -source=("https://github.com/$pkgname-app/$pkgname/archive/refs/tags/v$pkgver/$pkgname-$pkgver.tar.gz";) -sha256sums=('55ea01931f90f066df1abc0ae4e9575672e80b83b241f51884224baa8dccac24') +source=("https://github.com/$pkgname-app/$pkgname/archive/refs/tags/v$pkgver/$pkgname-$pkgver.tar.gz"; + f3d-2.5.4-vtk9.4-compat.patch) +sha256sums=('55ea01931f90f066df1abc0ae4e9575672e80b83b241f51884224baa8dccac24' + '937d1b5bd922dc226340b6480dd51df5ad37ad66f6683121e4aa7b82737179b5') + +prepare() { + # Minimal backport of https://github.com/f3d-app/f3d/commit/d9fa161e99817028a16b9db371c0369d44b8022e for vtk 9.4 compatibility + patch -Np1 -i ../f3d-2.5.4-vtk9.4-compat.patch -d "$pkgname-$pkgver" +} build() { cd "$pkgname-$pkgver" ===================================== f3d-2.5.4-vtk9.4-compat.patch ===================================== @@ -0,0 +1,19 @@ +diff --git a/application/CMakeLists.txt b/application/CMakeLists.txt +index f0a44d8..35d9219 100644 +--- a/application/CMakeLists.txt ++++ b/application/CMakeLists.txt +@@ -86,9 +86,11 @@ set(f3d_compile_options_private "") + set(f3d_compile_options_public "") + set(f3d_link_options_public "") + +-# Headless EGL build +-if (VTK_OPENGL_HAS_EGL) +- target_compile_definitions(f3d PRIVATE F3D_HEADLESS_BUILD) ++if(VTK_VERSION VERSION_LESS 9.3.20240914) ++ # Headless EGL build ++ if (VTK_OPENGL_HAS_EGL) ++ target_compile_definitions(f3d PRIVATE F3D_HEADLESS_BUILD) ++ endif () + endif () + + # F3D_STRICT_BUILD View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/f3d/-/commit/d5b07cfad43a746f5c4f64c2e1b286baa8ec0b00 -- View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/f3d/-/commit/d5b07cfad43a746f5c4f64c2e1b286baa8ec0b00 You're receiving this email because of your account on gitlab.archlinux.org.
