# HG changeset patch # User Drew Perttula # Date 2014-06-02 07:46:55 # Node ID b281ee32c785cac8aec4f7acf80170bc535ebb1d # Parent c756638275d6f99adec53c76e0a98fb3d0d3f151 use Pillow. make vidref start up Ignore-this: 52ba5ec2409bbf446c7592d3646220ad diff --git a/bin/vidref b/bin/vidref --- a/bin/vidref +++ b/bin/vidref @@ -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 diff --git a/light9/vidref/videorecorder.py b/light9/vidref/videorecorder.py --- a/light9/vidref/videorecorder.py +++ b/light9/vidref/videorecorder.py @@ -2,7 +2,7 @@ import pygst 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 diff --git a/makefile b/makefile --- a/makefile +++ b/makefile @@ -27,8 +27,6 @@ link_to_sys_packages: 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 diff --git a/pydeps b/pydeps --- a/pydeps +++ b/pydeps @@ -15,4 +15,5 @@ genshi==0.7 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