From d7dbbcba891c18d5134e4ff8f0c51f44f2a4b1dd Mon Sep 17 00:00:00 2001
From: Nitin A Kamble <nitin.a.kamble@intel.com>
Date: Thu, 15 Nov 2012 18:12:59 -0800
Subject: emgd-driver-bin: remove duplicate files & fix soft links

Replace all the duplicate files by soft links, and also fix targets of
some of the broken soft links.

These changes avoid link issues like following, where detailed
library versions included in the .so filenames cause linking issues.

[...]/tmp/sysroots/x86_64-linux/usr/libexec/core2-poky-linux/gcc/i586-poky-linux/4.7.2/ld: warning: libEMGDegl.so, needed by [...]/tmp/sysroots/fri2/usr/lib/libGLESv2.so, not found (try using -rpath or -rpath-link)
[...]/tmp/sysroots/x86_64-linux/usr/libexec/core2-poky-linux/gcc/i586-poky-linux/4.7.2/ld: warning: libemgdsrv_um.so, needed by [...]/tmp/sysroots/fri2/usr/lib/libGLESv2.so, not found (try using -rpath or -rpath-link)

This fixes Bug:
[YOCTO #4020]

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
 .../xorg-driver/emgd-driver-bin_1.14.bb            | 32 +++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

(limited to 'common')

diff --git a/common/recipes-graphics/xorg-driver/emgd-driver-bin_1.14.bb b/common/recipes-graphics/xorg-driver/emgd-driver-bin_1.14.bb
index e068f7a6..4569518d 100644
--- a/common/recipes-graphics/xorg-driver/emgd-driver-bin_1.14.bb
+++ b/common/recipes-graphics/xorg-driver/emgd-driver-bin_1.14.bb
@@ -7,7 +7,7 @@ to LICENSE_FLAGS_WHITELIST += \"license_emgd-driver-bin_1.14\" to your \
 local.conf in order to enable it in a build."
 LICENSE = "Intel-software-license-emgd-1.14 & Intel-user-space-graphics-driver-binary-license-emgd-1.14"
 LICENSE_FLAGS = "license_${PN}_${PV}"
-PR = "r2"
+PR = "r3"
 
 EMGD_LIC_DIR = "IEMGD_HEAD_Linux/License"
 EMGD_RPM_DIR = "IEMGD_HEAD_Linux/MeeGo1.2"
@@ -91,11 +91,41 @@ do_install () {
     install -d -m 0755                                    ${D}${includedir}/VG
     install -m 0755 ${S}/usr/include/VG/*.h               ${D}${includedir}/VG/
 
+    EMGD_SNAPSHOT="1.5.15.3226"
+    ln -sf libEGL.so.${EMGD_SNAPSHOT}                     ${D}${libdir}/libEGL.so.1
     ln -sf libEGL.so.1                                    ${D}${libdir}/libEGL.so
+    ln -sf libGLES_CM.so.${EMGD_SNAPSHOT}                 ${D}${libdir}/libGLES_CM.so.1
     ln -sf libGLES_CM.so.1                                ${D}${libdir}/libGLES_CM.so
+    ln -sf libGLESv2.so.${EMGD_SNAPSHOT}                  ${D}${libdir}/libGLESv2.so.2
     ln -sf libGLESv2.so.2                                 ${D}${libdir}/libGLESv2.so
+    ln -sf libOpenVG.so.${EMGD_SNAPSHOT}                  ${D}${libdir}/libOpenVG.so.1
     ln -sf libOpenVG.so.1                                 ${D}${libdir}/libOpenVG.so
+    ln -sf libOpenVGU.so.${EMGD_SNAPSHOT}                 ${D}${libdir}/libOpenVGU.so.1
     ln -sf libOpenVGU.so.1                                ${D}${libdir}/libOpenVGU.so
+    ln -sf libEMGD2d.so.${EMGD_SNAPSHOT}                  ${D}${libdir}/libEMGD2d.so
+    ln -sf libEMGDegl.so.${EMGD_SNAPSHOT}                 ${D}${libdir}/libEMGDegl.so
+    ln -sf libemgdglslcompiler.so.${EMGD_SNAPSHOT}        ${D}${libdir}/libemgdglslcompiler.so
+    ln -sf libEMGDOGL.so.${EMGD_SNAPSHOT}                 ${D}${libdir}/libEMGDOGL.so
+    ln -sf libemgdPVR2D_DRIWSEGL.so.${EMGD_SNAPSHOT}      ${D}${libdir}/libemgdPVR2D_DRIWSEGL.so
+    ln -sf libEMGDScopeServices.so.${EMGD_SNAPSHOT}       ${D}${libdir}/libEMGDScopeServices.so
+    ln -sf libemgdsrv_init.so.${EMGD_SNAPSHOT}            ${D}${libdir}/libemgdsrv_init.so
+    ln -sf libemgdsrv_um.so.${EMGD_SNAPSHOT}              ${D}${libdir}/libemgdsrv_um.so
+
+    #Replace duplicate files with symlinks
+    rm -f ${D}${libdir}/libmixvideo.so.0
+    ln -sf libmixvideo.so.0.10.9                          ${D}${libdir}/libmixvideo.so.0
+    rm -f ${D}${libdir}/libmixvbp_h264.so.0
+    ln -sf libmixvbp_h264.so.0.10.8                       ${D}${libdir}/libmixvbp_h264.so.0
+    rm -f ${D}${libdir}/libmixvbp.so.0
+    ln -sf libmixvbp.so.0.10.8                            ${D}${libdir}/libmixvbp.so.0
+    rm -f ${D}${libdir}/libmixvbp_vc1.so.0
+    ln -sf libmixvbp_vc1.so.0.10.8                        ${D}${libdir}/libmixvbp_vc1.so.0
+    rm -f ${D}${libdir}/libmixvbp_mpeg4.so.0
+    ln -sf libmixvbp_mpeg4.so.0.10.8                      ${D}${libdir}/libmixvbp_mpeg4.so.0
+    rm -f ${D}${libdir}/libmixcommon.so.0
+    ln -sf libmixcommon.so.0.10.8                         ${D}${libdir}/libmixcommon.so.0
+    rm -f ${D}${libdir}/libgstvabuffer.so.0
+    ln -sf libgstvabuffer.so.0.10.8                       ${D}${libdir}/libgstvabuffer.so.0
 }
 
 LEAD_SONAME = "libEGL.so"
-- 
cgit v1.2.3-54-g00ecf