Add replacements as submodules

.gitmodules

@@ -64,3 +64,21 @@
 [submodule "programs/init"]
 	path = programs/init
 	url = https://github.com/redox-os/init.git
+[submodule "libs/orbclient"]
+	path = libs/orbclient
+	url = https://github.com/redox-os/orbclient.git
+[submodule "libs/orbtk"]
+	path = libs/orbtk
+	url = https://github.com/redox-os/orbtk.git
+[submodule "libs/orbimage"]
+	path = libs/orbimage
+	url = https://github.com/redox-os/orbimage.git
+[submodule "libs/orbfont"]
+	path = libs/orbfont
+	url = https://github.com/redox-os/orbfont.git
+[submodule "libs/jpeg-decoder"]
+	path = libs/jpeg-decoder
+	url = https://github.com/redox-os/jpeg-decoder.git
+[submodule "libs/termion"]
+	path = libs/termion
+	url = https://github.com/redox-os/termion.git

Cargo.lock

@@ -486,7 +486,6 @@ dependencies = [
 [[package]]
 name = "jpeg-decoder"
 version = "0.1.12"
-source = "git+https://github.com/redox-os/jpeg-decoder.git?branch=single_thread#0660fc061973598515ec5d39d03a1bc7e53d68f6"
 dependencies = [
  "byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -495,7 +494,7 @@ dependencies = [
 name = "jpeg-decoder"
 version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-replace = "jpeg-decoder 0.1.12 (git+https://github.com/redox-os/jpeg-decoder.git?branch=single_thread)"
+replace = "jpeg-decoder 0.1.12"
 
 [[package]]
 name = "kernel"
@@ -801,31 +800,46 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "orbclient"
 version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "redox_syscall 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
  "sdl2 0.29.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "orbclient"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+replace = "orbclient 0.3.3"
+
 [[package]]
 name = "orbfont"
 version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "orbclient 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "rusttype 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "orbfont"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+replace = "orbfont 0.1.7"
+
 [[package]]
 name = "orbimage"
 version = "0.1.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "image 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "orbclient 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "resize 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "orbimage"
+version = "0.1.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+replace = "orbimage 0.1.15"
+
 [[package]]
 name = "orbital"
 version = "0.1.0"
@@ -843,13 +857,18 @@ dependencies = [
 [[package]]
 name = "orbtk"
 version = "0.2.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "orbclient 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "orbfont 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "orbimage 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "orbtk"
+version = "0.2.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+replace = "orbtk 0.2.19"
+
 [[package]]
 name = "orbutils"
 version = "0.1.14"
@@ -1424,11 +1443,18 @@ dependencies = [
  "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "termion"
+version = "1.3.0"
+dependencies = [
+ "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "termion"
 version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-replace = "termion 1.3.0 (git+https://github.com/redox-os/termion.git)"
+replace = "termion 1.3.0"
 
 [[package]]
 name = "thread-scoped"
@@ -1752,7 +1778,6 @@ dependencies = [
 "checksum idna 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6ac85ec3f80c8e4e99d9325521337e14ec7555c458a14e377d189659a427f375"
 "checksum image 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "979bad0502082fd60053a490282e87d6c89650942e3a270e0d4c83569c7f5899"
 "checksum inflate 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e7e0062d2dc2f17d2f13750d95316ae8a2ff909af0fda957084f5defd87c43bb"
-"checksum jpeg-decoder 0.1.12 (git+https://github.com/redox-os/jpeg-decoder.git?branch=single_thread)" = "<none>"
 "checksum jpeg-decoder 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "919d49b634cde303392353c5dd51153ec005a1a981c6f4b8277692a51e9d260d"
 "checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
 "checksum language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a91d884b6667cd606bb5a69aa0c99ba811a115fc68915e7056ec08a46e93199a"

Cargo.toml

@@ -37,5 +37,9 @@ members = [
 ]
 
 [replace]
-"jpeg-decoder:0.1.12" = { git = "https://github.com/redox-os/jpeg-decoder.git", branch = "single_thread" }
+"jpeg-decoder:0.1.12" = { path = "libs/jpeg-decoder" }
-"termion:1.3.0" = { git = "https://github.com/redox-os/termion.git" }
+"orbclient:0.3.3" = { path = "libs/orbclient" }
+"orbfont:0.1.7" = { path = "libs/orbfont" }
+"orbimage:0.1.15" = { path = "libs/orbimage" }
+"orbtk:0.2.19" = { path = "libs/orbtk" }
+"termion:1.3.0" = { path = "libs/termion" }

libs/jpeg-decoder

@@ -0,0 +1 @@
+Subproject commit 0660fc061973598515ec5d39d03a1bc7e53d68f6

libs/orbclient

@@ -0,0 +1 @@
+Subproject commit 2266aac1a9f300941d72d51e9a7fdb23eceeeb7e

libs/orbfont

@@ -0,0 +1 @@
+Subproject commit 8a8d19dcddbd78b3d3b12f7a7264c97c506b0a01

libs/orbimage

@@ -0,0 +1 @@
+Subproject commit cc3b593a585e339819cafcd8133b22cc6242f84d

libs/orbtk

@@ -0,0 +1 @@
+Subproject commit 9ff1aa42bdd7404585e5cf7f666e2a0f67c4e4be

libs/termion

@@ -0,0 +1 @@
+Subproject commit 550b9ea50a11c838533a0cf2cd9c8f7584927cdb