Merge pull request #1150 from OlegOAndreev/master

Replaced downloading SDL2 from libsdl.org with git submodule SDL release 2.0.16
Rust-SDL2 · Oct 10, 2021 · bbb84d3 · bbb84d3
2 parents f25716a + 78e46e9
commit bbb84d3
Show file tree

Hide file tree

Showing 99 changed files with 92 additions and 40,327 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "sdl2-sys/SDL"]
+	path = sdl2-sys/SDL
+	url = https://github.com/libsdl-org/SDL/
diff --git a/README.md b/README.md
@@ -41,7 +41,7 @@ SDL2 >= 2.0.8 is recommended to use these bindings, but note that SDL2 >= 2.0.5
 
 ### "Bundled" Feature
 
-Since 0.31, this crate supports a feature named "bundled" which downloads SDL2 from source, compiles it and links it automatically. While this should work for any architecture, you **will** need a C compiler (like `gcc`, `clang`, or MS's own compiler) to use this feature properly.
+Since 0.31, this crate supports a feature named "bundled" which compiles SDL2 from source and links it automatically. While this should work for any architecture, you **will** need a C compiler (like `gcc`, `clang`, or MS's own compiler) to use this feature properly.
 
 ### Linux
 Install these through your favourite package management tool, or via

diff --git a/changelog.md b/changelog.md
@@ -8,6 +8,8 @@ enum variants directly in your project, you may be affected. If you only used sd
 
 [PR #1138](https://github.com/Rust-SDL2/rust-sdl2/pull/1138) Added binding for `SDL_OpenURL`
 
+[PR #1150](https://github.com/Rust-SDL2/rust-sdl2/pull/1150) Do not download SDL2 sources when using bundled feature
+
 ### v0.34.5
 
 [PR #1100](https://github.com/Rust-SDL2/rust-sdl2/pull/1100) Added binding for `SDL_GetDisplayUsableBounds`

diff --git a/sdl2-sys/Cargo.toml b/sdl2-sys/Cargo.toml
@@ -35,18 +35,10 @@ optional = true
 version = "^0.1"
 optional = true
 
-[build-dependencies.tar]
-version = "^0.4"
-optional = true
-
 [build-dependencies.flate2]
 version = "^1"
 optional = true
 
-[build-dependencies.unidiff]
-version = "^0.3"
-optional = true
-
 [build-dependencies]
 version-compare = "0.0.10"
 cfg-if = "^1.0"
@@ -59,7 +51,7 @@ use-vcpkg = ["vcpkg"]
 use-bindgen = ["bindgen"]
 static-link = []
 use_mac_framework = []
-bundled = ["cmake", "tar", "flate2", "unidiff"]
+bundled = ["cmake"]
 mixer = []
 image = []
 ttf = []

diff --git a/sdl2-sys/SDL b/sdl2-sys/SDL
diff --git a/sdl2-sys/SDL2-2.0.14/include/SDL.h b/sdl2-sys/SDL2-2.0.14/include/SDL.h