Make an x11-base image buildable using the NVIDIA-provided

libraries.

conf/machine/jetson-tx1.conf

@@ -32,3 +32,11 @@ GCCVERSION = "4.9%"
 
 OLDEST_KERNEL_aarch64 = "3.10"
 PREFERRED_VERSION_linux-libc-headers = "3.16"
+
+PREFERRED_PROVIDER_virtual/libgl = "tegra-libraries"
+PREFERRED_PROVIDER_virtual/libegl = "tegra-libraries"
+PREFERRED_PROVIDER_virtual/libgles1 = "tegra-libraries"
+PREFERRED_PROVIDER_virtual/libgles2 = "tegra-libraries"
+
+PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
+XSERVER = "xserver-xorg xf86-input-evdev xserver-xorg-video-nvidia xserver-xorg-module-libwfb"

recipes-bsp/tegra-binaries/files/xorg.conf

@@ -0,0 +1,12 @@
+# Disable extensions not useful on Tegra.
+Section "Module"
+    Disable     "dri"
+    SubSectionSub  "extmod"
+        Option  "omit xfree86-dga"
+    EndSubSection
+EndSection
+
+Section "Device"
+    Identifier  "Tegra0"
+    Driver      "nvidia"
+EndSection

recipes-bsp/tegra-binaries/gstreamer1.0-plugins-tegra_23.1.1.bb

@@ -3,6 +3,11 @@ require tegra-shared-binaries.inc
 
 COMPATIBLE_HOST = "(arm.*)"
 
+DEPENDS = "\
+	gstreamer1.0-plugins-base \
+	${@bb.utils.contains('DISTRO_FEATURES', ['x11', 'alsa'], 'virtual/libx11 alsa-lib', '', d)} \
+"
+
 do_configure() {
     tar -C ${B} -x -f ${S}/nv_tegra/nv_sample_apps/nvgstapps.tbz2
 }
@@ -11,7 +16,7 @@ do_compile[noexec] = "1"
 
 LIBROOT = "${B}/usr/lib/arm-linux-gnueabihf"
 
