Skip to content

Commit 83c2f71

Browse files
g-maximeg-maxime
committed
Update snap project files
Signed-off-by: Maxime Gervais <gervais.maxime@gmail.com>
1 parent fd6b8cc commit 83c2f71

11 files changed

Lines changed: 166 additions & 190 deletions

File tree

‎Project/Snap/mediaconch-gui/parts/plugins/x-autotools-subdir.py‎

Lines changed: 0 additions & 33 deletions
This file was deleted.

‎Project/Snap/mediaconch-gui/parts/plugins/x-qmake-subdir.py‎

Lines changed: 0 additions & 33 deletions
This file was deleted.

Project/Snap/mediaconch-gui/setup/gui/icon.svg renamed to Project/Snap/mediaconch-gui/snap/gui/icon.svg

File renamed without changes.

Project/Snap/mediaconch-gui/setup/gui/mediaconch-gui.desktop renamed to Project/Snap/mediaconch-gui/snap/gui/mediaconch-gui.desktop

File renamed without changes.

‎Project/Snap/mediaconch-gui/snapcraft.yaml‎

Lines changed: 73 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1+
base: core24
2+
13
name: mediaconch-gui
2-
version: 25.04
4+
title: MediaConch
5+
version: '25.04'
36
summary: Implementation checker and policy checker for video and audio files (GUI)
47
description: |
58
MediaConch is an implementation checker, policy checker, reporter,
@@ -8,74 +11,121 @@ description: |
811
and FF Video Codec 1 (FFV1)).
912
1013
This project is maintained by MediaArea and funded by PREFORMA.
14+
license: BSD-2-Clause
15+
contact: info@mediaarea.net
16+
website: https://mediaarea.net/MediaConch
17+
source-code: https://github.com/MediaArea/MediaConch_SourceCode
18+
issues: https://github.com/MediaArea/MediaConch_SourceCode/issues
1119
confinement: strict
1220
grade: stable
1321

22+
lint:
23+
ignore:
24+
- classic
25+
- library:
26+
- usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/lib*
27+
28+
plugs:
29+
shared-memory:
30+
private: true
31+
1432
apps:
1533
mediaconch-gui:
16-
command: desktop-launch mediaconch-gui
34+
extensions:
35+
- kde-neon-6
36+
environment:
37+
QTWEBENGINE_DISABLE_SANDBOX: 1
38+
command: usr/bin/mediaconch-gui
1739
plugs:
40+
- x11
1841
- unity7
42+
- wayland
43+
- opengl
44+
- desktop
45+
- desktop-legacy
1946
- home
2047
- network
48+
- gsettings
49+
- removable-media
2150

2251
parts:
2352
mediaconch-gui:
24-
plugin: qmake-subdir
53+
plugin: qmake
2554
source: MediaConch
26-
make-directory: Project/Qt
27-
qt-version: qt5
28-
options:
29-
- USE_WEBKIT=1
55+
qmake-major-version: 6
56+
qmake-project-file: Project/Qt/MediaConch.pro
57+
build-environment:
58+
- PATH: "/usr/lib/qt6/bin:$PATH"
3059
build-packages:
31-
- qtbase5-dev
32-
- libqt5webkit5-dev
3360
- zlib1g-dev
3461
- libxml2-dev
3562
- libxslt1-dev
3663
- libevent-dev
3764
- libsqlite3-dev
3865
- libjansson-dev
39-
- libcurl4-gnutls-dev
66+
- libcurl4-openssl-dev
67+
- qt6-tools-dev-tools
68+
- qt6-l10n-tools
69+
- qt6-base-dev
70+
- qt6-webengine-dev
71+
- qmake6
72+
- libglib2.0-bin
73+
stage-packages:
74+
- libcurl4t64
75+
- libmms0
76+
- libjansson4
77+
- libxml2
78+
- libxslt1.1
79+
- libqt6widgets6t64
80+
- libqt6xml6t64
81+
- libqt6quickwidgets6
82+
- libqt6printsupport6t64
83+
- libqt6webenginecore6
84+
- libqt6webenginewidgets6
85+
- libgtk-3-common # needed by qt applications, but not pulled by kf6 part
86+
override-prime: |
87+
craftctl default
88+
glib-compile-schemas $CRAFT_PRIME/usr/share/glib-2.0/schemas
4089
after:
41-
- desktop-qt5
4290
- libmediainfo
4391
- libzen
4492
- build-essential
4593

4694
libmediainfo:
47-
plugin: autotools-subdir
95+
plugin: autotools
4896
source: MediaInfoLib
49-
make-directory: Project/GNU/Library
50-
configflags:
97+
source-subdir: Project/GNU/Library
98+
autotools-configure-parameters:
99+
- --prefix=/usr
51100
- --enable-shared
52101
- --disable-static
53102
- --with-libcurl
54103
- --with-libmms
55104
build-packages:
56-
- libcurl4-gnutls-dev
57-
- libglib2.0-dev
105+
- libcurl4-openssl-dev
58106
- libmms-dev
59107
- zlib1g-dev
60108
after:
61109
- libzen
62110
- build-essential
63-
snap:
64-
- lib/libmediainfo.*
111+
prime:
112+
- usr/lib/libmediainfo.*
65113

