From e3bc69b7e77aa6771c8db3695f12548447e1de51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20Ka=CC=88fer?= <mail@kkaefer.com>
Date: Wed, 29 Oct 2014 19:58:34 -0400
Subject: use CoreImage for decoding/encoding images on osx/ios

---
 configure | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index afb94d4795..daf09eaeee 100755
--- a/configure
+++ b/configure
@@ -6,6 +6,10 @@ shopt -s expand_aliases
 
 CONFIG_FILE=${1:-config.gypi}
 
+if [ `uname -s` = 'Darwin' ]; then
+    MASON_PLATFORM=${MASON_PLATFORM:-osx}
+fi
+
 function finish {
     >&2 echo -en "\033[0m";
 }
@@ -34,11 +38,16 @@ if [[ ! -d ~/.mason ]]; then
 fi
 alias mason='~/.mason/mason'
 
-
-case $MASON_PLATFORM in
+case ${MASON_PLATFORM} in
     'ios')
         SQLITE_VERSION=system
-        LIBPNG_VERSION=1.6.13
+        LIBUV_VERSION=0.10.28
+        ZLIB_VERSION=system
+        BOOST_VERSION=system
+        ;;
+    'osx')
+        GLFW_VERSION=a21f2377
+        SQLITE_VERSION=system
         LIBUV_VERSION=0.10.28
         ZLIB_VERSION=system
         BOOST_VERSION=system
-- 
cgit v1.2.1


From 242993b43a27e6f013e622bb4f268c4fdf436ac7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20Ka=CC=88fer?= <mail@kkaefer.com>
Date: Thu, 30 Oct 2014 15:06:10 -0400
Subject: fix gyp project

---
 configure | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index daf09eaeee..2bcfbdf62e 100755
--- a/configure
+++ b/configure
@@ -45,13 +45,6 @@ case ${MASON_PLATFORM} in
         ZLIB_VERSION=system
         BOOST_VERSION=system
         ;;
-    'osx')
-        GLFW_VERSION=a21f2377
-        SQLITE_VERSION=system
-        LIBUV_VERSION=0.10.28
-        ZLIB_VERSION=system
-        BOOST_VERSION=system
-        ;;
     *)
         GLFW_VERSION=a21f2377
         SQLITE_VERSION=system
-- 
cgit v1.2.1


From 592ed57d09f8f0913dae195e6e867884d11a2327 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20Ka=CC=88fer?= <mail@kkaefer.com>
Date: Thu, 30 Oct 2014 12:40:16 -0700
Subject: use more modern libpng version instead of the system-provided one and
 fix compile errors

---
 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'configure')

diff --git a/configure b/configure
index 2bcfbdf62e..cc96f038b0 100755
--- a/configure
+++ b/configure
@@ -48,7 +48,7 @@ case ${MASON_PLATFORM} in
     *)
         GLFW_VERSION=a21f2377
         SQLITE_VERSION=system
-        LIBPNG_VERSION=system
+        LIBPNG_VERSION=1.6.13
         LIBCURL_VERSION=system
         LIBUV_VERSION=0.10.28
         ZLIB_VERSION=system
-- 
cgit v1.2.1


From 080c185ea1b05dd673076e385cc659ecc46c697b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20Ka=CC=88fer?= <mail@kkaefer.com>
Date: Fri, 31 Oct 2014 15:08:31 -0400
Subject: remove dependency on node

---
 configure | 24 ------------------------
 1 file changed, 24 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index afb94d4795..edda1c1fa1 100755
--- a/configure
+++ b/configure
@@ -11,22 +11,6 @@ function finish {
 }
 trap finish EXIT
 
-# Install node
-if [[ ! -d ~/.nvm ]]; then
-    git clone --depth 1 https://github.com/creationix/nvm.git ~/.nvm
-fi
-set +u
-. ~/.nvm/nvm.sh
-if [ ! `nvm use 0.10 > /dev/null; echo $?` = 0 ]; then
-    >&2 echo -en "\033[1m\033[32m* "
-    nvm install 0.10
-    >&2 echo -en "\033[0m";
-else
-    >&2 echo -en "\033[1m\033[32m* "
-    nvm use 0.10
-    >&2 echo -en "\033[0m";
-fi
-
 # Install mason
 if [[ ! -d ~/.mason ]]; then
     >&2 echo -e "\033[1m\033[32m* Installing Mason\033[0m"
@@ -56,14 +40,8 @@ esac
 
 function abort { >&2 echo -e "\033[1m\033[31m$1\033[0m"; exit 1; }
 
-NODE=`which node || abort 'Cannot find node'`
-NPM=`which npm || abort 'Cannot find npm'`
 PYTHON=`which python || abort 'Cannot find python'`
 
->&2 echo -en "\033[1m\033[32m* Using npm "
->&2 ${NPM} --version
->&2 echo -en "\033[0m";
-
 >&2 echo -en "\033[1m\033[32m* Using "
 >&2 ${PYTHON} --version
 >&2 echo -en "\033[0m";
@@ -84,8 +62,6 @@ CONFIG="# Do not edit. Generated by the configure script.
     'libraries': []
   },
   'variables': {
-    'node': '${NODE}',
-    'npm': '${NPM}',
     'python': '${PYTHON}',
 "
 
-- 
cgit v1.2.1


From 03ae142d7257999b196593cf8bea77bdc2f50915 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20Ka=CC=88fer?= <mail@kkaefer.com>
Date: Fri, 31 Oct 2014 17:33:10 -0400
Subject: use a local version of mason instead of writing into ~/.mason

fixes #526
---
 configure | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index 8b82a72083..2b5ec80ca2 100755
--- a/configure
+++ b/configure
@@ -2,7 +2,6 @@
 
 set -e
 set -o pipefail
-shopt -s expand_aliases
 
 CONFIG_FILE=${1:-config.gypi}
 
@@ -16,11 +15,7 @@ function finish {
 trap finish EXIT
 
 # Install mason
-if [[ ! -d ~/.mason ]]; then
-    >&2 echo -e "\033[1m\033[32m* Installing Mason\033[0m"
-    git clone https://github.com/mapbox/mason.git ~/.mason
-fi
-alias mason='~/.mason/mason'
+. ./scripts/local_mason.sh
 
 case ${MASON_PLATFORM} in
     'ios')
-- 
cgit v1.2.1