ffmpeg: Update from version 4.3.2 to 4.3.3 (#4929)

* ffmpeg: Update from version 4.3.2 to 4.3.3

* libva: Update from version 2.11 to version 2.13

* libaom: Update from version 3.1.0 to 3.2.0

* libvpx: Update to version 1.11.0

* zmq: Update to version 4.3.4

* ffmpeg: Update jellyfin segment muxer patch

* ffmpeg: Update intel-media-driver to version 21Q3

* tvheadend: Adjust changelog and add french description

* python2: Split wheels in pure vs cross requirements

* tvheadend: Enable logs but disable debug mode

* tvheadend: Fix epggrabber default cron issue

* zap2epg: Use latest version that includes a few fixes

cross/ffmpeg/Makefile

@@ -1,5 +1,5 @@
 PKG_NAME = ffmpeg
-PKG_VERS = 4.3.2
+PKG_VERS = 4.3.3
 PKG_EXT = tar.bz2
 PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://www.ffmpeg.org/releases

cross/ffmpeg/digests

@@ -1,3 +1,3 @@
-ffmpeg-4.3.2.tar.bz2 SHA1 5f36fbff86b29853e4693fb974844bfe60841167
-ffmpeg-4.3.2.tar.bz2 SHA256 ab3a6d6a70358ba0a5f67f37f91f6656b7302b02e98e5b8c846c16763c99913a
-ffmpeg-4.3.2.tar.bz2 MD5 d84e0f81740adefa76d94ed8c3aa9006
+ffmpeg-4.3.3.tar.bz2 SHA1 6feeae2618b816a7a4c5461144bd39f3c008a8ea
+ffmpeg-4.3.3.tar.bz2 SHA256 0bfe5929ad0c591ff2b6bd39e8b50bbe2f9278638ca39f52c7e666a50547da15
+ffmpeg-4.3.3.tar.bz2 MD5 07442396ef51a742a9091494f30666c5

cross/ffmpeg/patches/010-jellyfin-fix-segment-muxer.patch

@@ -1,25 +1,25 @@
-Index: libavformat/segment.c
-#Source: https://github.com/jellyfin/jellyfin-ffmpeg/tree/jellyfin/debian/patches
+Index: jellyfin-ffmpeg/libavformat/segment.c
+Source: https://github.com/jellyfin/jellyfin-ffmpeg/tree/jellyfin/debian/patches
 ===================================================================
---- libavformat/segment.c.orig	2019-10-02 13:05:57.119005772 -0400
-+++ libavformat/segment.c	2019-10-02 13:06:11.367388679 -0400
-@@ -87,6 +87,7 @@
+--- libavformat/segment.c.orig
++++ libavformat/segment.c
+@@ -87,6 +87,7 @@ typedef struct SegmentContext {
      int64_t last_val;      ///< remember last time for wrap around detection
      int cut_pending;
      int header_written;    ///< whether we've already called avformat_write_header
 +    int64_t start_pts;     ///< pts of the very first packet processed, used to compute correct segment length
-
+ 
      char *entry_prefix;    ///< prefix to add to list entry filenames
      int list_type;         ///< set the list type
-@@ -702,6 +703,7 @@
+@@ -712,6 +713,7 @@ static int seg_init(AVFormatContext *s)
          if ((ret = parse_frames(s, &seg->frames, &seg->nb_frames, seg->frames_str)) < 0)
              return ret;
      } else {
 +        seg->start_pts = -1;
-         /* set default value if not specified */
-         if (!seg->time_str)
-             seg->time_str = av_strdup("2");
-@@ -914,7 +916,15 @@
+         if (seg->use_clocktime) {
+             if (seg->time <= 0) {
+                 av_log(s, AV_LOG_ERROR, "Invalid negative segment_time with segment_atclocktime option set\n");
+@@ -889,7 +891,15 @@ calc_times:
                  seg->cut_pending = 1;
              seg->last_val = wrapped_val;
          } else {
@@ -35,4 +35,4 @@ Index: libavformat/segment.c
 +            }
          }
      }
-
+ 

cross/gmmlib/Makefile

@@ -1,5 +1,5 @@
 PKG_NAME = gmmlib
-PKG_VERS = 21.1.3
+PKG_VERS = 21.3.2
 PKG_EXT = tar.gz
 PKG_DIST_NAME = intel-$(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://github.com/intel/gmmlib/archive

cross/gmmlib/digests

@@ -1,3 +1,3 @@
-intel-gmmlib-21.1.3.tar.gz SHA1 700d55829696949d2a38daea818534e96868e7b4
-intel-gmmlib-21.1.3.tar.gz SHA256 c459a95243075296c72a40674c449ffcc314ed6d21ad0291c1603dbc11f4a74e
-intel-gmmlib-21.1.3.tar.gz MD5 a1997471c73aa066c32d483e497ae094
+intel-gmmlib-21.3.2.tar.gz SHA1 53ebb974af9fd980d10ee921991429c83ba885c1
+intel-gmmlib-21.3.2.tar.gz SHA256 a6a61ff7e66cb710be1593f2afbda3b21c679fe953bf5e80a5b3f047c1cbdb6c
+intel-gmmlib-21.3.2.tar.gz MD5 c1afe07c352cd47660582b366b33b612

cross/intel-media-driver/Makefile

@@ -1,5 +1,5 @@
 PKG_NAME = intel-media
-PKG_VERS = 21.1.3
+PKG_VERS = 21.3.5
 PKG_EXT = tar.gz
 PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://github.com/intel/media-driver/archive

cross/intel-media-driver/digests

@@ -1,3 +1,3 @@
-intel-media-21.1.3.tar.gz SHA1 9032c4cedcd155df2d641f2a7117a278a8674d06
-intel-media-21.1.3.tar.gz SHA256 219ce6b08a84bdce311160dc694d866249fd4e390391c2ac7be55f13a2fb928c
-intel-media-21.1.3.tar.gz MD5 98f59d7fd2c6c08808acf0ba741216b0
+intel-media-21.3.5.tar.gz SHA1 f2cf3b3aeb2f96e23028066e38e0208f9952cc4e
+intel-media-21.3.5.tar.gz SHA256 182925ed21c0a9843a63865e34dc35bf713294260d14ceb29e8de0de2e34733f
+intel-media-21.3.5.tar.gz MD5 3ace8aec373b3990acb1e3270e4a9e0b

cross/intel-media-sdk/Makefile

@@ -1,5 +1,5 @@
 PKG_NAME = intel-mediasdk
-PKG_VERS = 21.1.3
+PKG_VERS = 21.3.5
 PKG_EXT = tar.gz
 PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://github.com/Intel-Media-SDK/MediaSDK/archive

cross/intel-media-sdk/digests

@@ -1,3 +1,3 @@
-intel-mediasdk-21.1.3.tar.gz SHA1 62c7798aa5bb1395075ffe091f96b791b04baf26
-intel-mediasdk-21.1.3.tar.gz SHA256 718e68e3be78fcdc2dea0e3cd4714c38df2d451d7c8afef840c9c07e82bd4cb9
-intel-mediasdk-21.1.3.tar.gz MD5 a4747e315448ded38171b245232a5a7c
+intel-mediasdk-21.3.5.tar.gz SHA1 90a97b78ed8bc2c2dd213e487bf0f7fdfbf1df4d
+intel-mediasdk-21.3.5.tar.gz SHA256 3f13869298d3946d7d91e58846e274ef62cd5af2473f59f36b57b2c27ebfd87c
+intel-mediasdk-21.3.5.tar.gz MD5 7a71beb6def13ab71348785a8880dd0a

cross/libaom/Makefile

@@ -1,8 +1,9 @@
 PKG_NAME = libaom
-PKG_VERS = v3.1.0
+PKG_VERS = v3.2.0
 PKG_EXT = tar.gz
 PKG_DOWNLOAD_METHOD = git
-PKG_GIT_HASH = 33aff8586e35ffe385637f6aa2c991858c0fb58e
+PKG_GIT_HASH = 287164de79516c25c8c84fd544f67752c170082a
+# Tag v3.2.0: 287164de79516c25c8c84fd544f67752c170082a
 # Tag v3.1.0: 33aff8586e35ffe385637f6aa2c991858c0fb58e
 # Tag v3.0.0: d853caa2ab62d161e5edf344ffee7b597449dc0d
 PKG_DIST_SITE = https://aomedia.googlesource.com/aom

cross/libaom/PLIST

@@ -1,5 +1,5 @@
 bin:bin/aomdec
 bin:bin/aomenc
-lib:lib/libaom.so.3.1.0
+lib:lib/libaom.so.3.2.0
 lnk:lib/libaom.so.3
 lnk:lib/libaom.so

cross/libaom/digests

@@ -1,3 +1,3 @@
-libaom-git33aff8586e35ffe385637f6aa2c991858c0fb58e.tar.gz SHA1 32ba595f2ce9a32b77a32629b60125a0a63f213c
-libaom-git33aff8586e35ffe385637f6aa2c991858c0fb58e.tar.gz SHA256 4151d07396174415250a826bb5c2f714599c9ef4b3e6468757484a76132c7362
-libaom-git33aff8586e35ffe385637f6aa2c991858c0fb58e.tar.gz MD5 4346cd0d006f9891d262cb4a601eea19
+libaom-git287164de79516c25c8c84fd544f67752c170082a.tar.gz SHA1 494dc10a78eb99c8e411c03ce0909eba786baf15
+libaom-git287164de79516c25c8c84fd544f67752c170082a.tar.gz SHA256 596d3ddeb479c73e3d3787a310aad6eeb90520e5d9dd6beff5b6f35277807e20
+libaom-git287164de79516c25c8c84fd544f67752c170082a.tar.gz MD5 1a9bdf9981225561ad2f978a4e50e8d7

cross/libdrm/Makefile

@@ -1,5 +1,5 @@
 PKG_NAME = libdrm
-PKG_VERS = 2.4.106
+PKG_VERS = 2.4.107
 PKG_EXT = tar.xz
 PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://dri.freedesktop.org/libdrm

cross/libdrm/digests

@@ -1,3 +1,3 @@
-libdrm-2.4.106.tar.xz SHA1 46ef6579b571b430cd68ed183933896200bfde04
-libdrm-2.4.106.tar.xz SHA256 92d8ac54429b171e087e61c2894dc5399fe6a549b1fbba09fa6a3cb9d4e57bd4
-libdrm-2.4.106.tar.xz MD5 4e316ae1966a1a63c31a3885313a8fb8
+libdrm-2.4.107.tar.xz SHA1 372eb85849d1858a892dc5569edfa278640a9732
+libdrm-2.4.107.tar.xz SHA256 c554cef03b033636a975543eab363cc19081cb464595d3da1ec129f87370f888
+libdrm-2.4.107.tar.xz MD5 252175d363e3dbc4ffe32faaa8e93494

cross/libva-utils/Makefile

@@ -1,5 +1,5 @@
 PKG_NAME = libva-utils
-PKG_VERS = 2.11.1
+PKG_VERS = 2.13.0
 PKG_EXT = tar.gz
 PKG_DIST_NAME = $(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://github.com/intel/libva-utils/archive

cross/libva-utils/digests

@@ -1,3 +1,3 @@
-libva-utils-2.11.1.tar.gz SHA1 3e92345f12106807a8d722740dd2016912bde1a2
-libva-utils-2.11.1.tar.gz SHA256 0c1eb7f717e391d00da74c53a9fe5caf3d6c510dcd35bac7f71a0e59ad1b8d26
-libva-utils-2.11.1.tar.gz MD5 010243cc8217fd455d0ad11f2025d43c
+libva-utils-2.13.0.tar.gz SHA1 e270193489b9f8ceb395ba399bc652d1e43f7335
+libva-utils-2.13.0.tar.gz SHA256 128333faa9792a3b87586a80bfb70859dcdd81847ec9a722f785a601a48e1731
+libva-utils-2.13.0.tar.gz MD5 3749f30f2a262379b0e98edf68915975

cross/libva/Makefile

@@ -1,5 +1,5 @@
 PKG_NAME = libva
-PKG_VERS = 2.11.0
+PKG_VERS = 2.13.0
 PKG_EXT = tar.gz
 PKG_DIST_NAME = $(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://github.com/intel/libva/archive

cross/libva/PLIST

@@ -1,6 +1,6 @@
 lnk:lib/libva.so
 lnk:lib/libva.so.2
-lib:lib/libva.so.2.1100.0
+lib:lib/libva.so.2.1300.0
 lnk:lib/libva-drm.so
 lnk:lib/libva-drm.so.2
-lib:lib/libva-drm.so.2.1100.0
+lib:lib/libva-drm.so.2.1300.0

cross/libva/digests

@@ -1,3 +1,3 @@
-libva-2.11.0.tar.gz SHA1 f3cd6fb4b578435d8d67ab1caf8eaff8f55882d4
-libva-2.11.0.tar.gz SHA256 ee2bd79bad5e2404143f089360685f5da63a32dd551b54ccd61d2d49c041178a
-libva-2.11.0.tar.gz MD5 ba136b5a02ee4c7bf093d09bc1635560
+libva-2.13.0.tar.gz SHA1 519444a1c96d8f485d8e56d4445eb53168c9c4e1
+libva-2.13.0.tar.gz SHA256 6b7ec7d4fa204dad3f266450981f1f0892400c03afd3e00ac11f8ccade5aaaa1
+libva-2.13.0.tar.gz MD5 d8753a1ed468b5a8ac343d0ec64d0f13

cross/libvpx/Makefile

@@ -1,5 +1,5 @@
 PKG_NAME = libvpx
-PKG_VERS = 1.10.0
+PKG_VERS = 1.11.0
 PKG_EXT = tar.gz
 PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://github.com/webmproject/libvpx/archive

cross/libvpx/PLIST

@@ -1,4 +1,4 @@
 lnk:lib/libvpx.so
-lnk:lib/libvpx.so.6
-lnk:lib/libvpx.so.6.4
-lib:lib/libvpx.so.6.4.0
+lnk:lib/libvpx.so.7
+lnk:lib/libvpx.so.7.0
+lib:lib/libvpx.so.7.0.0

cross/libvpx/digests

@@ -1,3 +1,3 @@
-libvpx-1.10.0.tar.gz SHA1 72ba77ee50c379c54417ac924cca29336e37b953
-libvpx-1.10.0.tar.gz SHA256 85803ccbdbdd7a3b03d930187cb055f1353596969c1f92ebec2db839fa4f834a
-libvpx-1.10.0.tar.gz MD5 cded283be38dc0078c3fbe751722efc5
+libvpx-1.11.0.tar.gz SHA1 865737462d11b36f6ee1153e8b9fe90e160d4d35
+libvpx-1.11.0.tar.gz SHA256 965e51c91ad9851e2337aebcc0f517440c637c506f3a03948062e3d5ea129a83
+libvpx-1.11.0.tar.gz MD5 82e5e527336b41281a582204db1f3457

cross/libzmq/Makefile

@@ -1,5 +1,5 @@
 PKG_NAME = libzmq
-PKG_VERS = 4.3.3
+PKG_VERS = 4.3.4
 PKG_EXT = tar.gz
 PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://github.com/zeromq/libzmq/archive

cross/libzmq/PLIST

@@ -7,4 +7,4 @@ bin:bin/remote_lat
 bin:bin/remote_thr
 lnk:lib/libzmq.so
 lnk:lib/libzmq.so.5
-lib:lib/libzmq.so.5.2.3
+lib:lib/libzmq.so.5.2.4

cross/libzmq/digests

@@ -1,3 +1,3 @@
-libzmq-4.3.3.tar.gz SHA1 60027b9d57041b8cb964faa85b262eccaf5a5e18
-libzmq-4.3.3.tar.gz SHA256 c4fd999d67cd12872a8604162f2b1cf5b5a02fb807a88215f0f96bd50331b166
-libzmq-4.3.3.tar.gz MD5 bad8d6f61f4c01f21697eb5bd22c15e3
+libzmq-4.3.4.tar.gz SHA1 9c91ef047885531877e0ad5f5593b97ccd2c1023
+libzmq-4.3.4.tar.gz SHA256 0ff5a531c9ffaf0dfdc7dc78d13d1383088f454896d252934c429b2554d10559
+libzmq-4.3.4.tar.gz MD5 cc20b769ac10afa352e5ed2769bb23b3

cross/tvheadend/patches/003-fix-epggrab-cron.patch

@@ -0,0 +1,11 @@
+--- src/epggrab.c.orig	2021-10-21 00:14:56.000000000 +0000
++++ src/epggrab.c	2021-10-25 20:17:24.306546129 +0000
+@@ -252,7 +252,7 @@ static void _epggrab_load ( void )
+   /* Defaults */
+   } else {
+     free(epggrab_conf.cron);
+-    epggrab_conf.cron = strdup("# Default config (00:04 and 12:04 everyday)\n4 */12 * * *");
++    epggrab_conf.cron = strdup("# Default config (00:04 and 12:04 everyday)\n4 0 * * *\n4 12 * * *");
+     LIST_FOREACH(mod, &epggrab_modules, link) // enable only OTA EIT and OTA PSIP by default
+       if (mod->type == EPGGRAB_OTA &&
+           ((mod->subsys == LS_TBL_EIT && strcmp(mod->id, "eit") == 0) ||

cross/zap2epg/Makefile

@@ -1,7 +1,7 @@
 PKG_NAME = zap2epg
-PKG_VERS = 3.0
+PKG_VERS = 3.1
 PKG_EXT = tar.gz
-PKG_GIT_HASH = 65336f7e6d24c32df392aadc0c9140429bbbe1d7
+PKG_GIT_HASH = 3c4aa1ab6a19ba6b4608ba5a3140b3c5ca5a941c
 PKG_DIST_NAME = $(PKG_GIT_HASH).$(PKG_EXT)
 PKG_DIST_SITE = https://github.com/th0ma7/script.module.zap2epg/archive
 PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)

cross/zap2epg/digests

@@ -1,3 +1,3 @@
-zap2epg-3.0.tar.gz SHA1 da206997e6cc75599daee4370cdcba031d47ecea
-zap2epg-3.0.tar.gz SHA256 105b9291be572551efd5cbcb4bb6b828da3bc36e985a1eced2be7aa4f0b89feb
-zap2epg-3.0.tar.gz MD5 fabc98f7d9ec079776e8eab2cd7d6700
+zap2epg-3.1.tar.gz SHA1 ca26699be6167d6e3f0b31bb702c8e342b03ba9e
+zap2epg-3.1.tar.gz SHA256 33a13721eabf2241970e3c1a0c01445521fc82cd34f6219790cb7f2ee5447198
+zap2epg-3.1.tar.gz MD5 0e47aa293a541552744f421184084098

spk/chromaprint/Makefile

@@ -1,6 +1,6 @@
 SPK_NAME = chromaprint
 SPK_VERS = 1.5.0
-SPK_REV = 15
+SPK_REV = 16
 SPK_ICON = src/chromaprint.png
 
 DEPENDS = cross/$(SPK_NAME)
@@ -10,7 +10,7 @@ STARTABLE = no
 MAINTAINER = ymartin59
 DESCRIPTION = Chromaprint is the core component of the AcoustID project. It\'s a client-side library that implements a custom algorithm for extracting fingerprints from any audio source.
 DISPLAY_NAME = Chromaprint
-CHANGELOG = "1. Update to ffmpeg 4.3.2"
+CHANGELOG = "1. Update to ffmpeg 4.3.3"
 
 HOMEPAGE   = https://acoustid.org/chromaprint
 LICENSE    = LGPL2.1+

spk/comskip/Makefile

@@ -1,6 +1,6 @@
 SPK_NAME = comskip
 SPK_VERS = 0.82.010
-SPK_REV = 6
+SPK_REV = 7
 SPK_ICON = src/comskip.png
 
 DEPENDS = cross/$(SPK_NAME)
@@ -10,7 +10,7 @@ STARTABLE = no
 MAINTAINER = schumi2004
 DESCRIPTION = Comskip is a free mpeg commercial detector. Read the wiki on how to use and configure it.
 DISPLAY_NAME = Comskip
-CHANGELOG = "1. Update to ffmpeg 4.3.2"
+CHANGELOG = "1. Update to ffmpeg 4.3.3"
 
 HOMEPAGE = https://www.kaashoek.com/comskip/
 LICENSE = LGPL

spk/ffmpeg/Makefile

@@ -1,8 +1,8 @@
 SPK_NAME = ffmpeg
-SPK_VERS = 4.3.2
-SPK_REV = 38
+SPK_VERS = 4.3.3
+SPK_REV = 39
 SPK_ICON = src/ffmpeg.png
-CHANGELOG = "1. Added zvbi library<br/>2. Add dash demuxer support"
+CHANGELOG = "1. Update to version 4.3.3<br/>2. Update intel-media-driver to 21Q3<br/>3. Update libaom to 3.2.0<br/>4. Update libvpx to 1.11.0<br/>5. Update zmq to 4.3.4"
 
 CONF_DIR = src/conf
 

spk/python2/Makefile

@@ -16,7 +16,7 @@ DEPENDS += cross/lxml cross/m2crypto cross/msgpack-python cross/pillow_py2
 DEPENDS += cross/pyalsa cross/pyaudio cross/pycrypto cross/pycurl
 DEPENDS += cross/pyyaml cross/pyzmq cross/uwsgi
 
-WHEELS = src/requirements.txt
+WHEELS = src/requirements.txt src/requirements-cross.txt
 
 
 MAINTAINER = Safihre

spk/python2/src/requirements-cross.txt

@@ -0,0 +1,36 @@
+## Modules cross-compiled via spksrc.python-wheel.mk
+## These modules require patches or have cross dependencies
+# Included for reference
+#lxml==4.5.0
+#m2crypto==0.25.1
+#msgpack-python==0.5.6
+#pillow==5.3.0
+#pyalsa==1.0.29
+#pyaudio==0.2.9
+#pycrypto==2.6.1
+#pycurl==7.43.0
+#PyYAML==5.4.1
+#pyzmq==16.0.2
+#uwsgi==2.0.14
+#pycparser==2.19
+
+## Cross-compiled via spksrc.wheel.mk
+markupsafe==1.1.1
+psutil==5.7.0
+pymongo==3.10.1
+sqlalchemy==1.3.17
+
+# Cheetah
+cheetah==2.4.4
+
+# Cryptography/pyOpenSSL/M2Crypto dependencies
+# These also depends on cross/cffi and cross/openssl,
+# which are installed through cross/bcrypt
+#cryptography==2.9.2 now built as buildtime dependency
+
+# Twisted and dependencies
+twisted==20.3.0
+zope.interface==5.1.0
+
+# pillow dependencies
+olefile==0.46

spk/python2/src/requirements.txt

@@ -1,48 +1,22 @@
-## Modules cross-compiled via spksrc.python-wheel.mk
-## These modules require patches or have cross dependencies
-# Included for reference
-#lxml==4.5.0
-#m2crypto==0.25.1
-#msgpack-python==0.5.6
-#pillow==5.3.0
-#pyalsa==1.0.29
-#pyaudio==0.2.9
-#pycrypto==2.6.1
-#pycurl==7.43.0
-#PyYAML==5.4.1
-#pyzmq==16.0.2
-#uwsgi==2.0.14
-#pycparser==2.19
-
-## Cross-compiled via spksrc.wheel.mk
-markupsafe==1.1.1
-psutil==5.7.0
-pymongo==3.10.1
-sqlalchemy==1.3.17
-
 # General support
 six==1.16.0
 virtualenv==16.7.10
 
-# Cheetah and dependencies
-cheetah==2.4.4
+# Cheetah dependency
 markdown==3.1.1
 
 # Cryptography/pyOpenSSL/M2Crypto dependencies
 # These also depends on cross/cffi and cross/openssl,
 # which are installed through cross/bcrypt
 pyOpenSSL==19.1.0
-#cryptography==2.9.2 now built as buildtime dependency
 pyasn1==0.4.8
 asn1crypto==1.3.0
 enum34==1.1.10
 idna==2.10
 ipaddress==1.0.23
 typing==3.7.4.1
 
-# Twisted and dependencies
-twisted==20.3.0
-zope.interface==5.1.0
+# Twisted dependencies
 Automat==20.2.0
 constantly==15.1.0
 hyperlink==19.0.0
@@ -55,6 +29,3 @@ requests==2.23.0
 urllib3==1.26.4
 chardet==4.0.0
 certifi
-
-# pillow dependencies
-olefile==0.46