| Message ID | 20221212085411.2405538-1-kory.maincent@bootlin.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | package/gcnano-binaries: bump version to 6.4.9 | expand |
>>>>> "Köry" == Köry Maincent via buildroot <buildroot@buildroot.org> writes: > From: Kory Maincent <kory.maincent@bootlin.com> > Update to the latest version of the gcnano-binaries blobs, which are > compatible with the last v5.15-stm32mp-r2 kernel from the > STMicroelectronics BSP. > Signed-off-by: Kory Maincent <kory.maincent@bootlin.com> > --- > package/gcnano-binaries/gcnano-binaries.hash | 2 +- > package/gcnano-binaries/gcnano-binaries.mk | 30 ++++++++------------ > 2 files changed, 13 insertions(+), 19 deletions(-) > diff --git a/package/gcnano-binaries/gcnano-binaries.hash b/package/gcnano-binaries/gcnano-binaries.hash > index 1ed66e3753..7bb942e6da 100644 > --- a/package/gcnano-binaries/gcnano-binaries.hash > +++ b/package/gcnano-binaries/gcnano-binaries.hash > @@ -1,3 +1,3 @@ > # Locally calculated > -sha256 d3aebbc87ca27e743fdd21d71025cdf0761af748907bbdd7b193262eb48ab3c7 gcnano-binaries-a20611434ef048d3d0c04f55b6cd7d75a2156d43.tar.gz > +sha256 b122a0cd7a1bd2cee8c6117b259ef977a765d24e48655f639694cbef471da99b gcnano-binaries-0ac1a89d7a59d040a69745a85f0da7e98644cc4b.tar.gz > sha256 7d209718473d18f69f75adb7caf9cb5d4b0a31da068756aa011bea617de3dc57 EULA > diff --git a/package/gcnano-binaries/gcnano-binaries.mk b/package/gcnano-binaries/gcnano-binaries.mk > index d9c47bf64e..83261f3b7c 100644 > --- a/package/gcnano-binaries/gcnano-binaries.mk > +++ b/package/gcnano-binaries/gcnano-binaries.mk > @@ -4,10 +4,10 @@ > # > ################################################################################ > -GCNANO_BINARIES_LIB_VERSION = 6.4.7 > +GCNANO_BINARIES_LIB_VERSION = 6.4.9 > GCNANO_BINARIES_DRIVER_VERSION = $(GCNANO_BINARIES_LIB_VERSION) > -GCNANO_BINARIES_USERLAND_VERSION = $(GCNANO_BINARIES_LIB_VERSION)-20220524 > -GCNANO_BINARIES_VERSION = a20611434ef048d3d0c04f55b6cd7d75a2156d43 > +GCNANO_BINARIES_USERLAND_VERSION = $(GCNANO_BINARIES_LIB_VERSION)-20221206 > +GCNANO_BINARIES_VERSION = 0ac1a89d7a59d040a69745a85f0da7e98644cc4b > GCNANO_BINARIES_SITE = $(call github,STMicroelectronics,gcnano-binaries,$(GCNANO_BINARIES_VERSION)) > GCNANO_BINARIES_LICENSE = MIT, Vivante End User Software License Terms > @@ -38,31 +38,25 @@ GCNANO_BINARIES_POST_EXTRACT_HOOKS += GCNANO_BINARIES_EXTRACT_HELPER > GCNANO_BINARIES_MODULE_MAKE_OPTS = \ > KERNEL_DIR=$(LINUX_DIR) \ > - SOC_PLATFORM=st-st \ > + SOC_PLATFORM=st-mp1 \ > AQROOT=$(@D) \ > DEBUG=0 > GCNANO_BINARIES_USERLAND_SUBDIR = gcnano-userland-multi-$(GCNANO_BINARIES_USERLAND_VERSION) > -# This creates: > -# libGLESv2.so.2 -> libGLESv2.so > -# libGLESv1_CM.so.1 -> libGLESv1_CM.so > -# symlinks, as most OpenGL implementations have them, and they are > -# expected by some users such as libepoxy. > define GCNANO_BINARIES_INSTALL > 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 \; > - ln -sf libGLESv2.so $(1)/usr/lib/libGLESv2.so.2 > - ln -sf libGLESv1_CM.so $(1)/usr/lib/libGLESv1_CM.so.1 Why are you removing this? Does upstream now have these symlinks? A more detailed commit message would be good so I don't need to reverse engineer it.
diff --git a/package/gcnano-binaries/gcnano-binaries.hash b/package/gcnano-binaries/gcnano-binaries.hash index 1ed66e3753..7bb942e6da 100644 --- a/package/gcnano-binaries/gcnano-binaries.hash +++ b/package/gcnano-binaries/gcnano-binaries.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 d3aebbc87ca27e743fdd21d71025cdf0761af748907bbdd7b193262eb48ab3c7 gcnano-binaries-a20611434ef048d3d0c04f55b6cd7d75a2156d43.tar.gz +sha256 b122a0cd7a1bd2cee8c6117b259ef977a765d24e48655f639694cbef471da99b gcnano-binaries-0ac1a89d7a59d040a69745a85f0da7e98644cc4b.tar.gz sha256 7d209718473d18f69f75adb7caf9cb5d4b0a31da068756aa011bea617de3dc57 EULA diff --git a/package/gcnano-binaries/gcnano-binaries.mk b/package/gcnano-binaries/gcnano-binaries.mk index d9c47bf64e..83261f3b7c 100644 --- a/package/gcnano-binaries/gcnano-binaries.mk +++ b/package/gcnano-binaries/gcnano-binaries.mk @@ -4,10 +4,10 @@ # ################################################################################ -GCNANO_BINARIES_LIB_VERSION = 6.4.7 +GCNANO_BINARIES_LIB_VERSION = 6.4.9 GCNANO_BINARIES_DRIVER_VERSION = $(GCNANO_BINARIES_LIB_VERSION) -GCNANO_BINARIES_USERLAND_VERSION = $(GCNANO_BINARIES_LIB_VERSION)-20220524 -GCNANO_BINARIES_VERSION = a20611434ef048d3d0c04f55b6cd7d75a2156d43 +GCNANO_BINARIES_USERLAND_VERSION = $(GCNANO_BINARIES_LIB_VERSION)-20221206 +GCNANO_BINARIES_VERSION = 0ac1a89d7a59d040a69745a85f0da7e98644cc4b GCNANO_BINARIES_SITE = $(call github,STMicroelectronics,gcnano-binaries,$(GCNANO_BINARIES_VERSION)) GCNANO_BINARIES_LICENSE = MIT, Vivante End User Software License Terms @@ -38,31 +38,25 @@ GCNANO_BINARIES_POST_EXTRACT_HOOKS += GCNANO_BINARIES_EXTRACT_HELPER GCNANO_BINARIES_MODULE_MAKE_OPTS = \ KERNEL_DIR=$(LINUX_DIR) \ - SOC_PLATFORM=st-st \ + SOC_PLATFORM=st-mp1 \ AQROOT=$(@D) \ DEBUG=0 GCNANO_BINARIES_USERLAND_SUBDIR = gcnano-userland-multi-$(GCNANO_BINARIES_USERLAND_VERSION) -# This creates: -# libGLESv2.so.2 -> libGLESv2.so -# libGLESv1_CM.so.1 -> libGLESv1_CM.so -# symlinks, as most OpenGL implementations have them, and they are -# expected by some users such as libepoxy. define GCNANO_BINARIES_INSTALL 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 \; - ln -sf libGLESv2.so $(1)/usr/lib/libGLESv2.so.2 - ln -sf libGLESv1_CM.so $(1)/usr/lib/libGLESv1_CM.so.1 + for sharelib in *.so.*; do \ + dev_lib_name=`echo $${sharelib} | awk -F'.so' '{print $$1}'`.so ; \ + link_name=`$(TARGET_OBJDUMP) -x $${sharelib} 2>/dev/null | grep SONAME | sed 's/.* //'` ; \ + ln -sf $${sharelib} $(1)/usr/lib/$${dev_lib_name} ; \ + ln -sf $${sharelib} $(1)/usr/lib/$${link_name} ; \ + done mkdir -p $(1)/usr/include 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|" -e "s|#VERSION#|21.1.1|" $$file > $$file.temp ; \ - $(INSTALL) -D -m 0644 $$file.temp $(1)/usr/lib/pkgconfig/$$file ; \ - done + mkdir -p $(1)/usr/lib/pkgconfig/ + cp -a $(@D)/$(GCNANO_BINARIES_USERLAND_SUBDIR)/pkgconfig/* $(1)/usr/lib/pkgconfig/ endef define GCNANO_BINARIES_INSTALL_TARGET_CMDS