Commit 4c0613e7 authored by Gary Bisson's avatar Gary Bisson Committed by Thomas Petazzoni
Browse files

gpu-viv-bin-mx6q: rename package to imx-gpu-viv 

In order to be in line with new Freescale naming convention:

https://github.com/Freescale/meta-fsl-arm/commit/74c86aa9



"Graphics recipe is renamed from gpu-viv-bin-mx6q to imx-gpu-viv"

Signed-off-by: default avatarGary Bisson <gary.bisson@boundarydevices.com>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 15cd6fe2

Config.in.legacy

+9 −0
Original line number Diff line number Diff line
@@ -107,6 +107,15 @@ endif 
###############################################################################

comment "Legacy options removed in 2015.08"



config BR2_PACKAGE_GPU_VIV_BIN_MX6Q

	bool "gpu-viv-bin-mx6q"

	select BR2_LEGACY

	select BR2_PACKAGE_IMX_GPU_VIV

	help

	  Vivante graphics libraries have been renamed to

	  BR2_PACKAGE_IMX_GPU_VIV to be aligned with upstream package

	  name.



config BR2_PACKAGE_LIBSEMANAGE_PYTHON_BINDINGS

	depends on BR2_PACKAGE_PYTHON

	bool "libsemanage python bindings removed"

package/freescale-imx/Config.in

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ source "package/freescale-imx/gpu-amd-bin-mx51/Config.in" 
source "package/freescale-imx/libz160/Config.in"

endif

if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6Q

source "package/freescale-imx/gpu-viv-bin-mx6q/Config.in"

source "package/freescale-imx/imx-gpu-viv/Config.in"

endif



endif

package/freescale-imx/gpu-viv-bin-mx6q/Config.in→package/freescale-imx/imx-gpu-viv/Config.in

+13 −13
Original line number Diff line number Diff line 
comment "gpu-viv-bin-mx6q needs an (e)glibc toolchain"

comment "imx-gpu-viv needs an (e)glibc toolchain"

	depends on BR2_arm

	depends on !BR2_TOOLCHAIN_USES_GLIBC



config BR2_PACKAGE_GPU_VIV_BIN_MX6Q

	bool "gpu-viv-bin-mx6q"

config BR2_PACKAGE_IMX_GPU_VIV

	bool "imx-gpu-viv"

	select BR2_PACKAGE_HAS_LIBEGL

	select BR2_PACKAGE_HAS_LIBGLES

	select BR2_PACKAGE_HAS_LIBOPENVG
@@ -21,7 +21,7 @@ config BR2_PACKAGE_GPU_VIV_BIN_MX6Q 
	  This library is provided by Freescale as-is and doesn't have

	  an upstream.



if BR2_PACKAGE_GPU_VIV_BIN_MX6Q

if BR2_PACKAGE_IMX_GPU_VIV



choice

	prompt "Output option"
@@ -30,7 +30,7 @@ choice 
	  direct framebuffer access, one for X11 rendering.

	  Choose here which version to install.



config BR2_PACKAGE_GPU_VIV_BIN_MX6Q_OUTPUT_X11

config BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_X11

	bool "X11"

	depends on BR2_PACKAGE_XORG7

	select BR2_PACKAGE_XLIB_LIBXDAMAGE # Runtime dependency
@@ -39,26 +39,26 @@ config BR2_PACKAGE_GPU_VIV_BIN_MX6Q_OUTPUT_X11 
comment "X11 backend needs Xorg package"

	depends on !BR2_PACKAGE_XORG7



config BR2_PACKAGE_GPU_VIV_BIN_MX6Q_OUTPUT_FB

config BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_FB

	bool "Framebuffer"



endchoice



config BR2_PACKAGE_GPU_VIV_BIN_MX6Q_OUTPUT

config BR2_PACKAGE_IMX_GPU_VIV_OUTPUT

	string

	default "x11" if BR2_PACKAGE_GPU_VIV_BIN_MX6Q_OUTPUT_X11

	default "fb" if BR2_PACKAGE_GPU_VIV_BIN_MX6Q_OUTPUT_FB

	default "x11" if BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_X11

	default "fb" if BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_FB



config BR2_PACKAGE_PROVIDES_LIBEGL

	default "gpu-viv-bin-mx6q"

	default "imx-gpu-viv"



config BR2_PACKAGE_PROVIDES_LIBGLES

	default "gpu-viv-bin-mx6q"

	default "imx-gpu-viv"



config BR2_PACKAGE_PROVIDES_LIBOPENVG

	default "gpu-viv-bin-mx6q"

	default "imx-gpu-viv"



config BR2_PACKAGE_GPU_VIV_BIN_MX6Q_EXAMPLES

config BR2_PACKAGE_IMX_GPU_VIV_EXAMPLES

	bool "install examples"

	help

	  Copy the Vivante examples to the target.

package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk→package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk

+98 −0
Original line number Diff line number Diff line 
################################################################################

#

# gpu-viv-bin-mx6q

# imx-gpu-viv

#

################################################################################



GPU_VIV_BIN_MX6Q_BASE_VERSION = 5.0.11.p4.1

