Apalis/Colibri T30: Integrate NVIDIA L4T R16.5 for T30

Integrate L4T R16.5 currently exclusively distributed via NVIDIA's
partner portal and for T30 only. Should supposedly fix some memory
leaks in gstreamer resp. its OpenMAX wrapper thereof.

While at it:
- Unpack OpenMAX IL headers with overwrite option
- Cleanup recipe and delete unused files

13 files changed, 12 insertions, 107 deletions

diff --git a/recipes/trdx-nv-binaries/files/Tegra-Linux-nvgstplayerR15.alpha.1.0.tbz2 b/recipes/trdx-nv-binaries/files/Tegra-Linux-nvgstplayerR15.alpha.1.0.tbz2
deleted file mode 100644
index 1b602aa..0000000
--- a/recipes/trdx-nv-binaries/files/Tegra-Linux-nvgstplayerR15.alpha.1.0.tbz2
+++ /dev/null
diff --git a/recipes/trdx-nv-binaries/files/nvgstplayer.tbz2 b/recipes/trdx-nv-binaries/files/nvgstplayer.tbz2
deleted file mode 100755
index 4a06b33..0000000
--- a/recipes/trdx-nv-binaries/files/nvgstplayer.tbz2
+++ /dev/null
diff --git a/recipes/trdx-nv-binaries/files/tegra2/gstnvvidconf.tar.bz2 b/recipes/trdx-nv-binaries/files/tegra2/gstnvvidconf.tar.bz2
deleted file mode 100644
index 980958a..0000000
--- a/recipes/trdx-nv-binaries/files/tegra2/gstnvvidconf.tar.bz2
+++ /dev/null
diff --git a/recipes/trdx-nv-binaries/files/tegra3/Tegra30_Linux-codecs_R16.5_armhf.tbz2 b/recipes/trdx-nv-binaries/files/tegra3/Tegra30_Linux-codecs_R16.5_armhf.tbz2
new file mode 100644
index 0000000..90566ce
--- /dev/null
+++ b/recipes/trdx-nv-binaries/files/tegra3/Tegra30_Linux-codecs_R16.5_armhf.tbz2
diff --git a/recipes/trdx-nv-binaries/files/tegra3/cardhu_Tegra-Linux-R16.4.0_armhf.tbz2 b/recipes/trdx-nv-binaries/files/tegra3/Tegra30_Linux_R16.5_armhf.tbz2
index 341fb9f..92de4e4 100644
--- a/recipes/trdx-nv-binaries/files/tegra3/cardhu_Tegra-Linux-R16.4.0_armhf.tbz2
+++ b/recipes/trdx-nv-binaries/files/tegra3/Tegra30_Linux_R16.5_armhf.tbz2
diff --git a/recipes/trdx-nv-binaries/files/tegra3/cardhu_Tegra-Linux-codecs-R16.4.0_armhf.tbz2 b/recipes/trdx-nv-binaries/files/tegra3/cardhu_Tegra-Linux-codecs-R16.4.0_armhf.tbz2
deleted file mode 100644
index a1fb41a..0000000
--- a/recipes/trdx-nv-binaries/files/tegra3/cardhu_Tegra-Linux-codecs-R16.4.0_armhf.tbz2
+++ /dev/null
diff --git a/recipes/trdx-nv-binaries/files/tegra3/gstnvvidconf.tar.bz2 b/recipes/trdx-nv-binaries/files/tegra3/gstnvvidconf.tar.bz2
deleted file mode 100644
index d2d2a58..0000000
--- a/recipes/trdx-nv-binaries/files/tegra3/gstnvvidconf.tar.bz2
+++ /dev/null
diff --git a/recipes/trdx-nv-binaries/files/tegra3/kernel_supplements.tbz2 b/recipes/trdx-nv-binaries/files/tegra3/kernel_supplements.tbz2
deleted file mode 100644
index 9e1ece0..0000000
--- a/recipes/trdx-nv-binaries/files/tegra3/kernel_supplements.tbz2
+++ /dev/null
diff --git a/recipes/trdx-nv-binaries/files/tegra3/nvgstplayer.tbz2 b/recipes/trdx-nv-binaries/files/tegra3/nvgstplayer.tbz2
deleted file mode 100644
index 4a06b33..0000000
--- a/recipes/trdx-nv-binaries/files/tegra3/nvgstplayer.tbz2
+++ /dev/null
diff --git a/recipes/trdx-nv-binaries/files/tegra3/restricted_codecs.tbz2 b/recipes/trdx-nv-binaries/files/tegra3/restricted_codecs.tbz2
deleted file mode 100644
index 33f2255..0000000
--- a/recipes/trdx-nv-binaries/files/tegra3/restricted_codecs.tbz2
+++ /dev/null
diff --git a/recipes/trdx-nv-binaries/files/tegra3/wifi.tbz2 b/recipes/trdx-nv-binaries/files/tegra3/wifi.tbz2
deleted file mode 100644
index f4dedc9..0000000
--- a/recipes/trdx-nv-binaries/files/tegra3/wifi.tbz2
+++ /dev/null
diff --git a/recipes/trdx-nv-binaries/files/tegra3/xorg.conf b/recipes/trdx-nv-binaries/files/tegra3/xorg.conf
deleted file mode 100644
index 4cb4f5a..0000000
--- a/recipes/trdx-nv-binaries/files/tegra3/xorg.conf
+++ /dev/null
@@ -1,92 +0,0 @@
-# This is the minimal configuration necessary to use the Tegra driver.
-# Please refer to the xorg.conf man page for more configuration
-# options provided by the X server, including display-related options
-# provided by RandR 1.2 and higher.
-
-# Disable extensions not useful on Tegra.
-Section "Module"
-    Disable     "dri"
-    Disable     "dri2"
-    Disable     "glx"
-    SubSection  "extmod"
-        Option  "omit xfree86-dga"
-    EndSubSection
-EndSection
-
-Section "Device"
-    Identifier  "Tegra"
-    Driver      "tegra"
-
-# VirtualDesktop indicates which virtual desktops should be used by X.
-# X will use the specified virtual desktop *and* the next one.  In
-# order for an external app to share a display with the X server, it
-# needs to use the same virtual desktop.  Valid values are integers 0
-# (default) or 1.
-
-#    Option      "VirtualDesktop" "1"
-
-# OverlayDepth is a 32-bit integer which is used to control overlay
-# stacking order.  The overlay with the lowest depth is in front of
-# all others.  This value has meaning only when multiple overlays are
-# present on a display.
-
-#    Option      "OverlayDepth" "255"
-
-# OverlayCombineMode determines how the X overlay is combined with the
-# overlay behind it during scanout.  Available modes are: Opaque
-# (default), SourceAlphaBlend, and PremultSourceAlphaBlend.  This
-# value has meaning only when an external process has created a
-# display which is behind the X server.
-
-#    Option      "OverlayCombineMode" "PremultSourceAlphaBlend"
-
-# ARGBHWCursor controls whether the X driver uses an overlay to
-# display 32-bit "true-color" cursors, or whether such cursors are
-# emulated in software.  Valid values are "true" (default) to enable
-# hardware cursors, and "false" to disable them.
-
-    Option      "ARGBHWCursor" "false"
-EndSection
-
-Section "ServerFlags"
-# Set the basic blanking screen saver timeout in minutes.  0 to disable.
-
-    Option      "blank time"    "0"
-
-# Set the DPMS timeouts.  These are set here because they are global
-# rather than screen-specific.  These settings alone don't enable DPMS.
-# It is enabled per-screen (or per-monitor), and even then only when
-# the driver supports it.
-
-    Option      "standby time"  "0"
-    Option      "suspend time"  "0"
-    Option      "off time"      "0"
-EndSection
-
-Section "Monitor"
-    Identifier "LVDS-1"
-    Option "DPMS" "off"
-EndSection
-
-Section "Screen"
-
-    Identifier  "Screen LVDS-1"
-    Device      "Tegra"
-    Monitor     "LVDS-1"
-
-#    DefaultDepth 16
-
-#    SubSection "Display"
-#        Depth           16
-#        Modes           "1280x720"
-#        ViewPort        0 0
-#        Virtual         1280 720
-#    EndSubsection
-
-EndSection
-
-Section "ServerLayout"
-    Identifier  "TouchView"
-    Screen      "Screen LVDS-1"
-EndSection
-
diff --git a/recipes/trdx-nv-binaries/trdx-nv-binaries.bb b/recipes/trdx-nv-binaries/trdx-nv-binaries.bb
index 253ef69..e7b30c5 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"
+DESCRIPTION = "binary files from Nvidia along with their configuration"
 LICENSE = "CLOSED SGI Khronos"
