From b3059a93d5a666488044239fe5cf053325f7e154 Mon Sep 17 00:00:00 2001 From: Windsome Zeng Date: Wed, 17 Aug 2022 14:10:04 +0800 Subject: [PATCH] [GPU] Upgrade OpenGL ES library to DDK 1.17. --- .../img-gpu-powervr/img-gpu-powervr.hash | 7 +- .../img-gpu-powervr/img-gpu-powervr.mk | 79 +------------------ 2 files changed, 6 insertions(+), 80 deletions(-) diff --git a/package/starfive/img-gpu-powervr/img-gpu-powervr.hash b/package/starfive/img-gpu-powervr/img-gpu-powervr.hash index 66648748..ee2ac02f 100644 --- a/package/starfive/img-gpu-powervr/img-gpu-powervr.hash +++ b/package/starfive/img-gpu-powervr/img-gpu-powervr.hash @@ -1,6 +1,3 @@ # Locally calculated -# sha256 1324b1aaf190110b80ad9a6f6533f4f50dce9e9ab8d49d8503f59764b151d219 imx-gpu-viv-6.4.3.p2.0-aarch32.bin -# sha256 003c30baefb1655790b475c3cdfa5cefbf81ea89ef37c6649b64f151dd23a52e imx-gpu-viv-6.4.3.p2.0-aarch64.bin -# sha256 ea58636bf34f589048fcd46e38497c47229fde8498df086ff5fb52f9ef8e15ee COPYING -# sha256 50099e283cfd307f84f159aeb1a6f462351320273dbcdb80d7f2c9db0494b71c EULA -sha256 66dabdd5964833822ba1f48c92cc7fa1be0a6f07ac63d88f560d10ba4c56684a img-gpu-powervr-bin-1.15.6052913.tar.gz +sha256 9941384b78d6999a645f322a34fdd417ef8b398f226d48e410e131a1a4c0b40a img-gpu-powervr-bin-1.17.6210866.tar.gz +sha512 4daf5fc53e26131ff1a4ecddd79d727799e78652860f01bbe74877eb12f7108e4da5f62c1434459aa0ff40a195e1165e89b3ff662ab56da0784f1273d93cf95c img-gpu-powervr-bin-1.17.6210866.tar.gz diff --git a/package/starfive/img-gpu-powervr/img-gpu-powervr.mk b/package/starfive/img-gpu-powervr/img-gpu-powervr.mk index 3d7bff9a..a2951045 100644 --- a/package/starfive/img-gpu-powervr/img-gpu-powervr.mk +++ b/package/starfive/img-gpu-powervr/img-gpu-powervr.mk @@ -1,22 +1,11 @@ -################################################################################ +# SPDX-License-Identifier: GPL-2.0 # -# img-gpu-powervr +# Copyright (C) 2022 StarFive Technology Co., Ltd. # -# This file is for Imagination PowerVR GPU, modified from freescale-imx/imx-gpu-viv +# Description: Add support for Imagination PowerVR GPU # -# Windsome Zeng -# -################################################################################ -# ifeq ($(BR2_aarch64),y) -# IMG_GPU_POWERVR_VERSION = 6.4.3.p2.0-aarch64 -# else -# IMG_GPU_POWERVR_VERSION = 6.4.3.p2.0-aarch32 -# endif -# IMG_GPU_POWERVR_SITE = $(FREESCALE_IMX_SITE) -# IMG_GPU_POWERVR_SOURCE = imx-gpu-viv-$(IMG_GPU_POWERVR_VERSION).bin - -IMG_GPU_POWERVR_VERSION:=1.15.6052913 +IMG_GPU_POWERVR_VERSION:=1.17.6210866 IMG_GPU_POWERVR_SITE=$(TOPDIR)/../soft_3rdpart/IMG_GPU/out IMG_GPU_POWERVR_SITE_METHOD=file IMG_GPU_POWERVR_SOURCE=img-gpu-powervr-bin-$(IMG_GPU_POWERVR_VERSION).tar.gz @@ -30,14 +19,9 @@ IMG_GPU_POWERVR_PROVIDES = libgles libopencl IMG_GPU_POWERVR_LIB_TARGET = $(call qstrip,$(BR2_PACKAGE_IMG_GPU_POWERVR_OUTPUT)) ifeq ($(IMG_GPU_POWERVR_LIB_TARGET),x11) -# The libGAL.so library provided by imx-gpu-viv uses X functions. Packages -# may want to link against libGAL.so (QT5 Base with OpenGL and X support -# does so). For this to work we need build dependencies to libXdamage, -# libXext and libXfixes so that X functions used in libGAL.so are referenced. IMG_GPU_POWERVR_DEPENDENCIES += xlib_libXdamage xlib_libXext xlib_libXfixes endif -# Libraries are linked against libdrm, except framebuffer output on ARM ifneq ($(IMG_GPU_POWERVR_LIB_TARGET)$(BR2_riscv),fby) IMG_GPU_POWERVR_DEPENDENCIES += libdrm endif @@ -54,59 +38,4 @@ define IMG_GPU_POWERVR_INSTALL_TARGET_CMDS cp -rdpf $(@D)/target/* $(TARGET_DIR)/ endef -# define IMG_GPU_POWERVR_EXTRACT_CMDS -# $(call FREESCALE_IMX_EXTRACT_HELPER,$(IMG_GPU_POWERVR_DL_DIR)/$(IMG_GPU_POWERVR_SOURCE)) -# endef - -# ifeq ($(IMG_GPU_POWERVR_LIB_TARGET),fb) -# define IMG_GPU_POWERVR_FIXUP_PKGCONFIG -# ln -sf egl_linuxfb.pc $(@D)/gpu-core/usr/lib/pkgconfig/egl.pc -# endef -# else ifeq ($(IMG_GPU_POWERVR_LIB_TARGET),wayland) -# define IMG_GPU_POWERVR_FIXUP_PKGCONFIG -# ln -sf egl_wayland.pc $(@D)/gpu-core/usr/lib/pkgconfig/egl.pc -# endef -# else ifeq ($(IMG_GPU_POWERVR_LIB_TARGET),x11) -# define IMG_GPU_POWERVR_FIXUP_PKGCONFIG -# $(foreach lib,egl gbm glesv1_cm glesv2 vg, \ -# ln -sf $(lib)_x11.pc $(@D)/gpu-core/usr/lib/pkgconfig/$(lib).pc -# ) -# endef -# endif - -# Instead of building, we fix up the inconsistencies that exist -# in the upstream archive here. We also remove unused backend files. -# Make sure these commands are idempotent. -# define IMG_GPU_POWERVR_BUILD_CMDS -# cp -dpfr $(@D)/gpu-core/usr/lib/$(IMG_GPU_POWERVR_LIB_TARGET)/* $(@D)/gpu-core/usr/lib/ -# $(foreach backend,fb x11 wayland, \ -# $(RM) -r $(@D)/gpu-core/usr/lib/$(backend) -# ) -# $(IMG_GPU_POWERVR_FIXUP_PKGCONFIG) -# endef -# -# define IMG_GPU_POWERVR_INSTALL_STAGING_CMDS -# cp -r $(@D)/gpu-core/usr/* $(STAGING_DIR)/usr -# endef - -# ifeq ($(BR2_PACKAGE_IMG_GPU_POWERVR_EXAMPLES),y) -# define IMG_GPU_POWERVR_INSTALL_EXAMPLES -# mkdir -p $(TARGET_DIR)/usr/share/examples/ -# cp -r $(@D)/gpu-demos/opt/* $(TARGET_DIR)/usr/share/examples/ -# endef -# endif -# -# ifeq ($(BR2_PACKAGE_IMG_GPU_POWERVR_GMEM_INFO),y) -# define IMG_GPU_POWERVR_INSTALL_GMEM_INFO -# cp -dpfr $(@D)/gpu-tools/gmem-info/usr/bin/* $(TARGET_DIR)/usr/bin/ -# endef -# endif - -# define IMG_GPU_POWERVR_INSTALL_TARGET_CMDS -# $(IMG_GPU_POWERVR_INSTALL_EXAMPLES) -# $(IMG_GPU_POWERVR_INSTALL_GMEM_INFO) -# cp -a $(@D)/gpu-core/usr/lib $(TARGET_DIR)/usr -# $(INSTALL) -D -m 0644 $(@D)/gpu-core/etc/Vivante.icd $(TARGET_DIR)/etc/OpenCL/vendors/Vivante.icd -# endef - $(eval $(generic-package))