u-boot 2011.12: fix beagleboard C4 memory detection

[glsdk/meta-ti-glsdk.git] / recipes-graphics / libgles / libgles-omap3.inc

diff --git a/recipes-graphics/libgles/libgles-omap3.inc b/recipes-graphics/libgles/libgles-omap3.inc
index 016b99168d8c54367a4b0ddcf251da7f8fba184b..69254c13959d731e66706a39c4aab23c6261e977 100644 (file)
--- a/recipes-graphics/libgles/libgles-omap3.inc
+++ b/recipes-graphics/libgles/libgles-omap3.inc
@@ -3,7 +3,7 @@ LICENSE = "proprietary-binary"
 # 'TSPA.txt' might not be the best file to md5sum
 LIC_FILES_CHKSUM = "file://TSPA.txt;md5=c0d5d9c1e38b41677144c4e24d6ddee1"
 
-PR = "r22"
+PR = "r25"
 
 COMPATIBLE_MACHINE = "(omap3|ti816x|ti33x)"
 
@@ -241,6 +241,13 @@ FILES_${PN}-es5 = "${libdir}/ES5*/* ${bindir}/ES5*/*"
 FILES_${PN}-es6 = "${libdir}/ES6*/* ${bindir}/ES6*/*"
 FILES_${PN}-es8 = "${libdir}/ES8*/* ${bindir}/ES8*/*"
 
+# Stop shlib code from picking a subpackage
+PRIVATE_LIBS_${PN}-es2 = "libGLESv2.so libIMGegl.so libsrv_um.so libOpenVG.so libpvr2d.so libsrv_init.so libEGL.so libsrv_um_dri.so libOpenVGU.so libglslcompiler.so libGLES_CM.so"
+PRIVATE_LIBS_${PN}-es3 = "libGLESv2.so libIMGegl.so libsrv_um.so libOpenVG.so libpvr2d.so libsrv_init.so libEGL.so libsrv_um_dri.so libOpenVGU.so libglslcompiler.so libGLES_CM.so"
+PRIVATE_LIBS_${PN}-es5 = "libGLESv2.so libIMGegl.so libsrv_um.so libOpenVG.so libpvr2d.so libsrv_init.so libEGL.so libsrv_um_dri.so libOpenVGU.so libglslcompiler.so libGLES_CM.so"
+PRIVATE_LIBS_${PN}-es6 = "libGLESv2.so libIMGegl.so libsrv_um.so libOpenVG.so libpvr2d.so libsrv_init.so libEGL.so libsrv_um_dri.so libOpenVGU.so libglslcompiler.so libGLES_CM.so"
+PRIVATE_LIBS_${PN}-es8 = "libGLESv2.so libIMGegl.so libsrv_um.so libOpenVG.so libpvr2d.so libsrv_init.so libEGL.so libsrv_um_dri.so libOpenVGU.so libglslcompiler.so libGLES_CM.so"
+
 PACKAGES =+ "${PN}-blitwsegl ${PN}-flipwsegl ${PN}-frontwsegl ${PN}-linuxfbwsegl ${PN}-x11wsegl ${PN}-driwsegl"
 FILES_${PN}-blitwsegl = "${libdir}/libpvrPVR2D_BLITWSEGL.so.*"
 FILES_${PN}-flipwsegl = "${libdir}/libpvrPVR2D_FLIPWSEGL.so.*"
@@ -340,32 +347,35 @@ INITSCRIPT_PARAMS = "start 30 5 2 . stop 40 0 1 6 ."
 
 # Append to update-rc.d postinst
 pkg_postinst_${PN}_append() {
-rm -f ${sysconfdir}/powervr-esrev
+rm -f $D${sysconfdir}/powervr-esrev
 
 ln -sf /usr/lib/libXdmcp.so.6.0.0 /usr/lib/libXdmcp.so.0 
 ln -sf /usr/lib/libXau.so.6.0.0 /usr/lib/libXau.so.0
 }
 
 pkg_postinst_${PN}-blitwsegl() {
-rm -f ${sysconfdir}/powervr-esrev
+rm -f $D${sysconfdir}/powervr-esrev
 }
 
 pkg_postinst_${PN}-flipwsegl() {
-rm -f ${sysconfdir}/powervr-esrev
+rm -f $D${sysconfdir}/powervr-esrev
 }
 
 pkg_postinst_${PN}-frontwsegl() {
-rm -f ${sysconfdir}/powervr-esrev
+rm -f $D${sysconfdir}/powervr-esrev
 }
 pkg_postinst_${PN}-linuxfbwsegl() {
-rm -f ${sysconfdir}/powervr-esrev
+rm -f $D${sysconfdir}/powervr-esrev
 }
 
 pkg_postinst_${PN}-x11wsegl() {
-rm -f ${sysconfdir}/powervr-esrev
+rm -f $D${sysconfdir}/powervr-esrev
+
+echo "[default]" > $D${sysconfdir}/powervr.ini
+echo "WindowSystem=libpvrPVR2D_X11WSEGL.so.1" >> $D${sysconfdir}/powervr.ini
 }
 
 pkg_postinst_${PN}-driwsegl() {
-rm -f ${sysconfdir}/powervr-esrev
+rm -f $D${sysconfdir}/powervr-esrev
 }