From bb3e8fb3d5f25222203d7db5b8db1f66e22d7f07 Mon Sep 17 00:00:00 2001 From: Simo Kinnunen Date: Tue, 22 Sep 2015 11:54:57 +0900 Subject: [PATCH] Update jpeg-turbo, removes libjpeg-turbo from requirements but adds yasm. --- .travis.yml | 1 + README.md | 6 +++--- package.json | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8e633bb4..de2cc8d2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,6 +10,7 @@ addons: - libprotobuf-dev - graphicsmagick - rethinkdb + - yasm script: - gulp build before_script: diff --git a/README.md b/README.md index 3eb6e20f..93034a49 100644 --- a/README.md +++ b/README.md @@ -65,15 +65,15 @@ As the product has evolved from an internal tool running in our internal network * [GraphicsMagick](http://www.graphicsmagick.org/) (for resizing screenshots) * [ZeroMQ](http://zeromq.org/) libraries installed * [Protocol Buffers](https://github.com/google/protobuf) libraries installed -* [jpeg-turbo](http://libjpeg-turbo.virtualgl.org/) libraries installed (for quick VNC format conversions) +* [yasm](http://yasm.tortall.net/) installed (for compiling embedded [libjpeg-turbo](https://github.com/sorccu/node-jpeg-turbo)) * [pkg-config](http://www.freedesktop.org/wiki/Software/pkg-config/) so that Node.js can find the libraries -Note that you need these dependencies even if you've installed STF directly from [NPM](https://www.npmjs.com/), because they can't be included. +Note that you need these dependencies even if you've installed STF directly from [NPM](https://www.npmjs.com/), because they can't be included in the package. On OS X, you can use [homebrew](http://brew.sh/) to install most of the dependencies: ```bash -brew install rethinkdb graphicsmagick zeromq protobuf jpeg-turbo pkg-config +brew install rethinkdb graphicsmagick zeromq protobuf yasm pkg-config ``` On Windows you're on your own. In theory you might be able to get STF installed via [Cygwin](https://www.cygwin.com/) or similar, but we've never tried. In principle we will not provide any Windows installation support, but please do send a documentation pull request if you figure out what to do. diff --git a/package.json b/package.json index acb01d95..20da8fee 100644 --- a/package.json +++ b/package.json @@ -50,7 +50,7 @@ "http-proxy": "^1.11.2", "in-publish": "^2.0.0", "jade": "^1.9.2", - "jpeg-turbo": "^0.2.1", + "jpeg-turbo": "^0.3.0", "jws": "^3.1.0", "ldapjs": "git+https://github.com/mcavage/node-ldapjs.git#acc1ca8f4314fd9d67561feabc8ce4c235076a5e", "lodash": "^3.10.1",