Skip to content

Commit 28fa227

Browse files
trin94trin94
authored
feat: move to 25.08 base image (#5)
* feat: move to 25.08 base image * build(deps): upgrade dependencies Use nv-codec-headers provided by runtime.
1 parent d1ffbc7 commit 28fa227

File tree

4 files changed

+132
-112
lines changed

4 files changed

+132
-112
lines changed

‎Justfile‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ APPSTREAM_FILE := 'io.github.mpvqc.mpvQC.metainfo.xml'
99
DESKTOP_FILE := 'io.github.mpvqc.mpvQC.desktop'
1010
BUILD_DIR := 'build-dir'
1111

12+
alias fmt := format
13+
1214
@_default:
1315
just --list --unsorted
1416

@@ -29,8 +31,8 @@ lint:
2931
@generate-flatpak-dependencies:
3032
uv run flatpak-pypi-updater.py \
3133
--dependency inject::none:any \
32-
--dependency PySide6-Essentials==6.10.0::manylinux:x86_64 \
33-
--dependency shiboken6==6.10.0::manylinux:x86_64 \
34+
--dependency PySide6-Essentials==6.10.1::manylinux:x86_64 \
35+
--dependency shiboken6==6.10.1::manylinux:x86_64 \
3436
--dependency MarkupSafe==3.0.2::cp312:manylinux:x86_64 \
3537
--dependency Jinja2::none:any \
3638
--dependency mpv::none:any \

‎io.github.mpvqc.mpvQC.pypi.yml‎

Lines changed: 84 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: pypi-dependencies
22
buildsystem: simple
33
build-commands:
4-
- pip3 install --verbose --exists-action=i --no-index --find-links="file://${PWD}" --prefix=${FLATPAK_DEST} --no-build-isolation jinja2~=3.1.6 markupsafe~=3.0.2 pyside6-essentials~=6.10.0 colorlog~=6.10.1 inject~=5.3.0 mpv~=1.0.8 shiboken6~=6.10.0
4+
- pip3 install --verbose --exists-action=i --no-index --find-links="file://${PWD}" --prefix=${FLATPAK_DEST} --no-build-isolation jinja2~=3.1.6 markupsafe~=3.0.2 pyside6-essentials~=6.10.1 colorlog~=6.10.1 inject~=5.3.0 mpv~=1.0.8 shiboken6~=6.10.1
55
sources:
66
- type: file
77
url: https://files.pythonhosted.org/packages/62/a1/3d680cbfd5f4b8f15abc1d571870c5fc3e594bb582bc3b64ea099db13e56/jinja2-3.1.6-py3-none-any.whl
@@ -10,8 +10,8 @@ sources:
1010
url: https://files.pythonhosted.org/packages/f3/f0/89e7aadfb3749d0f52234a0c8c7867877876e0a20b60e2188e9850794c17/MarkupSafe-3.0.2-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
1111
sha256: e17c96c14e19278594aa4841ec148115f9c7615a47382ecb6b82bd8fea3ab0c8
1212
- type: file
13-
url: https://files.pythonhosted.org/packages/5c/75/e17efc7eb900993e0e3925885635c6cf373c817196f09bcbcc102b00ac94/pyside6_essentials-6.10.0-cp39-abi3-manylinux_2_34_x86_64.whl
14-
sha256: 1d5e013a8698e37ab8ef360e6960794eb5ef20832a8d562e649b8c5a0574b2d8
13+
url: https://files.pythonhosted.org/packages/5f/8e/b69ba7fa0c701f3f4136b50460441697ec49ee6ea35c229eb2a5ee4b5952/pyside6_essentials-6.10.1-cp39-abi3-manylinux_2_34_x86_64.whl
14+
sha256: e9ccbfb58c03911a0bce1f2198605b02d4b5ca6276bfc0cbcf7c6f6393ffb856
1515
- type: file
1616
url: https://files.pythonhosted.org/packages/6d/c1/e419ef3723a074172b68aaa89c9f3de486ed4c2399e2dbd8113a4fdcaf9e/colorlog-6.10.1-py3-none-any.whl
1717
sha256: 2d7e8348291948af66122cff006c9f8da6255d224e7cf8e37d8de2df3bad8c9c
@@ -22,86 +22,86 @@ sources:
2222
url: https://files.pythonhosted.org/packages/f4/cf/0d5f52753366ecf2c3d763e331dcda54b0f20a1a8e52b175feb9c625399d/mpv-1.0.8-py3-none-any.whl
2323
sha256: dcf77f612e3f5ce49bd89393f37d286de7ac290db6b0800f1fdcfe0aeb5ba9b8
2424
- type: file
25-
url: https://files.pythonhosted.org/packages/ea/09/4ffa3284a17b6b765d45b41c9a7f1b2cde6c617c853ac6f170fb62bbbece/shiboken6-6.10.0-cp39-abi3-manylinux_2_34_x86_64.whl
26-
sha256: e612734da515d683696980107cdc0396a3ae0f07b059f0f422ec8a2333810234
25+
url: https://files.pythonhosted.org/packages/56/ba/b50c1a44b3c4643f482afbf1a0ea58f393827307100389ce29404f9ad3b0/shiboken6-6.10.1-cp39-abi3-manylinux_2_34_x86_64.whl
26+
sha256: f4221a52dfb81f24a0d20cc4f8981cb6edd810d5a9fb28287ce10d342573a0e4
2727
cleanup:
2828
- /bin
29-
- /lib/python3.12/site-packages/PySide6/*.pyi
30-
- /lib/python3.12/site-packages/PySide6/assistant
31-
- /lib/python3.12/site-packages/PySide6/designer
32-
- /lib/python3.12/site-packages/PySide6/doc
33-
- /lib/python3.12/site-packages/PySide6/examples
34-
- /lib/python3.12/site-packages/PySide6/glue
35-
- /lib/python3.12/site-packages/PySide6/include
36-
- /lib/python3.12/site-packages/PySide6/linguist
37-
- /lib/python3.12/site-packages/PySide6/lrelease
38-
- /lib/python3.12/site-packages/PySide6/lupdate
39-
- /lib/python3.12/site-packages/PySide6/py.typed
40-
- /lib/python3.12/site-packages/PySide6/qmlformat
41-
- /lib/python3.12/site-packages/PySide6/qmllint
42-
- /lib/python3.12/site-packages/PySide6/qmlls
43-
- /lib/python3.12/site-packages/PySide6/Qt/lib/libQt6Concurrent.so.6
44-
- /lib/python3.12/site-packages/PySide6/Qt/lib/libQt6Designer.so.6
45-
- /lib/python3.12/site-packages/PySide6/Qt/lib/libQt6DesignerComponents.so.6
46-
- /lib/python3.12/site-packages/PySide6/Qt/lib/libQt6Help.so.6
47-
- /lib/python3.12/site-packages/PySide6/Qt/lib/libQt6LabsAnimation.so.6
48-
- /lib/python3.12/site-packages/PySide6/Qt/lib/libQt6LabsFolderListModel.so.6
49-
- /lib/python3.12/site-packages/PySide6/Qt/lib/libQt6LabsPlatform.so.6
50-
- /lib/python3.12/site-packages/PySide6/Qt/lib/libQt6LabsQmlModels.so.6
51-
- /lib/python3.12/site-packages/PySide6/Qt/lib/libQt6LabsSettings.so.6
52-
- /lib/python3.12/site-packages/PySide6/Qt/lib/libQt6LabsSharedImage.so.6
53-
- /lib/python3.12/site-packages/PySide6/Qt/lib/libQt6LabsWavefrontMesh.so.6
54-
- /lib/python3.12/site-packages/PySide6/Qt/lib/libQt6PrintSupport.so.6
55-
- /lib/python3.12/site-packages/PySide6/Qt/lib/libQt6QmlLocalStorage.so.6
56-
- /lib/python3.12/site-packages/PySide6/Qt/lib/libQt6QmlNetwork.so.6
57-
- /lib/python3.12/site-packages/PySide6/Qt/lib/libQt6QmlXmlListModel.so.6
58-
- /lib/python3.12/site-packages/PySide6/Qt/lib/libQt6QuickControls2FluentWinUI3StyleImpl.so.6
59-
- /lib/python3.12/site-packages/PySide6/Qt/lib/libQt6QuickControls2Fusion.so.6
60-
- /lib/python3.12/site-packages/PySide6/Qt/lib/libQt6QuickControls2FusionStyleImpl.so.6
61-
- /lib/python3.12/site-packages/PySide6/Qt/lib/libQt6QuickControls2Imagine.so.6
62-
- /lib/python3.12/site-packages/PySide6/Qt/lib/libQt6QuickControls2ImagineStyleImpl.so.6
63-
- /lib/python3.12/site-packages/PySide6/Qt/lib/libQt6QuickControls2Universal.so.6
64-
- /lib/python3.12/site-packages/PySide6/Qt/lib/libQt6QuickControls2UniversalStyleImpl.so.6
65-
- /lib/python3.12/site-packages/PySide6/Qt/lib/libQt6QuickTest.so.6
66-
- /lib/python3.12/site-packages/PySide6/Qt/lib/libQt6QuickTimeline.so.6
67-
- /lib/python3.12/site-packages/PySide6/Qt/lib/libQt6QuickTimelineBlendTrees.so.6
68-
- /lib/python3.12/site-packages/PySide6/Qt/lib/libQt6QuickVectorImageGenerator.so.6
69-
- /lib/python3.12/site-packages/PySide6/Qt/lib/libQt6QuickWidgets.so.6
70-
- /lib/python3.12/site-packages/PySide6/Qt/lib/libQt6Sql.so.6
71-
- /lib/python3.12/site-packages/PySide6/Qt/lib/libQt6SvgWidgets.so.6
72-
- /lib/python3.12/site-packages/PySide6/Qt/lib/libQt6Test.so.6
73-
- /lib/python3.12/site-packages/PySide6/Qt/lib/libQt6UiTools.so.6
74-
- /lib/python3.12/site-packages/PySide6/Qt/lib/libQt6Widgets.so.6
75-
- /lib/python3.12/site-packages/PySide6/Qt/lib/libQt6Xml.so.6
76-
- /lib/python3.12/site-packages/PySide6/Qt/plugins/designer
77-
- /lib/python3.12/site-packages/PySide6/Qt/plugins/generic
78-
- /lib/python3.12/site-packages/PySide6/Qt/plugins/networkinformation
79-
- /lib/python3.12/site-packages/PySide6/Qt/plugins/printsupport
80-
- /lib/python3.12/site-packages/PySide6/Qt/plugins/qmllint
81-
- /lib/python3.12/site-packages/PySide6/Qt/plugins/qmltooling
82-
- /lib/python3.12/site-packages/PySide6/Qt/plugins/sqldrivers
83-
- /lib/python3.12/site-packages/PySide6/Qt/plugins/tls
84-
- /lib/python3.12/site-packages/PySide6/Qt/plugins/wayland-graphics-integration-server
85-
- /lib/python3.12/site-packages/PySide6/Qt/qml/Qt
86-
- /lib/python3.12/site-packages/PySide6/Qt/qml/QtNetwork
87-
- /lib/python3.12/site-packages/PySide6/Qt/qml/QtQuick/Controls/FluentWinUI3
88-
- /lib/python3.12/site-packages/PySide6/Qt/qml/QtQuick/VirtualKeyboard
89-
- /lib/python3.12/site-packages/PySide6/Qt/translations/assistant_*
90-
- /lib/python3.12/site-packages/PySide6/Qt/translations/designer_*
91-
- /lib/python3.12/site-packages/PySide6/Qt/translations/linguist_*
92-
- /lib/python3.12/site-packages/PySide6/Qt/translations/qt_*
93-
- /lib/python3.12/site-packages/PySide6/Qt/translations/qtdeclarative_*
94-
- /lib/python3.12/site-packages/PySide6/QtConcurrent.abi3.so
95-
- /lib/python3.12/site-packages/PySide6/QtDesigner.abi3.so
96-
- /lib/python3.12/site-packages/PySide6/QtHelp.abi3.so
97-
- /lib/python3.12/site-packages/PySide6/QtPrintSupport.abi3.so
98-
- /lib/python3.12/site-packages/PySide6/QtQuickTest.abi3.so
99-
- /lib/python3.12/site-packages/PySide6/QtQuickWidgets.abi3.so
100-
- /lib/python3.12/site-packages/PySide6/QtSql.abi3.so
101-
- /lib/python3.12/site-packages/PySide6/QtSvgWidgets.abi3.so
102-
- /lib/python3.12/site-packages/PySide6/QtTest.abi3.so
103-
- /lib/python3.12/site-packages/PySide6/QtUiTools.abi3.so
104-
- /lib/python3.12/site-packages/PySide6/QtWidgets.abi3.so
105-
- /lib/python3.12/site-packages/PySide6/QtXml.abi3.so
106-
- /lib/python3.12/site-packages/PySide6/svgtoqml
107-
- /lib/python3.12/site-packages/PySide6/typesystems
29+
- /lib/python3.13/site-packages/PySide6/*.pyi
30+
- /lib/python3.13/site-packages/PySide6/assistant
31+
- /lib/python3.13/site-packages/PySide6/designer
32+
- /lib/python3.13/site-packages/PySide6/doc
33+
- /lib/python3.13/site-packages/PySide6/examples
34+
- /lib/python3.13/site-packages/PySide6/glue
35+
- /lib/python3.13/site-packages/PySide6/include
36+
- /lib/python3.13/site-packages/PySide6/linguist
37+
- /lib/python3.13/site-packages/PySide6/lrelease
38+
- /lib/python3.13/site-packages/PySide6/lupdate
39+
- /lib/python3.13/site-packages/PySide6/py.typed
40+
- /lib/python3.13/site-packages/PySide6/qmlformat
41+
- /lib/python3.13/site-packages/PySide6/qmllint
42+
- /lib/python3.13/site-packages/PySide6/qmlls
43+
- /lib/python3.13/site-packages/PySide6/Qt/lib/libQt6Concurrent.so.6
44+
- /lib/python3.13/site-packages/PySide6/Qt/lib/libQt6Designer.so.6
45+
- /lib/python3.13/site-packages/PySide6/Qt/lib/libQt6DesignerComponents.so.6
46+
- /lib/python3.13/site-packages/PySide6/Qt/lib/libQt6Help.so.6
47+
- /lib/python3.13/site-packages/PySide6/Qt/lib/libQt6LabsAnimation.so.6
48+
- /lib/python3.13/site-packages/PySide6/Qt/lib/libQt6LabsFolderListModel.so.6
49+
- /lib/python3.13/site-packages/PySide6/Qt/lib/libQt6LabsPlatform.so.6
50+
- /lib/python3.13/site-packages/PySide6/Qt/lib/libQt6LabsQmlModels.so.6
51+
- /lib/python3.13/site-packages/PySide6/Qt/lib/libQt6LabsSettings.so.6
52+
- /lib/python3.13/site-packages/PySide6/Qt/lib/libQt6LabsSharedImage.so.6
53+
- /lib/python3.13/site-packages/PySide6/Qt/lib/libQt6LabsWavefrontMesh.so.6
54+
- /lib/python3.13/site-packages/PySide6/Qt/lib/libQt6PrintSupport.so.6
55+
- /lib/python3.13/site-packages/PySide6/Qt/lib/libQt6QmlLocalStorage.so.6
56+
- /lib/python3.13/site-packages/PySide6/Qt/lib/libQt6QmlNetwork.so.6
57+
- /lib/python3.13/site-packages/PySide6/Qt/lib/libQt6QmlXmlListModel.so.6
58+
- /lib/python3.13/site-packages/PySide6/Qt/lib/libQt6QuickControls2FluentWinUI3StyleImpl.so.6
59+
- /lib/python3.13/site-packages/PySide6/Qt/lib/libQt6QuickControls2Fusion.so.6
60+
- /lib/python3.13/site-packages/PySide6/Qt/lib/libQt6QuickControls2FusionStyleImpl.so.6
61+
- /lib/python3.13/site-packages/PySide6/Qt/lib/libQt6QuickControls2Imagine.so.6
62+
- /lib/python3.13/site-packages/PySide6/Qt/lib/libQt6QuickControls2ImagineStyleImpl.so.6
63+
- /lib/python3.13/site-packages/PySide6/Qt/lib/libQt6QuickControls2Universal.so.6
64+
- /lib/python3.13/site-packages/PySide6/Qt/lib/libQt6QuickControls2UniversalStyleImpl.so.6
65+
- /lib/python3.13/site-packages/PySide6/Qt/lib/libQt6QuickTest.so.6
66+
- /lib/python3.13/site-packages/PySide6/Qt/lib/libQt6QuickTimeline.so.6
67+
- /lib/python3.13/site-packages/PySide6/Qt/lib/libQt6QuickTimelineBlendTrees.so.6
68+
- /lib/python3.13/site-packages/PySide6/Qt/lib/libQt6QuickVectorImageGenerator.so.6
69+
- /lib/python3.13/site-packages/PySide6/Qt/lib/libQt6QuickWidgets.so.6
70+
- /lib/python3.13/site-packages/PySide6/Qt/lib/libQt6Sql.so.6
71+
- /lib/python3.13/site-packages/PySide6/Qt/lib/libQt6SvgWidgets.so.6
72+
- /lib/python3.13/site-packages/PySide6/Qt/lib/libQt6Test.so.6
73+
- /lib/python3.13/site-packages/PySide6/Qt/lib/libQt6UiTools.so.6
74+
- /lib/python3.13/site-packages/PySide6/Qt/lib/libQt6Widgets.so.6
75+
- /lib/python3.13/site-packages/PySide6/Qt/lib/libQt6Xml.so.6
76+
- /lib/python3.13/site-packages/PySide6/Qt/plugins/designer
77+
- /lib/python3.13/site-packages/PySide6/Qt/plugins/generic
78+
- /lib/python3.13/site-packages/PySide6/Qt/plugins/networkinformation
79+
- /lib/python3.13/site-packages/PySide6/Qt/plugins/printsupport
80+
- /lib/python3.13/site-packages/PySide6/Qt/plugins/qmllint
81+
- /lib/python3.13/site-packages/PySide6/Qt/plugins/qmltooling
82+
- /lib/python3.13/site-packages/PySide6/Qt/plugins/sqldrivers
83+
- /lib/python3.13/site-packages/PySide6/Qt/plugins/tls
84+
- /lib/python3.13/site-packages/PySide6/Qt/plugins/wayland-graphics-integration-server
85+
- /lib/python3.13/site-packages/PySide6/Qt/qml/Qt
86+
- /lib/python3.13/site-packages/PySide6/Qt/qml/QtNetwork
87+
- /lib/python3.13/site-packages/PySide6/Qt/qml/QtQuick/Controls/FluentWinUI3
88+
- /lib/python3.13/site-packages/PySide6/Qt/qml/QtQuick/VirtualKeyboard
89+
- /lib/python3.13/site-packages/PySide6/Qt/translations/assistant_*
90+
- /lib/python3.13/site-packages/PySide6/Qt/translations/designer_*
91+
- /lib/python3.13/site-packages/PySide6/Qt/translations/linguist_*
92+
- /lib/python3.13/site-packages/PySide6/Qt/translations/qt_*
93+
- /lib/python3.13/site-packages/PySide6/Qt/translations/qtdeclarative_*
94+
- /lib/python3.13/site-packages/PySide6/QtConcurrent.abi3.so
95+
- /lib/python3.13/site-packages/PySide6/QtDesigner.abi3.so
96+
- /lib/python3.13/site-packages/PySide6/QtHelp.abi3.so
97+
- /lib/python3.13/site-packages/PySide6/QtPrintSupport.abi3.so
98+
- /lib/python3.13/site-packages/PySide6/QtQuickTest.abi3.so
99+
- /lib/python3.13/site-packages/PySide6/QtQuickWidgets.abi3.so
100+
- /lib/python3.13/site-packages/PySide6/QtSql.abi3.so
101+
- /lib/python3.13/site-packages/PySide6/QtSvgWidgets.abi3.so
102+
- /lib/python3.13/site-packages/PySide6/QtTest.abi3.so
103+
- /lib/python3.13/site-packages/PySide6/QtUiTools.abi3.so
104+
- /lib/python3.13/site-packages/PySide6/QtWidgets.abi3.so
105+
- /lib/python3.13/site-packages/PySide6/QtXml.abi3.so
106+
- /lib/python3.13/site-packages/PySide6/svgtoqml
107+
- /lib/python3.13/site-packages/PySide6/typesystems

‎io.github.mpvqc.mpvQC.yml‎

Lines changed: 22 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
id: io.github.mpvqc.mpvQC
22
runtime: org.freedesktop.Platform
3-
runtime-version: '24.08'
3+
runtime-version: '25.08'
44
sdk: org.freedesktop.Sdk
55
command: mpvQC
66

@@ -56,7 +56,7 @@ modules:
5656
- type: git
5757
url: https://github.com/LuaJIT/LuaJIT.git
5858
disable-shallow-clone: true
59-
commit: f9140a622a0c44a99efb391cc1c2358bc8098ab7
59+
commit: e17ee83326f73d2bbfce5750ae8dc592a3b63c27
6060
# x-checker-data:
6161
# type: json
6262
# url: https://api.github.com/repos/LuaJIT/LuaJIT/branches/v2.1
@@ -72,6 +72,7 @@ modules:
7272
config-opts:
7373
- -DCMAKE_BUILD_TYPE=Release
7474
- -DBUILD_STATIC=0
75+
- -DCMAKE_POLICY_VERSION_MINIMUM=3.5 # TODO can be removed when updating to uchardet > 0.0.8
7576
cleanup:
7677
- /bin
7778
- /include
@@ -115,8 +116,8 @@ modules:
115116
sources:
116117
- type: archive
117118
archive-type: tar
118-
url: https://api.github.com/repos/sekrit-twc/zimg/tarball/release-3.0.5
119-
sha256: 1b8998f03f4a49e4d730033143722b32bc28a5306ef809ccfb3b4bbb29e4b784
119+
url: https://api.github.com/repos/sekrit-twc/zimg/tarball/release-3.0.6
120+
sha256: 15140e491c4ce9db5f02a038d8a1eb53e9151b55eeed06a2899425a6ebfef367
120121
x-checker-data:
121122
type: json
122123
url: https://api.github.com/repos/sekrit-twc/zimg/releases/latest
@@ -160,21 +161,6 @@ modules:
160161
url: https://api.github.com/repos/ccxvii/mujs/tags
161162
tag-pattern: ^([\d.]+)$
162163

163-
- name: nv-codec-headers
164-
cleanup:
165-
- '*'
166-
no-autogen: true
167-
make-install-args:
168-
- PREFIX=/app
169-
sources:
170-
- type: git
171-
url: https://github.com/FFmpeg/nv-codec-headers.git
172-
tag: n13.0.19.0
173-
commit: e844e5b26f46bb77479f063029595293aa8f812d
174-
x-checker-data:
175-
type: git
176-
tag-pattern: ^n([\d.]+)$
177-
178164
- name: ffmpeg
179165
cleanup:
180166
- /include
@@ -202,8 +188,8 @@ modules:
202188
sources:
203189
- type: git
204190
url: https://github.com/FFmpeg/FFmpeg.git
205-
tag: n7.1.1
206-
commit: db69d06eeeab4f46da15030a80d539efb4503ca8
191+
tag: n8.0
192+
commit: 140fd653aed8cad774f991ba083e2d01e86420c7
207193

208194
- name: vapoursynth
209195
config-opts:
@@ -231,8 +217,8 @@ modules:
231217
sources:
232218
- type: git
233219
url: https://github.com/haasn/libplacebo.git
234-
tag: v7.349.0
235-
commit: 1fd3c7bde7b943fe8985c893310b5269a09b46c5
220+
# tag: v7.351.0
221+
commit: 06992a53fafc1549843c8b36751e166cfe3a4079
236222
# x-checker-data:
237223
# type: git
238224
# tag-pattern: ^v([\d.]+)$
@@ -265,6 +251,11 @@ modules:
265251
type: git
266252
tag-pattern: ^v([\d.]+)$
267253

254+
# required to build against ffmpeg 8.0
255+
# https://github.com/mpv-player/mpv/commit/26b29fba02a2782f68e2906f837d21201fc6f1b9
256+
- type: patch
257+
path: patches/demux_mkv-fix-compilation-after-deprecated-definitio.patch
258+
268259
# https://github.com/flathub/io.qt.qtwebengine.BaseApp/tree/branch/6.7/krb5
269260
- name: krb5
270261
subdir: src
@@ -281,11 +272,16 @@ modules:
281272
post-install:
282273
- install -Dm644 ../krb5.conf -t ${FLATPAK_DEST}/etc/
283274
sources:
275+
- type: archive
276+
url: https://kerberos.org/dist/krb5/1.22/krb5-1.22.1.tar.gz
277+
sha256: 1a8832b8cad923ebbf1394f67e2efcf41e3a49f460285a66e35adec8fa0053af
278+
x-checker-data:
279+
type: html
280+
url: https://kerberos.org/dist/
281+
version-pattern: Kerberos V5 Release ([\d\.-]*) - current release
282+
url-template: https://kerberos.org/dist/krb5/$version0.$version1/krb5-$version.tar.gz
284283
- type: file
285284
path: krb5.conf
286-
- type: archive
287-
url: https://kerberos.org/dist/krb5/1.21/krb5-1.21.2.tar.gz
288-
sha256: 9560941a9d843c0243a71b17a7ac6fe31c7cebb5bce3983db79e52ae7e850491
289285

290286
- name: mpvQC
291287
buildsystem: simple

‎patches/demux_mkv-fix-compilation-after-deprecated-definitio.patch‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
--- a/demux/demux_mkv.c
2+
+++ b/demux/demux_mkv.c
3+
@@ -2200,16 +2200,16 @@ static int demux_mkv_open_sub(demuxer_t *demuxer, mkv_track_t *track)
4+
// [0x30..0x37] are component tags utilized for
5+
// non-mobile captioning service ("profile A").
6+
if (component_tag >= 0x30 && component_tag <= 0x37)
7+
- lav->profile = FF_PROFILE_ARIB_PROFILE_A;
8+
+ lav->profile = AV_PROFILE_ARIB_PROFILE_A;
9+
break;
10+
case 0x0012:
11+
// component tag 0x87 signifies a mobile/partial reception
12+
// (1seg) captioning service ("profile C").
13+
if (component_tag == 0x87)
14+
- lav->profile = FF_PROFILE_ARIB_PROFILE_C;
15+
+ lav->profile = AV_PROFILE_ARIB_PROFILE_C;
16+
break;
17+
}
18+
- if (lav->profile == FF_PROFILE_UNKNOWN)
19+
+ if (lav->profile == AV_PROFILE_UNKNOWN)
20+
MP_WARN(demuxer, "ARIB caption profile %02x / %04x not supported.\n",
21+
component_tag, data_component_id);
22+
}

0 commit comments

Comments
 (0)