From 40a64ea398acad92412ec05abf72312b20cb8c73 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Mon, 4 Jul 2016 16:42:51 +0000
Subject: [PATCH] alarm/raspberrypi-firmware to 20160704-1

---
 .../00-raspberrypi-firmware.conf               |  5 +++++
 alarm/raspberrypi-firmware/PKGBUILD            | 18 +++++++++++-------
 2 files changed, 16 insertions(+), 7 deletions(-)
 create mode 100644 alarm/raspberrypi-firmware/00-raspberrypi-firmware.conf

diff --git a/alarm/raspberrypi-firmware/00-raspberrypi-firmware.conf b/alarm/raspberrypi-firmware/00-raspberrypi-firmware.conf
new file mode 100644
index 000000000..677592dda
--- /dev/null
+++ b/alarm/raspberrypi-firmware/00-raspberrypi-firmware.conf
@@ -0,0 +1,5 @@
+/opt/vc/lib
+
+# GLES/EGL libraries - disabled by default due to ABI incompatibility with Mesa
+# Warning: enabling may break applications linked against Mesa
+#/opt/vc/lib/GL
diff --git a/alarm/raspberrypi-firmware/PKGBUILD b/alarm/raspberrypi-firmware/PKGBUILD
index 01484d387..a20182b83 100644
--- a/alarm/raspberrypi-firmware/PKGBUILD
+++ b/alarm/raspberrypi-firmware/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=('raspberrypi-firmware'
          'raspberrypi-firmware-bootloader-x'
          'raspberrypi-firmware-tools'
          'raspberrypi-firmware-examples')
-pkgver=20160703
+pkgver=20160704
 pkgrel=1
 _commit=1f8d685c22761b9a5ee3343b01e79d31e2ed0f6b
 pkgdesc="Firmware files for Raspberry Pi"
@@ -15,8 +15,10 @@ url="https://github.com/raspberrypi/firmware"
 makedepends=('git')
 license=('custom')
 options=(!strip)
-source=("https://github.com/raspberrypi/firmware/archive/${_commit}.tar.gz")
-md5sums=('aab212972d04d84c11761e50b3110646')
+source=("https://github.com/raspberrypi/firmware/archive/${_commit}.tar.gz"
+        '00-raspberrypi-firmware.conf')
+md5sums=('aab212972d04d84c11761e50b3110646'
+         'baeeace452010ff9a936fb1ea33863a8')
 
 package_raspberrypi-firmware() {
   depends=('raspberrypi-firmware-bootloader'
@@ -48,12 +50,14 @@ package_raspberrypi-firmware-tools() {
 
   cp -R "${srcdir}"/firmware-${_commit}/hardfp/opt/vc/{bin,include,lib,sbin,LICENCE} "${pkgdir}"/opt/vc
 
+  # move GL libraries out of the way due to Mesa incompatibility
+  mkdir -p "${pkgdir}/opt/vc/lib/GL"
+  mv "${pkgdir}/opt/vc/lib"/{libGL*,libEGL*} "${pkgdir}/opt/vc/lib/GL"
+  sed -i 's|/lib|/lib/GL|' "${pkgdir}/opt/vc/lib/pkgconfig"/{egl.pc,glesv2.pc}
+
   # Create lib links
   mkdir -p "${pkgdir}"/etc/ld.so.conf.d/
- 
-  # ensure we can load libs
-  echo "# Disabled by default due to ABI incompatibility with Mesa" > "${pkgdir}"/etc/ld.so.conf.d/00-raspberrypi-firmware.conf
-  echo "#/opt/vc/lib/" >> "${pkgdir}"/etc/ld.so.conf.d/00-raspberrypi-firmware.conf
+  cp "${srcdir}/00-raspberrypi-firmware.conf" "${pkgdir}"/etc/ld.so.conf.d/
 }
 
 package_raspberrypi-firmware-examples() {