package/gstreamer1/gst-omx: make variant mutually exclusive
PATCH 1/1 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.
--- package/gstreamer1/gst-omx/gst-omx.mk | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
package/gstreamer1/gst-omx/gst-omx.mk +3 -5
@@ -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)
Signature · 1 line
2.20.1
PATCH 1/1 package/gstreamer1/gst-omx: make variant mutually exclusive
Quoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Arnout" == Arnout Vandecappelle (Essensium/Mind) <[email protected]> writes:
Commit
cc419509506added theGST_OMX_VARIANToption 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.Cc Peter Korsgaard <[email protected]>
Funky - I do run check-package in a post-commit hook, but I must have missed the warnings.
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 1/1 package/gstreamer1/gst-omx: make variant mutually exclusive
In reply to Arnout Vandecappelle (Essensium/Mind)Quoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Arnout" == Arnout Vandecappelle (Essensium/Mind) <[email protected]> writes:
Commit
cc419509506added theGST_OMX_VARIANToption 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.Cc Peter Korsgaard <[email protected]>
Committed to 2019.02.x, thanks.
Signature · 1 line
Bye, Peter Korsgaard