diff --git a/Config.in.legacy b/Config.in.legacy index 1f83c0dfd2..1833c7246b 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -161,6 +161,20 @@ config BR2_PACKAGE_GNUPG2_GPGV2 The gpgv2 executable is now named gpgv. The config option has been renamed accordingly. +config BR2_PACKAGE_IMX_GPU_VIV_APITRACE + bool "Vivante apitrace tool option removed" + select BR2_LEGACY + help + The apitrace tool for Vivante is not provided by the + imx-gpu-viv package any longer. + +config BR2_PACKAGE_IMX_GPU_VIV_G2D + bool "Vivante G2D libraries from imx-gpu-viv removed" + select BR2_LEGACY + select BR2_PACKAGE_IMX_GPU_G2D + help + The G2D libraries are now provided by the imx-gpu-g2d package. + ############################################################################### comment "Legacy options removed in 2017.11" diff --git a/package/freescale-imx/imx-gpu-viv/Config.in b/package/freescale-imx/imx-gpu-viv/Config.in index dba378c2d2..cf58ad475c 100644 --- a/package/freescale-imx/imx-gpu-viv/Config.in +++ b/package/freescale-imx/imx-gpu-viv/Config.in @@ -60,17 +60,6 @@ config BR2_PACKAGE_PROVIDES_LIBGLES config BR2_PACKAGE_PROVIDES_LIBOPENVG default "imx-gpu-viv" -config BR2_PACKAGE_IMX_GPU_VIV_APITRACE - bool "install apitrace tools" - select BR2_PACKAGE_IMX_GPU_VIV_G2D - select BR2_PACKAGE_LIBPNG - help - Copy the apitrace tool to the target. Apitrace consists - of a set of tools to trace, replay and/or inspect OpenGL, - OpenGL ES APIs calls - - http://apitrace.github.io/ - config BR2_PACKAGE_IMX_GPU_VIV_EXAMPLES bool "install examples" help @@ -78,11 +67,6 @@ config BR2_PACKAGE_IMX_GPU_VIV_EXAMPLES Warning: examples take approximately 150 MB of disk space. -config BR2_PACKAGE_IMX_GPU_VIV_G2D - bool "install G2D libraries" - help - Copy the GPU2D libraries to the target. - config BR2_PACKAGE_IMX_GPU_VIV_GMEM_INFO bool "install gmem_info tool" help diff --git a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash index 6c526c5876..894bc90dae 100644 --- a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash +++ b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash @@ -1 +1 @@ -sha256 caaabd59a259e29aa5b7f9d1d7f3fe71cff9336ba44904485d258baef276351f imx-gpu-viv-5.0.11.p8.6-hfp.bin +sha256 4f93a4412c93ca5959aa2437bfed2ecbaf983b5b272be5977f76a967de5db150 imx-gpu-viv-6.2.2.p0-aarch32.bin diff --git a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk index 961f574c8b..5d3d9c671b 100644 --- a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk +++ b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk @@ -4,7 +4,7 @@ # ################################################################################ -IMX_GPU_VIV_VERSION = 5.0.11.p8.6-hfp +IMX_GPU_VIV_VERSION = 6.2.2.p0-aarch32 IMX_GPU_VIV_SITE = $(FREESCALE_IMX_SITE) IMX_GPU_VIV_SOURCE = imx-gpu-viv-$(IMX_GPU_VIV_VERSION).bin @@ -45,6 +45,7 @@ define IMX_GPU_VIV_BUILD_CMDS 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 libVDK-$(IMX_GPU_VIV_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libVDK.so endef ifeq ($(IMX_GPU_VIV_LIB_TARGET),fb) @@ -56,17 +57,9 @@ define IMX_GPU_VIV_FIXUP_FB_HEADERS endef endif -ifeq ($(BR2_PACKAGE_IMX_GPU_VIV_G2D),y) -define IMX_GPU_VIV_INSTALL_G2D_STAGING - cp -dpfr $(@D)/g2d/usr/include/* $(STAGING_DIR)/usr/include/ - cp -dpfr $(@D)/g2d/usr/lib/* $(STAGING_DIR)/usr/lib/ -endef -endif - define IMX_GPU_VIV_INSTALL_STAGING_CMDS cp -r $(@D)/gpu-core/usr/* $(STAGING_DIR)/usr $(IMX_GPU_VIV_FIXUP_FB_HEADERS) - $(IMX_GPU_VIV_INSTALL_G2D_STAGING) for lib in egl glesv2 vg; do \ $(INSTALL) -m 0644 -D \ $(@D)/gpu-core/usr/lib/pkgconfig/$${lib}.pc \ @@ -74,21 +67,6 @@ define IMX_GPU_VIV_INSTALL_STAGING_CMDS done endef -ifeq ($(BR2_PACKAGE_IMX_GPU_VIV_APITRACE),y) -IMX_GPU_VIV_DEPENDENCIES += libpng -ifeq ($(IMX_GPU_VIV_LIB_TARGET),x11) -define IMX_GPU_VIV_INSTALL_APITRACE - cp -dpfr $(@D)/apitrace/x11/usr/bin/* $(TARGET_DIR)/usr/bin/ - cp -dpfr $(@D)/apitrace/x11/usr/lib/* $(TARGET_DIR)/usr/lib/ -endef -else -define IMX_GPU_VIV_INSTALL_APITRACE - cp -dpfr $(@D)/apitrace/non-x11/usr/bin/* $(TARGET_DIR)/usr/bin/ - cp -dpfr $(@D)/apitrace/non-x11/usr/lib/* $(TARGET_DIR)/usr/lib/ -endef -endif -endif - ifeq ($(BR2_PACKAGE_IMX_GPU_VIV_EXAMPLES),y) define IMX_GPU_VIV_INSTALL_EXAMPLES mkdir -p $(TARGET_DIR)/usr/share/examples/ @@ -96,12 +74,6 @@ define IMX_GPU_VIV_INSTALL_EXAMPLES endef endif -ifeq ($(BR2_PACKAGE_IMX_GPU_VIV_G2D),y) -define IMX_GPU_VIV_INSTALL_G2D - cp -dpfr $(@D)/g2d/usr/lib/* $(TARGET_DIR)/usr/lib/ -endef -endif - ifeq ($(BR2_PACKAGE_IMX_GPU_VIV_GMEM_INFO),y) define IMX_GPU_VIV_INSTALL_GMEM_INFO cp -dpfr $(@D)/gpu-tools/gmem-info/usr/bin/* $(TARGET_DIR)/usr/bin/ @@ -112,12 +84,10 @@ endif # Note that this is _required_, else ldconfig may create symlinks # to the wrong library define IMX_GPU_VIV_INSTALL_TARGET_CMDS - $(IMX_GPU_VIV_INSTALL_APITRACE) $(IMX_GPU_VIV_INSTALL_EXAMPLES) - $(IMX_GPU_VIV_INSTALL_G2D) $(IMX_GPU_VIV_INSTALL_GMEM_INFO) cp -a $(@D)/gpu-core/usr/lib $(TARGET_DIR)/usr - for lib in EGL GAL VIVANTE GLESv2; do \ + for lib in EGL GAL VIVANTE GLESv2 VDK; do \ for f in $(TARGET_DIR)/usr/lib/lib$${lib}-*.so; do \ case $$f in \ *-$(IMX_GPU_VIV_LIB_TARGET).so) : ;; \ diff --git a/package/gstreamer1/gst1-imx/Config.in b/package/gstreamer1/gst1-imx/Config.in index e4cee05b90..7b46233b53 100644 --- a/package/gstreamer1/gst1-imx/Config.in +++ b/package/gstreamer1/gst1-imx/Config.in @@ -27,12 +27,12 @@ comment "imxeglvivsink needs the Vivante 3D libraries" config BR2_PACKAGE_GST1_IMX_G2D bool "imxg2d" - depends on BR2_PACKAGE_IMX_GPU_VIV_G2D + depends on BR2_PACKAGE_IMX_GPU_G2D help Elements leveraging the 2D GPU -comment "imxg2d needs the Vivante 2D libraries" - depends on !BR2_PACKAGE_IMX_GPU_VIV_G2D +comment "imxg2d needs the G2D libraries" + depends on !BR2_PACKAGE_IMX_GPU_G2D config BR2_PACKAGE_GST1_IMX_IPU bool "imxipu" diff --git a/package/gstreamer1/gst1-imx/gst1-imx.mk b/package/gstreamer1/gst1-imx/gst1-imx.mk index a8fe6fe041..43b4d9b15f 100644 --- a/package/gstreamer1/gst1-imx/gst1-imx.mk +++ b/package/gstreamer1/gst1-imx/gst1-imx.mk @@ -33,6 +33,10 @@ ifeq ($(BR2_PACKAGE_IMX_GPU_VIV),y) GST1_IMX_DEPENDENCIES += imx-gpu-viv endif +ifeq ($(BR2_PACKAGE_IMX_GPU_G2D),y) +GST1_IMX_DEPENDENCIES += imx-gpu-g2d +endif + ifeq ($(BR2_PACKAGE_GST1_IMX_EGLVISINK),y) # There's no --enable-eglvivsink option ifeq ($(BR2_PACKAGE_XLIB_LIBX11),y)