From: Grazvydas Ignotas <notasas@gmail.com>
Date: Sun, 10 Apr 2016 15:27:48 +0000 (+0300)
Subject: libgles-omap3-es23: make the rc script armhf aware
X-Git-Tag: sz_176~15
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d6c5818ea6dd64729ea46ec0f3245173b5afba6f;p=openembedded.git

libgles-omap3-es23: make the rc script armhf aware
---

diff --git a/recipes/powervr-drivers/files/rc.pvr b/recipes/powervr-drivers/files/rc.pvr
index 20252c566d..3b0da20d02 100755
--- a/recipes/powervr-drivers/files/rc.pvr
+++ b/recipes/powervr-drivers/files/rc.pvr
@@ -94,7 +94,7 @@ fbset -vyres $(expr $YRES \* 3)
 
 	if [ "${ES_REVISION}" != "${SAVED_ESREVISION}" -o ! -e /etc/powervr-kmodver ] ; then
 		sdkver=`echo /usr/lib/ES${ES_REVISION}.0/libGLESv2.so.1.* | sed -e 's:.*lib.*.so.\(.*\).*:\1:'`
-		echo -n "Starting SGX fixup for"
+		echo -n "Performing SGX fixup for"
 		echo " ES${ES_REVISION}.x (${sdkver})"
 		for lib in /usr/lib/ES${ES_REVISION}.0/*.so*; do
 			install_lib $lib
@@ -115,6 +115,21 @@ fbset -vyres $(expr $YRES \* 3)
 		sync
 	fi
 
+	# set up optional armhf libs if needed
+	if test -d /usr/lib/arm-linux-gnueabihf/ES${ES_REVISION}.0; then
+		touch /etc/powervr-esrev-armhf
+		SAVED_ESREVISION_HF="$(cat /etc/powervr-esrev-armhf)"
+
+		if [ "${ES_REVISION}" != "${SAVED_ESREVISION_HF}" ] ; then
+			echo -n "Performing SGX armhf fixup for"
+			echo " ES${ES_REVISION}.x"
+			for lib in /usr/lib/arm-linux-gnueabihf/ES${ES_REVISION}.0/*.so*; do
+				cp -a $lib /usr/lib/arm-linux-gnueabihf/
+			done
+			echo "${ES_REVISION}" > /etc/powervr-esrev-armhf
+		fi
+	fi
+
 	load_driver
 
 	if test -x /usr/bin/pvrsrvinit; then
diff --git a/recipes/powervr-drivers/libgles-omap3-es23_4.00.00.01.bb b/recipes/powervr-drivers/libgles-omap3-es23_4.00.00.01.bb
index 5079634d10..3e11b608a8 100644
--- a/recipes/powervr-drivers/libgles-omap3-es23_4.00.00.01.bb
+++ b/recipes/powervr-drivers/libgles-omap3-es23_4.00.00.01.bb
@@ -6,7 +6,7 @@ ES5LOCATION = "none"
 
 require libgles-omap3.inc
 
-PR = "r5"
+PR = "r6"
 
 SGXPV = "4_00_00_01"
 IMGPV = "1.4.14.2616"