mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

servo: Merge #6395 - Use cgl and gleam from crates.io (from SimonSapin:crates.io-cgl-gleam); r=metajack 

r? @metajack

Source-Repo: https://github.com/servo/servo
Source-Revision: 5d89235c5696a65bcf93a5da5244093294eb4fbe
This commit is contained in:
Simon Sapin 2015-06-15 15:08:43 -06:00
Родитель a44285c32d
Коммит 9f3f7f698e
6 изменённых файлов: 77 добавлений и 51 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

3
servo/components/canvas/Cargo.toml
Просмотреть файл

@ -16,8 +16,6 @@ git = "https://github.com/servo/rust-geom"
[dependencies.layers]
git = "https://github.com/servo/rust-layers"
[dependencies.gleam]
git = "https://github.com/servo/gleam"
[dependencies.canvas_traits]
path = "../canvas_traits"
@ -36,3 +34,4 @@ features = ["texture_surface"]
log = "*"
cssparser = "0.3.1"
num = "0.1.24"
gleam = "0.1"

4
servo/components/compositing/Cargo.toml
Просмотреть файл

@ -52,9 +52,6 @@ git = "https://github.com/servo/rust-layers"
[dependencies.png]
git = "https://github.com/servo/rust-png"
[dependencies.gleam]
git = "https://github.com/servo/gleam"
[dependencies.clipboard]
git = "https://github.com/aweinstock314/rust-clipboard"
@ -64,6 +61,7 @@ num = "0.1.24"
url = "0.2.35"
time = "0.1.17"
libc = "*"
gleam = "0.1"
[target.x86_64-apple-darwin.dependencies]
core-graphics = "*"

36
servo/components/servo/Cargo.lock сгенерированный
Просмотреть файл

