From: Otavio Salvador <otavio@ossystems.com.br>
Date: Sat, 31 Jan 2015 21:02:49 +0000 (-0200)
Subject: amd-gpu-mx51: Stop auto-renaming GPU driver libraries
X-Git-Tag: 2.1~661
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=55de701e5f9e57d4cdf0218f28c0b92c95fb671a;p=meta-freescale.git

amd-gpu-mx51: Stop auto-renaming GPU driver libraries

The AMD GPU libraries shouldn't be renamed; this allow for runtime to
choose the right library at installation time.

Change-Id: If674fa3d3ee0c8ff99688d0a1bc2dfda67355fa8
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---

diff --git a/meta-fsl-arm/recipes-graphics/amd-gpu-x11-bin/amd-gpu-mx51.inc b/meta-fsl-arm/recipes-graphics/amd-gpu-x11-bin/amd-gpu-mx51.inc
index 9d97ab07..743892a0 100644
--- a/meta-fsl-arm/recipes-graphics/amd-gpu-x11-bin/amd-gpu-mx51.inc
+++ b/meta-fsl-arm/recipes-graphics/amd-gpu-x11-bin/amd-gpu-mx51.inc
@@ -1,5 +1,5 @@
 # Copyright (C) 2011, 2012, 2013 Freescale
-# Copyright (C) 2011-2014 O.S. Systems Software LTDA.
+# Copyright (C) 2011-2015 O.S. Systems Software LTDA.
 # Released under the MIT license (see COPYING.MIT for the terms)
 
 LICENSE = "Proprietary"
@@ -17,11 +17,31 @@ SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.bin;fsl-eula=true \
 
 inherit fsl-eula-unpack
 
+# For the packages that make up the OpenGL interfaces, inject variables so that
+# they don't get Debian-renamed (which would remove the -mx51 suffix).
+#
 # FIXME: All binaries lack GNU_HASH in elf binary but as we don't have
 # the source we cannot fix it. Disable the insane check for now.
-python () {
+python __anonymous() {
     for p in d.getVar('PACKAGES', True).split():
         d.setVar("INSANE_SKIP_%s" % p, "ldflags")
+
+    for p in (("libegl", "libegl1"), ("libgl", "libgl1"),
+              ("libgles2", "libglesv2-2")):
+        fullp = p[0] + "-mx51"
+        pkgs = " ".join(p)
+        d.setVar("DEBIAN_NOAUTONAME_" + fullp, "1")
+        d.appendVar("RREPLACES_" + fullp, pkgs)
+        d.appendVar("RPROVIDES_" + fullp, pkgs)
+        d.appendVar("RCONFLICTS_" + fullp, pkgs)
+
+        # For -dev, the first element is both the Debian and original name
+        fullp += "-dev"
+        pkgs = p[0] + "-dev"
+        d.setVar("DEBIAN_NOAUTONAME_" + fullp, "1")
+        d.appendVar("RREPLACES_" + fullp, pkgs)
+        d.appendVar("RPROVIDES_" + fullp, pkgs)
+        d.appendVar("RCONFLICTS_" + fullp, pkgs)
 }
 
 do_install () {