From 77bd43ecc40c32ac66709842870d4c5b1b885cb6 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 19 Jul 2014 10:23:33 +0530
Subject: [PATCH] Add webp support to the binary build on osx and linux to
 match windows

---
 setup/installer/linux/freeze2.py |  2 +-
 setup/installer/osx/app/main.py  | 15 +++++----------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/setup/installer/linux/freeze2.py b/setup/installer/linux/freeze2.py
index 9dff01fe08..018dde3f82 100644
--- a/setup/installer/linux/freeze2.py
+++ b/setup/installer/linux/freeze2.py
@@ -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',
diff --git a/setup/installer/osx/app/main.py b/setup/installer/osx/app/main.py
index 10aaa07b19..a61c4308c9 100644
--- a/setup/installer/osx/app/main.py
+++ b/setup/installer/osx/app/main.py
@@ -182,8 +182,7 @@ class Py2App(object):
             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 @@ class Py2App(object):
             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):