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.

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

deps: Update imgui, libpng, glad, and some Bazel rules #1056

Merged
merged 2 commits into from
Sep 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
34 changes: 17 additions & 17 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ load("@bazel_tools//tools/build_defs/repo:local.bzl", "local_repository")
# https://github.com/bazelbuild/apple_support
http_archive(
name = "build_bazel_apple_support",
integrity = "sha256-xLsrc2fEhDgjAK7nW+WYuS+EeJb7MbvSLzojRq32aoA=",
url = "https://github.com/bazelbuild/apple_support/releases/download/1.15.1/apple_support.1.15.1.tar.gz",
integrity = "sha256-AvdFbliUcdz8c/G5yn8sLqXKSuqZlnSr6prr6BhwC24=",
url = "https://github.com/bazelbuild/apple_support/releases/download/1.17.0/apple_support.1.17.0.tar.gz",
)

# https://github.com/bazelbuild/platforms
Expand All @@ -21,9 +21,9 @@ http_archive(
# https://github.com/bazelbuild/rules_cc
http_archive(
name = "rules_cc", # Apache-2.0
sha256 = "2037875b9a4456dce4a79d112a8ae885bbc4aad968e6587dca6e64f3a0900cdf",
strip_prefix = "rules_cc-0.0.9",
url = "https://github.com/bazelbuild/rules_cc/releases/download/0.0.9/rules_cc-0.0.9.tar.gz",
integrity = "sha256-ZbZ7gcbaN48TbMfn4U7gjVuTdZc0J+zrjHc6T2n6fkk=",
strip_prefix = "rules_cc-0.0.10",
url = "https://github.com/bazelbuild/rules_cc/releases/download/0.0.10/rules_cc-0.0.10.tar.gz",
)

# https://github.com/bazelbuild/rules_fuzzing
Expand All @@ -48,8 +48,8 @@ http_archive(
# https://github.com/uber/hermetic_cc_toolchain
http_archive(
name = "hermetic_cc_toolchain",
integrity = "sha256-3wka/CXXOwlI7TcdPWG+7ylEf2kFCOArwk5wAczBLTg=",
url = "https://github.com/uber/hermetic_cc_toolchain/releases/download/v3.1.0/hermetic_cc_toolchain-v3.1.0.tar.gz",
integrity = "sha256-kHdFv5FVX3foI0wLlTNx5srFunFdHPEv9kFJbdG86dE=",
url = "https://github.com/uber/hermetic_cc_toolchain/releases/download/v3.1.1/hermetic_cc_toolchain-v3.1.1.tar.gz",
)

# Misc tools
Expand Down Expand Up @@ -181,17 +181,13 @@ http_file(
url = "https://www.unicode.org/Public/idna/15.1.0/IdnaMappingTable.txt",
)

# 1.91.0 doesn't build w/ clang-cl:
# external/imgui/imgui_widgets.cpp(5196,62): error: invalid bitwise operation
# between different enumeration types ('ImGuiItemFlagsPrivate_' and
# 'ImGuiItemFlags_')
# https://github.com/ocornut/imgui
http_archive(
name = "imgui", # MIT
build_file = "//third_party:imgui.BUILD",
integrity = "sha256-BJQ5GXIeh0rHWi9F5utsAiQ5UDRme/UIkjOIr9paUL8=",
strip_prefix = "imgui-1.90.9",
url = "https://github.com/ocornut/imgui/archive/v1.90.9.tar.gz",
integrity = "sha256-o8T9hXoKSPbtrT4l3mj6HpbSQ38WZQOXFNHemtV5uNA=",
strip_prefix = "imgui-1.91.2",
url = "https://github.com/ocornut/imgui/archive/v1.91.2.tar.gz",
)

# https://github.com/SFML/imgui-sfml
Expand Down Expand Up @@ -222,9 +218,9 @@ http_archive(
http_archive(
name = "libpng", # Libpng
build_file = "//third_party:libpng.BUILD",
integrity = "sha256-/syVtGzwXo4/yKQUdQ4LparQDYnp/fF16U/wQcrxoDo=",
strip_prefix = "libpng-1.6.43",
url = "https://github.com/glennrp/libpng/archive/v1.6.43.tar.gz",
integrity = "sha256-DvW2M9DGX3gMT87Sf/gymY5xR4wTtF37bpTyOoL2T3w=",
strip_prefix = "libpng-1.6.44",
url = "https://github.com/glennrp/libpng/archive/v1.6.44.tar.gz",
)

# https://github.com/SFML/SFML
Expand Down Expand Up @@ -388,6 +384,10 @@ load("@build_bazel_apple_support//lib:repositories.bzl", "apple_support_dependen

apple_support_dependencies()

load("@bazel_features//:deps.bzl", "bazel_features_deps")

bazel_features_deps()

# rules_python
load("@rules_python//python:repositories.bzl", "py_repositories", "python_register_toolchains")

Expand Down
5 changes: 4 additions & 1 deletion third_party/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@ load("@rules_python//python:pip.bzl", "compile_pip_requirements")
compile_pip_requirements(
name = "requirements",
timeout = "moderate",
requirements_in = "requirements.in",
src = "requirements.in",
extra_args = [
"--strip-extras",
],
requirements_txt = "requirements.txt",
tags = [
"no-cross",
Expand Down
12 changes: 6 additions & 6 deletions third_party/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
#
# bazel run //third_party:requirements.update
#
glad2==2.0.6 \
--hash=sha256:08615aed3219ea1c77584bd5961d823bab226f8ac3831d09adf65c6fa877f8ec \
--hash=sha256:c421e05c697ec9c657dfe21e8633d59f1f2d0cfef38d408f20d2357d28f96642
glad2==2.0.7 \
--hash=sha256:365a5c9f790f069ad0d2b92cd236f1970b2a3094fdc91df9e6f2d470df5320db \
--hash=sha256:513e87e7feed59e4775c56966cf76ed3c097643a62535b9c508fef33dff3d2af
# via -r third_party/requirements.in
jinja2==3.1.3 \
--hash=sha256:7d6d50dd97d52cbc355597bd845fabfbac3f551e1f99619e39a35ce8c370b5fa \
--hash=sha256:ac8bd6544d4bb2c9792bf3a159e80bba8fda7f07e81bc3aed565432d5925ba90
jinja2==3.1.4 \
--hash=sha256:4a3aee7acbbe7303aede8e9648d13b8bf88a429282aa6122a993f0ac800cb369 \
--hash=sha256:bc5dd2abb727a5319567b7a813e6a2e7318c39f4f487cfe6c89c6f9c7d25197d
# via glad2
markupsafe==2.1.5 \
--hash=sha256:00e046b6dd71aa03a41079792f8473dc494d564611a8f89bbbd7cb93295ebdcf \
Expand Down