From patchwork Fri Mar 2 19:34:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 880816 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gmx.net Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3ztKJy71vKz9s1v for ; Sat, 3 Mar 2018 06:35:30 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 7F0CB2E8C8; Fri, 2 Mar 2018 19:35:20 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id np4laJNo54ap; Fri, 2 Mar 2018 19:35:12 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 16FC42E956; Fri, 2 Mar 2018 19:35:09 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 73EAB1C0F8E for ; Fri, 2 Mar 2018 19:35:06 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 6CF0D89002 for ; Fri, 2 Mar 2018 19:35:06 +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 4S1H7YTyj+y4 for ; Fri, 2 Mar 2018 19:35:05 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mout.gmx.net (mout.gmx.net [212.227.15.15]) by whitealder.osuosl.org (Postfix) with ESMTPS id 5BDDC890BE for ; Fri, 2 Mar 2018 19:35:05 +0000 (UTC) Received: from localhost.localdomain ([92.75.40.49]) by mail.gmx.com (mrgmx002 [212.227.17.190]) with ESMTPSA (Nemesis) id 0Leux5-1eM4LP04B5-00qn6m; Fri, 02 Mar 2018 20:34:40 +0100 From: Peter Seiderer To: buildroot@buildroot.org Date: Fri, 2 Mar 2018 20:34:37 +0100 Message-Id: <20180302193437.15573-4-ps.report@gmx.net> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180302193437.15573-1-ps.report@gmx.net> References: <20180302193437.15573-1-ps.report@gmx.net> MIME-Version: 1.0 X-Provags-ID: V03:K0:nVaataYUG/FcvRY9vhg0j6f0nsCmHahO2fOGvICmZqKGycwTg9Y Mrsbux7sp2pwidM2nS3KMiOpd+FebtFydlEO/1HfVhj9w5PDR2EuS6P01gHP2ITHtonrhK9 WQOfQuaH6EdJ4cZfgHN37NarEFtGlvhMICDHZeHOC43i0xOL6AzzaqFOxxUAhO7+4RM8QDl 35cQcbqV8OBHjObls55sw== X-UI-Out-Filterresults: notjunk:1; V01:K0:0JIe/qJ25YE=:GEJOA7W9eKN8/X+6rVSY9o J1nuk24bDLvB3c0cuweEaiLWDSryIShsv+sWEawlzeizAx2nlm5qJjn2uopl1elDcyHLgOCmN 8aRFQtNMQ6eieiTzNdiswWptWVd31ENH49iYcNSk3JI4Qgyiuc3RdW+inKnZkjGJqO/+nVgXR vhMROc1uxOSHzu5156s1kcLFSTh51iqThF8VuSkUsiDbdsXI6GUqfjzIVxpbruVA9QB4Lz/ys iISznp+5GVT6gWW6n3o0BAx8e3IxByJU4SSyUedAVOtpV+K805OEDrwOwjxkLdLoqAV8dHS9q k4g7JrdsIaC+eJNe6AxKbL2uN2bTElxwUcd2I49B4NT9nXLnrTy+XIYQa34xds+AZTZHPG/id 4vl6qKqZpj0kjmZ2mIj3TfW/7CIVcCcRhQIuPht3OW4rLr/nQZ2h85iz5OPFwK1lwc6xdGuNk 5tTrIg2WB6F+2kTmIGeXWo5abbK1EZsj9asQmfe94ji5bZihAG4iUy3zbybnw0xvNYvOKtWAE 8/mFOu/R2Mkd6mEPBcECdQYSoHKgEE7Cd45VzjgBQ4XzSmJJT6VSHDLTwrThSLVBeN9bt92vT VQQ8SadnSfZUydRHlvcJJHWwEZoYT0MdxFh3X15Nh9oPQy9oF9Ap/4l8If6iN1bJADMO/Fol2 wcy2osLEGgEgj8iMlM/mwkmvC8dZ3tNKjODvgEp/y3p1dYSHKUrZUPqXtDAuriqdmLiTWthZK Lkgy5KtOJNG4DWMn6+zmKuorFR6dP2x0CrEbAYaEdZ7HfpN42t2Guwk9ChjIzqSLpyhX5L6kO aDex5FJReiLRBi6SH07IqDR+fzZtg5Hl1EU6B/2xl3fogXdDL8= Subject: [Buildroot] [Patch next v2 3/3] qt5multimedia: fix Qt5.10.1 target installation X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Ga=C3=ABl_PORTAY?= Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Fixes: cp: cannot stat ‘.../host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/libqgsttools*.so.*’: No such file or directory Signed-off-by: Peter Seiderer --- Changes v1 -> v2: - update descripton (add missing compile error line) - move !BR2_PACKAGE_QT5_VERSION_LATEST dependency to the right if scope --- package/qt5/qt5multimedia/qt5multimedia.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/qt5/qt5multimedia/qt5multimedia.mk b/package/qt5/qt5multimedia/qt5multimedia.mk index 6120403f30..e2210817c1 100644 --- a/package/qt5/qt5multimedia/qt5multimedia.mk +++ b/package/qt5/qt5multimedia/qt5multimedia.mk @@ -48,7 +48,9 @@ define QT5MULTIMEDIA_INSTALL_STAGING_CMDS endef ifeq ($(BR2_STATIC_LIBS),) -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE),y) +# 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 @@ -59,7 +61,7 @@ define QT5MULTIMEDIA_INSTALL_TARGET_LIBS cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/* $(TARGET_DIR)/usr/lib/qt/plugins $(QT5MULTIMEDIA_INSTALL_TARGET_QGSTTOOLS_LIB) endef -endif +endif # !BR2_STATIC_LIBS # this is only built with quick/opengl support enabled ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK)$(BR2_PACKAGE_QT5_GL_AVAILABLE),yy)