From dedbc1ddb34002a24c0cc404f5d0f293acba9e8d Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Wed, 5 Jun 2019 17:55:35 +0530 Subject: [PATCH] Split up Qt into modules Add extra deps for webengine --- bypy/linux.conf | 2 +- bypy/linux/__main__.py | 3 +- bypy/macos/__main__.py | 2 +- bypy/sources.json | 88 +++++++++++++++++++++++++++++++++++++----- 4 files changed, 82 insertions(+), 13 deletions(-) diff --git a/bypy/linux.conf b/bypy/linux.conf index 974edc55fc..60ad3f5e9b 100644 --- a/bypy/linux.conf +++ b/bypy/linux.conf @@ -1,4 +1,4 @@ image 'https://partner-images.canonical.com/core/xenial/current/ubuntu-xenial-core-cloudimg-{}-root.tar.gz' # Build time deps for Qt. See http://doc.qt.io/qt-5/linux-requirements.html and https://wiki.qt.io/Building_Qt_5_from_Git -deps 'flex bison gperf ruby libx11-dev libxext-dev libxfixes-dev libxi-dev libxrender-dev libxcb1-dev libx11-xcb-dev libxcb-glx0-dev xkb-data libglu1-mesa-dev libxkbcommon-dev libinput-dev libxkbcommon-x11-dev libgtk2.0-dev libvulkan-dev libwayland-dev libwayland-egl1-mesa' +deps 'flex bison gperf ruby libx11-dev libxext-dev libxfixes-dev libxi-dev libxrender-dev libxcb1-dev libx11-xcb-dev libxcb-glx0-dev xkb-data libglu1-mesa-dev libxkbcommon-dev libinput-dev libxkbcommon-x11-dev libgtk2.0-dev libvulkan-dev libwayland-dev libwayland-egl1-mesa libegl1-mesa-dev libxtst-dev libnss3-dev' diff --git a/bypy/linux/__main__.py b/bypy/linux/__main__.py index ea19369e69..0de067464c 100644 --- a/bypy/linux/__main__.py +++ b/bypy/linux/__main__.py @@ -40,7 +40,8 @@ def binary_includes(): ] + list(map( get_dll_path, ('usb-1.0 mtp expat sqlite3 ffi z poppler dbus-1 iconv xml2 xslt jpeg png16' - ' webp exslt ncursesw readline chm icudata icui18n icuuc icuio gcrypt gpg-error' + ' webp webpmux webpdemux exslt ncursesw readline chm' + ' 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() )) + [ get_dll_path('podofo', 3), get_dll_path('bz2', 2), j(PREFIX, 'lib', 'libunrar.so'), diff --git a/bypy/macos/__main__.py b/bypy/macos/__main__.py index d249f6b7ff..6d9371c0e1 100644 --- a/bypy/macos/__main__.py +++ b/bypy/macos/__main__.py @@ -425,7 +425,7 @@ class Freeze(object): @flush def add_imaging_libs(self): print('\nAdding libjpeg, libpng, libwebp, optipng and mozjpeg') - for x in ('jpeg.8', 'png16.16', 'webp.7'): + for x in ('jpeg.8', 'png16.16', 'webp.7', 'webpmux.3', 'webpdemux.2'): self.install_dylib(os.path.join(PREFIX, 'lib', 'lib%s.dylib' % x)) for x in 'optipng', 'JxrDecApp': self.install_dylib(os.path.join(PREFIX, 'bin', x), False) diff --git a/bypy/sources.json b/bypy/sources.json index c41cd5d6c8..c20594fad1 100644 --- a/bypy/sources.json +++ b/bypy/sources.json @@ -384,16 +384,84 @@ }, { - "name": "qt", - "unix": { - "filename": "qt-everywhere-src-5.12.3.tar.xz", - "hash": "sha256:6462ac74c00ff466487d8ef8d0922971aa5b1d5b33c0753308ec9d57711f5a42", - "urls": ["https://download.qt.io/official_releases/qt/5.12/5.12.3/single/{filename}"] - }, - "windows": { - "filename": "qt-everywhere-src-5.12.3.zip", - "hash": "md5:b684a2f37b1beebd421b3b7d1eca15dc", - "urls": ["https://download.qt.io/official_releases/qt/5.12/5.12.3/single/{filename}"] + "name": "qt-base", + "version": "5.12.3", + "hashes": { + "unix": "sha256:fddfd8852ef7503febeed67b876d1425160869ae2b1ae8e10b3fb0fedc5fe701", + "windows": "sha256:f7a14e5e7156988e1673a7c64ac1e25353c238c2e3008e4c0b91778f14d8c70c" + } + }, + + { + "name": "qt-svg", + "hashes": { + "unix": "sha256:f666438dbf6816b7534e539b95e3fa4405f11d7e2e2bbcde34f2db5ae0f27dc2", + "windows": "sha256:a39476cf3355e315311afb523c5d6da9153ba8434dc770b81407c4a3180c47a5" + } + }, + + { + "name": "qt-declarative", + "hashes": { + "unix": "sha256:839881cd6996e35c351bc7d560372ebb91e61f3688957c33248c4f31ea007fa7", + "windows": "sha256:9df94bdba58f6c136a93a4c3786b07f67a217343225d48f3da38f51c68f2ee1f" + } + }, + + { + "name": "qt-imageformats", + "hashes": { + "unix": "sha256:db5a9e784f9c327c1e6830b1550311024cc91202d3b8dde82cd0944164298be2", + "windows": "sha256:ade8a611d7f61971bbd87b205d5083d88b00300887a50c8ba92ec6268003824f" + } + }, + + { + "name": "qt-webchannel", + "hashes": { + "unix": "sha256:72d1620bcc94e14caa91ddf344c84cd1288aa9479e00b1bb3b5e51f92efe088a", + "windows": "sha256:f3de125c163a27a8683f5fcdf9bbb4af91461c8854976a9609b951f43a8fbad5" + } + }, + + { + "name": "qt-location", + "hashes": { + "unix": "sha256:52d589be2852ada0c000b06cc411b61e521cd0797470be567fd1625bcc9d75c6", + "windows": "sha256:47d329bf32b37023759353347431d8d7f7248b399e917e3717b2d20da4526b1f" + } + }, + + { + "name": "qt-x11extras", + "os": "linux", + "hashes": { + "unix": "sha256:85e3ae5177970c2d8656226d7535d0dff5764c100e55a79a59161d80754ba613" + } + }, + + { + "name": "qt-wayland", + "os": "linux", + "hashes": { + "unix": "sha256:f0b45ad84180730e2d5a1249eb20c6357869b4b78f45eb266c2f2b17f77d86ff" + } + }, + + { + "name": "qt-sensors", + "hashes": { + "unix": "sha256:7f63fedf60fdf110a3fc529568c7226d7acd59cc5eaee908f4d5a969e34005fc", + "windows": "sha256:5f1e9d8e1add61ba20b6499dd4335d9b157bb99793ed16319c142569625c546d" + } + }, + + + { + "name": "qt-webengine", + "hashes": { + "unix": "sha256:3ff3bac12d75aa0f3fd993bb7077fe411f7b0e6a3993af6f8b039d48e3dc4317", + "windows": "sha256:dec39e37480cb8644d628a75bb13c124a799277ab8851864781d17739a4c573d" } },