From 10d5d8b6bc4c96363c9a7d5026e1b8d5d3844602 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 17 Oct 2019 11:10:42 +0530
Subject: [PATCH] Fix a regression in 4.0 that broke rendering of PDF covers
 for PDF files that used JPEG2000 compression. Fixes #1847567 [Cover
 generation from PDF files is not
 working](https://bugs.launchpad.net/calibre/+bug/1847567)

---
 bypy/linux/__main__.py | 2 +-
 bypy/macos/__main__.py | 2 +-
 bypy/sources.json      | 9 +++++++++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/bypy/linux/__main__.py b/bypy/linux/__main__.py
index ca4514491a..1a5b07b60a 100644
--- a/bypy/linux/__main__.py
+++ b/bypy/linux/__main__.py
@@ -40,7 +40,7 @@ def binary_includes():
         j(PREFIX, 'private', 'mozjpeg', 'bin', x) for x in ('jpegtran', 'cjpeg')] + [
         ] + list(map(
             get_dll_path,
-            ('usb-1.0 mtp expat sqlite3 ffi z poppler dbus-1 iconv xml2 xslt jpeg png16'
+            ('usb-1.0 mtp expat sqlite3 ffi z openjp2 poppler dbus-1 iconv xml2 xslt jpeg png16'
              ' webp webpmux webpdemux exslt ncursesw readline chm hunspell-1.7'
              ' icudata icui18n icuuc icuio gcrypt gpg-error'
              ' gobject-2.0 glib-2.0 gthread-2.0 gmodule-2.0 gio-2.0 dbus-glib-1').split()
diff --git a/bypy/macos/__main__.py b/bypy/macos/__main__.py
index 9390bab016..8bf6980c42 100644
--- a/bypy/macos/__main__.py
+++ b/bypy/macos/__main__.py
@@ -457,7 +457,7 @@ class Freeze(object):
     @flush
     def add_poppler(self):
         print('\nAdding poppler')
-        for x in ('libpoppler.87.dylib',):
+        for x in ('libopenjp2.7.dylib', 'libpoppler.87.dylib',):
             self.install_dylib(join(PREFIX, 'lib', x))
         for x in ('pdftohtml', 'pdftoppm', 'pdfinfo'):
             self.install_dylib(
diff --git a/bypy/sources.json b/bypy/sources.json
index cfe4d42b05..4e1af7d488 100644
--- a/bypy/sources.json
+++ b/bypy/sources.json
@@ -306,6 +306,15 @@
         }
     },
 
+    {
+        "name": "openjpeg",
+        "unix": {
+            "filename": "openjpeg-2.3.1.tar.gz",
+            "hash": "sha256:63f5a4713ecafc86de51bfad89cc07bb788e9bba24ebbf0c4ca637621aadb6a9",
+            "urls": ["https://github.com/uclouvain/openjpeg/archive/v2.3.1/{filename}"]
+        }
+    },
+
     {
         "name": "poppler",
         "unix": {