# HG changeset patch
# User drewp@bigasterisk.com
# Date 2016-06-10 03:25:31
# Node ID 0b2edd4de97a123bbd6ad77ee17830205cbbda34
# Parent 20782112abf078575384e6088a05e0bc458b4d77
setup changes for laptop
Ignore-this: d66248aa8e10e157409fb873479de732
diff --git a/bin/homepage b/bin/homepage
--- a/bin/homepage
+++ b/bin/homepage
@@ -33,4 +33,4 @@ http {
}
EOF
head -1 /tmp/light9_nginx_routes.conf
-exec nginx -c $CONF
+exec /usr/sbin/nginx -c $CONF
diff --git a/light9/web/index.html b/light9/web/index.html
--- a/light9/web/index.html
+++ b/light9/web/index.html
@@ -5,6 +5,7 @@
+
diff --git a/light9/web/lib/bower.json b/light9/web/lib/bower.json
--- a/light9/web/lib/bower.json
+++ b/light9/web/lib/bower.json
@@ -15,7 +15,8 @@
"rdfstore": "https://github.com/antoniogarrote/rdfstore-js.git#b3f7c0c9c1da9b26261af0d4858722fa982411bb",
"N3.js": "https://github.com/RubenVerborgh/N3.js.git#04f4e21f4ccb351587dc00a3f26340b28d4bb10f",
"shortcut": "http://www.openjs.com/scripts/events/keyboard_shortcuts/shortcut.js",
- "async": "https://github.com/caolan/async.git#^1.5.2"
+ "async": "https://github.com/caolan/async.git#^1.5.2",
+ "iron-resizable-behavior": "PolymerElements/iron-resizable-behavior#^1.0.3"
},
"resolutions": {
"paper-styles": "^1.1.4",
diff --git a/makefile b/makefile
--- a/makefile
+++ b/makefile
@@ -46,6 +46,9 @@ link_to_sys_packages:
ln -sf $(DP)/pygst.py $(SP)/
ln -sf $(DP)/gst-0.10 $(SP)/
ln -sf $(DP)/goocanvasmodule.so $(SP)/
+ ln -sf $(DP)/cv2.x86_64-linux-gnu.so $(SP)/
+ ln -sf $(DP)/cv.py $(SP)/
+ ln -sf $(DP)/numpy $(SP)/
PYTHON=/usr/bin/pypy
PYTHON=/usr/bin/python
@@ -69,7 +72,7 @@ gst_packages:
sudo aptitude install python-gi gir1.2-gst-plugins-base-1.0 libgirepository-1.0-1 gir1.2-gstreamer-1.0 gstreamer1.0-tools gstreamer1.0-plugins-good gstreamer1.0-pulseaudio
packages:
- sudo aptitude install coffeescript freemind normalize-audio audacity python-pygoocanvas python-pygame gir1.2-goocanvas-2.0-9 libffi-dev tix libzmq3 python-dev libssl-dev
+ sudo aptitude install coffeescript freemind normalize-audio audacity python-pygoocanvas python-pygame gir1.2-goocanvas-2.0-9 libffi-dev tix libzmq3 python-dev libssl-dev python-opencv
bower:
cd light9/web/lib; bower install