Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Cargo.lock
target/
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "osmesa-src"
version = "12.0.1"
version = "17.2.0-devel"
authors = ["mesa3d maintainers"]
build = "build.rs"
repository = "https://github.com/servo/osmesa-src/"
Expand Down
17 changes: 9 additions & 8 deletions build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ fn main() {
// Prevent aclocal being run due to timestamps being messed up by git.
// https://stackoverflow.com/questions/18769770/user-of-autotools-generated-tarball-gets-error-message-aclocal-1-13-command-no
run(Command::new("touch")
.current_dir(src.join("mesa-12.0.1"))
.current_dir(src.join("mesa-src"))
.arg("configure.ac")
.arg("aclocal.m4")
.arg("configure")
Expand All @@ -22,20 +22,21 @@ fn main() {
.arg("src/mesa/program/program_parse.tab.c")
.arg("src/compiler/glsl/glsl_lexer.cpp"));

run(Command::new(src.join("mesa-12.0.1/configure"))
run(Command::new(src.join("mesa-src/configure"))
.current_dir(&dst)
.env("PTHREADSTUBS_CFLAGS", ".")
.env("PTHREADSTUBS_LIBS", ".")
.arg("--disable-gles1")
.arg("--disable-gles2")
.arg("--disable-dri")
.arg("--disable-driglx-direct")
.arg("--disable-dri3")
.arg("--disable-glx")
.arg("--disable-egl")
.arg("--disable-driglx-direct")
.arg("--disable-gbm")
.arg("--disable-gles1")
.arg("--disable-gles2")
.arg("--disable-glx")
.arg("--disable-llvm-shared-libs")
.arg("--enable-gallium-osmesa")
.arg("--with-gallium-drivers=swrast")
.arg("--disable-llvm-shared-libs"));
.arg("--with-gallium-drivers=swrast"));

run(Command::new("make")
.arg(format!("-j{}", env::var("NUM_JOBS").unwrap()))
Expand Down
72 changes: 0 additions & 72 deletions mesa-12.0.1/Makefile.am

This file was deleted.

Loading