diff --git a/media-libs/amdvlk/files/amdvlk-2022.3.5-no-compiler-presets.patch b/media-libs/amdvlk/files/amdvlk-2022.3.5-no-compiler-presets.patch new file mode 100644 index 0000000..095705b --- /dev/null +++ b/media-libs/amdvlk/files/amdvlk-2022.3.5-no-compiler-presets.patch @@ -0,0 +1,20 @@ +diff --git a/xgl/CMakeLists.txt b/xgl/CMakeLists.txt +index 0abdb0f42..dada07d96 100644 +--- a/xgl/CMakeLists.txt ++++ b/xgl/CMakeLists.txt +@@ -31,7 +31,6 @@ option(XGL_USE_CLANG "Build with clang?" OFF) + if(UNIX AND XGL_USE_CLANG) + list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) + include(XglCompilerOptions) +- xgl_use_clang_compiler() + endif() + + ### CMake Includes #################################################################################################### +@@ -114,7 +113,6 @@ if(UNIX) + endif() + + ### Set Compiler ###################################################################################################### +-xgl_set_compiler() + + ### Sanitizers ######################################################################################################## + # Temporary variables diff --git a/media-libs/amdvlk/files/amdvlk-2022.4.1-proper-libdir.patch b/media-libs/amdvlk/files/amdvlk-2022.4.1-proper-libdir.patch new file mode 100644 index 0000000..dd6679e --- /dev/null +++ b/media-libs/amdvlk/files/amdvlk-2022.4.1-proper-libdir.patch @@ -0,0 +1,13 @@ +diff --git a/xgl/icd/CMakeLists.txt b/xgl/icd/CMakeLists.txt +index 2d52a00ab..2d723e51b 100644 +--- a/xgl/icd/CMakeLists.txt ++++ b/xgl/icd/CMakeLists.txt +@@ -30,7 +30,7 @@ set(ICD_TARGET amdvlk${TARGET_ARCHITECTURE_BITS}) + set_target_properties(xgl PROPERTIES OUTPUT_NAME ${ICD_TARGET}) + set_target_properties(xgl PROPERTIES PREFIX "") + +-install(TARGETS xgl DESTINATION ${CMAKE_SOURCE_DIR}/lib/${CMAKE_BUILD_TYPE}) ++install(TARGETS xgl DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}) + + ### Compiler Options ################################################################################################### + xgl_compiler_options(xgl) diff --git a/media-libs/amdvlk/files/amdvlk-2022.4.2-license-path.patch b/media-libs/amdvlk/files/amdvlk-2022.4.2-license-path.patch new file mode 100644 index 0000000..9fd5901 --- /dev/null +++ b/media-libs/amdvlk/files/amdvlk-2022.4.2-license-path.patch @@ -0,0 +1,13 @@ +diff --git a/xgl/cmake/XglPackaging.cmake b/xgl/cmake/XglPackaging.cmake +index a3375293d..14d951b69 100644 +--- a/xgl/cmake/XglPackaging.cmake ++++ b/xgl/cmake/XglPackaging.cmake +@@ -128,7 +128,7 @@ function(generateInstallTargets) + install(FILES ${CMAKE_BINARY_DIR}/icd/amd_icd${TARGET_ARCHITECTURE_BITS}.json COMPONENT icd DESTINATION /etc/vulkan/icd.d) + install(FILES ${CMAKE_BINARY_DIR}/icd/amd_icd${TARGET_ARCHITECTURE_BITS}.json COMPONENT icd DESTINATION /etc/vulkan/implicit_layer.d) + if(EXISTS ${CMAKE_SOURCE_DIR}/LICENSE.txt) +- install(FILES ${CMAKE_SOURCE_DIR}/LICENSE.txt COMPONENT icd DESTINATION share/doc/${PACKAGE_NAME}) ++ install(FILES ${CMAKE_SOURCE_DIR}/LICENSE.txt COMPONENT icd DESTINATION share/doc/${PACKAGE_NAME}-${PACKAGE_VERSION}) + else() + message(WARNING "LICENSE.txt is not found under ${CMAKE_SOURCE_DIR}, please put it there") + endif() diff --git a/media-libs/amdvlk/files/amdvlk-2022.4.2-reduced-llvm-installations-part2.patch b/media-libs/amdvlk/files/amdvlk-2022.4.2-reduced-llvm-installations-part2.patch new file mode 100644 index 0000000..aa9f7ac --- /dev/null +++ b/media-libs/amdvlk/files/amdvlk-2022.4.2-reduced-llvm-installations-part2.patch @@ -0,0 +1,175 @@ +diff --git a/llvm-project/compiler-rt/cmake/Modules/AddCompilerRT.cmake b/llvm-project/compiler-rt/cmake/Modules/AddCompilerRT.cmake +index 00bb892be..af4677fdc 100644 +--- a/llvm-project/compiler-rt/cmake/Modules/AddCompilerRT.cmake ++++ b/llvm-project/compiler-rt/cmake/Modules/AddCompilerRT.cmake +@@ -355,9 +355,9 @@ function(add_compiler_rt_runtime name type) + DEPENDS ${sources_${libname}} + COMMENT "Building C object ${output_file_${libname}}") + add_custom_target(${libname} DEPENDS ${output_dir_${libname}}/${output_file_${libname}}) +- install(FILES ${output_dir_${libname}}/${output_file_${libname}} +- DESTINATION ${install_dir_${libname}} +- ${COMPONENT_OPTION}) ++ #install(FILES ${output_dir_${libname}}/${output_file_${libname}} ++ # DESTINATION ${install_dir_${libname}} ++ # ${COMPONENT_OPTION}) + else() + add_library(${libname} ${type} ${sources_${libname}}) + set_target_compile_flags(${libname} ${extra_cflags_${libname}}) +@@ -365,13 +365,13 @@ function(add_compiler_rt_runtime name type) + set_property(TARGET ${libname} APPEND PROPERTY + COMPILE_DEFINITIONS ${LIB_DEFS}) + set_target_output_directories(${libname} ${output_dir_${libname}}) +- install(TARGETS ${libname} +- ARCHIVE DESTINATION ${install_dir_${libname}} +- ${COMPONENT_OPTION} +- LIBRARY DESTINATION ${install_dir_${libname}} +- ${COMPONENT_OPTION} +- RUNTIME DESTINATION ${install_dir_${libname}} +- ${COMPONENT_OPTION}) ++ # install(TARGETS ${libname} ++ # ARCHIVE DESTINATION ${install_dir_${libname}} ++ # ${COMPONENT_OPTION} ++ # LIBRARY DESTINATION ${install_dir_${libname}} ++ # ${COMPONENT_OPTION} ++ # RUNTIME DESTINATION ${install_dir_${libname}} ++ # ${COMPONENT_OPTION}) + endif() + if(LIB_DEPS) + add_dependencies(${libname} ${LIB_DEPS}) +@@ -557,10 +557,10 @@ macro(add_compiler_rt_resource_file target_name file_name component) + COMMENT "Copying ${file_name}...") + add_custom_target(${target_name} DEPENDS ${dst_file}) + # Install in Clang resource directory. +- install(FILES ${file_name} +- DESTINATION ${COMPILER_RT_INSTALL_DATA_DIR} +- COMPONENT ${component}) +- add_dependencies(${component} ${target_name}) ++ #install(FILES ${file_name} ++ # DESTINATION ${COMPILER_RT_INSTALL_DATA_DIR} ++ # COMPONENT ${component}) ++ #add_dependencies(${component} ${target_name}) + + set_target_properties(${target_name} PROPERTIES FOLDER "Compiler-RT Misc") + endmacro() +diff --git a/llvm-project/libc/loader/linux/CMakeLists.txt b/llvm-project/libc/loader/linux/CMakeLists.txt +index 92ff8965b..e2aa73465 100644 +--- a/llvm-project/libc/loader/linux/CMakeLists.txt ++++ b/llvm-project/libc/loader/linux/CMakeLists.txt +@@ -90,7 +90,7 @@ foreach(target IN LISTS startup_components) + set(fq_target_name libc.loader.linux.${target}) + add_dependencies(libc-startup ${fq_target_name}) + get_target_property(loader_object ${fq_target_name} LOADER_OBJECT) +- install(FILES ${loader_object} +- DESTINATION ${CMAKE_INSTALL_LIBDIR} +- COMPONENT ${LIBC_COMPONENT}) ++ #install(FILES ${loader_object} ++ # DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ # COMPONENT ${LIBC_COMPONENT}) + endforeach() +diff --git a/llvm-project/libcxx/src/CMakeLists.txt b/llvm-project/libcxx/src/CMakeLists.txt +index 9abf548ab..2170d4391 100644 +--- a/llvm-project/libcxx/src/CMakeLists.txt ++++ b/llvm-project/libcxx/src/CMakeLists.txt +@@ -366,32 +366,32 @@ if (LIBCXX_BUILD_EXTERNAL_THREAD_LIBRARY) + endif() + + if (LIBCXX_INSTALL_SHARED_LIBRARY) +- install(TARGETS cxx_shared +- ARCHIVE DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx +- LIBRARY DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx +- RUNTIME DESTINATION ${LIBCXX_INSTALL_RUNTIME_DIR} COMPONENT cxx) ++ #install(TARGETS cxx_shared ++ # ARCHIVE DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx ++ # LIBRARY DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx ++ # RUNTIME DESTINATION ${LIBCXX_INSTALL_RUNTIME_DIR} COMPONENT cxx) + endif() + + if (LIBCXX_INSTALL_STATIC_LIBRARY) +- install(TARGETS cxx_static +- ARCHIVE DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx +- LIBRARY DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx +- RUNTIME DESTINATION ${LIBCXX_INSTALL_RUNTIME_DIR} COMPONENT cxx) ++ # install(TARGETS cxx_static ++ # ARCHIVE DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx ++ # LIBRARY DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx ++ # RUNTIME DESTINATION ${LIBCXX_INSTALL_RUNTIME_DIR} COMPONENT cxx) + endif() + + if (LIBCXX_INSTALL_LIBRARY) +- install(TARGETS cxx_experimental +- LIBRARY DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx +- ARCHIVE DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx +- RUNTIME DESTINATION ${LIBCXX_INSTALL_RUNTIME_DIR} COMPONENT cxx) ++ # install(TARGETS cxx_experimental ++ # LIBRARY DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx ++ # ARCHIVE DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx ++ # RUNTIME DESTINATION ${LIBCXX_INSTALL_RUNTIME_DIR} COMPONENT cxx) + endif() + + # NOTE: This install command must go after the cxx install command otherwise + # it will not be executed after the library symlinks are installed. + if (LIBCXX_ENABLE_SHARED AND LIBCXX_ENABLE_ABI_LINKER_SCRIPT) +- install(FILES "$" +- DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} +- COMPONENT libcxx) ++ # install(FILES "$" ++ # DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} ++ # COMPONENT libcxx) + endif() + + if (NOT CMAKE_CONFIGURATION_TYPES) +diff --git a/llvm-project/llvm/tools/lto/CMakeLists.txt b/llvm-project/llvm/tools/lto/CMakeLists.txt +index 67f6d3af4..51aa827a4 100644 +--- a/llvm-project/llvm/tools/lto/CMakeLists.txt ++++ b/llvm-project/llvm/tools/lto/CMakeLists.txt +@@ -32,9 +32,9 @@ endif() + add_llvm_library(${LTO_LIBRARY_NAME} ${LTO_LIBRARY_TYPE} INSTALL_WITH_TOOLCHAIN + ${SOURCES} DEPENDS intrinsics_gen) + +-install(FILES ${LLVM_MAIN_INCLUDE_DIR}/llvm-c/lto.h +- DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/llvm-c" +- COMPONENT LTO) ++#install(FILES ${LLVM_MAIN_INCLUDE_DIR}/llvm-c/lto.h ++# DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/llvm-c" ++# COMPONENT LTO) + + if (APPLE) + set(LTO_VERSION ${LLVM_VERSION_MAJOR}) +diff --git a/llvm-project/llvm/tools/opt-viewer/CMakeLists.txt b/llvm-project/llvm/tools/opt-viewer/CMakeLists.txt +index c0070f8cb..afe9756e0 100644 +--- a/llvm-project/llvm/tools/opt-viewer/CMakeLists.txt ++++ b/llvm-project/llvm/tools/opt-viewer/CMakeLists.txt +@@ -6,11 +6,11 @@ set (files + "optrecord.py" + "style.css") + +-foreach (file ${files}) +- install(PROGRAMS ${file} +- DESTINATION "${CMAKE_INSTALL_DATADIR}/opt-viewer" +- COMPONENT opt-viewer) +-endforeach (file) ++#foreach (file ${files}) ++ # install(PROGRAMS ${file} ++ # DESTINATION "${CMAKE_INSTALL_DATADIR}/opt-viewer" ++ # COMPONENT opt-viewer) ++ #endforeach (file) + + add_custom_target(opt-viewer DEPENDS ${files}) + if(NOT LLVM_ENABLE_IDE) +diff --git a/llvm-project/llvm/tools/remarks-shlib/CMakeLists.txt b/llvm-project/llvm/tools/remarks-shlib/CMakeLists.txt +index f22cedd9e..13ec0103d 100644 +--- a/llvm-project/llvm/tools/remarks-shlib/CMakeLists.txt ++++ b/llvm-project/llvm/tools/remarks-shlib/CMakeLists.txt +@@ -18,9 +18,9 @@ if(LLVM_ENABLE_PIC) + set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -INCLUDE:malloc") + endif() + +- install(FILES ${LLVM_MAIN_INCLUDE_DIR}/llvm-c/Remarks.h +- DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/llvm-c" +- COMPONENT Remarks) ++ # install(FILES ${LLVM_MAIN_INCLUDE_DIR}/llvm-c/Remarks.h ++ # DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/llvm-c" ++ # COMPONENT Remarks) + + if (APPLE) + set(REMARKS_VERSION ${LLVM_VERSION_MAJOR}) diff --git a/media-libs/amdvlk/files/amdvlk-2022.4.2-reduced-llvm-installations.patch b/media-libs/amdvlk/files/amdvlk-2022.4.2-reduced-llvm-installations.patch new file mode 100644 index 0000000..0bbd4d9 --- /dev/null +++ b/media-libs/amdvlk/files/amdvlk-2022.4.2-reduced-llvm-installations.patch @@ -0,0 +1,309 @@ +diff --git a/llvm-project/compiler-rt/include/CMakeLists.txt b/llvm-project/compiler-rt/include/CMakeLists.txt +index 5968cfd0e..b19de088b 100644 +--- a/llvm-project/compiler-rt/include/CMakeLists.txt ++++ b/llvm-project/compiler-rt/include/CMakeLists.txt +@@ -74,30 +74,30 @@ add_dependencies(compiler-rt compiler-rt-headers) + set_target_properties(compiler-rt-headers PROPERTIES FOLDER "Compiler-RT Misc") + + # Install sanitizer headers. +-install(FILES ${SANITIZER_HEADERS} +- COMPONENT compiler-rt-headers +- PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ +- DESTINATION ${COMPILER_RT_INSTALL_INCLUDE_DIR}/sanitizer) ++#install(FILES ${SANITIZER_HEADERS} ++# COMPONENT compiler-rt-headers ++# PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ ++# DESTINATION ${COMPILER_RT_INSTALL_INCLUDE_DIR}/sanitizer) + # Install fuzzer headers. +-install(FILES ${FUZZER_HEADERS} +- COMPONENT compiler-rt-headers +- PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ +- DESTINATION ${COMPILER_RT_INSTALL_INCLUDE_DIR}/fuzzer) ++#install(FILES ${FUZZER_HEADERS} ++# COMPONENT compiler-rt-headers ++# PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ ++# DESTINATION ${COMPILER_RT_INSTALL_INCLUDE_DIR}/fuzzer) + # Install xray headers. +-install(FILES ${XRAY_HEADERS} +- COMPONENT compiler-rt-headers +- PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ +- DESTINATION ${COMPILER_RT_INSTALL_INCLUDE_DIR}/xray) ++#install(FILES ${XRAY_HEADERS} ++# COMPONENT compiler-rt-headers ++# PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ ++# DESTINATION ${COMPILER_RT_INSTALL_INCLUDE_DIR}/xray) + # Install ORC headers. +-install(FILES ${ORC_HEADERS} +- COMPONENT compiler-rt-headers +- PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ +- DESTINATION ${COMPILER_RT_INSTALL_INCLUDE_DIR}/orc) ++#install(FILES ${ORC_HEADERS} ++# COMPONENT compiler-rt-headers ++# PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ ++# DESTINATION ${COMPILER_RT_INSTALL_INCLUDE_DIR}/orc) + # Install profile headers. +-install(FILES ${PROFILE_HEADERS} +- COMPONENT compiler-rt-headers +- PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ +- DESTINATION ${COMPILER_RT_INSTALL_INCLUDE_DIR}/profile) ++#install(FILES ${PROFILE_HEADERS} ++# COMPONENT compiler-rt-headers ++# PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ ++# DESTINATION ${COMPILER_RT_INSTALL_INCLUDE_DIR}/profile) + + if (NOT CMAKE_CONFIGURATION_TYPES) # don't add this for IDEs. + add_custom_target(install-compiler-rt-headers +diff --git a/llvm-project/libclc/CMakeLists.txt b/llvm-project/libclc/CMakeLists.txt +index 96519e09e..4d971d617 100644 +--- a/llvm-project/libclc/CMakeLists.txt ++++ b/llvm-project/libclc/CMakeLists.txt +@@ -186,16 +186,16 @@ endif() + + # pkg-config file + configure_file( libclc.pc.in libclc.pc @ONLY ) +-install( FILES ${CMAKE_CURRENT_BINARY_DIR}/libclc.pc DESTINATION "${CMAKE_INSTALL_DATADIR}/pkgconfig" ) +-install( DIRECTORY generic/include/clc DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" ) ++#install( FILES ${CMAKE_CURRENT_BINARY_DIR}/libclc.pc DESTINATION "${CMAKE_INSTALL_DATADIR}/pkgconfig" ) ++#install( DIRECTORY generic/include/clc DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" ) + + if( ENABLE_RUNTIME_SUBNORMAL ) + add_library( subnormal_use_default STATIC + generic/lib/subnormal_use_default.ll ) + add_library( subnormal_disable STATIC + generic/lib/subnormal_disable.ll ) +- install( TARGETS subnormal_use_default subnormal_disable ARCHIVE +- DESTINATION "${CMAKE_INSTALL_DATADIR}/clc" ) ++ # install( TARGETS subnormal_use_default subnormal_disable ARCHIVE ++ # DESTINATION "${CMAKE_INSTALL_DATADIR}/clc" ) + endif() + + find_package( Python3 REQUIRED COMPONENTS Interpreter ) +diff --git a/llvm-project/libcxxabi/include/CMakeLists.txt b/llvm-project/libcxxabi/include/CMakeLists.txt +index 5b1cc2545..587549494 100644 +--- a/llvm-project/libcxxabi/include/CMakeLists.txt ++++ b/llvm-project/libcxxabi/include/CMakeLists.txt +@@ -22,11 +22,11 @@ target_include_directories(cxxabi-headers INTERFACE "${CMAKE_CURRENT_SOURCE_DIR} + if (LIBCXXABI_INSTALL_HEADERS) + foreach(file ${files}) + get_filename_component(dir ${file} DIRECTORY) +- install(FILES ${file} +- DESTINATION ${LIBCXXABI_INSTALL_INCLUDE_DIR}/${dir} +- COMPONENT cxxabi-headers +- PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ +- ) ++ # install(FILES ${file} ++ # DESTINATION ${LIBCXXABI_INSTALL_INCLUDE_DIR}/${dir} ++ # COMPONENT cxxabi-headers ++ # PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ ++ #) + endforeach() + + add_custom_target(install-cxxabi-headers +diff --git a/llvm-project/libunwind/include/CMakeLists.txt b/llvm-project/libunwind/include/CMakeLists.txt +index adf1766c4..5ca04b1f0 100644 +--- a/llvm-project/libunwind/include/CMakeLists.txt ++++ b/llvm-project/libunwind/include/CMakeLists.txt +@@ -13,11 +13,11 @@ target_include_directories(unwind-headers INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}) + if(LIBUNWIND_INSTALL_HEADERS) + foreach(file ${files}) + get_filename_component(dir ${file} DIRECTORY) +- install(FILES ${file} +- DESTINATION "${LIBUNWIND_INSTALL_INCLUDE_DIR}/${dir}" +- COMPONENT unwind-headers +- PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ +- ) ++ #install(FILES ${file} ++ # DESTINATION "${LIBUNWIND_INSTALL_INCLUDE_DIR}/${dir}" ++ # COMPONENT unwind-headers ++ # PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ ++ #) + endforeach() + + if(NOT CMAKE_CONFIGURATION_TYPES) +diff --git a/llvm-project/lld/cmake/modules/CMakeLists.txt b/llvm-project/lld/cmake/modules/CMakeLists.txt +index 61e7a1fe2..71395e8bb 100644 +--- a/llvm-project/lld/cmake/modules/CMakeLists.txt ++++ b/llvm-project/lld/cmake/modules/CMakeLists.txt +@@ -50,10 +50,10 @@ set(LLD_CONFIG_CMAKE_DIR) + if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + install_distribution_exports(LLD) + +- install(FILES +- ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/LLDConfig.cmake +- DESTINATION ${LLD_INSTALL_PACKAGE_DIR} +- COMPONENT lld-cmake-exports) ++ #install(FILES ++ # ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/LLDConfig.cmake ++ # DESTINATION ${LLD_INSTALL_PACKAGE_DIR} ++ # COMPONENT lld-cmake-exports) + + if(NOT LLVM_ENABLE_IDE) + # Add a dummy target so this can be used with LLVM_DISTRIBUTION_COMPONENTS +diff --git a/llvm-project/llvm-libgcc/lib/CMakeLists.txt b/llvm-project/llvm-libgcc/lib/CMakeLists.txt +index d895a2155..fb1969249 100644 +--- a/llvm-project/llvm-libgcc/lib/CMakeLists.txt ++++ b/llvm-project/llvm-libgcc/lib/CMakeLists.txt +@@ -45,10 +45,10 @@ target_link_libraries(libgcc_s PRIVATE + extend_path(LLVM_LIBGCC_LIBUNWIND_STATIC_ROOT "${CMAKE_INSTALL_PREFIX}" "${LIBUNWIND_INSTALL_LIBRARY_DIR}") + #string(REPLACE "${CMAKE_INSTALL_FULL_LIBDIR}/" "" LLVM_LIBGCC_LIBUNWIND_STATIC_ROOT "${LLVM_LIBGCC_LIBUNWIND_STATIC_ROOT}") + +-install(TARGETS libgcc_s +- LIBRARY DESTINATION "${LLVM_LIBGCC_LIBUNWIND_STATIC_ROOT}" COMPONENT unwind +- ARCHIVE DESTINATION "${LLVM_LIBGCC_LIBUNWIND_STATIC_ROOT}" COMPONENT unwind +- RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT unwind) ++#install(TARGETS libgcc_s ++# LIBRARY DESTINATION "${LLVM_LIBGCC_LIBUNWIND_STATIC_ROOT}" COMPONENT unwind ++# ARCHIVE DESTINATION "${LLVM_LIBGCC_LIBUNWIND_STATIC_ROOT}" COMPONENT unwind ++# RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT unwind) + + get_compiler_rt_install_dir(${LLVM_LIBGCC_TARGET_ARCH} install_dir_builtins) + string(REGEX REPLACE "^lib/" "" install_dir_builtins "${install_dir_builtins}") +@@ -58,29 +58,29 @@ if(install_path_contains_triple EQUAL -1) + else() + string(PREPEND install_dir_builtins "../") + endif() +-install(CODE "execute_process( +- COMMAND \"\${CMAKE_COMMAND}\" -E +- create_symlink ${install_dir_builtins}/libclang_rt.builtins${builtins_suffix}.a libgcc.a +- WORKING_DIRECTORY \"\$ENV{DESTDIR}${LLVM_LIBGCC_LIBUNWIND_STATIC_ROOT}\")" +- COMPONENT unwind) ++#install(CODE "execute_process( ++# COMMAND \"\${CMAKE_COMMAND}\" -E ++# create_symlink ${install_dir_builtins}/libclang_rt.builtins${builtins_suffix}.a libgcc.a ++# WORKING_DIRECTORY \"\$ENV{DESTDIR}${LLVM_LIBGCC_LIBUNWIND_STATIC_ROOT}\")" ++# COMPONENT unwind) + +-install(CODE "execute_process( +- COMMAND \"\${CMAKE_COMMAND}\" -E +- create_symlink libunwind.a libgcc_eh.a +- WORKING_DIRECTORY \"\$ENV{DESTDIR}${LLVM_LIBGCC_LIBUNWIND_STATIC_ROOT}\")" +- COMPONENT unwind) +-install(CODE "execute_process( +- COMMAND \"\${CMAKE_COMMAND}\" -E +- create_symlink libunwind.so libgcc_s.so.1.0 +- WORKING_DIRECTORY \"\$ENV{DESTDIR}${LLVM_LIBGCC_LIBUNWIND_STATIC_ROOT}\")" +- COMPONENT unwind) +-install(CODE "execute_process( +- COMMAND \"\${CMAKE_COMMAND}\" -E +- create_symlink libgcc_s.so.1.0 libgcc_s.so.1 +- WORKING_DIRECTORY \"\$ENV{DESTDIR}${LLVM_LIBGCC_LIBUNWIND_STATIC_ROOT}\")" +- COMPONENT unwind) +-install(CODE "execute_process( +- COMMAND \"\${CMAKE_COMMAND}\" -E +- create_symlink libgcc_s.so.1 libgcc_s.so +- WORKING_DIRECTORY \"\$ENV{DESTDIR}${LLVM_LIBGCC_LIBUNWIND_STATIC_ROOT}\")" +- COMPONENT unwind) ++#install(CODE "execute_process( ++# COMMAND \"\${CMAKE_COMMAND}\" -E ++# create_symlink libunwind.a libgcc_eh.a ++# WORKING_DIRECTORY \"\$ENV{DESTDIR}${LLVM_LIBGCC_LIBUNWIND_STATIC_ROOT}\")" ++# COMPONENT unwind) ++#install(CODE "execute_process( ++# COMMAND \"\${CMAKE_COMMAND}\" -E ++# create_symlink libunwind.so libgcc_s.so.1.0 ++# WORKING_DIRECTORY \"\$ENV{DESTDIR}${LLVM_LIBGCC_LIBUNWIND_STATIC_ROOT}\")" ++# COMPONENT unwind) ++#install(CODE "execute_process( ++# COMMAND \"\${CMAKE_COMMAND}\" -E ++# create_symlink libgcc_s.so.1.0 libgcc_s.so.1 ++# WORKING_DIRECTORY \"\$ENV{DESTDIR}${LLVM_LIBGCC_LIBUNWIND_STATIC_ROOT}\")" ++# COMPONENT unwind) ++#install(CODE "execute_process( ++# COMMAND \"\${CMAKE_COMMAND}\" -E ++# create_symlink libgcc_s.so.1 libgcc_s.so ++# WORKING_DIRECTORY \"\$ENV{DESTDIR}${LLVM_LIBGCC_LIBUNWIND_STATIC_ROOT}\")" ++# COMPONENT unwind) +diff --git a/llvm-project/llvm/CMakeLists.txt b/llvm-project/llvm/CMakeLists.txt +index c60e34efa..123704685 100644 +--- a/llvm-project/llvm/CMakeLists.txt ++++ b/llvm-project/llvm/CMakeLists.txt +@@ -999,8 +999,8 @@ if (NOT TENSORFLOW_AOT_PATH STREQUAL "") + include_directories(${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/tensorflow/include) + add_subdirectory(${TENSORFLOW_AOT_PATH}/xla_aot_runtime_src + ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}/tf_runtime) +- install(TARGETS tf_xla_runtime EXPORT LLVMExports +- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT tf_xla_runtime) ++ #install(TARGETS tf_xla_runtime EXPORT LLVMExports ++ # ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT tf_xla_runtime) + set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS tf_xla_runtime) + # Once we add more modules, we should handle this more automatically. + if (DEFINED LLVM_OVERRIDE_MODEL_HEADER_INLINERSIZEMODEL) +@@ -1247,44 +1247,44 @@ if (LLVM_INCLUDE_UTILS) + endif() + + if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) +- install(DIRECTORY include/llvm include/llvm-c +- DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" +- COMPONENT llvm-headers +- FILES_MATCHING +- PATTERN "*.def" +- PATTERN "*.h" +- PATTERN "*.td" +- PATTERN "*.inc" +- PATTERN "LICENSE.TXT" +- ) +- +- install(DIRECTORY ${LLVM_INCLUDE_DIR}/llvm ${LLVM_INCLUDE_DIR}/llvm-c +- DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" +- COMPONENT llvm-headers +- FILES_MATCHING +- PATTERN "*.def" +- PATTERN "*.h" +- PATTERN "*.gen" +- PATTERN "*.inc" ++ #install(DIRECTORY include/llvm include/llvm-c ++ # DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" ++ # COMPONENT llvm-headers ++ # FILES_MATCHING ++ # PATTERN "*.def" ++ # PATTERN "*.h" ++ # PATTERN "*.td" ++ # PATTERN "*.inc" ++ # PATTERN "LICENSE.TXT" ++ # ) ++ ++ # install(DIRECTORY ${LLVM_INCLUDE_DIR}/llvm ${LLVM_INCLUDE_DIR}/llvm-c ++ # DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" ++ # COMPONENT llvm-headers ++ # FILES_MATCHING ++ # PATTERN "*.def" ++ # PATTERN "*.h" ++ # PATTERN "*.gen" ++ # PATTERN "*.inc" + # Exclude include/llvm/CMakeFiles/intrinsics_gen.dir, matched by "*.def" +- PATTERN "CMakeFiles" EXCLUDE +- PATTERN "config.h" EXCLUDE +- ) ++ # PATTERN "CMakeFiles" EXCLUDE ++ # PATTERN "config.h" EXCLUDE ++ # ) + + if (LLVM_INSTALL_MODULEMAPS) +- install(DIRECTORY include/llvm include/llvm-c +- DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" +- COMPONENT llvm-headers +- FILES_MATCHING +- PATTERN "module.modulemap" +- ) +- install(FILES include/llvm/module.install.modulemap +- DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/llvm" +- COMPONENT llvm-headers +- RENAME "module.extern.modulemap" +- ) ++ # install(DIRECTORY include/llvm include/llvm-c ++ # DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" ++ # COMPONENT llvm-headers ++ # FILES_MATCHING ++ # PATTERN "module.modulemap" ++ # ) ++ # install(FILES include/llvm/module.install.modulemap ++ # DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/llvm" ++ # COMPONENT llvm-headers ++ # RENAME "module.extern.modulemap" ++ # + endif(LLVM_INSTALL_MODULEMAPS) +- ++ # + # Installing the headers needs to depend on generating any public + # tablegen'd headers. + add_custom_target(llvm-headers DEPENDS intrinsics_gen omp_gen) diff --git a/media-libs/amdvlk/files/amdvlk-2022.4.4-r1-disable-Werror.patch b/media-libs/amdvlk/files/amdvlk-2022.4.4-r1-disable-Werror.patch new file mode 100644 index 0000000..01c28e0 --- /dev/null +++ b/media-libs/amdvlk/files/amdvlk-2022.4.4-r1-disable-Werror.patch @@ -0,0 +1,13 @@ +diff --git a/pal/shared/devdriver/cmake/DevDriver.cmake b/pal/shared/devdriver/cmake/DevDriver.cmake +index b3f2e7e48..cbd9f7839 100644 +--- a/pal/shared/devdriver/cmake/DevDriver.cmake ++++ b/pal/shared/devdriver/cmake/DevDriver.cmake +@@ -111,7 +111,7 @@ function(apply_devdriver_warnings name) + target_compile_options(${name} PRIVATE + -Wall # Enable all warnings. + -Wextra # Enable extra warnings that are not enabled by -Wall. +- -Werror # warning as error ++ #-Werror # warning as error + ) + elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") + target_compile_options(${name} PRIVATE diff --git a/media-libs/amdvlk/files/amdvlk-2023.1.2-gcc13-cstdint.patch b/media-libs/amdvlk/files/amdvlk-2023.1.2-gcc13-cstdint.patch new file mode 100644 index 0000000..2bfc7d2 --- /dev/null +++ b/media-libs/amdvlk/files/amdvlk-2023.1.2-gcc13-cstdint.patch @@ -0,0 +1,11 @@ +diff -Naur amdvlk.orig/pal/src/core/imported/rdf/rdf/inc/amdrdf.h amdvlk/pal/src/core/imported/rdf/rdf/inc/amdrdf.h +--- amdvlk.orig/pal/src/core/imported/rdf/rdf/inc/amdrdf.h 2023-02-16 17:37:47.000000000 +0900 ++++ amdvlk/pal/src/core/imported/rdf/rdf/inc/amdrdf.h 2024-01-17 06:58:02.666146730 +0900 +@@ -25,6 +25,7 @@ + #pragma once + + #include ++#include + #include + #include + #include