IMX_GPU_VIV_BASE_VERSION = 5.0.11.p4.1

ifeq ($(BR2_ARM_EABIHF),y)

GPU_VIV_BIN_MX6Q_VERSION = $(GPU_VIV_BIN_MX6Q_BASE_VERSION)-hfp

IMX_GPU_VIV_VERSION = $(IMX_GPU_VIV_BASE_VERSION)-hfp

else

GPU_VIV_BIN_MX6Q_VERSION = $(GPU_VIV_BIN_MX6Q_BASE_VERSION)-sfp

IMX_GPU_VIV_VERSION = $(IMX_GPU_VIV_BASE_VERSION)-sfp

endif

GPU_VIV_BIN_MX6Q_SITE = $(FREESCALE_IMX_SITE)

GPU_VIV_BIN_MX6Q_SOURCE = imx-gpu-viv-$(GPU_VIV_BIN_MX6Q_VERSION).bin

IMX_GPU_VIV_SITE = $(FREESCALE_IMX_SITE)

IMX_GPU_VIV_SOURCE = imx-gpu-viv-$(IMX_GPU_VIV_VERSION).bin



GPU_VIV_BIN_MX6Q_INSTALL_STAGING = YES

IMX_GPU_VIV_INSTALL_STAGING = YES



GPU_VIV_BIN_MX6Q_LICENSE = Freescale Semiconductor Software License Agreement

GPU_VIV_BIN_MX6Q_LICENSE_FILES = EULA

GPU_VIV_BIN_MX6Q_REDISTRIBUTE = NO

IMX_GPU_VIV_LICENSE = Freescale Semiconductor Software License Agreement

IMX_GPU_VIV_LICENSE_FILES = EULA

IMX_GPU_VIV_REDISTRIBUTE = NO



GPU_VIV_BIN_MX6Q_PROVIDES = libegl libgles libopenvg

GPU_VIV_BIN_MX6Q_LIB_TARGET = $(call qstrip,$(BR2_PACKAGE_GPU_VIV_BIN_MX6Q_OUTPUT))

IMX_GPU_VIV_PROVIDES = libegl libgles libopenvg

IMX_GPU_VIV_LIB_TARGET = $(call qstrip,$(BR2_PACKAGE_IMX_GPU_VIV_OUTPUT))



define GPU_VIV_BIN_MX6Q_EXTRACT_CMDS

	$(call FREESCALE_IMX_EXTRACT_HELPER,$(DL_DIR)/$(GPU_VIV_BIN_MX6Q_SOURCE))

define IMX_GPU_VIV_EXTRACT_CMDS

	$(call FREESCALE_IMX_EXTRACT_HELPER,$(DL_DIR)/$(IMX_GPU_VIV_SOURCE))

endef



# For some reason libGAL_egl for x11 is called libGAL_egl.dri.so

ifeq ($(GPU_VIV_BIN_MX6Q_LIB_TARGET),x11)

define GPU_VIV_BIN_MX6Q_FIXUP_SYMLINKS

ifeq ($(IMX_GPU_VIV_LIB_TARGET),x11)

define IMX_GPU_VIV_FIXUP_SYMLINKS

	ln -sf libGAL_egl.dri.so $(@D)/gpu-core/usr/lib/libGAL_egl.so

endef

endif
@@ -36,25 +36,25 @@ endif 
# Instead of building, we fix up the inconsistencies that exist

# in the upstream archive here.

# Make sure these commands are idempotent.

define GPU_VIV_BIN_MX6Q_BUILD_CMDS

