xserver: update to version 14, remove pixman_glyph_cache

With the propriatry GPU driver, some text is not rendered.
e.g. like in this report
http://slopjong.de/2012/11/19/problem-with-font-rendering/
-> remvert the relevant patch

1 files changed, 23 insertions, 3 deletions

diff --git a/recipes/trdx-nv-binaries/trdx-nv-binaries.bb b/recipes/trdx-nv-binaries/trdx-nv-binaries.bb
index f546c84..c4ccddf 100644
--- a/recipes/trdx-nv-binaries/trdx-nv-binaries.bb
+++ b/recipes/trdx-nv-binaries/trdx-nv-binaries.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "binary files from Nvidia along with there configuration"
 LICENSE = "CLOSED SGI Khronos"
-PR = "r13"
+PR = "r14"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
@@ -19,18 +19,21 @@ SRC_COMMON =  " \
 SRC_URI_colibri-t20 =  " \
     file://ventana_Tegra-Linux-codecs-R16.3.0_armhf.tbz2 \
     file://ventana_Tegra-Linux-R16.3.0_armhf.tbz2 \
+    file://ventana_Tegra-Linux-tegra_drv_abi14-R16.3.0_armhf.tbz2 \
     ${SRC_COMMON} \
 "
 
 SRC_URI_colibri-t30 =  " \
     file://t30/cardhu_Tegra-Linux-codecs-R16.3.0_armhf.tbz2 \
     file://t30/cardhu_Tegra-Linux-R16.3.0_armhf.tbz2 \
+    file://t30/cardhu_Tegra-Linux-tegra_drv_abi14-R16.3.0_armhf.tbz2 \
     ${SRC_COMMON} \
 "
 
 SRC_URI_apalis-t30 =  " \
     file://t30/cardhu_Tegra-Linux-codecs-R16.3.0_armhf.tbz2 \
     file://t30/cardhu_Tegra-Linux-R16.3.0_armhf.tbz2 \
+    file://t30/cardhu_Tegra-Linux-tegra_drv_abi14-R16.3.0_armhf.tbz2 \
     ${SRC_COMMON} \
 "
 
@@ -43,10 +46,16 @@ SRC_URI[openmax-h.sha256sum] = "9e8aee85f37946202ff15a52836233f983e90a751c0816ba
 #SRC_URI[openmax-h.md5sum] = "a328b82e29d1e2abc1f20f070b9041a9"
 #SRC_URI[openmax-h.sha256sum] = "9a121921450497e5373abcda000daf52af2ee31097d59c0d299a522b66936fa7"
 
+# xserver-xorg driver ABI version to be used by the symlink, must match the required ABI version from the used xserver
+XSERVER_DRIVER_ABI_REQUIRED = "14"
+
 LIC_FILES_CHKSUM = "file://../khronos_headers/GLES2/gl2.h;beginline=12;endline=15;md5=acbf6ad5edbe9552e8cc04776b0208fa"
 
 PACKAGES = "${PN}-dbg ${PN}-restricted-codecs ${PN}-nv-gstapps ${PN} ${PN}-dev"
 
+# Inhibit warnings about files being stripped.
+INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
+
 FILES_${PN}-dbg += " \
     /usr/lib/gstreamer-0.10/.debug \
 "
@@ -59,7 +68,9 @@ FILES_${PN} += " \
     ${sysconfdir}/init/wpa* \	
     /lib/firmware/* \
     ${LIC_DIR}/${PN}/* \
-    /usr/lib/* \
+    /usr/lib/lib* \
+    /usr/lib/xorg/* \
+    /usr/lib/gstreamer*/* \
     /home/root/.local/share/applications/* \
 "
 FILES_${PN}-restricted-codecs += " \
@@ -88,6 +99,8 @@ do_compile () {
     mkdir -p nvidia_drivers${LIC_DIR}/${PN}/nvidia_drivers
     tar -C nvidia_drivers -xjf ${WORKDIR}/Linux_for_Tegra/nv_tegra/nvidia_drivers.tbz2
     tar -C nvidia_drivers -xjf ${WORKDIR}/Linux_for_Tegra/nv_tegra/config.tbz2
+    #R16.3 separate xdriver abi version 14
+    tar -C nvidia_drivers -xjf ${WORKDIR}/tegra_drv_abi_14.tbz2
     cp ${WORKDIR}/Linux_for_Tegra/nv_tegra/LICENSE nvidia_drivers${LIC_DIR}/${PN}/nvidia_drivers/
 
     #nvidia sample gstreamer apps
@@ -119,7 +132,7 @@ do_install () {
     install -m 0644 nvidia_drivers/usr/lib/*.so.? ${D}/usr/lib/
     rm ${D}/usr/lib/libjpeg.so
     install -m 0644 nvidia_drivers/usr/lib/xorg/modules/drivers/* ${D}/usr/lib/xorg/modules/drivers/
-    ln -s tegra_drv.abi13.so ${D}/usr/lib/xorg/modules/drivers/tegra_drv.so
+    ln -s tegra_drv.abi${XSERVER_DRIVER_ABI_REQUIRED}.so ${D}/usr/lib/xorg/modules/drivers/tegra_drv.so
     # create symlink to the shared libs for development, *.so -> *.so.x
     export LIBNAME=`ls ${D}/usr/lib/libGLESv2.so.?`
     export LIBNAME=`basename $LIBNAME`
@@ -162,3 +175,10 @@ do_install () {
     install -d  ${D}/usr/lib/pkgconfig
     install -m 0644 ${WORKDIR}/*.pc ${D}/usr/lib/pkgconfig/
 }
+
+# Add the ABI dependency at package generation time, as otherwise bitbake will
+# attempt to find a provider for it (and fail) when it does the parse.
+python populate_packages_prepend() {
+    pn = d.getVar("PN", True)
+    d.appendVar("RDEPENDS_" + pn, " xorg-abi-video-${XSERVER_DRIVER_ABI_REQUIRED}")
+}