aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>2019-04-02 00:02:28 +0200
committerGravatar Peter Korsgaard <peter@korsgaard.com>2019-04-05 17:36:15 +0200
commit54d556c0b71d3a1c67c262bbda0af6e45fef2f71 (patch)
tree56f8e012f48e391d18c98a7abcefb06097ee374a
parent5ac0076598e09905e294585fe0a7eda26c13a421 (diff)
downloadbuildroot-54d556c0b71d3a1c67c262bbda0af6e45fef2f71.tar.gz
buildroot-54d556c0b71d3a1c67c262bbda0af6e45fef2f71.tar.bz2
package/gstreamer1/gst-omx: make variant mutually exclusive
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> (cherry picked from commit 5b217aad9c0242209e41155280b91a8d79fee305) Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--package/gstreamer1/gst-omx/gst-omx.mk8
1 files 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)