Skip to content

Commit 4e0d50e

Browse files
Trinkle23897Trinkle23897
committed
Upgrade C++ third-party dependencies
1 parent af6641b commit 4e0d50e

4 files changed

Lines changed: 40 additions & 42 deletions

File tree

‎envpool/workspace0.bzl‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -160,32 +160,32 @@ def workspace():
160160
maybe(
161161
http_archive,
162162
name = "opencv",
163-
sha256 = "62f650467a60a38794d681ae7e66e3e8cfba38f445e0bf87867e2f2cdc8be9d5",
164-
strip_prefix = "opencv-4.8.1",
163+
sha256 = "1d40ca017ea51c533cf9fd5cbde5b5fe7ae248291ddf2af99d4c17cf8e13017d",
164+
strip_prefix = "opencv-4.13.0",
165165
urls = [
166-
"https://github.com/opencv/opencv/archive/refs/tags/4.8.1.tar.gz",
166+
"https://github.com/opencv/opencv/archive/refs/tags/4.13.0.tar.gz",
167167
],
168168
build_file = "//third_party/opencv:opencv.BUILD",
169169
)
170170

171171
maybe(
172172
http_archive,
173173
name = "pugixml",
174-
sha256 = "610f98375424b5614754a6f34a491adbddaaec074e9044577d965160ec103d2e",
175-
strip_prefix = "pugixml-1.14/src",
174+
sha256 = "b39647064d9e28297a34278bfb897092bf33b7c487906ddfc094c9e8868bddcb",
175+
strip_prefix = "pugixml-1.15/src",
176176
urls = [
177-
"https://github.com/zeux/pugixml/archive/refs/tags/v1.14.tar.gz",
177+
"https://github.com/zeux/pugixml/archive/refs/tags/v1.15.tar.gz",
178178
],
179179
build_file = "//third_party/pugixml:pugixml.BUILD",
180180
)
181181

182182
maybe(
183183
http_archive,
184184
name = "ale",
185-
sha256 = "28960616cd89c18925ced7bbdeec01ab0b2ebd2d8ce5b7c88930e97381b4c3b5",
186-
strip_prefix = "Arcade-Learning-Environment-0.8.1",
185+
sha256 = "d6ac9406690bb3533b37a99253bdfc59bc27779c5e1b6855c763d0b367bcbf96",
186+
strip_prefix = "Arcade-Learning-Environment-0.11.2",
187187
urls = [
188-
"https://github.com/mgbellemare/Arcade-Learning-Environment/archive/refs/tags/v0.8.1.tar.gz",
188+
"https://github.com/Farama-Foundation/Arcade-Learning-Environment/archive/refs/tags/v0.11.2.tar.gz",
189189
],
190190
build_file = "//third_party/ale:ale.BUILD",
191191
)
@@ -226,11 +226,11 @@ def workspace():
226226
maybe(
227227
http_archive,
228228
name = "sdl2",
229-
sha256 = "888b8c39f36ae2035d023d1b14ab0191eb1d26403c3cf4d4d5ede30e66a4942c",
230-
strip_prefix = "SDL2-2.28.4",
229+
sha256 = "5f5993c530f084535c65a6879e9b26ad441169b3e25d789d83287040a9ca5165",
230+
strip_prefix = "SDL2-2.32.10",
231231
urls = [
232-
"https://www.libsdl.org/release/SDL2-2.28.4.tar.gz",
233-
"https://github.com/libsdl-org/SDL/releases/download/release-2.28.4/SDL2-2.28.4.tar.gz",
232+
"https://www.libsdl.org/release/SDL2-2.32.10.tar.gz",
233+
"https://github.com/libsdl-org/SDL/releases/download/release-2.32.10/SDL2-2.32.10.tar.gz",
234234
],
235235
build_file = "//third_party/sdl2:sdl2.BUILD",
236236
)
@@ -271,10 +271,10 @@ def workspace():
271271
maybe(
272272
http_archive,
273273
name = "vizdoom",
274-
sha256 = "e379a242ada7e1028b7a635da672b0936d99da3702781b76a4400b83602d78c4",
275-
strip_prefix = "ViZDoom-1.1.13/src/vizdoom/",
274+
sha256 = "76ddf186d7f093ef85cbcb0e7e387757d60e45190eb5da6d075aab31ffc316ed",
275+
strip_prefix = "ViZDoom-1.3.0/src/vizdoom/",
276276
urls = [
277-
"https://github.com/Farama-Foundation/ViZDoom/archive/refs/tags/1.1.13.tar.gz",
277+
"https://github.com/Farama-Foundation/ViZDoom/archive/refs/tags/1.3.0.tar.gz",
278278
],
279279
build_file = "//third_party/vizdoom:vizdoom.BUILD",
280280
patches = [
@@ -285,10 +285,10 @@ def workspace():
285285
maybe(
286286
http_archive,
287287
name = "vizdoom_lib",
288-
sha256 = "e379a242ada7e1028b7a635da672b0936d99da3702781b76a4400b83602d78c4",
289-
strip_prefix = "ViZDoom-1.1.13/",
288+
sha256 = "76ddf186d7f093ef85cbcb0e7e387757d60e45190eb5da6d075aab31ffc316ed",
289+
strip_prefix = "ViZDoom-1.3.0/",
290290
urls = [
291-
"https://github.com/Farama-Foundation/ViZDoom/archive/refs/tags/1.1.13.tar.gz",
291+
"https://github.com/Farama-Foundation/ViZDoom/archive/refs/tags/1.3.0.tar.gz",
292292
],
293293
build_file = "//third_party/vizdoom_lib:vizdoom_lib.BUILD",
294294
)
@@ -340,10 +340,10 @@ def workspace():
340340
maybe(
341341
http_archive,
342342
name = "box2d",
343-
sha256 = "d6b4650ff897ee1ead27cf77a5933ea197cbeef6705638dd181adc2e816b23c2",
344-
strip_prefix = "box2d-2.4.1",
343+
sha256 = "85b9b104d256c985e6e244b4227d447897fac429071cc114e5cc819dae848852",
344+
strip_prefix = "box2d-2.4.2",
345345
urls = [
346-
"https://github.com/erincatto/box2d/archive/refs/tags/v2.4.1.tar.gz",
346+
"https://github.com/erincatto/box2d/archive/refs/tags/v2.4.2.tar.gz",
347347
],
348348
build_file = "//third_party/box2d:box2d.BUILD",
349349
)

‎third_party/ale/ale.BUILD‎

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@ cc_library(
2727

2828
template_rule(
2929
name = "ale_version",
30-
src = "src/version.hpp.in",
31-
out = "version.hpp",
30+
src = "src/ale/version.hpp.in",
31+
out = "src/ale/version.hpp",
3232
substitutions = {
33-
"@ALE_VERSION@": "0.7.5",
33+
"@ALE_VERSION@": "0.11.2",
3434
"@ALE_VERSION_MAJOR@": "0",
35-
"@ALE_VERSION_MINOR@": "7",
36-
"@ALE_VERSION_PATCH@": "5",
37-
"@ALE_VERSION_GIT_SHA@": "978d2ce25665338ba71e45d32fff853b17c15f2e",
35+
"@ALE_VERSION_MINOR@": "11",
36+
"@ALE_VERSION_PATCH@": "2",
37+
"@ALE_VERSION_GIT_SHA@": "ecc113829d571348adc1a299fcf1321238dd684e",
3838
},
3939
)
4040

@@ -50,23 +50,19 @@ cc_library(
5050
"src/**/*.cxx",
5151
],
5252
exclude = [
53-
"src/python/*",
53+
"src/ale/python/**",
5454
],
5555
) + [
5656
":ale_version",
5757
],
58-
hdrs = ["src/ale_interface.hpp"],
58+
hdrs = ["src/ale/ale_interface.hpp"],
5959
copts = [
6060
"-include",
6161
"cstdint",
6262
],
6363
includes = [
6464
"src",
65-
"src/common",
66-
"src/emucore",
67-
"src/environment",
68-
"src/games",
69-
"src/games/supported",
65+
"src/ale",
7066
],
7167
linkopts = [
7268
"-ldl",

‎third_party/vizdoom/vizdoom.BUILD‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,8 @@ template_rule(
105105
src = "src/viz_version.h.in",
106106
out = "viz_version.h",
107107
substitutions = {
108-
"@ViZDoom_VERSION_ID@": "1113",
109-
"@ViZDoom_VERSION_STR@": "1.1.13",
108+
"@ViZDoom_VERSION_ID@": "1300",
109+
"@ViZDoom_VERSION_STR@": "1.3.0",
110110
},
111111
)
112112

@@ -403,7 +403,6 @@ cc_binary(
403403
"src/__autostart.cpp",
404404
"src/actorptrselect.cpp",
405405
"src/am_map.cpp",
406-
"src/asm_x86_64/tmap3.s",
407406
"src/b_bot.cpp",
408407
"src/b_func.cpp",
409408
"src/b_game.cpp",
@@ -535,7 +534,6 @@ cc_binary(
535534
"src/name.cpp",
536535
"src/nodebuild.cpp",
537536
"src/nodebuild_classify_nosse2.cpp",
538-
"src/nodebuild_classify_sse2.cpp",
539537
"src/nodebuild_events.cpp",
540538
"src/nodebuild_extract.cpp",
541539
"src/nodebuild_gl.cpp",

‎third_party/vizdoom_lib/vizdoom_lib.BUILD‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ template_rule(
2222
src = "src/lib/ViZDoomVersion.h.in",
2323
out = "ViZDoomVersion.h",
2424
substitutions = {
25-
"@ViZDoom_VERSION_ID@": "1113",
26-
"@ViZDoom_VERSION_STR@": "1.1.13",
25+
"@ViZDoom_VERSION_ID@": "1300",
26+
"@ViZDoom_VERSION_STR@": "1.3.0",
2727
},
2828
)
2929

@@ -35,7 +35,11 @@ cc_library(
3535
"src/lib/*.cpp",
3636
"src/lib/boost/**/*.hpp",
3737
]) + [":vizdoom_version"],
38-
hdrs = ["include/ViZDoom.h"],
38+
hdrs = glob([
39+
"include/*.h",
40+
"src/vizdoom/src/**/*.h",
41+
"src/vizdoom/src/**/*.hpp",
42+
]),
3943
includes = [
4044
"include",
4145
"src/lib",

0 commit comments

Comments
 (0)