diff --git a/Project/Snap/mediaconch-gui/parts/plugins/x-autotools-subdir.py b/Project/Snap/mediaconch-gui/parts/plugins/x-autotools-subdir.py deleted file mode 100644 index 48e9666b..00000000 --- a/Project/Snap/mediaconch-gui/parts/plugins/x-autotools-subdir.py +++ /dev/null @@ -1,33 +0,0 @@ -# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4 -*- - -"""This plugin extends the autotools plugin to run from subdirectory in source tree. -In addition to the autotools and defaults keywords, this plugin uses the following -plugin-specific keyword: - - make-directory: - (string) - Run autotools in the given path. -""" - -import os.path - -from snapcraft.plugins import autotools - -class AutotoolsSubdirPlugin(autotools.AutotoolsPlugin): - @classmethod - def schema(cls): - schema = super().schema() - schema['properties']['make-directory'] = { - 'type': 'string', - 'default': '' - } - - return schema - - def __init__(self, name, options, project): - super().__init__(name, options, project) - if self.options.make_directory: - self.builddir = os.path.join(self.build_basedir, self.options.make_directory) - - def enable_cross_compilation(self): - return - diff --git a/Project/Snap/mediaconch-gui/parts/plugins/x-qmake-subdir.py b/Project/Snap/mediaconch-gui/parts/plugins/x-qmake-subdir.py deleted file mode 100644 index 2928921e..00000000 --- a/Project/Snap/mediaconch-gui/parts/plugins/x-qmake-subdir.py +++ /dev/null @@ -1,33 +0,0 @@ -# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4 -*- - -"""This plugin extends the qmake plugin to run from subdirectory in source tree. -In addition to the qmake and defaults keywords, this plugin uses the following -plugin-specific keyword: - - make-directory: - (string) - Run qmake in the given path. -""" - -import os.path - -from snapcraft.plugins import qmake - -class QmakeSubdirPlugin(qmake.QmakePlugin): - @classmethod - def schema(cls): - schema = super().schema() - schema['properties']['make-directory'] = { - 'type': 'string', - 'default': '' - } - - return schema - - def __init__(self, name, options, project): - super().__init__(name, options, project) - if self.options.make_directory: - self.builddir = os.path.join(self.build_basedir, self.options.make_directory) - - def enable_cross_compilation(self): - return - diff --git a/Project/Snap/mediaconch-gui/setup/gui/icon.svg b/Project/Snap/mediaconch-gui/snap/gui/icon.svg similarity index 100% rename from Project/Snap/mediaconch-gui/setup/gui/icon.svg rename to Project/Snap/mediaconch-gui/snap/gui/icon.svg diff --git a/Project/Snap/mediaconch-gui/setup/gui/mediaconch-gui.desktop b/Project/Snap/mediaconch-gui/snap/gui/mediaconch-gui.desktop similarity index 100% rename from Project/Snap/mediaconch-gui/setup/gui/mediaconch-gui.desktop rename to Project/Snap/mediaconch-gui/snap/gui/mediaconch-gui.desktop diff --git a/Project/Snap/mediaconch-gui/snapcraft.yaml b/Project/Snap/mediaconch-gui/snapcraft.yaml index a2c0c73c..be4af88b 100644 --- a/Project/Snap/mediaconch-gui/snapcraft.yaml +++ b/Project/Snap/mediaconch-gui/snapcraft.yaml @@ -1,5 +1,8 @@ +base: core24 + name: mediaconch-gui -version: 25.04 +title: MediaConch +version: '25.04' summary: Implementation checker and policy checker for video and audio files (GUI) description: | MediaConch is an implementation checker, policy checker, reporter, @@ -8,74 +11,121 @@ description: | and FF Video Codec 1 (FFV1)). This project is maintained by MediaArea and funded by PREFORMA. +license: BSD-2-Clause +contact: info@mediaarea.net +website: https://mediaarea.net/MediaConch +source-code: https://github.com/MediaArea/MediaConch_SourceCode +issues: https://github.com/MediaArea/MediaConch_SourceCode/issues confinement: strict grade: stable +lint: + ignore: + - classic + - library: + - usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/lib* + +plugs: + shared-memory: + private: true + apps: mediaconch-gui: - command: desktop-launch mediaconch-gui + extensions: + - kde-neon-6 + environment: + QTWEBENGINE_DISABLE_SANDBOX: 1 + command: usr/bin/mediaconch-gui plugs: + - x11 - unity7 + - wayland + - opengl + - desktop + - desktop-legacy - home - network + - gsettings + - removable-media parts: mediaconch-gui: - plugin: qmake-subdir + plugin: qmake source: MediaConch - make-directory: Project/Qt - qt-version: qt5 - options: - - USE_WEBKIT=1 + qmake-major-version: 6 + qmake-project-file: Project/Qt/MediaConch.pro + build-environment: + - PATH: "/usr/lib/qt6/bin:$PATH" build-packages: - - qtbase5-dev - - libqt5webkit5-dev - zlib1g-dev - libxml2-dev - libxslt1-dev - libevent-dev - libsqlite3-dev - libjansson-dev - - libcurl4-gnutls-dev + - libcurl4-openssl-dev + - qt6-tools-dev-tools + - qt6-l10n-tools + - qt6-base-dev + - qt6-webengine-dev + - qmake6 + - libglib2.0-bin + stage-packages: + - libcurl4t64 + - libmms0 + - libjansson4 + - libxml2 + - libxslt1.1 + - libqt6widgets6t64 + - libqt6xml6t64 + - libqt6quickwidgets6 + - libqt6printsupport6t64 + - libqt6webenginecore6 + - libqt6webenginewidgets6 + - libgtk-3-common # needed by qt applications, but not pulled by kf6 part + override-prime: | + craftctl default + glib-compile-schemas $CRAFT_PRIME/usr/share/glib-2.0/schemas after: - - desktop-qt5 - libmediainfo - libzen - build-essential libmediainfo: - plugin: autotools-subdir + plugin: autotools source: MediaInfoLib - make-directory: Project/GNU/Library - configflags: + source-subdir: Project/GNU/Library + autotools-configure-parameters: + - --prefix=/usr - --enable-shared - --disable-static - --with-libcurl - --with-libmms build-packages: - - libcurl4-gnutls-dev - - libglib2.0-dev + - libcurl4-openssl-dev - libmms-dev - zlib1g-dev after: - libzen - build-essential - snap: - - lib/libmediainfo.* + prime: + - usr/lib/libmediainfo.* libzen: - plugin: autotools-subdir + plugin: autotools source: ZenLib - make-directory: Project/GNU/Library - configflags: + source-subdir: Project/GNU/Library + autotools-configure-parameters: + - --prefix=/usr - --enable-shared - --disable-static - snap: - - lib/libzen.* after: - build-essential + prime: + - usr/lib/libzen.* build-essential: plugin: nil build-packages: - build-essential + - pkgconf diff --git a/Project/Snap/mediaconch-server/parts/plugins/x-autotools-subdir.py b/Project/Snap/mediaconch-server/parts/plugins/x-autotools-subdir.py deleted file mode 100644 index 48e9666b..00000000 --- a/Project/Snap/mediaconch-server/parts/plugins/x-autotools-subdir.py +++ /dev/null @@ -1,33 +0,0 @@ -# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4 -*- - -"""This plugin extends the autotools plugin to run from subdirectory in source tree. -In addition to the autotools and defaults keywords, this plugin uses the following -plugin-specific keyword: - - make-directory: - (string) - Run autotools in the given path. -""" - -import os.path - -from snapcraft.plugins import autotools - -class AutotoolsSubdirPlugin(autotools.AutotoolsPlugin): - @classmethod - def schema(cls): - schema = super().schema() - schema['properties']['make-directory'] = { - 'type': 'string', - 'default': '' - } - - return schema - - def __init__(self, name, options, project): - super().__init__(name, options, project) - if self.options.make_directory: - self.builddir = os.path.join(self.build_basedir, self.options.make_directory) - - def enable_cross_compilation(self): - return - diff --git a/Project/Snap/mediaconch-server/setup/gui/icon.svg b/Project/Snap/mediaconch-server/snap/gui/icon.svg similarity index 100% rename from Project/Snap/mediaconch-server/setup/gui/icon.svg rename to Project/Snap/mediaconch-server/snap/gui/icon.svg diff --git a/Project/Snap/mediaconch-server/snapcraft.yaml b/Project/Snap/mediaconch-server/snapcraft.yaml index bf8645be..46c4230c 100644 --- a/Project/Snap/mediaconch-server/snapcraft.yaml +++ b/Project/Snap/mediaconch-server/snapcraft.yaml @@ -1,5 +1,8 @@ +base: core24 + name: mediaconch-server -version: 25.04 +title: MediaConch Server +version: '25.04' summary: Implementation checker and policy checker for video and audio files (Server) description: | MediaConch is an implementation checker, policy checker, reporter, @@ -8,21 +11,36 @@ description: | and FF Video Codec 1 (FFV1)). This project is maintained by MediaArea and funded by PREFORMA. +license: BSD-2-Clause +contact: info@mediaarea.net +website: https://mediaarea.net/MediaConch +source-code: https://github.com/MediaArea/MediaConch_SourceCode +issues: https://github.com/MediaArea/MediaConch_SourceCode/issues confinement: strict grade: stable +lint: + ignore: + - classic + - library: + - usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libmms.* + - usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libicu* + apps: mediaconch-server: - command: mediaconchd + command: usr/bin/mediaconchd plugs: - home - network - - network-bind + - removable-media + parts: mediaconch-server: - plugin: autotools-subdir + plugin: autotools source: MediaConch - make-directory: Project/GNU/Server + source-subdir: Project/GNU/Server + autotools-configure-parameters: + - --prefix=/usr build-packages: - zlib1g-dev - libxml2-dev @@ -30,45 +48,56 @@ parts: - libevent-dev - libsqlite3-dev - libjansson-dev - - libcurl4-gnutls-dev + - libcurl4-openssl-dev + stage-packages: + - libcurl4t64 + - libmms0 + - libjansson4 + - libxml2 + - libxslt1.1 + prime: + - usr/bin/mediaconchd + - usr/lib/* after: - libmediainfo - libzen - build-essential libmediainfo: - plugin: autotools-subdir + plugin: autotools source: MediaInfoLib - make-directory: Project/GNU/Library - configflags: + source-subdir: Project/GNU/Library + autotools-configure-parameters: + - --prefix=/usr - --enable-shared - --disable-static - --with-libcurl - --with-libmms build-packages: - - libcurl4-gnutls-dev - - libglib2.0-dev + - libcurl4-openssl-dev - libmms-dev - zlib1g-dev after: - libzen - build-essential - snap: - - lib/libmediainfo.* + prime: + - usr/lib/libmediainfo.* libzen: - plugin: autotools-subdir + plugin: autotools source: ZenLib - make-directory: Project/GNU/Library - configflags: + source-subdir: Project/GNU/Library + autotools-configure-parameters: + - --prefix=/usr - --enable-shared - --disable-static - snap: - - lib/libzen.* after: - build-essential + prime: + - usr/lib/libzen.* build-essential: plugin: nil build-packages: - build-essential + - pkgconf diff --git a/Project/Snap/mediaconch/parts/plugins/x-autotools-subdir.py b/Project/Snap/mediaconch/parts/plugins/x-autotools-subdir.py deleted file mode 100644 index 48e9666b..00000000 --- a/Project/Snap/mediaconch/parts/plugins/x-autotools-subdir.py +++ /dev/null @@ -1,33 +0,0 @@ -# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4 -*- - -"""This plugin extends the autotools plugin to run from subdirectory in source tree. -In addition to the autotools and defaults keywords, this plugin uses the following -plugin-specific keyword: - - make-directory: - (string) - Run autotools in the given path. -""" - -import os.path - -from snapcraft.plugins import autotools - -class AutotoolsSubdirPlugin(autotools.AutotoolsPlugin): - @classmethod - def schema(cls): - schema = super().schema() - schema['properties']['make-directory'] = { - 'type': 'string', - 'default': '' - } - - return schema - - def __init__(self, name, options, project): - super().__init__(name, options, project) - if self.options.make_directory: - self.builddir = os.path.join(self.build_basedir, self.options.make_directory) - - def enable_cross_compilation(self): - return - diff --git a/Project/Snap/mediaconch/setup/gui/icon.svg b/Project/Snap/mediaconch/snap/gui/icon.svg similarity index 100% rename from Project/Snap/mediaconch/setup/gui/icon.svg rename to Project/Snap/mediaconch/snap/gui/icon.svg diff --git a/Project/Snap/mediaconch/snapcraft.yaml b/Project/Snap/mediaconch/snapcraft.yaml index e8c407eb..767ca4c9 100644 --- a/Project/Snap/mediaconch/snapcraft.yaml +++ b/Project/Snap/mediaconch/snapcraft.yaml @@ -1,5 +1,8 @@ +base: core24 + name: mediaconch -version: 25.04 +title: MediaConch CLI +version: '25.04' summary: Implementation checker and policy checker for video and audio files (CLI) description: | MediaConch is an implementation checker, policy checker, reporter, @@ -8,21 +11,35 @@ description: | and FF Video Codec 1 (FFV1)). This project is maintained by MediaArea and funded by PREFORMA. +license: BSD-2-Clause +contact: info@mediaarea.net +website: https://mediaarea.net/MediaConch +source-code: https://github.com/MediaArea/MediaConch_SourceCode +issues: https://github.com/MediaArea/MediaConch_SourceCode/issues confinement: strict grade: stable +lint: + ignore: + - classic + - library: + - usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libmms.* + apps: mediaconch: - command: mediaconch + command: usr/bin/mediaconch plugs: - home - network + - removable-media parts: mediaconch: - plugin: autotools-subdir + plugin: autotools source: MediaConch - make-directory: Project/GNU/CLI + source-subdir: Project/GNU/CLI + autotools-configure-parameters: + - --prefix=/usr build-packages: - zlib1g-dev - libxml2-dev @@ -30,45 +47,57 @@ parts: - libevent-dev - libsqlite3-dev - libjansson-dev - - libcurl4-gnutls-dev + - libcurl4-openssl-dev + stage-packages: + - libcurl4t64 + - libmms0 + - libicu74 + - libjansson4 + - libxml2 + - libxslt1.1 + prime: + - usr/bin/mediaconch + - usr/lib/* after: - libmediainfo - libzen - build-essential libmediainfo: - plugin: autotools-subdir + plugin: autotools source: MediaInfoLib - make-directory: Project/GNU/Library - configflags: + source-subdir: Project/GNU/Library + autotools-configure-parameters: + - --prefix=/usr - --enable-shared - --disable-static - --with-libcurl - --with-libmms build-packages: - - libcurl4-gnutls-dev - - libglib2.0-dev + - libcurl4-openssl-dev - libmms-dev - zlib1g-dev after: - libzen - build-essential - snap: - - lib/libmediainfo.* + prime: + - usr/lib/libmediainfo.* libzen: - plugin: autotools-subdir + plugin: autotools source: ZenLib - make-directory: Project/GNU/Library - configflags: + source-subdir: Project/GNU/Library + autotools-configure-parameters: + - --prefix=/usr - --enable-shared - --disable-static - snap: - - lib/libzen.* after: - build-essential + prime: + - usr/lib/libzen.* build-essential: plugin: nil build-packages: - build-essential + - pkgconf