@ -80,7 +80,7 @@ dependencies = [
"cssparser 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"geom 0.1.0 (git+https://github.com/servo/rust-geom)",
"gfx_traits 0.0.1",
"gleam 0.0.1 (git+https://github.com/servo/gleam)",
"gleam 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"layers 0.1.0 (git+https://github.com/servo/rust-layers)",
"log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"num 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
@ -102,10 +102,10 @@ dependencies = [
[[package]]
name = "cgl"
version = "0.0.1"
source = "git+https://github.com/servo/cgl-rs#ee2ba57c0cc576d13eb7b9413a3981291410d3b8"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"gleam 0.0.1 (git+https://github.com/servo/gleam)",
"gleam 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
]
@ -148,7 +148,7 @@ dependencies = [
"geom 0.1.0 (git+https://github.com/servo/rust-geom)",
"gfx 0.0.1",
"gfx_traits 0.0.1",
"gleam 0.0.1 (git+https://github.com/servo/gleam)",
"gleam 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"layers 0.1.0 (git+https://github.com/servo/rust-layers)",
"layout_traits 0.0.1",
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
@ -464,8 +464,8 @@ dependencies = [
[[package]]
name = "gleam"
version = "0.0.1"
source = "git+https://github.com/servo/gleam#0108e2a6c7ca4dc471bfb94ba1ed368335e4da28"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"gl_common 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
"gl_generator 0.0.26 (registry+https://github.com/rust-lang/crates.io-index)",
@ -501,11 +501,11 @@ name = "glutin_app"
version = "0.0.1"
dependencies = [
"bitflags 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"cgl 0.0.1 (git+https://github.com/servo/cgl-rs)",
"cgl 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"compositing 0.0.1",
"egl 0.1.0 (git+https://github.com/servo/rust-egl)",
"geom 0.1.0 (git+https://github.com/servo/rust-geom)",
"gleam 0.0.1 (git+https://github.com/servo/gleam)",
"gleam 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"glutin 0.0.26 (git+https://github.com/servo/glutin?branch=servo)",
"layers 0.1.0 (git+https://github.com/servo/rust-layers)",
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
@ -588,12 +588,12 @@ dependencies = [
[[package]]
name = "io-surface"
version = "0.1.0"
source = "git+https://github.com/servo/io-surface-rs#51c187a698f832d52d8fe8a833d47a38c4c8cf06"
source = "git+https://github.com/servo/io-surface-rs#7f8d819c7c2cef9ba6e057478bc13f01fe5e5a96"
dependencies = [
"cgl 0.0.1 (git+https://github.com/servo/cgl-rs)",
"cgl 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"geom 0.1.0 (git+https://github.com/servo/rust-geom)",
"gleam 0.0.1 (git+https://github.com/servo/gleam)",
"gleam 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
]
@ -625,14 +625,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "layers"
version = "0.1.0"
source = "git+https://github.com/servo/rust-layers#e566d3fc6ec80fe3aaf8ce67785683c99c46a015"
source = "git+https://github.com/servo/rust-layers#76d90799f152a78c35c90d9d7a9311a68e98937a"
dependencies = [
"azure 0.1.0 (git+https://github.com/servo/rust-azure)",
"cgl 0.0.1 (git+https://github.com/servo/cgl-rs)",
"cgl 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"egl 0.1.0 (git+https://github.com/servo/rust-egl)",
"geom 0.1.0 (git+https://github.com/servo/rust-geom)",
"gleam 0.0.1 (git+https://github.com/servo/gleam)",
"gleam 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"glx 0.0.1 (git+https://github.com/servo/rust-glx)",
"io-surface 0.1.0 (git+https://github.com/servo/io-surface-rs)",
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
@ -857,13 +857,13 @@ dependencies = [
[[package]]
name = "offscreen_gl_context"
version = "0.0.1"
source = "git+https://github.com/ecoal95/rust-offscreen-rendering-context#c402c86f8d4472785e04e59505feb28638101700"
source = "git+https://github.com/ecoal95/rust-offscreen-rendering-context#5d126b050569545204ddb5b9101be64850ebfe5a"
dependencies = [
"cgl 0.0.1 (git+https://github.com/servo/cgl-rs)",
"cgl 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"egl 0.1.0 (git+https://github.com/servo/rust-egl)",
"geom 0.1.0 (git+https://github.com/servo/rust-geom)",
"gleam 0.0.1 (git+https://github.com/servo/gleam)",
"gleam 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"glx 0.0.1 (git+https://github.com/servo/rust-glx)",
"layers 0.1.0 (git+https://github.com/servo/rust-layers)",
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",

42
servo/ports/cef/Cargo.lock сгенерированный
Просмотреть файл

@ -108,6 +108,15 @@ dependencies = [
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "cgl"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"gleam 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "clipboard"
version = "0.0.1"
@ -465,6 +474,17 @@ dependencies = [
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "gleam"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"gl_common 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
"gl_generator 0.0.26 (registry+https://github.com/rust-lang/crates.io-index)",
"khronos_api 0.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "glutin"
version = "0.0.26"
@ -493,11 +513,11 @@ name = "glutin_app"
version = "0.0.1"
dependencies = [
"bitflags 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"cgl 0.0.1 (git+https://github.com/servo/cgl-rs)",
"cgl 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"compositing 0.0.1",
"egl 0.1.0 (git+https://github.com/servo/rust-egl)",
"geom 0.1.0 (git+https://github.com/servo/rust-geom)",
"gleam 0.0.1 (git+https://github.com/servo/gleam)",
"gleam 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"glutin 0.0.26 (git+https://github.com/servo/glutin?branch=servo)",
"layers 0.1.0 (git+https://github.com/servo/rust-layers)",
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
@ -580,12 +600,12 @@ dependencies = [
[[package]]
name = "io-surface"
version = "0.1.0"
source = "git+https://github.com/servo/io-surface-rs#51c187a698f832d52d8fe8a833d47a38c4c8cf06"
source = "git+https://github.com/servo/io-surface-rs#7f8d819c7c2cef9ba6e057478bc13f01fe5e5a96"
dependencies = [
"cgl 0.0.1 (git+https://github.com/servo/cgl-rs)",
"cgl 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"geom 0.1.0 (git+https://github.com/servo/rust-geom)",
"gleam 0.0.1 (git+https://github.com/servo/gleam)",
"gleam 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
]
@ -617,14 +637,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "layers"
version = "0.1.0"
source = "git+https://github.com/servo/rust-layers#e566d3fc6ec80fe3aaf8ce67785683c99c46a015"
source = "git+https://github.com/servo/rust-layers#76d90799f152a78c35c90d9d7a9311a68e98937a"
dependencies = [
"azure 0.1.0 (git+https://github.com/servo/rust-azure)",
"cgl 0.0.1 (git+https://github.com/servo/cgl-rs)",
"cgl 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"egl 0.1.0 (git+https://github.com/servo/rust-egl)",
"geom 0.1.0 (git+https://github.com/servo/rust-geom)",
"gleam 0.0.1 (git+https://github.com/servo/gleam)",
"gleam 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"glx 0.0.1 (git+https://github.com/servo/rust-glx)",
"io-surface 0.1.0 (git+https://github.com/servo/io-surface-rs)",
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
@ -837,13 +857,13 @@ dependencies = [
[[package]]
name = "offscreen_gl_context"
version = "0.0.1"
source = "git+https://github.com/ecoal95/rust-offscreen-rendering-context#c402c86f8d4472785e04e59505feb28638101700"
source = "git+https://github.com/ecoal95/rust-offscreen-rendering-context#5d126b050569545204ddb5b9101be64850ebfe5a"
dependencies = [
"cgl 0.0.1 (git+https://github.com/servo/cgl-rs)",
"cgl 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"egl 0.1.0 (git+https://github.com/servo/rust-egl)",
"geom 0.1.0 (git+https://github.com/servo/rust-geom)",
"gleam 0.0.1 (git+https://github.com/servo/gleam)",
"gleam 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"glx 0.0.1 (git+https://github.com/servo/rust-glx)",
"layers 0.1.0 (git+https://github.com/servo/rust-layers)",
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",

8
servo/ports/glutin/Cargo.toml
Просмотреть файл

@ -16,6 +16,7 @@ time = "0.1.12"
bitflags = "*"
libc = "*"
url = "*"
gleam = "0.1"
[dependencies.compositing]
path = "../../components/compositing"
@ -42,9 +43,6 @@ path = "../../components/util"
git = "https://github.com/servo/glutin"
branch = "servo"
[dependencies.gleam]
git = "https://github.com/servo/gleam"
[target.i686-unknown-linux-gnu.dependencies]
x11 = "*"
@ -54,8 +52,8 @@ x11 = "*"
[target.arm-unknown-linux-gnueabihf.dependencies]
x11 = "*"
[target.x86_64-apple-darwin.dependencies.cgl]
git = "https://github.com/servo/cgl-rs"
[target.x86_64-apple-darwin.dependencies]
cgl = "0.1"
[target.arm-linux-androideabi.dependencies.egl]
git = "https://github.com/servo/rust-egl"

35
servo/ports/gonk/Cargo.lock сгенерированный
Просмотреть файл

@ -88,10 +88,10 @@ dependencies = [
[[package]]
name = "cgl"
version = "0.0.1"
source = "git+https://github.com/servo/cgl-rs#ee2ba57c0cc576d13eb7b9413a3981291410d3b8"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"gleam 0.0.1 (git+https://github.com/servo/gleam)",
"gleam 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
]
@ -444,6 +444,17 @@ dependencies = [
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "gleam"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"gl_common 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
"gl_generator 0.0.26 (registry+https://github.com/rust-lang/crates.io-index)",
"khronos_api 0.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "glx"
version = "0.0.1"
@ -514,12 +525,12 @@ dependencies = [
[[package]]
name = "io-surface"
version = "0.1.0"
source = "git+https://github.com/servo/io-surface-rs#51c187a698f832d52d8fe8a833d47a38c4c8cf06"
source = "git+https://github.com/servo/io-surface-rs#7f8d819c7c2cef9ba6e057478bc13f01fe5e5a96"
dependencies = [
"cgl 0.0.1 (git+https://github.com/servo/cgl-rs)",
"cgl 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"geom 0.1.0 (git+https://github.com/servo/rust-geom)",
"gleam 0.0.1 (git+https://github.com/servo/gleam)",
"gleam 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
]
@ -551,14 +562,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "layers"
version = "0.1.0"
source = "git+https://github.com/servo/rust-layers#e566d3fc6ec80fe3aaf8ce67785683c99c46a015"
source = "git+https://github.com/servo/rust-layers#76d90799f152a78c35c90d9d7a9311a68e98937a"
dependencies = [
"azure 0.1.0 (git+https://github.com/servo/rust-azure)",
"cgl 0.0.1 (git+https://github.com/servo/cgl-rs)",
"cgl 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"egl 0.1.0 (git+https://github.com/servo/rust-egl)",
"geom 0.1.0 (git+https://github.com/servo/rust-geom)",
"gleam 0.0.1 (git+https://github.com/servo/gleam)",
"gleam 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"glx 0.0.1 (git+https://github.com/servo/rust-glx)",
"io-surface 0.1.0 (git+https://github.com/servo/io-surface-rs)",
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
@ -754,13 +765,13 @@ dependencies = [
[[package]]
name = "offscreen_gl_context"
version = "0.0.1"
source = "git+https://github.com/ecoal95/rust-offscreen-rendering-context#c402c86f8d4472785e04e59505feb28638101700"
source = "git+https://github.com/ecoal95/rust-offscreen-rendering-context#5d126b050569545204ddb5b9101be64850ebfe5a"
dependencies = [
"cgl 0.0.1 (git+https://github.com/servo/cgl-rs)",
"cgl 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"core-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"egl 0.1.0 (git+https://github.com/servo/rust-egl)",
"geom 0.1.0 (git+https://github.com/servo/rust-geom)",
"gleam 0.0.1 (git+https://github.com/servo/gleam)",
"gleam 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"glx 0.0.1 (git+https://github.com/servo/rust-glx)",
"layers 0.1.0 (git+https://github.com/servo/rust-layers)",
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",