opencollada{,-blender}: drop (#514283)
This commit is contained in:
yaya
@@ -9,7 +9,6 @@
|
||||
callPackage,
|
||||
ceres-solver,
|
||||
cmake,
|
||||
colladaSupport ? true,
|
||||
config,
|
||||
cudaPackages,
|
||||
cudaSupport ? config.cudaSupport,
|
||||
@@ -54,7 +53,6 @@
|
||||
nix-update-script,
|
||||
openUsdSupport ? !stdenv.hostPlatform.isDarwin,
|
||||
openal,
|
||||
opencollada-blender,
|
||||
opencolorio,
|
||||
openexr,
|
||||
openimagedenoise,
|
||||
@@ -188,7 +186,6 @@ stdenv'.mkDerivation (finalAttrs: {
|
||||
(lib.cmakeBool "WITH_INSTALL_PORTABLE" false)
|
||||
(lib.cmakeBool "WITH_JACK" jackaudioSupport)
|
||||
(lib.cmakeBool "WITH_LIBS_PRECOMPILED" false)
|
||||
(lib.cmakeBool "WITH_OPENCOLLADA" colladaSupport)
|
||||
(lib.cmakeBool "WITH_OPENIMAGEDENOISE" openImageDenoiseSupport)
|
||||
(lib.cmakeBool "WITH_PIPEWIRE" false)
|
||||
(lib.cmakeBool "WITH_PULSEAUDIO" false)
|
||||
@@ -329,7 +326,6 @@ stdenv'.mkDerivation (finalAttrs: {
|
||||
wayland
|
||||
wayland-protocols
|
||||
]
|
||||
++ lib.optional colladaSupport opencollada-blender
|
||||
++ lib.optional jackaudioSupport libjack2
|
||||
++ lib.optional spaceNavSupport libspnav
|
||||
++ lib.optionals vulkanSupport [
|
||||
|
||||
@@ -1,26 +0,0 @@
|
||||
From f036950f1ccc3ebdfe2fdc0a52d35a4620252901 Mon Sep 17 00:00:00 2001
|
||||
From: Grimmauld <Grimmauld@grimmauld.de>
|
||||
Date: Sat, 27 Sep 2025 11:43:21 +0200
|
||||
Subject: [PATCH] Build: update cmake minimum version to 3.10
|
||||
|
||||
cmake ABI compatibility with cmake <3.5 has been removed in cmake 4.
|
||||
Compatibility with cmake <3.10 is deprecated and soon to be removed.
|
||||
Thus set 3.10 minimum version. This is available in the vast majority
|
||||
of current linux distributions, as well as other platforms.
|
||||
---
|
||||
CMakeLists.txt | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 95abbe213..2d14b2552 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -18,7 +18,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
|
||||
endif()
|
||||
endif()
|
||||
|
||||
-cmake_minimum_required(VERSION 2.6)
|
||||
+cmake_minimum_required(VERSION 3.10)
|
||||
|
||||
|
||||
#-----------------------------------------------------------------------------
|
||||
@@ -1,51 +0,0 @@
|
||||
{
|
||||
cmake,
|
||||
dos2unix,
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
libxml2,
|
||||
pcre,
|
||||
pkg-config,
|
||||
stdenv,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "opencollada";
|
||||
version = "0-unstable-2025-01-30";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aras-p";
|
||||
repo = "OpenCOLLADA";
|
||||
rev = "4526eb8aaa6462c71fbedd23103976c151a01c50";
|
||||
sha256 = "sha256-ctr+GjDzxOJxBfaMwjwayPkAOcF+FMsP1X72QCOwvTY=";
|
||||
};
|
||||
|
||||
# Fix freaky dos-style CLRF things
|
||||
prePatch = ''
|
||||
dos2unix CMakeLists.txt
|
||||
'';
|
||||
|
||||
patches = [
|
||||
# https://github.com/aras-p/OpenCOLLADA/pull/1
|
||||
./cmake4-compat.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
dos2unix
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
libxml2
|
||||
pcre
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Library for handling the COLLADA file format";
|
||||
homepage = "https://github.com/aras-p/OpenCOLLADA";
|
||||
maintainers = [ lib.maintainers.amarshall ];
|
||||
platforms = lib.platforms.unix;
|
||||
license = lib.licenses.mit;
|
||||
};
|
||||
}
|
||||
@@ -1,77 +0,0 @@
|
||||
{
|
||||
cmake,
|
||||
dos2unix,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
lib,
|
||||
libxml2,
|
||||
pcre,
|
||||
pkg-config,
|
||||
stdenv,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "opencollada";
|
||||
version = "1.6.68";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KhronosGroup";
|
||||
repo = "OpenCOLLADA";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "1ym16fxx9qhf952vva71sdzgbm7ifis0h1n5fj1bfdj8zvvkbw5w";
|
||||
};
|
||||
|
||||
# Fix freaky dos-style CLRF things
|
||||
prePatch = ''
|
||||
dos2unix CMakeLists.txt
|
||||
'';
|
||||
|
||||
patches = [
|
||||
# fix build with gcc 13
|
||||
(fetchpatch {
|
||||
url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/opencollada/files/opencollada-1.6.68-gcc13.patch?id=b76590f9fb8615da3da9d783ad841c0e3881a27b";
|
||||
hash = "sha256-oi/QhNPRnuSHfJJ071/3wnjLeg4zZUL6NwSGYvgkb/k=";
|
||||
})
|
||||
|
||||
# fix pcre
|
||||
(fetchpatch {
|
||||
url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/opencollada/files/opencollada-1.6.63-pcre-fix.patch";
|
||||
hash = "sha256-igrwgmNwDKYwj6xWvWrryT5ARWJpztVmlQ0HCLQn5+Q=";
|
||||
})
|
||||
|
||||
# fix build with cmake 4
|
||||
(fetchpatch {
|
||||
url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/opencollada/files/opencollada-1.6.68-cmake4.patch?id=42f1e0614c4d056841fdc162c29a04ff0e910139";
|
||||
hash = "sha256-gbF6PPalJGgXGu4W7EptYeDq8418JdGH50LIqKqGKX0=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Drop blanket -Werror as it tends to fail on newer toolchain for
|
||||
# minor warnings. In this case it was gcc-13 build failure.
|
||||
substituteInPlace DAEValidator/CMakeLists.txt --replace-fail ' -Werror"' '"'
|
||||
''
|
||||
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
substituteInPlace GeneratedSaxParser/src/GeneratedSaxParserUtils.cpp \
|
||||
--replace math.h cmath
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
dos2unix
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
libxml2
|
||||
pcre
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Library for handling the COLLADA file format";
|
||||
homepage = "https://github.com/KhronosGroup/OpenCOLLADA/";
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.unix;
|
||||
license = lib.licenses.mit;
|
||||
};
|
||||
})
|
||||
@@ -24,7 +24,6 @@
|
||||
mpfr,
|
||||
nlohmann_json,
|
||||
opencascade-occt_7_6,
|
||||
opencollada,
|
||||
pcre,
|
||||
zlib,
|
||||
|
||||
@@ -102,7 +101,6 @@ buildPythonPackage rec {
|
||||
mpfr
|
||||
nlohmann_json
|
||||
opencascade-occt
|
||||
opencollada
|
||||
pcre
|
||||
];
|
||||
|
||||
@@ -138,12 +136,11 @@ buildPythonPackage rec {
|
||||
"-DBUILD_SHARED_LIBS=ON"
|
||||
"-DBUILD_IFCPYTHON=ON"
|
||||
"-DCITYJSON_SUPPORT=OFF"
|
||||
"-DCOLLADA_SUPPORT=OFF"
|
||||
"-DEIGEN_DIR=${eigen}/include/eigen3"
|
||||
"-DJSON_INCLUDE_DIR=${nlohmann_json}/include/"
|
||||
"-DOCC_INCLUDE_DIR=${opencascade-occt}/include/opencascade"
|
||||
"-DOCC_LIBRARY_DIR=${lib.getLib opencascade-occt}/lib"
|
||||
"-DOPENCOLLADA_INCLUDE_DIR=${opencollada}/include/opencollada"
|
||||
"-DOPENCOLLADA_LIBRARY_DIR=${lib.getLib opencollada}/lib/opencollada"
|
||||
"-DSWIG_EXECUTABLE=${swig}/bin/swig"
|
||||
"-DLIBXML2_INCLUDE_DIR=${libxml2.dev}/include/libxml2"
|
||||
"-DLIBXML2_LIBRARIES=${lib.getLib libxml2}/lib/libxml2${stdenv.hostPlatform.extensions.sharedLibrary}"
|
||||
|
||||
@@ -1566,6 +1566,8 @@ mapAliases {
|
||||
openbabel3 = openbabel; # Added 2025-09-17
|
||||
openbsdCross = throw "'openbsdCross' has been renamed to/replaced by 'openbsd'"; # Converted to throw 2025-10-27
|
||||
opencl-clang = throw "opencl-clang has been integrated into intel-graphics-compiler"; # Added 2025-09-10
|
||||
opencollada = throw "opencollada has been removed, as it is unmaintained upstream"; # Added 2026-04-26
|
||||
opencollada-blender = throw "opencollada-blender has been removed, as it is unmaintained upstream"; # Added 2026-04-26
|
||||
opencolorio_1 = throw "'opencolorio_1' has been removed. Use opencolorio instead"; # Added 2026-01-03
|
||||
openconnect_gnutls = throw "'openconnect_gnutls' has been renamed to/replaced by 'openconnect'"; # Converted to throw 2025-10-27
|
||||
openexr_3 = throw "'openexr_3' has been renamed to/replaced by 'openexr'"; # Converted to throw 2025-10-27
|
||||
|
||||
Reference in New Issue
Block a user