Commit 86bf23ce authored by Michka Popoff's avatar Michka Popoff
Browse files

Merge branch homebrew/master into linuxbrew/master

Conflicts:
	Formula/gdl.rb
parents 0112c096 027cbe92
......@@ -33,7 +33,7 @@ First time contributing to Homebrew? Read our [Code of Conduct](https://github.c
* `brew edit foo` and make edits
* leave the [`bottle`](http://www.rubydoc.info/github/Homebrew/brew/master/Formula#bottle-class_method) as-is
* `brew uninstall --force foo`, `brew install --build-from-source foo`, `brew test foo`, and `brew audit --strict foo`
* `git commit` with message formatted `foo: fix <insert details>`
* `git commit` with message formatted `foo: <insert details>`
* [open a pull request](https://docs.brew.sh/How-To-Open-a-Homebrew-Pull-Request) and fix any failing tests
* If the fix is relevant to macOS, please submit the PR to Homebrew. If it is only relevant to Linux, please submit it to Linuxbrew
......
class Draco < Formula
desc "3D geometric mesh and point cloud compression library"
homepage "https://google.github.io/draco/"
url "https://github.com/google/draco/archive/1.2.5.tar.gz"
sha256 "76064614bcf5bc80c13291d38c2ea7b8e9c8827a98de93f7bc8bbe4b6e1ec1c4"
bottle do
cellar :any_skip_relocation
sha256 "e73a9122f2fe8ff15eeb35fc43042c143ebab42ec7ae23ab03358a9cd307b099" => :high_sierra
sha256 "26e8d3e692983b81b862784d788bdd31644da8efdbf68b9b5f069cf2bdfcb804" => :sierra
sha256 "b6da06e26c080eab8b1a565d24cb1c9ed0a42f2a542aebc39f121a9be49db7a1" => :el_capitan
end
depends_on "cmake" => :build
def install
mkdir "build" do
system "cmake", "..", * std_cmake_args
system "make", "install"
end
pkgshare.install "testdata/cube_att.ply"
end
test do
system "#{bin}/draco_encoder", "-i", "#{pkgshare}/cube_att.ply",
"-o", "cube_att.drc"
assert_predicate testpath/"cube_att.drc", :exist?
end
end
class Druid < Formula
desc "High-performance, column-oriented, distributed data store"
homepage "http://druid.io"
url "http://static.druid.io/artifacts/releases/druid-0.11.0-bin.tar.gz"
sha256 "d50218d11f97612acc1447914e113f1869997640de586daabd85828440c4c546"
url "http://static.druid.io/artifacts/releases/druid-0.12.0-bin.tar.gz"
sha256 "eab3ff44745966c81f9cd0ee46798b4d20489ec0aff7e75019003f4e5ee8ec87"
bottle :unneeded
......@@ -12,8 +12,8 @@ class Druid < Formula
depends_on :java => "1.8"
resource "mysql-metadata-storage" do
url "http://static.druid.io/artifacts/releases/mysql-metadata-storage-0.11.0.tar.gz"
sha256 "13fd978cdcfa7f9bac715642f37ddc8bdaf572ce05a2326c455ab8284d457141"
url "http://static.druid.io/artifacts/releases/mysql-metadata-storage-0.12.0.tar.gz"
sha256 "dbf9baddae13acf72d12bbcf7d8ac4b06a885b2f70d1b742a1505716792371fd"
end
def install
......@@ -30,7 +30,7 @@ class Druid < Formula
end
inreplace libexec/"bin/node.sh" do |s|
s.gsub! "nohup java", "nohup java -Ddruid.extensions.directory=\"#{libexec}/extensions\""
s.gsub! "nohup $JAVA", "nohup $JAVA -Ddruid.extensions.directory=\"#{libexec}/extensions\""
s.gsub! ":=lib", ":=#{libexec}/lib"
s.gsub! ":=conf/druid", ":=#{libexec}/conf/druid"
s.gsub! ":=log", ":=#{var}/druid/log"
......
class Gdl < Formula
desc "GNOME Docking Library provides docking features for GTK+ 3"
homepage "https://developer.gnome.org/gdl/"
url "https://download.gnome.org/sources/gdl/3.26/gdl-3.26.0.tar.xz"
sha256 "f3ad03f9a34f751f52464e22d962c0dec8ff867b7b7b37fe24907f3dcd54c079"
url "https://download.gnome.org/sources/gdl/3.28/gdl-3.28.0.tar.xz"
sha256 "52cc98ecc105148467b3b2b4e0d27ae484b1b6710d53413f771ed07ef1b737b6"
bottle do
sha256 "0248d4c169e93117bdee5966467e6472077615636ecee14d6d4d829073753a30" => :high_sierra
sha256 "37f76b2e3ec79557b3d3519afd3a88f0862b098d4cc0440caff55f5f4ef9fe2d" => :sierra
sha256 "a6a61712548c304e4ae6223d52a076ef8ebb09b4ca1c9a0ae5e5697233ab5006" => :el_capitan
sha256 "c28a49e73cca53da3d823c01762b2547ec2992b87ef27681f530c7cdde8fc28b" => :x86_64_linux
sha256 "d590570bb1da0b79601016795fe1e12eaef7e045e6383b2a1922c15f446d8f3d" => :high_sierra
sha256 "71e83c0542ea769908d6d59db7bfff69b0091ee2ef99f4d16eac1fb72c2c646d" => :sierra
sha256 "65275d065cfdf61d17ebf9d5b0c27b20406ab361e76a6718f6b243f0afe783ba" => :el_capitan
end
depends_on "pkg-config" => :build
......
class Tj < Formula
desc "Line timestamping tool"
homepage "https://github.com/sgreben/tj"
url "https://github.com/sgreben/tj/archive/6.0.2.tar.gz"
sha256 "c667f8fb09839a677bd6b3d6c06103bce59ffb2e33ec1bd7b49abfc00f02f5dd"
bottle do
cellar :any_skip_relocation
sha256 "05fa676f8b78bdeb2b782d696dd0e7b0dc1aafaf4597f1bc259fc8ccd3b3f168" => :high_sierra
sha256 "26edd5e1c71f587c3aa9be749e2d18852cde5ad406c91a9402ecba7cf3ada798" => :sierra
sha256 "37a1cc78f74344b31c8e85dc32213f42b9bd43bb5cc015afee749254042906fa" => :el_capitan
end
depends_on "go" => :build
def install
ENV["GOPATH"] = buildpath
(buildpath/"src/github.com/sgreben/tj").install buildpath.children
cd "src/github.com/sgreben/tj" do
system "make", "binaries/osx_x86_64/tj"
bin.install "binaries/osx_x86_64/tj"
prefix.install_metafiles
end
end
test do
system bin/"tj", "test"
end
end
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment