From patchwork Wed Oct 21 08:06:29 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Korsgaard X-Patchwork-Id: 533652 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id D6CBB140DAE for ; Wed, 21 Oct 2015 19:06:44 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=USTZwqu8; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id B81658B7DF; Wed, 21 Oct 2015 08:06:43 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id r6AG-SsSSB8B; Wed, 21 Oct 2015 08:06:42 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 377698B66E; Wed, 21 Oct 2015 08:06:42 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 101F21C105C for ; Wed, 21 Oct 2015 08:06:41 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 0C2D18B66E for ; Wed, 21 Oct 2015 08:06:41 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id yRixx-bLjQOl for ; Wed, 21 Oct 2015 08:06:40 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wi0-f179.google.com (mail-wi0-f179.google.com [209.85.212.179]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 31F3B8B657 for ; Wed, 21 Oct 2015 08:06:40 +0000 (UTC) Received: by wicfv8 with SMTP id fv8so62592640wic.0 for ; Wed, 21 Oct 2015 01:06:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id; bh=VI2v37Bxhz/HVAyI+AJG03+XETMJyWv/lFi8dRa9/yE=; b=USTZwqu82yCKkNUn+yikkdBrmSSMxDOSaHnsYqkPs2vsZMBLnQaeRXM83vtn5gRGsP OppCGePeLUSOWphDJuD9FKtEJNQZBr7q70lgXmt3Nb89jTPsXV9Ftjh/Xon7/k2z38W/ Xq3pyKK7GEdrXdvayDxOohcMiQGXLt36oSP6/ubS7sFvDjf1HIuhRZiJQEx2s3+J1oqK WU8V45aZ2L0nzHBATcPRsSGUAHZOvYJPLi8l8NIegXU2HjQSrGzi8AlBuFrM802irpH9 t0eD0mnmPcHuvGwXhx+L7iumjpw3yD4l9l9XhXb2++r2ctO2bUQMwyaLqtZ0CktTxDhs LKyw== X-Received: by 10.180.8.68 with SMTP id p4mr33082566wia.16.1445414798831; Wed, 21 Oct 2015 01:06:38 -0700 (PDT) Received: from dell.be.48ers.dk ([2001:6f8:1434:0:6267:20ff:fe4e:21b6]) by smtp.gmail.com with ESMTPSA id bd4sm8720055wjb.15.2015.10.21.01.06.37 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 21 Oct 2015 01:06:38 -0700 (PDT) Received: from peko by dell.be.48ers.dk with local (Exim 4.84) (envelope-from ) id 1ZooPs-0004K7-22; Wed, 21 Oct 2015 10:06:36 +0200 From: Peter Korsgaard To: buildroot@buildroot.org Date: Wed, 21 Oct 2015 10:06:29 +0200 Message-Id: <1445414790-16583-1-git-send-email-peter@korsgaard.com> X-Mailer: git-send-email 2.1.4 Subject: [Buildroot] [PATCH 1/2] qt5base: add optional gstreamer1 support X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Indirectly fixes: http://autobuild.buildroot.net/results/773/773d9996bd3da283eed6b75083b8bab6469d0423/ http://autobuild.buildroot.net/results/069/069f564fde821b55e710fbe93fe30a5cf11a6da5/ http://autobuild.buildroot.net/results/456/456d380f8b4478245e89f711c33fe0c2d23aaa3a/ http://autobuild.buildroot.net/results/7c8/7c8ebfc93a5b11e40251495715d742520b3b8291/ And many more, as qt5multimedia needs qt5base to be built with gstreamer1 support as well. While qt5 has some gstreamer 0.10 support, it doesn't seem to be used much any more and E.G. the 0.10 fallback code in qt5multimedia is broken so only enable it for the 1.x series. Signed-off-by: Peter Korsgaard --- package/qt5/qt5base/qt5base.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index 570cd35..4eed126 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -147,6 +147,14 @@ QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_ICU),icu) QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_EXAMPLES),-make,-nomake) examples +# gstreamer 0.10 support is broken in qt5multimedia +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE),y) +QT5BASE_CONFIGURE_OPTS += -gstreamer 1.0 +QT5BASE_DEPENDENCIES += gst1-plugins-base +else +QT5BASE_CONFIGURE_OPTS += -no-gstreamer +endif + # Build the list of libraries to be installed on the target QT5BASE_INSTALL_LIBS_y += Qt5Core QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_XCB) += Qt5XcbQpa