define IMX_GPU_VIV_BUILD_CMDS

	$(SED) 's/defined(LINUX)/defined(__linux__)/g' $(@D)/gpu-core/usr/include/*/*.h

	ln -sf libGL.so.1.2 $(@D)/gpu-core/usr/lib/libGL.so

	ln -sf libGL.so.1.2 $(@D)/gpu-core/usr/lib/libGL.so.1

	ln -sf libGL.so.1.2 $(@D)/gpu-core/usr/lib/libGL.so.1.2.0

	ln -sf libEGL-$(GPU_VIV_BIN_MX6Q_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libEGL.so

	ln -sf libEGL-$(GPU_VIV_BIN_MX6Q_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libEGL.so.1

	ln -sf libEGL-$(GPU_VIV_BIN_MX6Q_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libEGL.so.1.0

	ln -sf libGLESv2-$(GPU_VIV_BIN_MX6Q_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libGLESv2.so

	ln -sf libGLESv2-$(GPU_VIV_BIN_MX6Q_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libGLESv2.so.2

	ln -sf libGLESv2-$(GPU_VIV_BIN_MX6Q_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libGLESv2.so.2.0.0

	ln -sf libVIVANTE-$(GPU_VIV_BIN_MX6Q_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libVIVANTE.so

	ln -sf libGAL-$(GPU_VIV_BIN_MX6Q_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libGAL.so

	ln -sf libGAL_egl.$(GPU_VIV_BIN_MX6Q_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libGAL_egl.so

	$(GPU_VIV_BIN_MX6Q_FIXUP_SYMLINKS)

	ln -sf libEGL-$(IMX_GPU_VIV_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libEGL.so

	ln -sf libEGL-$(IMX_GPU_VIV_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libEGL.so.1

	ln -sf libEGL-$(IMX_GPU_VIV_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libEGL.so.1.0

	ln -sf libGLESv2-$(IMX_GPU_VIV_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libGLESv2.so

	ln -sf libGLESv2-$(IMX_GPU_VIV_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libGLESv2.so.2

	ln -sf libGLESv2-$(IMX_GPU_VIV_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libGLESv2.so.2.0.0

	ln -sf libVIVANTE-$(IMX_GPU_VIV_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libVIVANTE.so

	ln -sf libGAL-$(IMX_GPU_VIV_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libGAL.so

	ln -sf libGAL_egl.$(IMX_GPU_VIV_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libGAL_egl.so

	$(IMX_GPU_VIV_FIXUP_SYMLINKS)

endef



ifeq ($(GPU_VIV_BIN_MX6Q_LIB_TARGET),fb)

define GPU_VIV_BIN_MX6Q_FIXUP_FB_HEADERS

ifeq ($(IMX_GPU_VIV_LIB_TARGET),fb)

define IMX_GPU_VIV_FIXUP_FB_HEADERS

	$(SED) '39i\

		#if !defined(EGL_API_X11) && !defined(EGL_API_DFB) && !defined(EGL_API_FB) \n\

		#define EGL_API_FB \n\
@@ -62,9 +62,9 @@ define GPU_VIV_BIN_MX6Q_FIXUP_FB_HEADERS 
endef

endif



define GPU_VIV_BIN_MX6Q_INSTALL_STAGING_CMDS

define IMX_GPU_VIV_INSTALL_STAGING_CMDS

	cp -r $(@D)/gpu-core/usr/* $(STAGING_DIR)/usr

	$(GPU_VIV_BIN_MX6Q_FIXUP_FB_HEADERS)

	$(IMX_GPU_VIV_FIXUP_FB_HEADERS)

	for lib in egl glesv2 vg; do \

		$(INSTALL) -m 0644 -D \

			$(@D)/gpu-core/usr/lib/pkgconfig/$${lib}.pc \
@@ -72,8 +72,8 @@ define GPU_VIV_BIN_MX6Q_INSTALL_STAGING_CMDS 
	done

endef



ifeq ($(BR2_PACKAGE_GPU_VIV_BIN_MX6Q_EXAMPLES),y)

define GPU_VIV_BIN_MX6Q_INSTALL_EXAMPLES

ifeq ($(BR2_PACKAGE_IMX_GPU_VIV_EXAMPLES),y)

define IMX_GPU_VIV_INSTALL_EXAMPLES

	mkdir -p $(TARGET_DIR)/usr/share/examples/

	cp -r $(@D)/gpu-demos/opt/* $(TARGET_DIR)/usr/share/examples/

endef
@@ -82,13 +82,13 @@ endif 
# On the target, remove the unused libraries.

# Note that this is _required_, else ldconfig may create symlinks

# to the wrong library

define GPU_VIV_BIN_MX6Q_INSTALL_TARGET_CMDS

	$(GPU_VIV_BIN_MX6Q_INSTALL_EXAMPLES)

define IMX_GPU_VIV_INSTALL_TARGET_CMDS

	$(IMX_GPU_VIV_INSTALL_EXAMPLES)

	cp -a $(@D)/gpu-core/usr/lib $(TARGET_DIR)/usr

	for lib in EGL GAL VIVANTE GLESv2; do \

		for f in $(TARGET_DIR)/usr/lib/lib$${lib}-*.so; do \

			case $$f in \

				*-$(GPU_VIV_BIN_MX6Q_LIB_TARGET).so) : ;; \

				*-$(IMX_GPU_VIV_LIB_TARGET).so) : ;; \

				*) $(RM) $$f ;; \

			esac; \

		done; \

package/gstreamer1/gst1-imx/Config.in

+3 −3
Original line number Diff line number Diff line 
comment "gst1-imx needs an imx-specific Linux kernel to be built"

	depends on BR2_arm && !BR2_LINUX_KERNEL



# Required by gpu-viv-bin-mx6q

# Required by imx-gpu-viv

comment "gst1-imx needs an (e)glibc toolchain"

	depends on BR2_arm

	depends on !BR2_TOOLCHAIN_USES_GLIBC
@@ -10,8 +10,8 @@ config BR2_PACKAGE_GST1_IMX 
	bool "gst1-imx"

	depends on BR2_LINUX_KERNEL

	depends on BR2_arm # Only relevant for i.MX

	depends on BR2_TOOLCHAIN_USES_GLIBC # gpu-viv-bin-mx6q

	depends on BR2_PACKAGE_GPU_VIV_BIN_MX6Q

	depends on BR2_TOOLCHAIN_USES_GLIBC # imx-gpu-viv

	depends on BR2_PACKAGE_IMX_GPU_VIV

	depends on BR2_PACKAGE_LIBFSLVPUWRAP

	select BR2_PACKAGE_GST1_PLUGINS_BASE

	help