Warning, /graphics/krita/3rdparty/ext_mlt/0001-Fix-compilation-on-Windows-with-Clang-15-965.patch is written in an unsupported language. File is not indexed.
0001 From 3ffb57b99a62a6cd356e6548f233d4f683a4b21c Mon Sep 17 00:00:00 2001 0002 From: Emmet O'Neill <emmetoneill.pdx@gmail.com> 0003 Date: Tue, 12 Dec 2023 15:36:19 -0800 0004 Subject: [PATCH] Fix compilation on Windows with Clang 15 (#965) 0005 0006 Co-authored-by: Dmitry Kazakov <dimula73@gmail.com> 0007 --- 0008 src/framework/CMakeLists.txt | 8 ++------ 0009 src/framework/mlt_property.h | 2 ++ 0010 src/mlt++/CMakeLists.txt | 8 ++------ 0011 3 files changed, 6 insertions(+), 12 deletions(-) 0012 0013 diff --git a/src/framework/CMakeLists.txt b/src/framework/CMakeLists.txt 0014 index e17e43c0..c61cd3b8 100644 0015 --- a/src/framework/CMakeLists.txt 0016 +++ b/src/framework/CMakeLists.txt 0017 @@ -96,12 +96,8 @@ set_target_properties(mlt PROPERTIES 0018 0019 if(WIN32) 0020 if(MINGW) 0021 - install(FILES "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/libmlt-${MLT_VERSION_MAJOR}.dll" 0022 - DESTINATION ${CMAKE_INSTALL_LIBDIR} 0023 - RENAME libmlt.dll 0024 - ) 0025 - target_link_options(mlt PRIVATE -Wl,--output-def,libmlt.def) 0026 - install(FILES "${CMAKE_BINARY_DIR}/libmlt.def" DESTINATION ${CMAKE_INSTALL_LIBDIR}) 0027 + target_link_options(mlt PRIVATE -Wl,--output-def,${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/libmlt-${MLT_VERSION_MAJOR}.def) 0028 + install(FILES "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/libmlt-${MLT_VERSION_MAJOR}.def" DESTINATION ${CMAKE_INSTALL_LIBDIR}) 0029 endif() 0030 target_sources(mlt PRIVATE ../win32/win32.c ../win32/strptime.c) 0031 target_link_libraries(mlt PRIVATE Iconv::Iconv) 0032 diff --git a/src/framework/mlt_property.h b/src/framework/mlt_property.h 0033 index 4b51af41..e347d4b6 100644 0034 --- a/src/framework/mlt_property.h 0035 +++ b/src/framework/mlt_property.h 0036 @@ -39,6 +39,8 @@ typedef locale_t mlt_locale_t; 0037 #elif defined(__OpenBSD__) 0038 /* XXX matches __nop_locale glue in libc++ */ 0039 typedef void *mlt_locale_t; 0040 +#elif (defined _WIN32 && defined _LIBCPP_VERSION) 0041 +struct mlt_locale_t; 0042 #else 0043 typedef char *mlt_locale_t; 0044 #endif 0045 diff --git a/src/mlt++/CMakeLists.txt b/src/mlt++/CMakeLists.txt 0046 index 26c05579..7028c41d 100644 0047 --- a/src/mlt++/CMakeLists.txt 0048 +++ b/src/mlt++/CMakeLists.txt 0049 @@ -85,12 +85,8 @@ set_target_properties(mlt++ PROPERTIES 0050 0051 if(WIN32) 0052 if(MINGW) 0053 - install(FILES "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/libmlt++-${MLT_VERSION_MAJOR}.dll" 0054 - DESTINATION ${CMAKE_INSTALL_LIBDIR} 0055 - RENAME libmlt++.dll 0056 - ) 0057 - target_link_options(mlt++ PRIVATE -Wl,--output-def,libmlt++.def) 0058 - install(FILES "${CMAKE_BINARY_DIR}/libmlt++.def" DESTINATION ${CMAKE_INSTALL_LIBDIR}) 0059 + target_link_options(mlt++ PRIVATE -Wl,--output-def,${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/libmlt++-${MLT_VERSION_MAJOR}.def) 0060 + install(FILES "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/libmlt++-${MLT_VERSION_MAJOR}.def" DESTINATION ${CMAKE_INSTALL_LIBDIR}) 0061 endif() 0062 target_compile_definitions(mlt++ PRIVATE MLTPP_EXPORTS) 0063 endif() 0064 -- 0065 2.23.0.windows.1 0066