From 2abf89d6482e6e4b7493befc2f5c1f3d1104dd2b Mon Sep 17 00:00:00 2001 From: HelpSeeker Date: Tue, 21 May 2024 12:41:36 +0200 Subject: [PATCH] Update Flatpak build dependencies Runtime Gnome 44 -> 46 FFmpeg 5.0 -> 5.1.4 libhandy 1.8.2 -> 1.8.3 aiohttp 3.8.4 -> 3.9.5 FFmpeg has to stay on 5.x branch, because the concat method that Gyre uses is still forcefully disabled in newer version and awaits a re-implementation. expandvars Python package added as explicit requirement, because frozenlist 1.4.1 doesn't play nice otherwise. Also optional aiohttp requirements are included from now on. --- .../flatpak/io.github.helpseeker.Gyre.json | 10 +-- build-aux/flatpak/python3-aiohttp.json | 54 ----------- build-aux/flatpak/python3-modules.json | 90 +++++++++++++++++++ 3 files changed, 95 insertions(+), 59 deletions(-) delete mode 100644 build-aux/flatpak/python3-aiohttp.json create mode 100644 build-aux/flatpak/python3-modules.json diff --git a/build-aux/flatpak/io.github.helpseeker.Gyre.json b/build-aux/flatpak/io.github.helpseeker.Gyre.json index bb3c731..29be096 100644 --- a/build-aux/flatpak/io.github.helpseeker.Gyre.json +++ b/build-aux/flatpak/io.github.helpseeker.Gyre.json @@ -1,7 +1,7 @@ { "app-id" : "io.github.helpseeker.Gyre", "runtime" : "org.gnome.Platform", - "runtime-version" : "44", + "runtime-version" : "46", "sdk" : "org.gnome.Sdk", "command" : "gyre", "finish-args" : [ @@ -23,7 +23,7 @@ "*.a" ], "modules" : [ - "python3-aiohttp.json", + "python3-modules.json", { "name" : "ffmpeg", "config-opts" : [ @@ -36,7 +36,7 @@ "--enable-protocol=file", "--enable-decoder=h264,mp3", "--enable-encoder=wrapped_avframe,pcm_s16le", - "--enable-demuxer=concat,mov,mp3", + "--enable-demuxer=concat,mov,mp3,asf", "--enable-muxer=matroska,mp4,asf,avi,flv,f4v,mov,null", "--enable-bsf=h264_mp4toannexb", "--enable-filter=aresample" @@ -45,7 +45,7 @@ { "type" : "git", "url" : "https://git.ffmpeg.org/ffmpeg.git", - "tag" : "n5.0" + "tag" : "n5.1.4" } ] }, @@ -65,7 +65,7 @@ { "type" : "git", "url" : "https://gitlab.gnome.org/GNOME/libhandy.git", - "tag" : "1.8.2" + "tag" : "1.8.3" } ] }, diff --git a/build-aux/flatpak/python3-aiohttp.json b/build-aux/flatpak/python3-aiohttp.json deleted file mode 100644 index 0ddcbff..0000000 --- a/build-aux/flatpak/python3-aiohttp.json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "name": "python3-aiohttp", - "buildsystem": "simple", - "build-commands": [ - "pip3 install --verbose --exists-action=i --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} \"aiohttp\" --no-build-isolation" - ], - "sources": [ - { - "type": "file", - "url": "https://files.pythonhosted.org/packages/c2/fd/1ff4da09ca29d8933fda3f3514980357e25419ce5e0f689041edb8f17dab/aiohttp-3.8.4.tar.gz", - "sha256": "bf2e1a9162c1e441bf805a1fd166e249d574ca04e03b34f97e2928769e91ab5c" - }, - { - "type": "file", - "url": "https://files.pythonhosted.org/packages/76/ac/a7305707cb852b7e16ff80eaf5692309bde30e2b1100a1fcacdc8f731d97/aiosignal-1.3.1-py3-none-any.whl", - "sha256": "f8376fb07dd1e86a584e4fcdec80b36b7f81aac666ebc724e2c090300dd83b17" - }, - { - "type": "file", - "url": "https://files.pythonhosted.org/packages/d6/c1/8991e7c5385b897b8c020cdaad718c5b087a6626d1d11a23e1ea87e325a7/async_timeout-4.0.2-py3-none-any.whl", - "sha256": "8ca1e4fcf50d07413d66d1a5e416e42cfdf5851c981d679a09851a6853383b3c" - }, - { - "type": "file", - "url": "https://files.pythonhosted.org/packages/fb/6e/6f83bf616d2becdf333a1640f1d463fef3150e2e926b7010cb0f81c95e88/attrs-22.2.0-py3-none-any.whl", - "sha256": "29e95c7f6778868dbd49170f98f8818f78f3dc5e0e37c0b1f474e3561b240836" - }, - { - "type": "file", - "url": "https://files.pythonhosted.org/packages/ff/d7/8d757f8bd45be079d76309248845a04f09619a7b17d6dfc8c9ff6433cac2/charset-normalizer-3.1.0.tar.gz", - "sha256": "34e0a2f9c370eb95597aae63bf85eb5e96826d81e3dcf88b8886012906f509b5" - }, - { - "type": "file", - "url": "https://files.pythonhosted.org/packages/e9/10/d629476346112b85c912527b9080944fd2c39a816c2225413dbc0bb6fcc0/frozenlist-1.3.3.tar.gz", - "sha256": "58bcc55721e8a90b88332d6cd441261ebb22342e238296bb330968952fbb3a6a" - }, - { - "type": "file", - "url": "https://files.pythonhosted.org/packages/fc/34/3030de6f1370931b9dbb4dad48f6ab1015ab1d32447850b9fc94e60097be/idna-3.4-py3-none-any.whl", - "sha256": "90b77e79eaa3eba6de819a0c442c0b4ceefc341a7a2ab77d7562bf49f425c5c2" - }, - { - "type": "file", - "url": "https://files.pythonhosted.org/packages/4a/15/bd620f7a6eb9aa5112c4ef93e7031bcd071e0611763d8e17706ef8ba65e0/multidict-6.0.4.tar.gz", - "sha256": "3666906492efb76453c0e7b97f2cf459b0682e7402c0489a95484965dbc1da49" - }, - { - "type": "file", - "url": "https://files.pythonhosted.org/packages/c4/1e/1b204050c601d5cd82b45d5c8f439cb6f744a2ce0c0a6f83be0ddf0dc7b2/yarl-1.8.2.tar.gz", - "sha256": "49d43402c6e3013ad0978602bf6bf5328535c48d192304b91b97a3c6790b1562" - } - ] -} \ No newline at end of file diff --git a/build-aux/flatpak/python3-modules.json b/build-aux/flatpak/python3-modules.json new file mode 100644 index 0000000..05c9d30 --- /dev/null +++ b/build-aux/flatpak/python3-modules.json @@ -0,0 +1,90 @@ +{ + "name": "python3-modules", + "buildsystem": "simple", + "build-commands": [], + "modules": [ + { + "name": "python3-expandvars", + "buildsystem": "simple", + "build-commands": [ + "pip3 install --verbose --exists-action=i --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} \"expandvars\" --no-build-isolation" + ], + "sources": [ + { + "type": "file", + "url": "https://files.pythonhosted.org/packages/df/b3/072c28eace372ba7630ea187b7efd7f09cc8bcebf847a96b5e03e9cc0828/expandvars-0.12.0-py3-none-any.whl", + "sha256": "7432c1c2ae50c671a8146583177d60020dd210ada7d940e52af91f1f84f753b2" + } + ] + }, + { + "name": "python3-aiohttp", + "buildsystem": "simple", + "build-commands": [ + "pip3 install --verbose --exists-action=i --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} \"aiohttp[speedups]\" --no-build-isolation" + ], + "sources": [ + { + "type": "file", + "url": "https://files.pythonhosted.org/packages/2f/c2/f9e977608bdf958650638c3f1e28f85a1b075f075ebbe77db8555463787b/Brotli-1.1.0.tar.gz", + "sha256": "81de08ac11bcb85841e440c13611c00b67d3bf82698314928d0b676362546724" + }, + { + "type": "file", + "url": "https://files.pythonhosted.org/packages/15/14/13c65b1bd59f7e707e0cc0964fbab45c003f90292ed267d159eeeeaa2224/aiodns-3.2.0-py3-none-any.whl", + "sha256": "e443c0c27b07da3174a109fd9e736d69058d808f144d3c9d56dbd1776964c5f5" + }, + { + "type": "file", + "url": "https://files.pythonhosted.org/packages/04/a4/e3679773ea7eb5b37a2c998e25b017cc5349edf6ba2739d1f32855cfb11b/aiohttp-3.9.5.tar.gz", + "sha256": "edea7d15772ceeb29db4aff55e482d4bcfb6ae160ce144f2682de02f6d693551" + }, + { + "type": "file", + "url": "https://files.pythonhosted.org/packages/76/ac/a7305707cb852b7e16ff80eaf5692309bde30e2b1100a1fcacdc8f731d97/aiosignal-1.3.1-py3-none-any.whl", + "sha256": "f8376fb07dd1e86a584e4fcdec80b36b7f81aac666ebc724e2c090300dd83b17" + }, + { + "type": "file", + "url": "https://files.pythonhosted.org/packages/e0/44/827b2a91a5816512fcaf3cc4ebc465ccd5d598c45cefa6703fcf4a79018f/attrs-23.2.0-py3-none-any.whl", + "sha256": "99b87a485a5820b23b879f04c2305b44b951b502fd64be915879d77a7e8fc6f1" + }, + { + "type": "file", + "url": "https://files.pythonhosted.org/packages/68/ce/95b0bae7968c65473e1298efb042e10cafc7bafc14d9e4f154008241c91d/cffi-1.16.0.tar.gz", + "sha256": "bcb3ef43e58665bbda2fb198698fcae6776483e0c4a631aa5647806c25e02cc0" + }, + { + "type": "file", + "url": "https://files.pythonhosted.org/packages/cf/3d/2102257e7acad73efc4a0c306ad3953f68c504c16982bbdfee3ad75d8085/frozenlist-1.4.1.tar.gz", + "sha256": "c037a86e8513059a2613aaba4d817bb90b9d9b6b69aace3ce9c877e8c8ed402b" + }, + { + "type": "file", + "url": "https://files.pythonhosted.org/packages/e5/3e/741d8c82801c347547f8a2a06aa57dbb1992be9e948df2ea0eda2c8b79e8/idna-3.7-py3-none-any.whl", + "sha256": "82fee1fc78add43492d3a1898bfa6d8a904cc97d8427f683ed8e798d07761aa0" + }, + { + "type": "file", + "url": "https://files.pythonhosted.org/packages/f9/79/722ca999a3a09a63b35aac12ec27dfa8e5bb3a38b0f857f7a1a209a88836/multidict-6.0.5.tar.gz", + "sha256": "f7e301075edaf50500f0b341543c41194d8df3ae5caf4702f2095f3ca73dd8da" + }, + { + "type": "file", + "url": "https://files.pythonhosted.org/packages/1b/8f/daf60bbc06f4a3cd1cfb0ab807057151287df6f5c78f2e0d298acc9193ac/pycares-4.4.0.tar.gz", + "sha256": "f47579d508f2f56eddd16ce72045782ad3b1b3b678098699e2b6a1b30733e1c2" + }, + { + "type": "file", + "url": "https://files.pythonhosted.org/packages/13/a3/a812df4e2dd5696d1f351d58b8fe16a405b234ad2886a0dab9183fb78109/pycparser-2.22-py3-none-any.whl", + "sha256": "c3702b6d3dd8c7abc1afa565d7e63d53a1d0bd86cdc24edd75470f4de499cfcc" + }, + { + "type": "file", + "url": "https://files.pythonhosted.org/packages/e0/ad/bedcdccbcbf91363fd425a948994f3340924145c2bc8ccb296f4a1e52c28/yarl-1.9.4.tar.gz", + "sha256": "566db86717cf8080b99b58b083b773a908ae40f06681e87e589a976faf8246bf" + } + ] + } + ] +} \ No newline at end of file