-PR = "r17"
+PR = "r18"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 COMPATIBLE_MACHINE = "(tegra)"
@@ -9,21 +9,21 @@ PROVIDES += "virtual/egl virtual/libgles1 virtual/libgles2"
 DEPENDS = "virtual/xserver"
 
 LIC_DIR = "${datadir}/common-licenses"
-#gstnvvidconf.tar.bz2 will hopefully be integrated into the public L4T packages
 
 # the khronos headers are taken from here: https://www.khronos.org/registry/khronos_headers.tgz
 # this tarball changes from time to time breaking the receipe, thus it is provided with the recipe
 SRC_COMMON =  " \
-    file://nvgstplayer.desktop \
     file://aplay.desktop \
-    file://mimeapps.list \
-    file://khronos_headers.tgz \
-    https://www.khronos.org/registry/omxil/api/1.1.2/OpenMAX_IL_1_1_2_Header.zip;name=openmax-h;unpack=no \
     file://egl.pc \
+    file://eglplatform.h \
     file://gles.pc \
     file://glesv2.pc \
-    file://eglplatform.h \
+    file://khronos_headers.tgz \
+    file://mimeapps.list \
+    file://nvgstplayer.desktop \
+    https://www.khronos.org/registry/omxil/api/1.1.2/OpenMAX_IL_1_1_2_Header.zip;name=openmax-h;unpack=no \
 "
