From patchwork Wed Feb 26 14:45:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Korsgaard X-Patchwork-Id: 1245112 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=korsgaard.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=FoRmTwNm; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48SJXs0dn9z9sR4 for ; Thu, 27 Feb 2020 01:46:53 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 284A587692; Wed, 26 Feb 2020 14:46:49 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id uDiHUSmWTUN6; Wed, 26 Feb 2020 14:46:42 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 789B3876C0; Wed, 26 Feb 2020 14:46:38 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 816691BF9AD for ; Wed, 26 Feb 2020 14:46:24 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 7E62A879DA for ; Wed, 26 Feb 2020 14:46:24 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id jzdpuiZjemK2 for ; Wed, 26 Feb 2020 14:46:19 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by hemlock.osuosl.org (Postfix) with ESMTPS id 4417E87999 for ; Wed, 26 Feb 2020 14:46:19 +0000 (UTC) Received: by mail-wr1-f66.google.com with SMTP id e8so3365981wrm.5 for ; Wed, 26 Feb 2020 06:46:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Cjt2vRcHtDcGsQBmVIvl0O17kf+fUc6DSwzd2CMF5IM=; b=FoRmTwNmzX7DbOiV6DzLV9OiDbXsiOuWORzcg7jHxJnMzNV7P1gR2eNAD9VY3bI0Xn Sf5kxrswLsxcZjMU4SgU9mvwrqVYvJMaus+uzNQo4ygzIi/7EC2M75G0JpBl4YcJZ4tH t9T/qEoxTw5f3R8cQS9KeGT0S1RqdRtOPewHWeLJlah+wzXQC/qO9DVCgOP3fVlO7P4D L0opVx5usocLUKbHa6j68jdgQxWTk0NO0/dev4EFqKij5U8dt/jRhaZHNd7SKM3dUCDQ es3qtVZB0KUGNKBfmUKzLnzd9RR+tN+KZbv8i3riTsMyx4SQSpFe4+6kkxojEs8OcdpF eEtg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Cjt2vRcHtDcGsQBmVIvl0O17kf+fUc6DSwzd2CMF5IM=; b=VgcnOwpaCgnN2PAcoZpz7MllBVvk2KT8kagT3EuPEWcUbdrRIb7UotaGvzZtnQOwuk Yp6zCmbBsAXPHWe6EVZHU61UEiarW3oJcT2Fb1vFc0af1eJoa4qhTI2cy1BJqZmhkUhJ 1fb9FNI6IYXTSS8++a5Lho7EdGUFJLAdO9RrpcPvmRcugS9umExPPkWoSuVPoA83RXCs 1aa2/C0FnYQ9d9CITo7Hg4mUmJVDNRVfGkaomhYf3HG/QCF2HMnA4SuihYK0Qo+sWzKO WoirzXdZ0yvBLu0q9ZVnSwQrmu+CzO8j8cpnm071I2JM8WWygYx6yHOK0D5Ty1haLusp il7A== X-Gm-Message-State: APjAAAV2a/V1dZdLOG3F0KEsOUHNj2i+O3SBnf1l5a5dQ6NapYWFo8Zj vsbSExOEsTexTaXchr0cpI4qxcqn X-Google-Smtp-Source: APXvYqwihOZP58kHMZXSaXhMIdPEs0yBLu0RvoOLl5amkhgzaSXpKDG4OD3+XiE8WVKqLgZYV7VnhA== X-Received: by 2002:adf:b60f:: with SMTP id f15mr6222217wre.372.1582728377331; Wed, 26 Feb 2020 06:46:17 -0800 (PST) Received: from dell.be.48ers.dk ([194.12.21.133]) by smtp.gmail.com with ESMTPSA id p26sm3046945wmc.24.2020.02.26.06.46.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Feb 2020 06:46:16 -0800 (PST) Received: from peko by dell.be.48ers.dk with local (Exim 4.92) (envelope-from ) id 1j6xx1-0003IU-2E; Wed, 26 Feb 2020 15:46:15 +0100 From: Peter Korsgaard To: buildroot@buildroot.org Date: Wed, 26 Feb 2020 15:45:43 +0100 Message-Id: <20200226144608.12529-12-peter@korsgaard.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200226144608.12529-1-peter@korsgaard.com> References: <20200226144608.12529-1-peter@korsgaard.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 12/37] package/qt5multimedia: drop qt 5.6 support X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Korsgaard , Peter Seiderer , Julien Corjon Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Peter Korsgaard --- package/qt5/qt5multimedia/qt5multimedia.hash | 7 ------- package/qt5/qt5multimedia/qt5multimedia.mk | 14 -------------- 2 files changed, 21 deletions(-) diff --git a/package/qt5/qt5multimedia/qt5multimedia.hash b/package/qt5/qt5multimedia/qt5multimedia.hash index 016ec44cee..a4df5af5dc 100644 --- a/package/qt5/qt5multimedia/qt5multimedia.hash +++ b/package/qt5/qt5multimedia/qt5multimedia.hash @@ -1,6 +1,3 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtmultimedia-opensource-src-5.6.3.tar.xz.mirrorlist -sha256 ae36039ea8037742342f1615687e0ca2188f3ed0d700627a5e5be546c15e1b46 qtmultimedia-opensource-src-5.6.3.tar.xz - # Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtmultimedia-everywhere-src-5.12.7.tar.xz.sha256 sha256 28bdaa81371f922223775ae5171c4d589a2c07f255abbe5ccf130ecbbdb4db1d qtmultimedia-everywhere-src-5.12.7.tar.xz @@ -10,8 +7,4 @@ sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE. sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3 sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL -sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3 -sha256 1996a36160b2158c2be264d2ddfa6148ebe0f1ececff55aca8d754a1ddcc7bb8 LICENSE.LGPLv21 -sha256 438c1f9a2b256e47dac33249f2ad6d4a9df643f1ec5312216d528a2f7ad82084 LGPL_EXCEPTION.txt -sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3 sha256 c1d75c15db4409bcbb182180d582f410a263dc9a631cd546b256e95f1da42165 examples/multimedia/spectrum/3rdparty/fftreal/license.txt diff --git a/package/qt5/qt5multimedia/qt5multimedia.mk b/package/qt5/qt5multimedia/qt5multimedia.mk index e598140a9a..0e9a6b97c9 100644 --- a/package/qt5/qt5multimedia/qt5multimedia.mk +++ b/package/qt5/qt5multimedia/qt5multimedia.mk @@ -10,13 +10,8 @@ QT5MULTIMEDIA_SOURCE = qtmultimedia-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5MULTIMEDIA QT5MULTIMEDIA_DEPENDENCIES = qt5base QT5MULTIMEDIA_INSTALL_STAGING = YES -ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) QT5MULTIMEDIA_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs) QT5MULTIMEDIA_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL -else -QT5MULTIMEDIA_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs) -QT5MULTIMEDIA_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL -endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE),y) QT5MULTIMEDIA_DEPENDENCIES += gst1-plugins-base @@ -47,18 +42,9 @@ define QT5MULTIMEDIA_INSTALL_STAGING_CMDS endef ifeq ($(BR2_STATIC_LIBS),) -# since Qt5.10.1 libqgsttools was renamed to libQtMultimediaGstTools -# and is installed by the default target install step below -ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST)x$(BR2_PACKAGE_GST1_PLUGINS_BASE),xy) -define QT5MULTIMEDIA_INSTALL_TARGET_QGSTTOOLS_LIB - cp -dpf $(STAGING_DIR)/usr/lib/libqgsttools*.so.* $(TARGET_DIR)/usr/lib -endef -endif - define QT5MULTIMEDIA_INSTALL_TARGET_LIBS cp -dpf $(STAGING_DIR)/usr/lib/libQt5Multimedia*.so.* $(TARGET_DIR)/usr/lib cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/* $(TARGET_DIR)/usr/lib/qt/plugins - $(QT5MULTIMEDIA_INSTALL_TARGET_QGSTTOOLS_LIB) endef endif # !BR2_STATIC_LIBS