Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix load of python module PIL egg. #3100

Merged
merged 2 commits into from
Aug 18, 2013
Merged

Conversation

ulion
Copy link
Contributor

@ulion ulion commented Aug 14, 2013

there are 2 problem to prevent the egg be loaded.

  1. on darwin/win32, only pyo can be loaded by xbmc, pyc can not, but the egg was built to pyc without py source, so add the souce to egg fixes this.
  2. the egg file is not in python's sys.path, so no one can load it without add the egg file into sys.path, I first fixed it by add a PIL.pth file in the site-packages dir which include the egg filename, but found the c runtime library can not be loaded from egg file, so we had to extract files inside the egg into the PIL subdir and put PIL subdir in to the PIL.pth file, just like the installed PIL in any system python site-packages dir does.

@MartijnKaijser
Copy link
Member

@jimfcarroll could you take a glance at this?

@Memphiz
Copy link
Member

Memphiz commented Aug 15, 2013

or @davilla might be handy too...

@jimfcarroll
Copy link
Member

Never really dug into the PIL extension. If @ulion says we need this and it addresses a problem then I'm OK with it. @davilla ?

@ulion
Copy link
Contributor Author

ulion commented Aug 15, 2013

removed 2 lines change which is not used.

@MartijnKaijser
Copy link
Member

jenkins build this please

MartijnKaijser added a commit that referenced this pull request Aug 18, 2013
Fix load of python module PIL egg.
@MartijnKaijser MartijnKaijser merged commit 81277a9 into xbmc:master Aug 18, 2013
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants