diff --git a/srcpkgs/rpi-userland/INSTALL b/srcpkgs/rpi-userland/INSTALL deleted file mode 100644 index b544f54c430..00000000000 --- a/srcpkgs/rpi-userland/INSTALL +++ /dev/null @@ -1,7 +0,0 @@ -case "$ACTION" in -post) - if [ -x sbin/ldconfig ]; then - sbin/ldconfig -X || : - fi - ;; -esac diff --git a/srcpkgs/rpi-userland/template b/srcpkgs/rpi-userland/template index e40f534acb1..b222667e334 100644 --- a/srcpkgs/rpi-userland/template +++ b/srcpkgs/rpi-userland/template @@ -1,20 +1,20 @@ # Template file for 'rpi-userland' -_githash="06bc6daa02137ca72b7a2104afad81e82a44de17" +_githash="093b30bbc2fd083d68cc3ee07e6e555c6e592d11" _gitshort="${_githash:0:7}" pkgname=rpi-userland -version=20191218 +version=20210110 revision=1 wrksrc="userland-${_githash}" build_style=cmake hostmakedepends="pkg-config" -configure_args="-DCMAKE_INSTALL_RPATH=/opt/vc/lib" +configure_args="-DCMAKE_INSTALL_RPATH=\$ORIGIN/../lib" short_desc="Raspberry Pi GPU userland libraries and utilities (git ${_gitshort})" maintainer="Orphaned " license="BSD-3-Clause" homepage="https://github.com/raspberrypi/userland" distfiles="https://github.com/raspberrypi/userland/archive/${_githash}.tar.gz" -checksum=cf4dff40a2f4ec38bc7e42a80b989df1bf88e12d714f7e681f83c4e5a588f5c9 +checksum=b23fc0849d282a8ba27b821cb8f63fa2ebc2ae8aa3cba0664ce3809ea814507b LDFLAGS="-Wl,--no-as-needed" archs="armv6l* armv7l* aarch64*" @@ -55,17 +55,6 @@ post_install() { vlicense LICENCE rm -rf ${DESTDIR}/etc rm -rf ${DESTDIR}/opt/vc/share - - case "$XBPS_TARGET_MACHINE" in - *-musl) - vmkdir etc - echo /lib:/usr/local/lib:/usr/lib:/opt/vc/lib > ${DESTDIR}/etc/ld-musl-armhf.path - ;; - *) - vmkdir etc/ld.so.conf.d - echo /opt/vc/lib > ${DESTDIR}/etc/ld.so.conf.d/rpi-userland.conf - ;; - esac } rpi-userland-devel_package() {