Backup_Repos/calibre
1
0
Fork 0
mirror of git://github.com/kovidgoyal/calibre.git synced 2026-04-30 17:33:03 +02:00
Code Issues Projects Releases Wiki Activity

Add webp support to the binary build on osx and linux to match windows

Browse source
This commit is contained in:
Kovid Goyal 2014-07-19 10:23:33 +05:30
parent 2aed6ba715
commit 77bd43ecc4
2 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
setup/installer/linux/freeze2.py
View file

@ -72,7 +72,7 @@ def binary_includes():
j(SW, 'lib', 'lib' + x) for x in (
'usb-1.0.so.0', 'mtp.so.9', 'expat.so.1', 'sqlite3.so.0',
'podofo.so.0.9.1', 'z.so.1', 'bz2.so.1.0', 'poppler.so.46',
'iconv.so.2', 'xml2.so.2', 'xslt.so.1', 'jpeg.so.8', 'png16.so.16',
'iconv.so.2', 'xml2.so.2', 'xslt.so.1', 'jpeg.so.8', 'png16.so.16', 'webp.so.5',
'exslt.so.0', 'imobiledevice.so.4', 'usbmuxd.so.2', 'plist.so.2',
'MagickCore-6.Q16.so.2', 'MagickWand-6.Q16.so.2', 'ssl.so.1.0.0',
'crypto.so.1.0.0', 'readline.so.6', 'chm.so.0', 'icudata.so.53',

15
setup/installer/osx/app/main.py
View file

@ -182,8 +182,7 @@ def run(self, test_launchers):
self.add_calibre_plugins()
self.add_podofo()
self.add_poppler()
self.add_libjpeg()
self.add_libpng()
self.add_imaging_libs()
self.add_fontconfig()
self.add_imagemagick()
self.add_misc_libraries()
@ -394,14 +393,10 @@ def add_poppler(self):
self.install_dylib(os.path.join(SW, 'bin', x), False)
@flush
def add_libjpeg(self):
info('\nAdding libjpeg')
self.install_dylib(os.path.join(SW, 'lib', 'libjpeg.8.dylib'))
@flush
def add_libpng(self):
info('\nAdding libpng')
self.install_dylib(os.path.join(SW, 'lib', 'libpng16.16.dylib'))
def add_imaging_libs(self):
info('\nAdding libjpeg, libpng and libwebp')
for x in ('jpeg.8', 'png16.16', 'webp.5'):
self.install_dylib(os.path.join(SW, 'lib', 'lib%s.dylib' % x))
@flush
def add_fontconfig(self):