-
Notifications
You must be signed in to change notification settings - Fork 1
Expand file tree
/
Copy pathtouchhle_cargo_system_sdl2.patch
More file actions
68 lines (63 loc) · 2.42 KB
/
Copy pathtouchhle_cargo_system_sdl2.patch
File metadata and controls
68 lines (63 loc) · 2.42 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
diff --git a/Cargo.toml b/Cargo.toml
index eeb5a60..838eb3e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -54,14 +54,8 @@ quick-xml = "0.38.4"
md5 = "0.7.0"
yore = "1.1.0"
encoding_rs = "0.8.35"
-# We currently use a fork of rust-sdl2 because we need a fix for Android builds
-# that's not upstream yet.
-# The HIDAPI feature is enabled because rust-sdl2 hides the SDL2 sensor features
-# behind this, but the actual HIDAPI is not used by touchHLE (see window.rs).
-# Note that the submodule in vendor/SDL2/ must use exactly the same revision of
-# SDL2 that rust-sdl2 uses, so that the Android JNI interface matches.
-sdl2 = { git = "https://github.com/touchHLE/rust-sdl2", tag = "touchHLE-3", features = ["hidapi"] }
-sdl2-sys = { git = "https://github.com/touchHLE/rust-sdl2", tag = "touchHLE-3" }
+sdl2 = { version = "0.38.0", features = ["use-pkgconfig", "hidapi"] }
+sdl2-sys = { version = "0.38.0", features = ["use-pkgconfig"] }
touchHLE_dynarmic_wrapper = { path = "src/cpu/dynarmic_wrapper" }
touchHLE_gl_bindings = { path = "src/gles/gl_bindings" }
touchHLE_openal_soft_wrapper = { path = "src/audio/openal_soft_wrapper" }
diff --git a/Cargo.lock b/Cargo.lock
index 05b7d2a..7ab2543 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -462,6 +462,12 @@ dependencies = [
"ttf-parser",
]
+[[package]]
+name = "pkg-config"
+version = "0.3.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
+
[[package]]
name = "plist"
version = "1.8.0"
@@ -556,8 +562,9 @@ checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde"
[[package]]
name = "sdl2"
-version = "0.37.0"
-source = "git+https://github.com/touchHLE/rust-sdl2?tag=touchHLE-3#b67f98fe6a147773b6f05d50ae775d9fe16561e7"
+version = "0.38.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d42407afc6a8ab67e36f92e80b8ba34cbdc55aaeed05249efe9a2e8d0e9feef"
dependencies = [
"bitflags",
"lazy_static",
@@ -567,12 +574,14 @@ dependencies = [
[[package]]
name = "sdl2-sys"
-version = "0.37.0"
-source = "git+https://github.com/touchHLE/rust-sdl2?tag=touchHLE-3#b67f98fe6a147773b6f05d50ae775d9fe16561e7"
+version = "0.38.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ff61407fc75d4b0bbc93dc7e4d6c196439965fbef8e4a4f003a36095823eac0"
dependencies = [
"cfg-if",
"cmake",
"libc",
+ "pkg-config",
"version-compare",
]