From patchwork Tue Dec 29 22:03:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gary Bisson X-Patchwork-Id: 1421259 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=boundarydevices.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=boundarydevices.com header.i=@boundarydevices.com header.a=rsa-sha256 header.s=google header.b=aWIbJR+d; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4D57jq09DFz9sVt for ; Wed, 30 Dec 2020 09:04:15 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 01D188717A; Tue, 29 Dec 2020 22:04:13 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id DGZ1efj2fW48; Tue, 29 Dec 2020 22:04:10 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 9800C87136; Tue, 29 Dec 2020 22:04:10 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 0A6381BF981 for ; Tue, 29 Dec 2020 22:04:06 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 0628085E51 for ; Tue, 29 Dec 2020 22:04:06 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id BtmPwz7bhUqv for ; Tue, 29 Dec 2020 22:04:05 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by fraxinus.osuosl.org (Postfix) with ESMTPS id F364485E25 for ; Tue, 29 Dec 2020 22:04:04 +0000 (UTC) Received: by mail-wr1-f42.google.com with SMTP id r3so15922014wrt.2 for ; Tue, 29 Dec 2020 14:04:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=boundarydevices.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=AwFcuHQwPsbmZHTwl0v4oB4Uf5qNhVZ+UUtptq8XylI=; b=aWIbJR+dX2p27wtvK6Wgq2Qqsu6j8Ku5yf2UyKuA+COJ0Y9dNR/ZYbrjk0Wtl8RTYV df3QXDa6JYo6fOhbRkoB3Zp7bW0fOrKuyEDO2+INeOjQTiZW3XbNZIvJ3k0mEba4y9gS PcGGgS7+SVondTBnshta7HTMmYA8EMgPwQFRM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=AwFcuHQwPsbmZHTwl0v4oB4Uf5qNhVZ+UUtptq8XylI=; b=RSf8/CIfa1yMOi2VehKrlE4oIF0gteo1/qwxtD/ZwfcJ4HlW6FdlfhPomvUiQUoMeA 19vIRnjHhE9Qern4yC/4+CIP9fp5csaDbab4VlKF1cjC2YfaG50x0NdPKoCTnc9hgdAG RBLTY48trhpjMElytK9C0DVCDcQCoWe7ii0otgWjc3HE5qlBFNkYO0/WfEKKWR2wW6PH QiLyavj7ExqTwNwaj9zZU78jkBaQgV07Y2g4jjQIxcAhRJ2HHlePwfK40FuZTCjBJkjk hki1NB0tb8xGd4L4+U6zNYk+dOvdt09RicHBT2SP3XtzvZGzIM5tpQDFbgmwaGgZzKkJ Ec9Q== X-Gm-Message-State: AOAM531C2lPg5wvgRuHxqKj1mPQWez+qAmqUAJscvFQI5lqqNXEUfZ7N 3eshsarnS3ZaAV/j3SRRlknz+y23oAVAGBzE X-Google-Smtp-Source: ABdhPJxyrhdDea7X8NVSdqDMXNVRGMkmHq5ELeKRdGhWuTzY5vvk6p6xuo8nhcz6lnfaT4yKpHzo4g== X-Received: by 2002:a5d:6708:: with SMTP id o8mr57299679wru.64.1609279443189; Tue, 29 Dec 2020 14:04:03 -0800 (PST) Received: from p1g2.home (2a01cb000f9f0e008f0bd0d6ec94dd0e.ipv6.abo.wanadoo.fr. [2a01:cb00:f9f:e00:8f0b:d0d6:ec94:dd0e]) by smtp.gmail.com with ESMTPSA id z6sm64221070wrw.58.2020.12.29.14.04.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Dec 2020 14:04:02 -0800 (PST) From: Gary Bisson To: buildroot@buildroot.org Date: Tue, 29 Dec 2020 23:03:57 +0100 Message-Id: <20201229220359.1048766-2-gary.bisson@boundarydevices.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201229220359.1048766-1-gary.bisson@boundarydevices.com> References: <20201229220359.1048766-1-gary.bisson@boundarydevices.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/3] package/freescale-imx/imx-gpu-viv: bump to version 6.4.3.p1.0 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gary Bisson , stephane.viau@oss.nxp.com Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" - Same version as NXP release 5.4.70-2.3.0 - EULA/COPYING: update to LA_OPT_NXP_Software_License v17 - backend libraries have moved to separated folders - can now be simply copied, no more symlink or -fb/wl/x11.so - wayland backend was renamed from 'wl' to 'wayland' - sed on headers for LINUX removed as packages now expected to use pkgconfig files properly (just like fb fixup was removed) Key Improvements (from NXP changelog): - GLES CTS 3.2.6.1 - Vulkan 1.1.6 - OpenVX 1.2 - GPU & NPU accelerated ML support - OpenCV 4.2 - Chromium v74 - Support for renderdoc 1.7 - Support for TFlite 2.2 - NNCTS 1.2 - Vulkan backend support for Unity Fixes: afbeed5d17 ("package/freescale-imx/imx-gpu-viv: bump version to 6.4.3.p0.0") Signed-off-by: Gary Bisson --- Note that with standard Weston package there's some flickering happening at the top of the screen. I'll investigate but using NXP Weston proves to be working fine. --- package/freescale-imx/imx-gpu-viv/Config.in | 2 +- .../imx-gpu-viv/imx-gpu-viv.hash | 8 ++-- .../freescale-imx/imx-gpu-viv/imx-gpu-viv.mk | 40 +++++-------------- 3 files changed, 14 insertions(+), 36 deletions(-) diff --git a/package/freescale-imx/imx-gpu-viv/Config.in b/package/freescale-imx/imx-gpu-viv/Config.in index 753a71ee00..cca2689905 100644 --- a/package/freescale-imx/imx-gpu-viv/Config.in +++ b/package/freescale-imx/imx-gpu-viv/Config.in @@ -67,7 +67,7 @@ config BR2_PACKAGE_IMX_GPU_VIV_OUTPUT string default "x11" if BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_X11 default "fb" if BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_FB - default "wl" if BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL + default "wayland" if BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL config BR2_PACKAGE_PROVIDES_LIBEGL default "imx-gpu-viv" 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 8978a3a769..9c18103996 100644 --- a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash +++ b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 cdec43e45e840fe30e188e3b6f07c44b4a1ceafc315e605c8d278564db5fcbe9 imx-gpu-viv-6.4.3.p0.0-aarch32.bin -sha256 b3bd03288106daf3a62d2301d09569292ef6a5c74c761cfa4e41dad85e4bf547 imx-gpu-viv-6.4.3.p0.0-aarch64.bin -sha256 69cbb76b3f10ac5a8c36f34df7bbdf50825815560c00a946fff2922365ef01a2 COPYING -sha256 a39da2e94bd8b99eaac4325633854620ea3a55145259c3a7748c610a80714cfc EULA +sha256 9960fadbc1ea919f8b1b5c1e2e38a52b7293b70c906518d7fff2ada4140c59ea imx-gpu-viv-6.4.3.p1.0-aarch32.bin +sha256 0505620c3851a980d2e08fee4b4fcd06eff92efac02d1646924bea86e4384ad4 imx-gpu-viv-6.4.3.p1.0-aarch64.bin +sha256 9c16421e7c702f56756650b8ac954d34556327e598a8666e6e8f4eb3a1aa95f1 COPYING +sha256 72edc2072c86d93aa1993d15d4d19d96270af3749b0108995ad50c81d1461f52 EULA 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 9d69acb7ae..6ae9aa7acc 100644 --- a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk +++ b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk @@ -5,9 +5,9 @@ ################################################################################ ifeq ($(BR2_aarch64),y) -IMX_GPU_VIV_VERSION = 6.4.3.p0.0-aarch64 +IMX_GPU_VIV_VERSION = 6.4.3.p1.0-aarch64 else -IMX_GPU_VIV_VERSION = 6.4.3.p0.0-aarch32 +IMX_GPU_VIV_VERSION = 6.4.3.p1.0-aarch32 endif IMX_GPU_VIV_SITE = $(FREESCALE_IMX_SITE) IMX_GPU_VIV_SOURCE = imx-gpu-viv-$(IMX_GPU_VIV_VERSION).bin @@ -29,7 +29,7 @@ ifeq ($(IMX_GPU_VIV_LIB_TARGET),x11) IMX_GPU_VIV_DEPENDENCIES += xlib_libXdamage xlib_libXext xlib_libXfixes endif -ifeq ($(IMX_GPU_VIV_LIB_TARGET),wl) +ifeq ($(IMX_GPU_VIV_LIB_TARGET),wayland) IMX_GPU_VIV_DEPENDENCIES += libdrm wayland endif @@ -38,24 +38,13 @@ define IMX_GPU_VIV_EXTRACT_CMDS endef # Instead of building, we fix up the inconsistencies that exist -# in the upstream archive here. +# in the upstream archive here. We also remove unused backend files. # Make sure these commands are idempotent. define IMX_GPU_VIV_BUILD_CMDS - $(SED) 's/defined(LINUX)/defined(__linux__)/g' $(@D)/gpu-core/usr/include/*/*.h - $(if $(BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_X11)$(BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL), - ln -sf libGL-$(IMX_GPU_VIV_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libGL.so - ln -sf libGL-$(IMX_GPU_VIV_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libGL.so.1 - ln -sf libGL-$(IMX_GPU_VIV_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libGL.so.1.2 - ln -sf libGL-$(IMX_GPU_VIV_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libGL.so.1.2.0 - ) - 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 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 + cp -dpfr $(@D)/gpu-core/usr/lib/$(IMX_GPU_VIV_LIB_TARGET)/* $(@D)/gpu-core/usr/lib/ + for backend in fb x11 wayland; do \ + $(RM) -r $(@D)/gpu-core/usr/lib/$$backend ; \ + done endef ifeq ($(IMX_GPU_VIV_LIB_TARGET),fb) @@ -64,7 +53,7 @@ define IMX_GPU_VIV_FIXUP_PKGCONFIG endef endif -ifeq ($(IMX_GPU_VIV_LIB_TARGET),wl) +ifeq ($(IMX_GPU_VIV_LIB_TARGET),wayland) define IMX_GPU_VIV_FIXUP_PKGCONFIG ln -sf egl_wayland.pc $(@D)/gpu-core/usr/lib/pkgconfig/egl.pc endef @@ -101,22 +90,11 @@ define IMX_GPU_VIV_INSTALL_GMEM_INFO endef endif -# On the target, remove the unused libraries. -# 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_EXAMPLES) $(IMX_GPU_VIV_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 - for lib in EGL GAL GLESv2 VDK; do \ - for f in $(TARGET_DIR)/usr/lib/lib$${lib}-*.so; do \ - case $$f in \ - *-$(IMX_GPU_VIV_LIB_TARGET).so) : ;; \ - *) $(RM) $$f ;; \ - esac; \ - done; \ - done endef $(eval $(generic-package))