* [Buildroot] [git commit] package/gstreamer1/gst-omx: make variant mutually exclusive
@ 2019-04-02 6:31 Peter Korsgaard
0 siblings, 0 replies; only message in thread
From: Peter Korsgaard @ 2019-04-02 6:31 UTC (permalink / raw)
To: buildroot
commit: https://git.buildroot.net/buildroot/commit/?id=5b217aad9c0242209e41155280b91a8d79fee305
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
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) <arnout@mind.be>
Cc: Peter Korsgaard <peter@korsgaard.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
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)
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2019-04-02 6:31 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-04-02 6:31 [Buildroot] [git commit] package/gstreamer1/gst-omx: make variant mutually exclusive Peter Korsgaard
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.