From: Grazvydas Ignotas <notasas@gmail.com>
Date: Sun, 12 Oct 2014 16:16:10 +0000 (+0300)
Subject: libgles-omap3: try to deal with replacement issue
X-Git-Tag: sz_173~85
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=771334c1ca63644700d2583eb2e6df6436e81be2;p=openembedded.git

libgles-omap3: try to deal with replacement issue

Multiple replacers for libgles-omap3, using first one
(libgles-omap3-dm3730-dbg).
---

diff --git a/recipes/powervr-drivers/libgles-omap3-dm3730_4.03.00.02.bb b/recipes/powervr-drivers/libgles-omap3-dm3730_4.03.00.02.bb
index 8b07b29993..b602e03ade 100644
--- a/recipes/powervr-drivers/libgles-omap3-dm3730_4.03.00.02.bb
+++ b/recipes/powervr-drivers/libgles-omap3-dm3730_4.03.00.02.bb
@@ -54,15 +54,13 @@ RRECOMMENDS_${PN} = "omap3-sgx-modules"
 
 INSANE_SKIP_${PN} = True
 
-PR = "r0"
+PR = "r1"
 
 SGXPV = "4_03_00_02"
 IMGPV = "1.6.16.3977"
 BINFILE := "Graphics_SDK_setuplinux_${SGXPV}.bin"
 
-# upgrade path
 RCONFLICTS = "libgles-omap3"
-RREPLACES = "libgles-omap3"
 
 SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/gfxsdk/${SGXPV}/exports/Graphics_SDK_setuplinux_${SGXPV}.bin"
 
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 fcc7385ee4..0fd0d3bbb1 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,16 +6,12 @@ ES5LOCATION = "none"
 
 require libgles-omap3.inc
 
-PR = "r0"
+PR = "r1"
 
 SGXPV = "4_00_00_01"
 IMGPV = "1.4.14.2616"
 BINFILE := "Graphics_SDK_setuplinux_${SGXPV}.bin"
 
-# upgrade path
-RCONFLICTS = "libgles-omap3"
-RREPLACES = "libgles-omap3"
-
 # init script needs this to be in place
 RDEPENDS_${PN} += "libgles-omap3-dm3730"
 
@@ -30,3 +26,12 @@ SRC_URI[md5sum] = "a027002dcd7164df467b1a315788d5fd"
 SRC_URI[sha256sum] = "62383d15e33adf9349afba063b0f2405a15aa6c4b0b5579b0abdf81db7580df7"
 
 S = "${WORKDIR}/Graphics_SDK_${SGXPV}"
+
+# upgrade path
+RCONFLICTS = "libgles-omap3"
+RREPLACES_${PN} = "libgles-omap3"
+RREPLACES_${PN}-rawdemos = "libgles-omap3-rawdemos"
+RREPLACES_${PN}-x11demos = "libgles-omap3-x11demos"
+RREPLACES_${PN}-rawtrainingcourses = "libgles-omap3-rawtrainingcourses"
+RREPLACES_${PN}-x11trainingcourses = "libgles-omap3-x11trainingcourses"
+RREPLACES_${PN}-tests = "libgles-omap3-tests"