Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update mingw to version 2023-10-26 #118

Merged
merged 2 commits into from
Jan 13, 2024
Merged

Update mingw to version 2023-10-26 #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b4a8bb
Update mingw to version 2023-10-26
garbear Nov 25, 2023
54862d3
Use mingw packages from out mirrors
garbear Dec 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions templates/addon/depends/windows/mingw/CMakeLists.txt.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,13 @@
cmake_minimum_required(VERSION 3.5)
project(mingw)

# TODO: Upload msys2 packages to mirrors
#foreach(repo msys mingw32 mingw64)
# if(${repo} STREQUAL msys)
# file(WRITE ${CMAKE_CURRENT_SOURCE_DIR}/etc/pacman.d/mirrorlist.${repo} "Server = http://mirrors.kodi.tv/build-deps/win32/msys2/repos/${repo}2/$arch\n")
# else()
# file(WRITE ${CMAKE_CURRENT_SOURCE_DIR}/etc/pacman.d/mirrorlist.${repo} "Server = http://mirrors.kodi.tv/build-deps/win32/msys2/repos/${repo}\n")
# endif()
#endforeach()
foreach(repo msys mingw32 mingw64)
if(${repo} STREQUAL msys)
file(WRITE ${CMAKE_CURRENT_SOURCE_DIR}/etc/pacman.d/mirrorlist.${repo} "Server = http://mirrors.kodi.tv/build-deps/win32/msys2/repos/${repo}2/$arch\n")
else()
file(WRITE ${CMAKE_CURRENT_SOURCE_DIR}/etc/pacman.d/mirrorlist.${repo} "Server = http://mirrors.kodi.tv/build-deps/win32/msys2/repos/${repo}\n")
endif()
endforeach()

include(CheckSymbolExists)
check_symbol_exists(_X86_ "Windows.h" _X86_)
Expand Down
2 changes: 1 addition & 1 deletion templates/addon/depends/windows/mingw/mingw.sha256.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{% if not makefile.cmake %}
4013a9d5e51b448343efc24fc6a324cc999bb96b4c01b13a6bd3c661bb5c8a82
fa75120560563a311241c05882016978bd35612692c7f0d39815a27837bff27d
{% endif %}
2 changes: 1 addition & 1 deletion templates/addon/depends/windows/mingw/mingw.txt.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{% if not makefile.cmake %}
mingw http://mirrors.kodi.tv/build-deps/win32/msys2/msys2-base-x86_64-20210725.tar.xz
mingw http://mirrors.kodi.tv/build-deps/win32/msys2/msys2-base-x86_64-20231026.tar.xz
{% endif %}
Loading