[v2] package/gcnano-binaries: bump version to 6.4.7

From: Kory Maincent <kory.maincent@bootlin.com>

Update to the latest version of the gcnano-binaries blobs, which are
compatible with the soon-to-be-released 5.15 kernel from the
STMicroelectronics BSP.

As we are installing all the libraries and the pkgconfig files we do not
need to list them anymore. Therefore this patch removes
GCNANO_BINARIES_LIBRARIES and GCNANO_BINARIES_PKG_CONFIGS variables.
It also updates the installation command to follow the path and naming
of the new version and the pkgconfig files to fill the prefix variable with
the right value.

The new version of gcnano has gbm.h header installed in a gbm folder,
this break the build of other packages. The patch fixes it with a simple
link.

Signed-off-by: Kory Maincent <kory.maincent@bootlin.com>
---

Change since v1:
- fix subject version error.
- made few code cleaning from Thomas review.
- add "-f" to link creation to avoid "File exists" message error.

 package/gcnano-binaries/gcnano-binaries.hash |  2 +-
 package/gcnano-binaries/gcnano-binaries.mk   | 36 ++++++++------------
 2 files changed, 15 insertions(+), 23 deletions(-)

On 22/06/2022 15:52, Kory Maincent via buildroot wrote:
> From: Kory Maincent <kory.maincent@bootlin.com>
> 
> Update to the latest version of the gcnano-binaries blobs, which are
> compatible with the soon-to-be-released 5.15 kernel from the
> STMicroelectronics BSP.
> 
> As we are installing all the libraries and the pkgconfig files we do not
> need to list them anymore. Therefore this patch removes
> GCNANO_BINARIES_LIBRARIES and GCNANO_BINARIES_PKG_CONFIGS variables.
> It also updates the installation command to follow the path and naming
> of the new version and the pkgconfig files to fill the prefix variable with
> the right value.
> 
> The new version of gcnano has gbm.h header installed in a gbm folder,
> this break the build of other packages. The patch fixes it with a simple
> link.
> 
> Signed-off-by: Kory Maincent <kory.maincent@bootlin.com>

  Applied to master, thanks.

  Regards,
  Arnout