-NVGSTPLAYER = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'nvgstplayer', '', d)}"
+NVGSTPLAYER = "${@bb.utils.contains('DISTRO_FEATURES', ['x11', 'alsa'], 'nvgstplayer', '', d)}"
 
 do_install() {
     install -d ${D}${bindir}
@@ -29,10 +34,11 @@ do_install() {
 
 PACKAGES = "nvgstcapture ${NVGSTPLAYER} ${PN}"
 FILES_nvgstcapture = "${bindir}/nvgstcapture-1.0"
-RDEPENDS_nvcapture = "${PN}"
+RDEPENDS_nvgstcapture = "${PN} libgstpbutils-1.0"
 FILES_nvgstplayer = "${bindir}/nvgstplayer-1.0"
-RDEPENDS_nvgstplayer = "${PN} virtual/libx11"
+RDEPENDS_nvgstplayer = "${PN}"
 FILES_${PN} = "${libdir}"
+DEBIAN_NOAUTONAME_${PN} = "1"
 
 INHIBIT_PACKAGE_STRIP = "1"
 INHIBIT_SYSROOT_STRIP = "1"
@@ -41,4 +47,4 @@ INSANE_SKIP_${PN} = "dev-so ldflags build-deps"
 INSANE_SKIP_${PN}-dev = "ldflags build-deps"
 INSANE_SKIP_${MLPREFIX}nvgstcapture = "ldflags build-deps"
 INSANE_SKIP_${MLPREFIX}nvgstplayer = "ldflags build-deps"
-DEPENDS_${PN} = "gstreamer1.0 gstreamer1.0-plugins-good-jpeg"
+RDEPENDS_${PN} = "gstreamer1.0 gstreamer1.0-plugins-good-jpeg tegra-libraries"

recipes-bsp/tegra-binaries/tegra-binaries-23.1.1.inc

@@ -5,6 +5,7 @@ LIC_FILES_CHKSUM = "file://nv_tegra/LICENSE;md5=60ad17cc726658e8cf73578bea47b85f
 SRC_URI = "http://developer.download.nvidia.com/embedded/L4T/r23_Release_v1.0/Tegra210_Linux_R${PV}_armhf.tbz2"
 SRC_URI[md5sum] = "4773c4aff47f464f0a6eb2a8342b05e7"
 SRC_URI[sha256sum] = "aacb0b1e9571df43621a6fd32101f8f52f9387ecb84e96930fb5682a68676c15"
+SRC_URI += "file://xorg.conf"
 
 S = "${TMPDIR}/work-shared/tegra-binaries-${PV}-${PR}/Linux_for_Tegra"
 B = "${WORKDIR}/build"

recipes-bsp/tegra-binaries/tegra-binaries_23.1.1.bb

@@ -26,6 +26,6 @@ deltask do_packagedata
 deltask do_rm_work
 
 do_preconfigure() {
-    :
+    cp ${WORKDIR}/xorg.conf ${S}
 }
 addtask preconfigure after do_patch

recipes-bsp/tegra-binaries/tegra-libraries_23.1.1.bb

@@ -3,6 +3,8 @@ require tegra-shared-binaries.inc
 
 COMPATIBLE_HOST = "(arm.*)"
 
+DEPENDS = "mesa"
+
 do_configure() {
     tar -C ${B} -x -f ${S}/nv_tegra/nvidia_drivers.tbz2 usr/lib
 }
@@ -26,34 +28,12 @@ do_install() {
     ln -sf libGLESv2.so.2 ${D}${libdir}/libGLESv2.so
 }
 
-python __anonymous() {
-    for p in (("libegl", "libegl1"), ("libgl", "libgl1"),
-              ("libgles1", "libglesv1-cm1"), ("libgles2", "libglesv2-2")):
-        fullp = p[0] + "-tegra"
-        pkgs = " ".join(p)
-        d.setVar("DEBIAN_NOAUTONAME_" + fullp, "1")
-        d.appendVar("RREPLACES_" + fullp, pkgs)
-        d.appendVar("RPROVIDES_" + fullp, pkgs)
-        d.appendVar("RCONFLICTS_" + fullp, pkgs)
+PACKAGES = "${PN}"
+PROVIDES += "virtual/libgl virtual/libgles1 virtual/libgles2 virtual/egl"
 
-        # 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)
-}
+FILES_${PN} = "${libdir}"
 
-PACKAGES = "libegl-tegra libgl-tegra libgles1-tegra libgles2-tegra \
-            libegl-tegra-dev libgl-tegra-dev libgles1-tegra-dev libgles2-tegra-dev ${PN}"
-FILES_libegl-tegra = "${libdir}/libEGL${SOLIBS}"
-FILES_libegl-tegra-dev = "${libdir}/libEGL${SOLIBSDEV}"
-FILES_libgl-tegra = "${libdir}/libGL${SOLIBS}"
-FILES_libgl-tegra-dev = "${libdir}/libGL${SOLIBSDEV}"
-FILES_libgles1-tegra = "${libdir}/libGLESv1*${SOLIBS}"
-FILES_libgles1-tegra-dev = "${libdir}/libGLESv1*${SOLIBSDEV}"
-FILES_libgles2-tegra = "${libdir}/libGLESv2*${SOLIBS}"
-FILES_libgles2-tegra-dev = "${libdir}/libGLESv2*${SOLIBSDEV}"
-
-INSANE_SKIP_${PN} = "dev-so"
+INSANE_SKIP_${PN} = "dev-so textrel ldflags build-deps"
+INHIBIT_PACKAGE_STRIP = "1"
+INHIBIT_SYSROOT_STRIP = "1"
+INHIBIT_PACKAGE_DEBUG_SPLIT = "1"

recipes-bsp/tegra-binaries/xserver-xorg-video-nvidia_23.1.1.bb

@@ -0,0 +1,32 @@
+require tegra-binaries-${PV}.inc
+require tegra-shared-binaries.inc
+
+COMPATIBLE_HOST = "(arm.*)"
+
+do_configure() {
+    tar -C ${B} -x -f ${S}/nv_tegra/nvidia_drivers.tbz2 usr/lib/xorg
+}
+
+do_compile[noexec] = "1"
+
+DRVROOT = "${B}/usr/lib/xorg/modules"
+
+do_install() {
+    install -d ${D}${libdir}/xorg/modules/drivers
+    install -m 0644 ${DRVROOT}/drivers/nvidia_drv.so ${D}${libdir}/xorg/modules/drivers/
+    install -d ${D}${libdir}/xorg/modules/extensions
+    install -m 0644 ${DRVROOT}/extensions/libglx.so ${D}${libdir}/xorg/modules/extensions/
+    install -d ${D}${datadir}/X11/xorg.conf.d
+    install -m 0644 ${S}/xorg.conf ${D}${datadir}/X11/xorg.conf.d/00-tegra-xorg.conf
+}
+
+PACKAGES = "${PN}"
+RDEPENDS_${PN} = "tegra-libraries"
+FILES_${PN} = "${libdir} ${datadir}"
+RPROVIDES_${PN} += "xserver-xorg-extension-glx"
+RCONFLICTS_${PN} = "xserver-xorg-extension-glx"
+
+INSANE_SKIP_${PN} = "dev-so textrel ldflags xorg-driver-abi"
+INHIBIT_PACKAGE_STRIP = "1"
+INHIBIT_SYSROOT_STRIP = "1"
+INHIBIT_PACKAGE_DEBUG_SPLIT = "1"

recipes-graphics/cairo/cairo_%.bbappend

@@ -0,0 +1 @@
+PACKAGECONFIG_append_jetson-tx1 = " egl glesv2"

recipes-graphics/mesa/mesa-gl_%.bbappend

@@ -0,0 +1,2 @@
+COMPATIBLE_MACHINE_jetson-tx1  = "(-)"
+

recipes-graphics/mesa/mesa_%.bbappend

@@ -0,0 +1,17 @@
+PROVIDES_remove_jetson-tx1 = "virtual/libgl virtual/libgles1 virtual/libgles2 virtual/libopenvg virtual/egl"
+
+python () {
+    overrides = d.getVar("OVERRIDES", True).split(":")
+    if "jetson-tx1" not in overrides:
+        return
+
+    extra_oeconf = d.getVar("EXTRA_OECONF", True)
+    extra_oeconf = extra_oeconf.replace("--enable-glx-tls", "--enable-glx")
+    d.setVar("EXTRA_OECONF", extra_oeconf)
+}
+
+do_install_append_jetson-tx1() {
+    rm -f ${D}${libdir}/libGL.*
+    rm -f ${D}${libdir}/libGLES*
+    rm -f ${D}${libdir}/libEGL.*
+}

recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend

@@ -0,0 +1,4 @@
+PACKAGECONFIG_append_jetson-tx1 = " xinerama"
+do_install_append_jetson-tx1() {
+    rm -f ${D}${libdir}/xorg/modules/extensions/libglx.so
+}