Skip to content

Commit 29e3ec7

Browse files
committed
feat: move to 25.08 base image
1 parent d1ffbc7 commit 29e3ec7

File tree

3 files changed

+126
-89
lines changed

3 files changed

+126
-89
lines changed

io.github.mpvqc.mpvQC.pypi.yml

Lines changed: 79 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -26,82 +26,82 @@ sources:
2626
sha256: e612734da515d683696980107cdc0396a3ae0f07b059f0f422ec8a2333810234
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: 25 additions & 10 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

@@ -47,6 +47,10 @@ modules:
4747
cflags: -O2 -fno-lto
4848
cxxflags: -O2 -fno-lto
4949
no-autogen: true
50+
config-opts:
51+
- -DCMAKE_BUILD_TYPE=Release
52+
- -DBUILD_STATIC=0
53+
- -DCMAKE_POLICY_VERSION_MINIMUM=3.5
5054
cleanup:
5155
- /bin
5256
- /include
@@ -56,7 +60,7 @@ modules:
5660
- type: git
5761
url: https://github.com/LuaJIT/LuaJIT.git
5862
disable-shallow-clone: true
59-
commit: f9140a622a0c44a99efb391cc1c2358bc8098ab7
63+
commit: 8518c0b40b1734901de888a0a363450c0709d3f8
6064
# x-checker-data:
6165
# type: json
6266
# url: https://api.github.com/repos/LuaJIT/LuaJIT/branches/v2.1
@@ -72,6 +76,7 @@ modules:
7276
config-opts:
7377
- -DCMAKE_BUILD_TYPE=Release
7478
- -DBUILD_STATIC=0
79+
- -DCMAKE_POLICY_VERSION_MINIMUM=3.5
7580
cleanup:
7681
- /bin
7782
- /include
@@ -202,8 +207,8 @@ modules:
202207
sources:
203208
- type: git
204209
url: https://github.com/FFmpeg/FFmpeg.git
205-
tag: n7.1.1
206-
commit: db69d06eeeab4f46da15030a80d539efb4503ca8
210+
tag: n8.0
211+
commit: 140fd653aed8cad774f991ba083e2d01e86420c7
207212

208213
- name: vapoursynth
209214
config-opts:
@@ -222,7 +227,7 @@ modules:
222227
buildsystem: meson
223228
config-opts:
224229
- -Dvulkan=enabled
225-
- -Dshaderc=enabled
230+
- -Dshaderc=disabled
226231
- -Ddemos=false
227232
- -Db_lto=true
228233
cleanup:
@@ -231,8 +236,8 @@ modules:
231236
sources:
232237
- type: git
233238
url: https://github.com/haasn/libplacebo.git
234-
tag: v7.349.0
235-
commit: 1fd3c7bde7b943fe8985c893310b5269a09b46c5
239+
# tag: v7.351.0
240+
commit: 06992a53fafc1549843c8b36751e166cfe3a4079
236241
# x-checker-data:
237242
# type: git
238243
# tag-pattern: ^v([\d.]+)$
@@ -265,6 +270,11 @@ modules:
265270
type: git
266271
tag-pattern: ^v([\d.]+)$
267272

273+
# required to build against ffmpeg 8.0
274+
# https://github.com/mpv-player/mpv/commit/26b29fba02a2782f68e2906f837d21201fc6f1b9
275+
- type: patch
276+
path: patches/demux_mkv-fix-compilation-after-deprecated-definitio.patch
277+
268278
# https://github.com/flathub/io.qt.qtwebengine.BaseApp/tree/branch/6.7/krb5
269279
- name: krb5
270280
subdir: src
@@ -281,11 +291,16 @@ modules:
281291
post-install:
282292
- install -Dm644 ../krb5.conf -t ${FLATPAK_DEST}/etc/
283293
sources:
294+
- type: archive
295+
url: https://kerberos.org/dist/krb5/1.22/krb5-1.22.1.tar.gz
296+
sha256: 1a8832b8cad923ebbf1394f67e2efcf41e3a49f460285a66e35adec8fa0053af
297+
x-checker-data:
298+
type: html
299+
url: https://kerberos.org/dist/
300+
version-pattern: Kerberos V5 Release ([\d\.-]*) - current release
301+
url-template: https://kerberos.org/dist/krb5/$version0.$version1/krb5-$version.tar.gz
284302
- type: file
285303
path: krb5.conf
286-
- type: archive
287-
url: https://kerberos.org/dist/krb5/1.21/krb5-1.21.2.tar.gz
288-
sha256: 9560941a9d843c0243a71b17a7ac6fe31c7cebb5bce3983db79e52ae7e850491
289304

290305
- name: mpvQC
291306
buildsystem: simple
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)