+
 SRC_URI_tegra2 =  " \
     file://ventana_Tegra-Linux-codecs-R16.4.0_armhf.tbz2 \
     file://ventana_Tegra-Linux-R16.4.0_armhf.tbz2 \
@@ -31,16 +31,13 @@ SRC_URI_tegra2 =  " \
 "
 
 SRC_URI_tegra3 =  " \
-    file://cardhu_Tegra-Linux-codecs-R16.4.0_armhf.tbz2 \
-    file://cardhu_Tegra-Linux-R16.4.0_armhf.tbz2 \
+    file://Tegra30_Linux-codecs_R16.5_armhf.tbz2 \
+    file://Tegra30_Linux_R16.5_armhf.tbz2 \
     ${SRC_COMMON} \
 "
 
 SRC_URI[openmax-h.md5sum] = "f8ac8d7272abdbe1980eeac8d03338e8"
 SRC_URI[openmax-h.sha256sum] = "9e8aee85f37946202ff15a52836233f983e90a751c0816ba341ba0c1ffedf99e"
-#    https://www.khronos.org/registry/omxil/api/1.2.0/OpenMAX_IL_1_2.0_Header.zip;name=openmax-h;unpack=no \
-#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"
@@ -84,7 +81,7 @@ INSANE_SKIP_${PN}-nv-gstapps = "dev-so ldflags already-stripped textrel"
 
 do_patch () {
     mkdir -p OpenMAX/il
-    unzip -d OpenMAX/il OpenMAX_IL_1_1_2_Header.zip
+    unzip -o -d OpenMAX/il OpenMAX_IL_1_1_2_Header.zip
 }
 
 do_compile () {
@@ -161,7 +158,7 @@ do_install () {
         install -m 0644 ${WORKDIR}/khronos_headers/$dir/* ${D}${includedir}/$dir
     done
 
-    #Override eglplatform.h that khrobos provide.
+    #Override eglplatform.h that khronos provide.
     install -m 0644 ${WORKDIR}/eglplatform.h ${D}${includedir}/EGL/
 
     dir="OpenMAX/il"