mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-08-07 09:01:38 -04:00
Include libtiff as otherwise when building on linux various components link against the system version
This commit is contained in:
parent
4f7046e5cf
commit
8bcf1aed00
@ -47,7 +47,7 @@ def binary_includes():
|
||||
('usb-1.0 mtp expat sqlite3 ffi z lzma openjp2 poppler dbus-1 iconv xml2 xslt jpeg png16'
|
||||
' webp webpmux webpdemux sharpyuv exslt ncursesw readline chm hunspell-1.7 hyphen'
|
||||
' icudata icui18n icuuc icuio stemmer gcrypt gpg-error uchardet graphite2'
|
||||
' brotlicommon brotlidec brotlienc zstd podofo ssl crypto'
|
||||
' brotlicommon brotlidec brotlienc zstd podofo ssl crypto tiff'
|
||||
' gobject-2.0 glib-2.0 gthread-2.0 gmodule-2.0 gio-2.0 dbus-glib-1').split()
|
||||
)) + [
|
||||
# debian/ubuntu for for some typical stupid reason use libpcre.so.3
|
||||
@ -58,7 +58,7 @@ def binary_includes():
|
||||
glob.glob('/usr/lib/*/libpcre.so.3')[0],
|
||||
|
||||
get_dll_path('bz2', 2), j(PREFIX, 'lib', 'libunrar.so'),
|
||||
get_dll_path('python' + py_ver, 2),
|
||||
get_dll_path('python' + py_ver, 2), get_dll_path('jbig', 2),
|
||||
|
||||
# We dont include libstdc++.so as the OpenGL dlls on the target
|
||||
# computer fail to load in the QPA xcb plugin if they were compiled
|
||||
|
@ -527,7 +527,7 @@ class Freeze:
|
||||
'usb-1.0.0', 'mtp.9', 'chm.0', 'sqlite3.0', 'hunspell-1.7.0',
|
||||
'icudata.70', 'icui18n.70', 'icuio.70', 'icuuc.70', 'hyphen.0', 'uchardet.0',
|
||||
'stemmer.0', 'xslt.1', 'exslt.0', 'xml2.2', 'z.1', 'unrar', 'lzma.5',
|
||||
'brotlicommon.1', 'brotlidec.1', 'brotlienc.1', 'zstd.1',
|
||||
'brotlicommon.1', 'brotlidec.1', 'brotlienc.1', 'zstd.1', 'jbig.2.1', 'tiff.6',
|
||||
'crypto.1.1', 'ssl.1.1', 'iconv.2', # 'ltdl.7'
|
||||
):
|
||||
print('\nAdding', x)
|
||||
|
@ -232,6 +232,25 @@
|
||||
}
|
||||
},
|
||||
|
||||
{
|
||||
"name": "libjbig",
|
||||
"comment": "Needed for libtiff",
|
||||
"unix": {
|
||||
"filename": "jbigkit-2.1.tar.gz",
|
||||
"hash": "sha256:de7106b6bfaf495d6865c7dd7ac6ca1381bd12e0d81405ea81e7f2167263d932",
|
||||
"urls": ["https://www.cl.cam.ac.uk/~mgk25/jbigkit/download/{filename}"]
|
||||
}
|
||||
},
|
||||
|
||||
{
|
||||
"name": "libtiff",
|
||||
"unix": {
|
||||
"filename": "tiff-4.6.0.tar.xz",
|
||||
"hash": "sha256:e178649607d1e22b51cf361dd20a3753f244f022eefab1f2f218fc62ebaf87d2",
|
||||
"urls": ["http://download.osgeo.org/libtiff/{filename}"]
|
||||
}
|
||||
},
|
||||
|
||||
{
|
||||
"name": "libwebp",
|
||||
"unix": {
|
||||
|
Loading…
x
Reference in New Issue
Block a user