> ---
> 
> Change since v1:
> - fix subject version error.
> - made few code cleaning from Thomas review.
> - add "-f" to link creation to avoid "File exists" message error.
> 
>   package/gcnano-binaries/gcnano-binaries.hash |  2 +-
>   package/gcnano-binaries/gcnano-binaries.mk   | 36 ++++++++------------
>   2 files changed, 15 insertions(+), 23 deletions(-)
> 
> diff --git a/package/gcnano-binaries/gcnano-binaries.hash b/package/gcnano-binaries/gcnano-binaries.hash
> index d4ad96672a..1ed66e3753 100644
> --- a/package/gcnano-binaries/gcnano-binaries.hash
> +++ b/package/gcnano-binaries/gcnano-binaries.hash
> @@ -1,3 +1,3 @@
>   # Locally calculated
> -sha256  32d91d6ce6e6551cb7ad0eee4698041fdeb10a4f216e6564adb06408476edc38  gcnano-binaries-969d11518529bb70a132909b02ddcc5736c92d91.tar.gz
> +sha256  d3aebbc87ca27e743fdd21d71025cdf0761af748907bbdd7b193262eb48ab3c7  gcnano-binaries-a20611434ef048d3d0c04f55b6cd7d75a2156d43.tar.gz
>   sha256  7d209718473d18f69f75adb7caf9cb5d4b0a31da068756aa011bea617de3dc57  EULA
> diff --git a/package/gcnano-binaries/gcnano-binaries.mk b/package/gcnano-binaries/gcnano-binaries.mk
> index affe0a6063..dc309ec3c2 100644
> --- a/package/gcnano-binaries/gcnano-binaries.mk
> +++ b/package/gcnano-binaries/gcnano-binaries.mk
> @@ -4,12 +4,10 @@
>   #
>   ################################################################################
>   
> -GCNANO_BINARIES_LIB_VERSION = 6.4
> -GCNANO_BINARIES_LIB_REVISION = 3
> -GCNANO_BINARIES_LIB_FULL_VERSION = $(GCNANO_BINARIES_LIB_VERSION).$(GCNANO_BINARIES_LIB_REVISION)
> -GCNANO_BINARIES_DRIVER_VERSION = $(GCNANO_BINARIES_LIB_FULL_VERSION)
> -GCNANO_BINARIES_USERLAND_VERSION = $(GCNANO_BINARIES_LIB_FULL_VERSION)-20210726
> -GCNANO_BINARIES_VERSION = 969d11518529bb70a132909b02ddcc5736c92d91
> +GCNANO_BINARIES_LIB_VERSION = 6.4.7
> +GCNANO_BINARIES_DRIVER_VERSION = $(GCNANO_BINARIES_LIB_VERSION)
> +GCNANO_BINARIES_USERLAND_VERSION = $(GCNANO_BINARIES_LIB_VERSION)-20220524
> +GCNANO_BINARIES_VERSION = a20611434ef048d3d0c04f55b6cd7d75a2156d43
>   GCNANO_BINARIES_SITE = $(call github,STMicroelectronics,gcnano-binaries,$(GCNANO_BINARIES_VERSION))
>   
>   GCNANO_BINARIES_LICENSE = MIT, Vivante End User Software License Terms
> @@ -44,26 +42,20 @@ GCNANO_BINARIES_MODULE_MAKE_OPTS = \
>   	AQROOT=$(@D) \
>   	DEBUG=0
>   
> -GCNANO_BINARIES_LIBRARIES = \
> -	libgbm_viv libEGL libGAL libgbm libGLESv1_CM \
> -	libGLESv2 libGLSLC libOpenVG libVSC
> -
>   GCNANO_BINARIES_USERLAND_SUBDIR = gcnano-userland-multi-$(GCNANO_BINARIES_USERLAND_VERSION)
>   
> -GCNANO_BINARIES_PKG_CONFIGS = egl gbm glesv1_cm glesv2 vg
> -
>   define GCNANO_BINARIES_INSTALL
> -	$(foreach lib,$(GCNANO_BINARIES_LIBRARIES), \
> -		$(INSTALL) -D -m 0755 $(@D)/$(GCNANO_BINARIES_USERLAND_SUBDIR)/usr/lib/$(lib).$(GCNANO_BINARIES_LIB_VERSION).multi.release.so \
> -			$(1)/usr/lib/$(lib).$(GCNANO_BINARIES_LIB_VERSION).multi.release.so ; \
> -		cp -a $(@D)/$(GCNANO_BINARIES_USERLAND_SUBDIR)/usr/lib/$(lib).so* $(1)/usr/lib
> -	)
> +	cd $(@D)/$(GCNANO_BINARIES_USERLAND_SUBDIR)/release/drivers/ ; \
> +	find . -type f -exec $(INSTALL) -D -m 0755 {} $(1)/usr/lib/{} \; ; \
> +	find . -type l -exec cp -a {} $(1)/usr/lib \;
>   	mkdir -p $(1)/usr/include
> -	cp -a $(@D)/$(GCNANO_BINARIES_USERLAND_SUBDIR)/usr/include/* $(1)/usr/include/
> -	$(foreach pkgconfig,$(GCNANO_BINARIES_PKG_CONFIGS), \
> -		$(INSTALL) -D -m 0644 $(@D)/$(GCNANO_BINARIES_USERLAND_SUBDIR)/usr/lib/pkgconfig/$(pkgconfig).pc \
> -			$(1)/usr/lib/pkgconfig/$(pkgconfig).pc
> -	)
> +	cp -a $(@D)/$(GCNANO_BINARIES_USERLAND_SUBDIR)/release/include/* $(1)/usr/include/
> +	ln -sf gbm/gbm.h $(1)/usr/include/gbm.h
> +	cd $(@D)/$(GCNANO_BINARIES_USERLAND_SUBDIR)/pkgconfig/ ; \
> +	for file in *.pc ; do \
> +		sed -e "s|#PREFIX#|/usr|" $$file > $$file.temp ; \
> +		$(INSTALL) -D -m 0644 $$file.temp $(1)/usr/lib/pkgconfig/$$file ; \
> +	done
>   endef
>   
>   define GCNANO_BINARIES_INSTALL_TARGET_CMDS