From patchwork Mon Apr 1 22:02:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnout Vandecappelle X-Patchwork-Id: 1073374 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.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=mind.be Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=mind-be.20150623.gappssmtp.com header.i=@mind-be.20150623.gappssmtp.com header.b="TNx4G/PE"; 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 44Y5tR6f7Rz9sQt for ; Tue, 2 Apr 2019 09:02:39 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 0877787680; Mon, 1 Apr 2019 22:02:37 +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 ssIuwRDzlXoC; Mon, 1 Apr 2019 22:02:35 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 9B54A87675; Mon, 1 Apr 2019 22:02:35 +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 CF8E91BF271 for ; Mon, 1 Apr 2019 22:02:33 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id CCCD187EE6 for ; Mon, 1 Apr 2019 22:02:33 +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 JeALhEZMvZ95 for ; Mon, 1 Apr 2019 22:02:32 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-ed1-f68.google.com (mail-ed1-f68.google.com [209.85.208.68]) by hemlock.osuosl.org (Postfix) with ESMTPS id 6618D87AE7 for ; Mon, 1 Apr 2019 22:02:32 +0000 (UTC) Received: by mail-ed1-f68.google.com with SMTP id q14so9794028edr.5 for ; Mon, 01 Apr 2019 15:02:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mind-be.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=xNjBdT4qdR/RZnADWoylbhQRNEzg69PVD53Ku9mE27Y=; b=TNx4G/PEnl/aHwh+Nko7RNo/L+dqk4DpdmFgKL0qfyA5biTXZfOgjfkhOzCwrmHBeT qd3m9v+a+YU+MVN1lY/K0jUO2BsgvqNK8wqu6u3czAjYUmlFjv0oJqs6oBCfnSHfpzC4 sVACqp9YDFl0upoaL57U1i8FFMWv287T2NFsKBFhf00ml+5RAJPlrDrLqAYjUpLao7Qh P1VvF223ugaJxZRQLNIQx0ps0SL06s1Yw1WOQaeFYVw00NBBXDAc16HHKD/jEka23pcw SugD3kXjt3YUDfS15cR4bk5Dc7lqCrj1kfm+tjPdrpuv9i30qYpkemb6JchRdZkSwoqC oYUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=xNjBdT4qdR/RZnADWoylbhQRNEzg69PVD53Ku9mE27Y=; b=mibQAwypDNbn9i4QivCfHvfsIAzsGC8lsMPnfSY7nANgc3MoPcMd+eQEzkf2Dwai48 5/ZEQbPjBY1VSAiYv2jfYoRsLZRRgvfJBBRtUaCpULcg4pVyO/thGQkaV8dDElv3lO/h WwlKXvyyeg4WiGRMhOrlJIsFgRHWcIjAamoh9XJ3+LLG9zFdnhZLXx4V/Tj26T/dv8Hq dorDp2lC4nmMoLyRbs+rUXnlvn5helkbCVtbeBWIcq3vCDs6V6kqT1hY8oQubfavvYO8 gzEX4tgp9fgYVtoidfeuXdduyYmuZ5bM8YhKL5QoQC7a3035q135rvNwHlsI7V9xgTvr x30g== X-Gm-Message-State: APjAAAVBMGCjLDkqIY6a3HXrSX5Ou/B7ST35gLHy2oOjvSI6sgxfbRbX vqQYUfYJtuM4YKV0S2toN27/J4ZZRYk= X-Google-Smtp-Source: APXvYqzriW0CIxHOZHj/jdGo8gI22lnjyJGSsAAeedW29BQvihfCzjZe3nrKIbsmzYrRgSJo5M/EIw== X-Received: by 2002:a50:b482:: with SMTP id w2mr44978562edd.41.1554156150444; Mon, 01 Apr 2019 15:02:30 -0700 (PDT) Received: from localhost.localdomain (d51A4E7A0.access.telenet.be. [81.164.231.160]) by smtp.gmail.com with ESMTPSA id w9sm3573767edw.41.2019.04.01.15.02.28 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 01 Apr 2019 15:02:29 -0700 (PDT) From: "Arnout Vandecappelle (Essensium/Mind)" To: buildroot@buildroot.org Date: Tue, 2 Apr 2019 00:02:28 +0200 Message-Id: <20190401220228.4923-1-arnout@mind.be> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH] package/gstreamer1/gst-omx: make variant mutually exclusive 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 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Commit cc419509506 added the GST_OMX_VARIANT option which gets a default value that gets overridden by subsequent conditions. check-package doesn't like that, so instead make the three cases explicitly mutually exclusive. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Cc: Peter Korsgaard --- package/gstreamer1/gst-omx/gst-omx.mk | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/package/gstreamer1/gst-omx/gst-omx.mk b/package/gstreamer1/gst-omx/gst-omx.mk index b8a8cd8457..bb325ad1d2 100644 --- a/package/gstreamer1/gst-omx/gst-omx.mk +++ b/package/gstreamer1/gst-omx/gst-omx.mk @@ -11,8 +11,6 @@ GST_OMX_SITE = https://gstreamer.freedesktop.org/src/gst-omx GST_OMX_LICENSE = LGPL-2.1 GST_OMX_LICENSE_FILES = COPYING -GST_OMX_VARIANT = generic - ifeq ($(BR2_PACKAGE_RPI_USERLAND),y) GST_OMX_VARIANT = rpi GST_OMX_CONF_ENV = \ @@ -20,9 +18,7 @@ GST_OMX_CONF_ENV = \ -I$(STAGING_DIR)/usr/include/IL \ -I$(STAGING_DIR)/usr/include/interface/vcos/pthreads \ -I$(STAGING_DIR)/usr/include/interface/vmcs_host/linux" -endif - -ifeq ($(BR2_PACKAGE_BELLAGIO),y) +else ifeq ($(BR2_PACKAGE_BELLAGIO),y) GST_OMX_VARIANT = bellagio GST_OMX_CONF_ENV = \ CFLAGS="$(TARGET_CFLAGS) \ @@ -30,6 +26,8 @@ GST_OMX_CONF_ENV = \ -DOMX_VERSION_MINOR=1 \ -DOMX_VERSION_REVISION=2 \ -DOMX_VERSION_STEP=0" +else +GST_OMX_VARIANT = generic endif GST_OMX_CONF_OPTS += --with-omx-target=$(GST_OMX_VARIANT)