66114
libzen:
67-
plugin: autotools-subdir
115+
plugin: autotools
68116
source: ZenLib
69-
make-directory: Project/GNU/Library
70-
configflags:
117+
source-subdir: Project/GNU/Library
118+
autotools-configure-parameters:
119+
- --prefix=/usr
71120
- --enable-shared
72121
- --disable-static
73-
snap:
74-
- lib/libzen.*
75122
after:
76123
- build-essential
124+
prime:
125+
- usr/lib/libzen.*
77126

78127
build-essential:
79128
plugin: nil
80129
build-packages:
81130
- build-essential
131+
- pkgconf

‎Project/Snap/mediaconch-server/parts/plugins/x-autotools-subdir.py‎

Lines changed: 0 additions & 33 deletions
This file was deleted.

Project/Snap/mediaconch-server/setup/gui/icon.svg renamed to Project/Snap/mediaconch-server/snap/gui/icon.svg

File renamed without changes.

‎Project/Snap/mediaconch-server/snapcraft.yaml‎

Lines changed: 47 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1+
base: core24
2+
13
name: mediaconch-server
2-
version: 25.04
4+
title: MediaConch Server
5+
version: '25.04'
36
summary: Implementation checker and policy checker for video and audio files (Server)
47
description: |
58
MediaConch is an implementation checker, policy checker, reporter,
@@ -8,67 +11,93 @@ description: |
811
and FF Video Codec 1 (FFV1)).
912
1013
This project is maintained by MediaArea and funded by PREFORMA.
14+
license: BSD-2-Clause
15+
contact: info@mediaarea.net
16+
website: https://mediaarea.net/MediaConch
17+
source-code: https://github.com/MediaArea/MediaConch_SourceCode
18+
issues: https://github.com/MediaArea/MediaConch_SourceCode/issues
1119
confinement: strict
1220
grade: stable
1321

22+
lint:
23+
ignore:
24+
- classic
25+
- library:
26+
- usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libmms.*
27+
- usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libicu*
28+
1429
apps:
1530
mediaconch-server:
16-
command: mediaconchd
31+
command: usr/bin/mediaconchd
1732
plugs:
1833
- home
1934
- network
20-
- network-bind
35+
- removable-media
36+
2137
parts:
2238
mediaconch-server:
23-
plugin: autotools-subdir
39+
plugin: autotools
2440
source: MediaConch
25-
make-directory: Project/GNU/Server
41+
source-subdir: Project/GNU/Server
42+
autotools-configure-parameters:
43+
- --prefix=/usr
2644
build-packages:
2745
- zlib1g-dev
2846
- libxml2-dev
2947
- libxslt1-dev
3048
- libevent-dev
3149
- libsqlite3-dev
3250
- libjansson-dev
33-
- libcurl4-gnutls-dev
51+
- libcurl4-openssl-dev
52+
stage-packages:
53+
- libcurl4t64
54+
- libmms0
55+
- libjansson4
56+
- libxml2
57+
- libxslt1.1
58+
prime:
59+
- usr/bin/mediaconchd
60+
- usr/lib/*
3461
after:
3562
- libmediainfo
3663
- libzen
3764
- build-essential
3865

3966
libmediainfo:
40-
plugin: autotools-subdir
67+
plugin: autotools
4168
source: MediaInfoLib
42-
make-directory: Project/GNU/Library
43-
configflags:
69+
source-subdir: Project/GNU/Library
70+
autotools-configure-parameters:
71+
- --prefix=/usr
4472
- --enable-shared
4573
- --disable-static
4674
- --with-libcurl
4775
- --with-libmms
4876
build-packages:
49-
- libcurl4-gnutls-dev
50-
- libglib2.0-dev
77+
- libcurl4-openssl-dev
5178
- libmms-dev
5279
- zlib1g-dev
5380
after:
5481
- libzen
5582
- build-essential
56-
snap:
57-
- lib/libmediainfo.*
83+
prime:
84+
- usr/lib/libmediainfo.*
5885

5986
libzen:
60-
plugin: autotools-subdir
87+
plugin: autotools
6188
source: ZenLib
62-
make-directory: Project/GNU/Library
63-
configflags:
89+
source-subdir: Project/GNU/Library
90+
autotools-configure-parameters:
91+
- --prefix=/usr
6492
- --enable-shared
6593
- --disable-static
66-
snap:
67-
- lib/libzen.*
6894
after:
6995
- build-essential
96+
prime:
97+
- usr/lib/libzen.*
7098

7199
build-essential:
72100
plugin: nil
73101
build-packages:
74102
- build-essential
103+
- pkgconf

0 commit comments

Comments
 (0)