Mercurial > code > home > repos > light9

changeset 1070:b281ee32c785

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use Pillow. make vidref start up Ignore-this: 52ba5ec2409bbf446c7592d3646220ad
author Drew Perttula <drewp@bigasterisk.com>
date Mon, 02 Jun 2014 07:46:55 +0000
parents c756638275d6
children 2f492b4ac301
files bin/vidref light9/vidref/videorecorder.py makefile pydeps
diffstat 4 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/bin/vidref	Mon Jun 02 07:04:40 2014 +0000
+++ b/bin/vidref	Mon Jun 02 07:46:55 2014 +0000
@@ -1,5 +1,7 @@
 #!bin/python
 from run_local import log
+import sys
+sys.path.append('/usr/lib/python2.7/dist-packages') # For gtk
 from twisted.internet import gtk2reactor
 gtk2reactor.install()
 from twisted.internet import reactor, defer
--- a/light9/vidref/videorecorder.py	Mon Jun 02 07:04:40 2014 +0000
+++ b/light9/vidref/videorecorder.py	Mon Jun 02 07:46:55 2014 +0000
@@ -2,7 +2,7 @@
 pygst.require("0.10")
 import gst, gobject, time, logging, os, traceback
 import gtk
-import Image
+from PIL import Image
 from threading import Thread
 from twisted.internet import defer
 from Queue import Queue, Empty
--- a/makefile	Mon Jun 02 07:04:40 2014 +0000
+++ b/makefile	Mon Jun 02 07:46:55 2014 +0000
@@ -27,8 +27,6 @@
 	ln -sf $(DP)/pygst.pth $(SP)/
 	ln -sf $(DP)/pygst.py $(SP)/
 	ln -sf $(DP)/gst-0.10 $(SP)/
-	ln -sf $(DP)/PIL $(SP)/
-	ln -sf $(DP)/PIL.pth $(SP)/
 	ln -sf $(DP)/goocanvasmodule.so $(SP)/
 
 PYTHON=/usr/bin/pypy
--- a/pydeps	Mon Jun 02 07:04:40 2014 +0000
+++ b/pydeps	Mon Jun 02 07:46:55 2014 +0000
@@ -15,4 +15,5 @@
 pyjade==2.2.0
 python-dateutil==2.2
 txosc==0.2.0
-service_identity==0.2
\ No newline at end of file
+service_identity==0.2
+Pillow==2.4.0
\ No newline at end of file