From d5d688f84b815b47c615c70767016bdc2177ab3d Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sat, 7 Feb 2015 09:42:36 +0100
Subject: [PATCH] rpi-firmware: regenerate ld.so(8) cache at post-install.

- Regenerate ld.so(8) cache at post-install for /opt/vc/lib.
- Do not replace libGLES/EGL vpkgs, they can co-exist with the mesa ones.
- Use shlib_provides to set our shlibs.
---
 srcpkgs/rpi-firmware/INSTALL  |  7 +++++++
 srcpkgs/rpi-firmware/template | 25 +++++++++++++++++++++----
 2 files changed, 28 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/rpi-firmware/INSTALL

diff --git a/srcpkgs/rpi-firmware/INSTALL b/srcpkgs/rpi-firmware/INSTALL
new file mode 100644
index 0000000000..b544f54c43
--- /dev/null
+++ b/srcpkgs/rpi-firmware/INSTALL
@@ -0,0 +1,7 @@
+case "$ACTION" in
+post)
+	if [ -x sbin/ldconfig ]; then
+		sbin/ldconfig -X || :
+	fi
+	;;
+esac
diff --git a/srcpkgs/rpi-firmware/template b/srcpkgs/rpi-firmware/template
index 0b9d3ad77a..4ddc4997a8 100644
--- a/srcpkgs/rpi-firmware/template
+++ b/srcpkgs/rpi-firmware/template
@@ -3,7 +3,7 @@ _githash="e42a747e8d5c4a2fb3e837d0924c7cc39999936a"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi-firmware
-version=20150206
+version=20150207
 revision=1
 noarch=yes
 wrksrc="firmware-${_githash}"
@@ -15,8 +15,25 @@ distfiles="https://github.com/raspberrypi/firmware/archive/${_githash}.tar.gz"
 checksum=a59eb7b1a2238e326d669a4754eec4b5da5e0f9a12e097f2fa64df9c26015fad
 
 conf_files="/boot/cmdline.txt /boot/config.txt"
-provides="libEGL-1.0_1 libGLES-1.0_1"
-replaces="libEGL>=0 libGLES>=0"
+provides="libGLES-1.0_1 libEGL-1.0_1"
+shlib_provides="
+ libvcsm.so
+ libvcos.so
+ libvchiq_arm.so
+ libopenmaxil.so
+ libmmal_vc_client.so
+ libmmal_util.so
+ libmmal_core.so
+ libmmal_components.so
+ libmmal.so
+ libdebug_sym.so
+ libcontainers.so
+ libbcm_host.so
+ libWFC.so
+ libOpenVG.so
+ libGLESv2.so
+ libEGL.so
+ libGLESv1_CM.so"
 
 do_install() {
 	rm -f boot/*.img
@@ -31,7 +48,7 @@ do_install() {
 	cp -R hardfp/opt/vc/{bin,include,lib,sbin,src,LICENCE} ${DESTDIR}/opt/vc
 
 	vmkdir etc/ld.so.conf.d
-	echo "/opt/vc/lib/" > ${DESTDIR}/etc/ld.so.conf.d/${pkgname}.conf
+	echo "/opt/vc/lib" > ${DESTDIR}/etc/ld.so.conf.d/${pkgname}.conf
 
 	vmkdir usr/share/licenses/${pkgname}
 	mv ${DESTDIR}/boot/LICENCE.broadcom ${DESTDIR}/usr/share/licenses/${pkgname}