From 7ec017829bd5ac674b92596d9836f1272878e3ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Leclercq?= Date: Wed, 29 Dec 2021 00:15:55 +0100 Subject: [PATCH] XMake: Remove custom assimp package since fix got merged on xmake-repo --- .../a/assimp/patches/5.0.1/fix-mingw.patch | 56 --------- xmake-repo/packages/a/assimp/xmake.lua | 112 ------------------ 2 files changed, 168 deletions(-) delete mode 100644 xmake-repo/packages/a/assimp/patches/5.0.1/fix-mingw.patch delete mode 100644 xmake-repo/packages/a/assimp/xmake.lua diff --git a/xmake-repo/packages/a/assimp/patches/5.0.1/fix-mingw.patch b/xmake-repo/packages/a/assimp/patches/5.0.1/fix-mingw.patch deleted file mode 100644 index 6ccff6c65..000000000 --- a/xmake-repo/packages/a/assimp/patches/5.0.1/fix-mingw.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff --git a/include/assimp/defs.h b/include/assimp/defs.h -index 05a5e3fd4..8b90edfca 100644 ---- a/include/assimp/defs.h -+++ b/include/assimp/defs.h -@@ -126,7 +126,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * GENBOUNDINGBOXES */ - ////////////////////////////////////////////////////////////////////////// - --#ifdef _MSC_VER -+#ifdef _WIN32 - # undef ASSIMP_API - - ////////////////////////////////////////////////////////////////////////// -@@ -135,7 +135,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - # ifdef ASSIMP_BUILD_DLL_EXPORT - # define ASSIMP_API __declspec(dllexport) - # define ASSIMP_API_WINONLY __declspec(dllexport) --# pragma warning (disable : 4251) -+# ifdef _MSC_VER -+# pragma warning (disable : 4251) -+# endif - - ////////////////////////////////////////////////////////////////////////// - /* Define 'ASSIMP_DLL' before including Assimp to link to ASSIMP in -@@ -149,6 +151,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - # define ASSIMP_API_WINONLY - # endif - -+# ifdef _MSC_VER -+ - /* Force the compiler to inline a function, if possible - */ - # define AI_FORCE_INLINE __forceinline -@@ -157,6 +161,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * to skip dead paths (e.g. after an assertion evaluated to false). */ - # define AI_WONT_RETURN __declspec(noreturn) - -+# else -+ -+# define AI_FORCE_INLINE inline -+# define AI_WONT_RETURN -+ -+# endif -+ - #elif defined(SWIG) - - /* Do nothing, the relevant defines are all in AssimpSwigPort.i */ -@@ -170,7 +181,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - # define AI_FORCE_INLINE inline - #endif // (defined _MSC_VER) - --#ifdef __GNUC__ -+#if defined(__GNUC__) || defined(__MINGW32__) - # define AI_WONT_RETURN_SUFFIX __attribute__((noreturn)) - #else - # define AI_WONT_RETURN_SUFFIX diff --git a/xmake-repo/packages/a/assimp/xmake.lua b/xmake-repo/packages/a/assimp/xmake.lua deleted file mode 100644 index c79965e34..000000000 --- a/xmake-repo/packages/a/assimp/xmake.lua +++ /dev/null @@ -1,112 +0,0 @@ -package("assimp") - - set_homepage("https://assimp.org") - set_description("Portable Open-Source library to import various well-known 3D model formats in a uniform manner") - - set_urls("https://github.com/assimp/assimp/archive/$(version).zip", - "https://github.com/assimp/assimp.git") - add_versions("v5.1.4", "59a00cf72fa5ceff960460677e2b37be5cd1041e85bae9c02828c27ade7e4160") - add_versions("v5.0.1", "d10542c95e3e05dece4d97bb273eba2dfeeedb37a78fb3417fd4d5e94d879192") - add_patches("v5.0.1", path.join(os.scriptdir(), "patches", "5.0.1", "fix-mingw.patch"), "a3375489e2bbb2dd97f59be7dd84e005e7e9c628b4395d7022a6187ca66b5abb") - - if not is_host("windows") then - add_extsources("pkgconfig::assimp") - end - - if is_plat("mingw") and is_subhost("msys") then - add_extsources("pacman::assimp") - elseif is_plat("linux") then - add_extsources("pacman::assimp", "apt::libassimp-dev") - elseif is_plat("macosx") then - add_extsources("brew::assimp") - end - - add_configs("asan", {description = "Enable AddressSanitizer", default = false, type = "boolean"}) - add_configs("build_tools", {description = "If the supplementary tools for Assimp are built in addition to the library", default = false, type = "boolean"}) - add_configs("double_precision", {description = "All data will be stored as double values", default = false, type = "boolean"}) - add_configs("no_export", {description = "Disable Assimp's export functionality (reduces library size)", default = false, type = "boolean"}) - add_configs("ubsan", {description = "Enable Undefined Behavior sanitizer", default = false, type = "boolean"}) - add_configs("with_pdb", {description = "Install MSVC debug files", default = false, type = "boolean"}) - - add_deps("cmake", "irrxml", "zlib") - - if is_plat("windows") then - add_syslinks("advapi32") - end - - on_load(function (package) - if is_plat("linux") and package:config("shared") then - package:add("ldflags", "-Wl,--as-needed," .. package:installdir("lib", "libassimp.so")) - end - end) - - on_install("windows", "linux", "macosx", "mingw", function (package) - local configs = {} - table.insert(configs, "-DASSIMP_BUILD_SAMPLES=OFF") - table.insert(configs, "-DASSIMP_BUILD_TESTS=OFF") - table.insert(configs, "-DBUILD_DOCS=OFF") - table.insert(configs, "-DBUILD_FRAMEWORK=OFF") - table.insert(configs, "-DINJECT_DEBUG_POSTFIX=" .. ((package:debug()) and "ON" or "OFF")) - - local irrxml = package:dep("irrxml") - if irrxml then - table.insert(configs, "-DSYSTEM_IRRXML=ON") - if irrxml:is_system() then - io.replace("CMakeLists.txt", "FIND_PACKAGE( IrrXML REQUIRED )", "", {plain = true}) - else - local fetchinfo = irrxml:fetch() - table.insert(configs, "-DIRRXML_INCLUDE_DIR=" .. table.concat(fetchinfo.includedirs or fetchinfo.sysincludedirs, ";")) - table.insert(configs, "-DIRRXML_LIBRARY=" .. table.concat(fetchinfo.libfiles, ";")) - end - else - table.insert(configs, "-DSYSTEM_IRRXML=OFF") - end - - local zlib = package:dep("zlib") - if zlib then - if not zlib:is_system() then - local fetchinfo = zlib:fetch() - io.replace("CMakeLists.txt", "FIND_PACKAGE(ZLIB)", "", {plain = true}) - io.replace("CMakeLists.txt", [[INSTALL( TARGETS zlib zlibstatic - EXPORT "${TARGETS_EXPORT_NAME}")]], "", {plain = true}) - table.insert(configs, "-DZLIB_FOUND=TRUE") - table.insert(configs, "-DZLIB_INCLUDE_DIR=" .. table.concat(fetchinfo.includedirs or fetchinfo.sysincludedirs, ";")) - table.insert(configs, "-DZLIB_LIBRARIES=" .. table.concat(fetchinfo.libfiles, ";")) - end - else - table.insert(configs, "-DASSIMP_BUILD_ZLIB=ON") - end - - local function add_config_arg(config_name, cmake_name) - table.insert(configs, "-D" .. cmake_name .. "=" .. (package:config(config_name) and "ON" or "OFF")) - end - - add_config_arg("asan", "ASSIMP_ASAN") - add_config_arg("double_precision", "ASSIMP_DOUBLE_PRECISION") - add_config_arg("no_export", "ASSIMP_NO_EXPORT") - add_config_arg("shared", "BUILD_SHARED_LIBS") - add_config_arg("ubsan", "ASSIMP_UBSAN") - - if package:is_plat("windows") then - table.insert(configs, "-DASSIMP_INSTALL_PDB=" .. ((package:debug() or package:config("install_pdb")) and "ON" or "OFF")) - end - if package:is_plat("android") then - add_config_arg("android_jniiosysystem", "ASSIMP_ANDROID_JNIIOSYSTEM") - end - if package:is_plat("windows", "linux", "macosx", "mingw") then - add_config_arg("build_tools", "ASSIMP_BUILD_ASSIMP_TOOLS") - else - table.insert(configs, "-DASSIMP_BUILD_ASSIMP_TOOLS=OFF") - end - - if package:is_plat("mingw") then - -- CMAKE_COMPILER_IS_MINGW has been removed: https://github.com/assimp/assimp/pull/4311 - io.replace("CMakeLists.txt", "CMAKE_COMPILER_IS_MINGW", "MINGW", {plain = true}) - end - - import("package.tools.cmake").install(package, configs) - end) - - on_test(function (package) - assert(package:has_cxxtypes("Assimp::Importer", {configs = {languages = "c++11"}, includes = "assimp/Importer.hpp"})) - end)