From caae18405d90c17c505f4d8f47fef2d984599121 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 5 Apr 2014 17:21:40 +0200 Subject: [PATCH] package/libopenmax: rename the _HAS and _PROVIDES variables The basic rule for a package is to have its options named after the package name. There is no reason this should not also be the case for virtual packages. Besides, this will allow us to switch libopenmax to use the soon-to-be-introduced virtual-package infrastructure. Signed-off-by: "Yann E. MORIN" Cc: Eric Le Bihan Cc: Thomas Petazzoni Cc: Thomas De Schampheleire Cc: Mike Zick Reviewed-by: Samuel Martin Acked-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/bellagio/Config.in | 4 ++-- package/gstreamer1/gst-omx/Config.in | 4 ++-- package/opengl/libopenmax/Config.in | 6 +++--- package/opengl/libopenmax/libopenmax.mk | 4 ++-- package/rpi-userland/Config.in | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/package/bellagio/Config.in b/package/bellagio/Config.in index 2beb6587a5..ee87e13058 100644 --- a/package/bellagio/Config.in +++ b/package/bellagio/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_BELLAGIO depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_PREFER_STATIC_LIB - select BR2_PACKAGE_HAS_OPENMAX + select BR2_PACKAGE_HAS_LIBOPENMAX help Bellagio is an opensource implementation of the OpenMAX IL API. @@ -19,7 +19,7 @@ config BR2_PACKAGE_BELLAGIO if BR2_PACKAGE_BELLAGIO -config BR2_PACKAGE_PROVIDES_OPENMAX +config BR2_PACKAGE_PROVIDES_LIBOPENMAX default "bellagio" endif diff --git a/package/gstreamer1/gst-omx/Config.in b/package/gstreamer1/gst-omx/Config.in index 1d5b131524..d2e477648b 100644 --- a/package/gstreamer1/gst-omx/Config.in +++ b/package/gstreamer1/gst-omx/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_GST_OMX bool "gst-omx" - depends on BR2_PACKAGE_HAS_OPENMAX + depends on BR2_PACKAGE_HAS_LIBOPENMAX select BR2_PACKAGE_GST1_PLUGINS_BASE help GStreamer plug-in to use OpenMAX API. @@ -8,4 +8,4 @@ config BR2_PACKAGE_GST_OMX http://cgit.freedesktop.org/gstreamer/gst-omx comment "gst-omx requires a OpenMAX implementation" - depends on !BR2_PACKAGE_HAS_OPENMAX + depends on !BR2_PACKAGE_HAS_LIBOPENMAX diff --git a/package/opengl/libopenmax/Config.in b/package/opengl/libopenmax/Config.in index 105c53e28a..d50f2ced1f 100644 --- a/package/opengl/libopenmax/Config.in +++ b/package/opengl/libopenmax/Config.in @@ -1,6 +1,6 @@ -config BR2_PACKAGE_HAS_OPENMAX +config BR2_PACKAGE_HAS_LIBOPENMAX bool -config BR2_PACKAGE_PROVIDES_OPENMAX - depends on BR2_PACKAGE_HAS_OPENMAX +config BR2_PACKAGE_PROVIDES_LIBOPENMAX + depends on BR2_PACKAGE_HAS_LIBOPENMAX string diff --git a/package/opengl/libopenmax/libopenmax.mk b/package/opengl/libopenmax/libopenmax.mk index a2bd23d2ae..6cdeacd005 100644 --- a/package/opengl/libopenmax/libopenmax.mk +++ b/package/opengl/libopenmax/libopenmax.mk @@ -5,9 +5,9 @@ ################################################################################ LIBOPENMAX_SOURCE = -LIBOPENMAX_DEPENDENCIES = $(call qstrip,$(BR2_PACKAGE_PROVIDES_OPENMAX)) +LIBOPENMAX_DEPENDENCIES = $(call qstrip,$(BR2_PACKAGE_PROVIDES_LIBOPENMAX)) -ifeq ($(BR2_PACKAGE_HAS_OPENMAX),y) +ifeq ($(BR2_PACKAGE_HAS_LIBOPENMAX),y) ifeq ($(LIBOPENMAX_DEPENDENCIES),) $(error No libopenmax implementation selected. Configuration error.) endif diff --git a/package/rpi-userland/Config.in b/package/rpi-userland/Config.in index 4a82c9da70..68ac1f609b 100644 --- a/package/rpi-userland/Config.in +++ b/package/rpi-userland/Config.in @@ -7,7 +7,7 @@ config BR2_PACKAGE_RPI_USERLAND select BR2_PACKAGE_HAS_LIBEGL select BR2_PACKAGE_HAS_LIBGLES select BR2_PACKAGE_HAS_OPENVG - select BR2_PACKAGE_HAS_OPENMAX + select BR2_PACKAGE_HAS_LIBOPENMAX help Raspberry Pi Userland contains the necessary library to use the VideoCore driver. @@ -28,7 +28,7 @@ config BR2_PACKAGE_PROVIDES_LIBGLES config BR2_PACKAGE_PROVIDES_OPENVG default "rpi-userland" -config BR2_PACKAGE_PROVIDES_OPENMAX +config BR2_PACKAGE_PROVIDES_LIBOPENMAX default "rpi-userland" endif