Patchwork [v2,2/2] libgles-omap3.inc : Fix for library linking isssue with graphics SDK

login
register
mail settings
Submitter Prathap M S
Date Nov. 21, 2011, 11:59 a.m.
Message ID <1321876755-15355-1-git-send-email-msprathap@ti.com>
Download mbox | patch
Permalink /patch/15185/
State Not Applicable
Headers show

Comments

Prathap M S - Nov. 21, 2011, 11:59 a.m.
* This is the fix for the issue seen with opkg install of libgles-omap3_4.04.00.02-r16.6_armv7a.ipk on target.
* With Graphics SDK release 04.04.00.02 onwards, there are 2 versions of the library libsrv_um.so - one is libsrv_um.so and other is libsrv_um_dri.so (For Xorg driver).In presence of libsrv_um_dri.so , the links created under /usr/lib were all by default linking to libsrv_um_dri.so only. Due to this 3D demos were failing.
* This fix makes sure that only one appropriate version of the library libsrv_um.so is present on target and hence links created will now be proper.

Signed-off-by: Prathap M S <msprathap@ti.com>
---
 recipes-graphics/libgles/libgles-omap3.inc |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)
Koen Kooi - Nov. 21, 2011, 1:14 p.m.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Op 21-11-11 12:59, Prathap M S schreef:
> * This is the fix for the issue seen with opkg install of
> libgles-omap3_4.04.00.02-r16.6_armv7a.ipk on target. * With Graphics SDK
> release 04.04.00.02 onwards, there are 2 versions of the library
> libsrv_um.so - one is libsrv_um.so and other is libsrv_um_dri.so (For
> Xorg driver).In presence of libsrv_um_dri.so , the links created under
> /usr/lib were all by default linking to libsrv_um_dri.so only. Due to
> this 3D demos were failing. * This fix makes sure that only one
> appropriate version of the library libsrv_um.so is present on target and
> hence links created will now be proper.
> 
> Signed-off-by: Prathap M S <msprathap@ti.com>

This patch seems to be against the meta-ti later, please follow the
instruction from its README:
http://git.angstrom-distribution.org/cgi-bin/cgit.cgi/meta-texasinstruments/tree/README

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (Darwin)
Comment: GPGTools - http://gpgtools.org

iEYEARECAAYFAk7KTq8ACgkQMkyGM64RGpEf5ACeNo4s3hEMLvxvtyInanUe1yGr
ZZsAmgMoTFNzXnYT0rdxhv8VtGlj5t0G
=aKje
-----END PGP SIGNATURE-----

Patch

diff --git a/recipes-graphics/libgles/libgles-omap3.inc b/recipes-graphics/libgles/libgles-omap3.inc
index 0b46818..24203b5 100644
--- a/recipes-graphics/libgles/libgles-omap3.inc
+++ b/recipes-graphics/libgles/libgles-omap3.inc
@@ -38,6 +38,17 @@  do_configure() {
 		chmod 0644 $i
 	done 
 
+	# The below for loop is the fix for the issue seen with opkg install of libgles-omap3_4.04.00.02-r16.6_armv7a.ipk on target. 
+	# With Graphics SDK release 04.04.00.02, there are 2 versions of the library libsrv_um.so - one is libsrv_um.so and other is libsrv_um_dri.so (For Xorg driver). 
+	# In presence of libsrv_um_dri.so , the links created under /usr/lib were all by default linking to libsrv_um_dri.so only. Due to this 3D demos were failing. 
+	# Now this fix makes sure that only one appropriate version of the library libsrv_um.so is present on target and hence links created will now be proper.
+	for drifile in $(find ${S} -name "libsrv_um_dri.so"); do
+		if [ "$drifile" != "" ] ; then
+			dir=$(dirname ${drifile})
+			rm -rf ${dir}/libsrv_um_dri.so
+		fi
+	done
+
 	# Attempt to create proper library softlinks
 	for sofile in $(find ${S} -name "lib*Open*.so") $(find ${S} -name "lib*srv*.so") $(find ${S} -name "lib*gl*.so") $(find ${S} -name "libpvr*.so") $(find ${S} -name "lib*GL*.so"); do
 		if [ "$(readlink -n ${sofile})" = "" ] ; then