From a6a88ddb70f1a029c34a265f48d4b15934d99d5d Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 24 Jan 2023 05:47:29 +0000 Subject: qtmultimedia: remove bbappend ffmpeg is enabled in meta-qt6. Change-Id: Ic561ae045a131e886d7238b2d34235c58ec5d634 Reviewed-by: Ari Parkkila (cherry picked from commit 630c53f42d2176d1eef70e423de2d75446941fa3) Reviewed-by: Qt Cherry-pick Bot --- .../recipes-qt/qt6/qtmultimedia_git.bbappend | 30 ---------------------- 1 file changed, 30 deletions(-) delete mode 100644 meta-boot2qt-distro/recipes-qt/qt6/qtmultimedia_git.bbappend diff --git a/meta-boot2qt-distro/recipes-qt/qt6/qtmultimedia_git.bbappend b/meta-boot2qt-distro/recipes-qt/qt6/qtmultimedia_git.bbappend deleted file mode 100644 index 06beb2d9..00000000 --- a/meta-boot2qt-distro/recipes-qt/qt6/qtmultimedia_git.bbappend +++ /dev/null @@ -1,30 +0,0 @@ -############################################################################ -## -## Copyright (C) 2022 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:GPL$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see https://www.qt.io/terms-conditions. For further -## information use the contact form at https://www.qt.io/contact-us. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3 or (at your option) any later version -## approved by the KDE Free Qt Foundation. The licenses are as published by -## the Free Software Foundation and appearing in the file LICENSE.GPL3 -## included in the packaging of this file. Please review the following -## information to ensure the GNU General Public License requirements will -## be met: https://www.gnu.org/licenses/gpl-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################ - -PACKAGECONFIG += "ffmpeg" -- cgit v1.2.3