diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2020-05-17 11:09:41 +0200 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2020-06-01 13:43:34 +0200 |
| commit | 179e4188a38ccc086f8b23201fa1594ea9ba0c0f (patch) | |
| tree | e39d15cec95a4a3ce4f562e6c78ff7d71338b1f6 | |
| parent | 8b6885b97588ccae34eb9a1338815b29bf58c811 (diff) | |
apalis-tk1: drop machine
The downstream kernel gets to old to be used with the new zeus
userspace components. Drop the machine.
Related-to: ELB-2733
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
(cherry picked from commit d13caaba2d90f856b944ebde44967b679d3eb3a9)
35 files changed, 0 insertions, 2018 deletions
diff --git a/conf/machine/apalis-tk1.conf b/conf/machine/apalis-tk1.conf deleted file mode 100644 index 9004d33..0000000 --- a/conf/machine/apalis-tk1.conf +++ /dev/null @@ -1,95 +0,0 @@ -#@TYPE: Machine -#@NAME: Toradex Apalis TK1 -#@SOC: Tegra K1 -#@DESCRIPTION: Machine configuration for Toradex Apalis TK1 SOM -#@MAINTAINER: Marcel Ziswiler <marcel.ziswiler@toradex.com> - -MACHINE_NAME = "Apalis-TK1" - -require conf/machine/include/soc-family.inc - -SOC_FAMILY = "tegra124" - -PREFERRED_PROVIDER_virtual/kernel = "linux-toradex" - -KERNEL_IMAGETYPE = "zImage" -KERNEL_DEVICETREE += "tegra124-apalis-eval.dtb tegra124-apalis-v1.2-eval.dtb" - -MACHINE_BOOT_FILES = "boot.scr" - -# wic support -IMAGE_BOOT_FILES ?= " \ - ${KERNEL_IMAGETYPE} \ - ${KERNEL_DEVICETREE} \ - ${MACHINE_BOOT_FILES} \ -" -WKS_FILE_DEPENDS ?= " \ - virtual/bootloader \ - u-boot-distro-boot \ - \ - e2fsprogs-native \ - bmap-tools-native \ -" - -WKS_FILE = "sdimage-bootpart-tegra.wks" -WIC_CREATE_EXTRA_ARGS_append = " --no-fstab-update" - -# The kernel lives in a seperate FAT or UBI partition, don't deploy it in /boot -RDEPENDS_${KERNEL_PACKAGE_NAME}-base = "" - -PREFERRED_PROVIDER_u-boot = "u-boot-toradex-tk1" -PREFERRED_PROVIDER_virtual/bootloader = "u-boot-toradex-tk1" -PREFERRED_PROVIDER_u-boot-fw-utils ?= "u-boot-toradex-fw-utils-tk1" -UBOOT_MACHINE = "apalis-tk1_defconfig" -UBOOT_ENTRYPOINT = "0x80008000" -UBOOT_LOADADDRESS = "${UBOOT_ENTRYPOINT}" -# The payload offsets are given in number of 512 byte blocks. -OFFSET_BOOTROM_PAYLOAD = "0" -UBOOT_BINARY_TEZI_EMMC = "apalis-tk1.img" - -# require u-boot-dtb-tegra.bin to be used -UBOOT_IMAGE = "u-boot-dtb-tegra-${MACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" -UBOOT_BINARY = "u-boot-dtb-tegra.${UBOOT_SUFFIX}" -UBOOT_SYMLINK = "u-boot-dtb-tegra-${MACHINE}.${UBOOT_SUFFIX}" - -PREFERRED_PROVIDER_lxde-icon-theme_apalis-tk1 = "lxde-icon-theme" -PREFERRED_PROVIDER_lxsession-lite_apalis-tk1 = "lxsession" - -PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" -PREFERRED_PROVIDER_virtual/mesa ?= "mesa" -PREFERRED_PROVIDER_virtual/egl ?= "linux-driver-package" -PREFERRED_PROVIDER_virtual/libgl ?= "linux-driver-package" -PREFERRED_PROVIDER_virtual/libgles1 ?= "linux-driver-package" -PREFERRED_PROVIDER_virtual/libgles2 ?= "linux-driver-package" - -#xf86-video-nouveau -#our fs-init may conflict with linux-driver-package-firstboot -XSERVER ?= " \ - xserver-xorg \ - mesa-driver-swrast \ - xf86-input-evdev \ - xf86-input-keyboard \ - xf86-input-mouse \ - xf86-video-modesetting \ - linux-driver-package \ -" - -MACHINE_FEATURES = "screen usbgadget usbhost vfat ext2 alsa touchscreen wifi bluetooth 3g pci " -MACHINE_EXTRA_RDEPENDS = " \ - tdx-k20-fw \ - linux-driver-package-boot \ - linux-driver-package-firmware \ - linux-driver-package-firstboot \ -" -EXTRA_IMAGEDEPENDS += "virtual/bootloader" - -# used by sysvinit_2 -SERIAL_CONSOLES = "115200;ttyS0" -IMAGE_CLASSES += "image_type_tezi" -IMAGE_FSTYPES += "wic.bmap wic.gz teziimg" - -TORADEX_PRODUCT_IDS = "0034" -TORADEX_FLASH_TYPE = "emmc" - -DEFAULTTUNE = "cortexa15hf-neon" -require conf/machine/include/tune-cortexa15.inc diff --git a/openembedded-layer/recipes-benchmark/glmark2/glmark2_%.bbappend b/openembedded-layer/recipes-benchmark/glmark2/glmark2_%.bbappend deleted file mode 100644 index 392aa84..0000000 --- a/openembedded-layer/recipes-benchmark/glmark2/glmark2_%.bbappend +++ /dev/null @@ -1,3 +0,0 @@ -# TK1: build it only for OpenGL & OpenGL ES on top of X11 -PACKAGECONFIG_tegra124 = "x11-gl x11-gles2" -PACKAGE_ARCH_tegra124 = "${MACHINE_ARCH}" diff --git a/recipes-bsp/alsa-state/alsa-state/apalis-tk1/asound.state b/recipes-bsp/alsa-state/alsa-state/apalis-tk1/asound.state deleted file mode 100644 index 95fe7d7..0000000 --- a/recipes-bsp/alsa-state/alsa-state/apalis-tk1/asound.state +++ /dev/null @@ -1,273 +0,0 @@ -state.SGTL5000 { - control.1 { - iface MIXER - name 'PCM Playback Volume' - value.0 126 - value.1 126 - comment { - access 'read write' - type INTEGER - count 2 - range '0 - 192' - } - } - control.2 { - iface MIXER - name 'Capture Volume' - value.0 12 - value.1 12 - comment { - access 'read write' - type INTEGER - count 2 - range '0 - 15' - } - } - control.3 { - iface MIXER - name 'Capture Attenuate Switch (-6dB)' - value 0 - comment { - access 'read write' - type INTEGER - count 1 - range '0 - 2' - dbmin -600 - dbmax 600 - dbvalue.0 -600 - } - } - control.4 { - iface MIXER - name 'Capture ZC Switch' - value true - comment { - access 'read write' - type BOOLEAN - count 1 - } - } - control.5 { - iface MIXER - name 'Headphone Playback Volume' - value.0 127 - value.1 127 - comment { - access 'read write' - type INTEGER - count 2 - range '0 - 127' - dbmin -5150 - dbmax 1200 - dbvalue.0 1200 - dbvalue.1 1200 - } - } - control.6 { - iface MIXER - name 'Headphone Playback ZC Switch' - value true - comment { - access 'read write' - type BOOLEAN - count 1 - } - } - control.7 { - iface MIXER - name 'Mic Volume' - value 2 - comment { - access 'read write' - type INTEGER - count 1 - range '0 - 3' - dbmin 0 - dbmax 4000 - dbvalue.0 3000 - } - } - control.8 { - iface MIXER - name 'Headphone Mux' - value DAC - comment { - access 'read write' - type ENUMERATED - count 1 - item.0 DAC - item.1 LINE_IN - } - } - control.9 { - iface MIXER - name 'Capture Mux' - value MIC_IN - comment { - access 'read write' - type ENUMERATED - count 1 - item.0 MIC_IN - item.1 LINE_IN - } - } - control.10 { - iface MIXER - name 'AVP alsa device select' - value -1 - comment { - access 'read write' - type INTEGER - count 1 - range '0 - 6' - } - } - control.11 { - iface MIXER - name 'AVP DMA channel id' - value 0 - comment { - access read - type INTEGER - count 1 - range '0 - 32' - } - } - control.12 { - iface MIXER - name 'AVP DMA address' - value 0 - comment { - access 'read write' - type INTEGER - count 1 - range '0 - -1' - } - } - control.13 { - iface MIXER - name 'Headset Plug State' - value false - comment { - access 'read write' - type BOOLEAN - count 1 - } - } - control.14 { - iface MIXER - name 'I2S LoopBack' - value Off - comment { - access 'read write' - type ENUMERATED - count 1 - item.0 Off - item.1 On - } - } -} -state.Tegra { - control.1 { - iface CARD - name 'HDMI/DP,pcm=3 Jack' - value false - comment { - access read - type BOOLEAN - count 1 - } - } - control.2 { - iface MIXER - name 'IEC958 Playback Con Mask' - value '0fff000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000' - comment { - access read - type IEC958 - count 1 - } - } - control.3 { - iface MIXER - name 'IEC958 Playback Pro Mask' - value '0f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000' - comment { - access read - type IEC958 - count 1 - } - } - control.4 { - iface MIXER - name 'IEC958 Playback Default' - value '0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000' - comment { - access 'read write' - type IEC958 - count 1 - } - } - control.5 { - iface MIXER - name 'IEC958 Playback Switch' - value true - comment { - access 'read write' - type BOOLEAN - count 1 - } - } - control.6 { - iface MIXER - name 'HDA Decode Capability' - value 0 - comment { - access read - type INTEGER - count 1 - range '0 - -1' - } - } - control.7 { - iface MIXER - name 'HDA Maximum PCM Channels' - value 0 - comment { - access read - type INTEGER - count 1 - range '0 - -1' - } - } - control.8 { - iface PCM - device 3 - name ELD - value '' - comment { - access 'read volatile' - type BYTES - count 0 - } - } - control.9 { - iface PCM - device 3 - name 'Playback Channel Map' - value.0 0 - value.1 0 - value.2 0 - value.3 0 - value.4 0 - value.5 0 - value.6 0 - value.7 0 - comment { - access 'read write' - type INTEGER - count 8 - range '0 - 36' - } - } -} diff --git a/recipes-bsp/binary-drivers/cudatoolkit6.5_21.5.0.bb b/recipes-bsp/binary-drivers/cudatoolkit6.5_21.5.0.bb deleted file mode 100644 index 6bb8657..0000000 --- a/recipes-bsp/binary-drivers/cudatoolkit6.5_21.5.0.bb +++ /dev/null @@ -1,41 +0,0 @@ -DESCRIPTION = "NVIDIA CUDA 6.5 Toolkit for L4T Rel 21.x Packages" -HOMEPAGE = "https://developer.nvidia.com/" -LICENSE = "Proprietary" - -SRC_URI = "http://developer.download.nvidia.com/devzone/devcenter/mobile/jetpack_l4t/005/linux-x64/cuda-repo-l4t-r21.5-6-5-local_6.5-53_armhf.deb" - -LIC_FILES_CHKSUM = "file://usr/share/doc/cuda-repo-l4t-r21.5-6-5-local/copyright;md5=f87877410d6936081b0b8ddd124ca96d" - -SRC_URI[md5sum] = "93b5c6592292565c389c46a16b4cbf5d" -SRC_URI[sha256sum] = "4739c63e16b9a169f988c2b8f175c0182fa118833b49950fe72fe8c039ba1359" - -DEPENDS = "dpkg-native" - -INSANE_SKIP_${PN} = "ldflags" - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -S = "${WORKDIR}/cuda6.5" - -INSANE_SKIP_${PN}-dev = "ldflags" - -FILES_${PN} = "${datadir}/lintian/* \ - ${base_prefix}/usr/local/cuda-6.5/* " - -INHIBIT_PACKAGE_STRIP = "1" - -INSANE_SKIP_${PN} += "already-stripped dev-so libdir" - -python do_unpack () { - locals = d.getVar('WORKDIR', True) - s = d.getVar('S', True) - d.setVar('WORKDIR', s) - d.setVar('S', s) - bb.build.exec_func('base_do_unpack', d) - d.setVar('WORKDIR', locals) -} - -do_install () { - cp -r ${WORKDIR}/cuda6.5/usr ${D} - dpkg -x ${WORKDIR}/cuda6.5/var/cuda-repo-6-5-local/cuda-cudart-6-5_6.5-53_armhf.deb ${D} -} diff --git a/recipes-bsp/binary-drivers/linux-driver-package/nv b/recipes-bsp/binary-drivers/linux-driver-package/nv deleted file mode 100755 index 2221688..0000000 --- a/recipes-bsp/binary-drivers/linux-driver-package/nv +++ /dev/null @@ -1,87 +0,0 @@ -#!/bin/sh -#"NVIDIA specific init script" - -nvexec() { - # power state - if [ -e /sys/power/state ]; then - chmod 0666 /sys/power/state - fi - - # Set minimum cpu freq. - if [ -e /sys/devices/soc0/family ]; then - SOCFAMILY="`cat /sys/devices/soc0/family`" - fi - - if [ "$SOCFAMILY" = "Tegra13" ] && - [ -e /sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq ]; then - sudo bash -c "echo -n 510000 > /sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq" - fi - - # CPU hotplugging - if [ -d /sys/devices/system/cpu/cpuquiet/tegra_cpuquiet ] ; then - echo 500 > /sys/devices/system/cpu/cpuquiet/tegra_cpuquiet/down_delay - echo 1 > /sys/devices/system/cpu/cpuquiet/tegra_cpuquiet/enable - elif [ -w /sys/module/cpu_tegra3/parameters/auto_hotplug ] ; then - # compatibility for prior kernels without cpuquiet support - echo 1 > /sys/module/cpu_tegra3/parameters/auto_hotplug - fi - - # lp2 idle state - if [ -e /sys/module/cpuidle/parameters/power_down_in_idle ] ; then - echo "Y" > /sys/module/cpuidle/parameters/power_down_in_idle - elif [ -e /sys/module/cpuidle/parameters/lp2_in_idle ] ; then - # compatibility for prior kernels - echo "Y" > /sys/module/cpuidle/parameters/lp2_in_idle - fi - - #FIXME remove once kernel CL merges into main Bug 1231069 - for uartInst in 0 1 2 3 - do - uartNode="/dev/ttyHS$uartInst" - if [ -e "$uartNode" ]; then - ln -s /dev/ttyHS$uartInst /dev/ttyTHS$uartInst - fi - done - # remove power to dc.0 for jetson-tk1 - machine=`cat /sys/devices/soc0/machine` - if [ "${machine}" = "jetson-tk1" ] ; then - echo 4 > /sys/class/graphics/fb0/blank - if [ -e /sys/devices/platform/tegra-otg/enable_device ] ; then - echo 0 > /sys/devices/platform/tegra-otg/enable_device - fi - if [ -e /sys/devices/platform/tegra-otg/enable_host ] ; then - echo 1 > /sys/devices/platform/tegra-otg/enable_host - fi - fi - - # CPU frequency governor - if [ -e /sys/devices/system/cpu/cpu0/cpufreq/scaling_available_governors ]; then - read governors < /sys/devices/system/cpu/cpu0/cpufreq/scaling_available_governors - case $governors in - *interactive*) - echo interactive > /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor - if [ -e /sys/devices/system/cpu/cpufreq/interactive ] ; then - echo "1224000" > /sys/devices/system/cpu/cpufreq/interactive/hispeed_freq - echo "95" > /sys/devices/system/cpu/cpufreq/interactive/target_loads - echo "20000" > /sys/devices/system/cpu/cpufreq/interactive/min_sample_time - fi - ;; - *) - ;; - esac - fi - - # CPU frequency boost on input event - if [ -e /sys/module/input_cfboost/parameters/boost_freq ]; then - echo "1224000" > /sys/module/input_cfboost/parameters/boost_freq - fi -} - -case "$1" in - start) - nvexec - exit 0 - ;; - *) - exit 1 -esac diff --git a/recipes-bsp/binary-drivers/linux-driver-package/nv.service b/recipes-bsp/binary-drivers/linux-driver-package/nv.service deleted file mode 100644 index c6fa901..0000000 --- a/recipes-bsp/binary-drivers/linux-driver-package/nv.service +++ /dev/null @@ -1,17 +0,0 @@ -[Unit] -Description=Nvidia binary driver init script -After=nvfb.service - -[Install] -WantedBy=multi-user.target - -[Service] -Type=forking -Restart=no -TimeoutSec=5min -IgnoreSIGPIPE=no -KillMode=process -GuessMainPID=no -RemainAfterExit=yes -ExecStart=/usr/bin/nv start -ExecStop=/usr/bin/nv stop diff --git a/recipes-bsp/binary-drivers/linux-driver-package/nvfb b/recipes-bsp/binary-drivers/linux-driver-package/nvfb deleted file mode 100755 index e5f4502..0000000 --- a/recipes-bsp/binary-drivers/linux-driver-package/nvfb +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh -#"specific first-boot script" - -nvexec() { - RET=0 - if [ ! -e /etc/nv/nvfirstboot ]; then - RET=0 - else - echo "/usr/lib/arm-linux-gnueabihf/tegra" >> /etc/ld.so.conf - echo "/usr/lib/arm-linux-gnueabihf/tegra-egl" >> /etc/ld.so.conf - - ldconfig - rm -rf /etc/nv/nvfirstboot - fi - exit $RET -} - -case "$1" in - start) - nvexec - exit 0 - ;; - *) - exit 1 -esac diff --git a/recipes-bsp/binary-drivers/linux-driver-package/nvfb.service b/recipes-bsp/binary-drivers/linux-driver-package/nvfb.service deleted file mode 100644 index deb8d97..0000000 --- a/recipes-bsp/binary-drivers/linux-driver-package/nvfb.service +++ /dev/null @@ -1,17 +0,0 @@ -[Unit] -Description=Nvidia binary driver first-boot script -Before=nv.service - -[Install] -WantedBy=multi-user.target - -[Service] -Type=forking -Restart=no -TimeoutSec=5min -IgnoreSIGPIPE=no -KillMode=process -GuessMainPID=no -RemainAfterExit=yes -ExecStart=/usr/bin/nvfb start -ExecStop=/usr/bin/nvfb stop diff --git a/recipes-bsp/binary-drivers/linux-driver-package/tegra_xusb_firmware b/recipes-bsp/binary-drivers/linux-driver-package/tegra_xusb_firmware Binary files differdeleted file mode 100644 index 7a18086..0000000 --- a/recipes-bsp/binary-drivers/linux-driver-package/tegra_xusb_firmware +++ /dev/null diff --git a/recipes-bsp/binary-drivers/linux-driver-package/xorg.conf b/recipes-bsp/binary-drivers/linux-driver-package/xorg.conf deleted file mode 100644 index 68b7925..0000000 --- a/recipes-bsp/binary-drivers/linux-driver-package/xorg.conf +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright (c) 2011-2013 NVIDIA CORPORATION. All Rights Reserved. - -# -# 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" - SubSection "extmod" - Option "omit xfree86-dga" - EndSubSection -EndSection - -Section "Device" - Identifier "Tegra0" - Driver "nvidia" - Option "NoLogo" "true" -EndSection - diff --git a/recipes-bsp/binary-drivers/linux-driver-package/xorg.conf.add b/recipes-bsp/binary-drivers/linux-driver-package/xorg.conf.add deleted file mode 100644 index 0abe390..0000000 --- a/recipes-bsp/binary-drivers/linux-driver-package/xorg.conf.add +++ /dev/null @@ -1,11 +0,0 @@ -Section "Monitor" - Identifier "DSI-1" - Option "DPMS" "false" -EndSection - -Section "ServerLayout" - Identifier "ServerLayout0" - Option "StandbyTime" "0" - Option "SuspendTime" "0" - Option "OffTime" "0" -EndSection diff --git a/recipes-bsp/binary-drivers/linux-driver-package_21.7.0.bb b/recipes-bsp/binary-drivers/linux-driver-package_21.7.0.bb deleted file mode 100755 index f64d009..0000000 --- a/recipes-bsp/binary-drivers/linux-driver-package_21.7.0.bb +++ /dev/null @@ -1,194 +0,0 @@ -DESCRIPTION = "NVIDIA Linux Driver Packages" -HOMEPAGE = "https://developer.nvidia.com/" -LICENSE = "Proprietary" - -SRC_URI = " \ - http://developer.download.nvidia.com/embedded/L4T/r21_Release_v7.0/Tegra124_Linux_R21.7.0_armhf.tbz2 \ - file://xorg.conf.add \ - file://nv \ - file://nvfb \ - file://tegra_xusb_firmware \ - file://xorg.conf \ - file://nvfb.service \ - file://nv.service \ -" - -LIC_FILES_CHKSUM = "file://nv_tegra/LICENSE;md5=60ad17cc726658e8cf73578bea47b85f" - -SRC_URI[md5sum] = "2139c0c7ecff94da68aef8a6ad0df20b" -SRC_URI[sha256sum] = "676add1e8e6b2fcf76d97f22f38c9d0cbbe8a92342039a85c8a4c87e8c1ce824" - -PR = "r7" - -inherit ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', 'update-rc.d', d)} - -INITSCRIPT_PACKAGES = "${PN}-boot ${PN}-firstboot" - -INITSCRIPT_NAME_${PN}-boot = "nv" -INITSCRIPT_PARAMS_${PN}-boot = "start 41 S . " - -INITSCRIPT_NAME_${PN}-firstboot = "nvfb" -INITSCRIPT_PARAMS_${PN}-firstboot = "start 40 S . " - -DEPENDS = "virtual/libx11 alsa-lib libxext mesa" - -INSANE_SKIP_${PN} = "ldflags" - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -S = "${WORKDIR}/Linux_for_Tegra" - -PROVIDES += " \ - virtual/egl \ - virtual/libgl \ - virtual/libgles1 \ - virtual/libgles2 \ -" -RPROVIDES_${PN} = " \ - libegl \ - libgl \ - libgles1 \ - libgles2 \ -" - -PACKAGES =+ "${PN}-firmware ${PN}-boot ${PN}-firstboot" - -INSANE_SKIP_${PN}-dev = "ldflags" - -# We have unversioned shared object, deploy them in the regular packages, -# but deploy the *.so files which are symlinks in the -dev package. -FILES_SOLIBSDEV = "" -FILES_${PN} = "${bindir}/* ${libdir}/* ${sysconfdir}/* ${sysconfdir}/*/*" -FILES_${PN}-dev += " \ - ${libdir}/libcuda.so ${libdir}/libEGL.so ${libdir}/libGLESv1_CM.so \ - ${libdir}/libGLESv2.so ${libdir}/libGL.so \ -" - -RRECOMMENDS_${PN} = "xserver-xorg-module-libwfb" -RDEPENDS_${PN} = "xserver-xorg bash" - -FILES_${PN}-firmware = "${base_libdir}/firmware/* ${base_libdir}/firmware/tegra12x/* " - -INHIBIT_PACKAGE_STRIP = "1" -#INHIBIT_PACKAGE_DEBUG_SPLIT = "1" - -INSANE_SKIP_${PN} += "dev-so" - -do_patch () { - mkdir -p ${WORKDIR}/l4tdrv - tar xjf ${WORKDIR}/Linux_for_Tegra/nv_tegra/config.tbz2 -C ${WORKDIR}/l4tdrv -} - -do_install () { - tar xjf ${WORKDIR}/Linux_for_Tegra/nv_tegra/nvidia_drivers.tbz2 -C ${D} - ln -sf tegra12x ${D}/lib/firmware/gk20a - ln -sf nvavp_vid_ucode_alt.bin ${D}/lib/firmware/nvavp_vid_ucode.bin - mv ${D}/usr/lib/arm-linux-gnueabihf/tegra/lib* ${D}/usr/lib/ - mv ${D}/usr/lib/arm-linux-gnueabihf/tegra-egl/lib* ${D}/usr/lib/ - rm -rf ${D}/usr/lib/arm-linux-gnueabihf/tegra ${D}/usr/lib/arm-linux-gnueabihf/tegra-egl - - rm -f ${D}/usr/lib/xorg/modules/extensions/libglx.so - ln -sf /usr/lib/libglx.so ${D}/usr/lib/xorg/modules/extensions/libglx.so - - cp -r ${WORKDIR}/tegra_xusb_firmware ${D}/lib/firmware/ - ln -sf ./libcuda.so.1.1 ${D}/usr/lib/libcuda.so - ln -sf ./libGL.so.1 ${D}/usr/lib/libGL.so - ln -sf ./libEGL.so.1 ${D}/usr/lib/libEGL.so - ln -sf ./libGLESv1_CM.so.1 ${D}/usr/lib/libGLESv1_CM.so - ln -sf ./libGLESv2.so.2 ${D}/usr/lib/libGLESv2.so - cp ${WORKDIR}/l4tdrv/etc/asound* ${D}/etc/ - cp -r ${WORKDIR}/l4tdrv/etc/udev ${D}/etc/ - mkdir ${D}/etc/X11/ - cp ${WORKDIR}/l4tdrv/etc/X11/xorg.conf* ${D}/etc/X11/ - cat ${WORKDIR}/l4tdrv/etc/X11/xorg.conf.jetson-tk1 ${WORKDIR}/xorg.conf.add > ${D}/etc/X11/xorg.conf.jetson-tk1 - - # install init scripts - install -d ${D}${sysconfdir}/init.d/ - install -m 0755 ${WORKDIR}/nv ${D}${sysconfdir}/init.d/nv - install -m 0755 ${WORKDIR}/nvfb ${D}${sysconfdir}/init.d/nvfb - install -d ${D}${sysconfdir}/nv - touch ${D}${sysconfdir}/nv/nvfirstboot - - cp ${WORKDIR}/xorg.conf ${D}/etc/X11/ - install -d ${D}${systemd_unitdir}/system/ - install -m 0755 ${WORKDIR}/nvfb.service ${D}${systemd_unitdir}/system - install -m 0755 ${WORKDIR}/nv.service ${D}${systemd_unitdir}/system - install -m 0755 ${WORKDIR}/nv ${D}${bindir} - install -m 0755 ${WORKDIR}/nvfb ${D}${bindir} - - NV_SAMPLE=${WORKDIR}/Linux_for_Tegra/nv_tegra/nv_sample_apps - tar xjf ${NV_SAMPLE}/nvgstapps.tbz2 -C ${NV_SAMPLE} - install -d ${D}${bindir} ${D}${libdir}/gstreamer-1.0 ${D}${docdir} - install -m 0755 ${NV_SAMPLE}/usr/bin/nvgstcapture-1.0 ${D}${bindir} - install -m 0755 ${NV_SAMPLE}/usr/bin/nvgstplayer-1.0 ${D}${bindir} - install -m 0755 ${NV_SAMPLE}/nvgstcapture-1.0_README.txt ${D}${docdir} - install -m 0755 ${NV_SAMPLE}/nvgstplayer-1.0_README.txt ${D}${docdir} - - install -m 0755 ${NV_SAMPLE}/usr/lib/arm-linux-gnueabihf/gstreamer-1.0/libgstnvcamera.so ${D}${libdir}/gstreamer-1.0 - install -m 0755 ${NV_SAMPLE}/usr/lib/arm-linux-gnueabihf/gstreamer-1.0/libgstnvvidconv.so ${D}${libdir}/gstreamer-1.0 - install -m 0755 ${NV_SAMPLE}/usr/lib/arm-linux-gnueabihf/gstreamer-1.0/libnvgstjpeg.so ${D}${libdir}/gstreamer-1.0 - - rm -rf ${D}/usr/lib/arm-linux-gnueabihf -} - -# Function to add the relevant ABI dependency to drivers, which should be called# from a PACKAGEFUNC. -python add_xorg_abi_depends() { - mlprefix = d.getVar('MLPREFIX', True) or '' - abi = "%sxorg-abi-%s-%s" % (mlprefix, "video", "19") - - pn = d.getVar("PN", True) - d.appendVar('RDEPENDS_' + pn, ' ' + abi) -} -PACKAGEFUNCS =+ "add_xorg_abi_depends" - -FILES_${PN}-boot = " \ - ${bindir}/nv \ - ${sysconfdir}/init.d/nv \ - ${systemd_unitdir}/system/nv.service \ -" - -FILES_${PN}-firstboot = "\ - ${bindir}/nvfb \ - ${sysconfdir}/init.d/nvfb \ - ${sysconfdir}/nv/nvfirstboot \ - ${systemd_unitdir}/system/nvfb.service \ -" - -# deploy additional binaries from the nv_gst_apps tarball -PACKAGES_prepend = "${PN}-gstnvcamera ${PN}-gstnvvidconv-1.0 ${PN}-nvgstjpeg-1.0 ${PN}-nvgstapps " -RRECOMMENDS_${PN}_append = " ${PN}-gstnvcamera ${PN}-gstnvvidconv-1.0 ${PN}-nvgstjpeg-1.0 ${PN}-nvgstapps" - -RDEPENDS_${PN}-gstnvcamera = "glib-2.0 gstreamer1.0 libgstvideo-1.0" -RDEPENDS_${PN}-gstnvvidconv-1.0 = "glib-2.0 gstreamer1.0 libgstvideo-1.0" -RDEPENDS_${PN}-nvgstjpeg-1.0 = "glib-2.0 gstreamer1.0 libgstvideo-1.0" -RDEPENDS_${PN}-nvgstapps = "glib-2.0 gstreamer1.0 libgstpbutils-1.0 libgstvideo-1.0" - -FILES_${PN}-gstnvcamera = " \ - ${libdir}/gstreamer-1.0/libgstnvcamera.so \ -" - -FILES_${PN}-gstnvvidconv-1.0 = " \ - ${libdir}/gstreamer-1.0/libgstnvvidconv.so \ -" - -FILES_${PN}-nvgstjpeg-1.0 = " \ - ${libdir}/gstreamer-1.0/libnvgstjpeg.so \ -" - -FILES_${PN}-nvgstapps = " \ - ${bindir}/nvgstcapture-1.0 \ - ${bindir}/nvgstplayer-1.0 \ - ${docdir}/nvgst*README.txt \ -" - -#no gnu_hash in NVIDIA binaries, skip QA dev-so for this package -#we have symlinks ending in .so, skip QA ldflags for this package -#inhibit warnings about files being stripped -INSANE_SKIP_${PN} = "build-deps dev-so ldflags already-stripped textrel" -INSANE_SKIP_${PN}-gstnvcamera = "build-deps dev-so ldflags already-stripped textrel" -INSANE_SKIP_${PN}-gstnvvidconv-1.0 = "build-deps dev-so ldflags already-stripped textrel" -INSANE_SKIP_${PN}-nvgstjpeg-1.0 = "build-deps dev-so ldflags already-stripped textrel" -INSANE_SKIP_${PN}-nvgstapps = "build-deps dev-so ldflags already-stripped textrel" - -SYSTEMD_AUTO_ENABLE = "enable" -SYSTEMD_SERVICE_${PN} = "nv.service nvfb.service" diff --git a/recipes-bsp/binary-drivers/opencv4tegra_21.5.0.bb b/recipes-bsp/binary-drivers/opencv4tegra_21.5.0.bb deleted file mode 100644 index b12c501..0000000 --- a/recipes-bsp/binary-drivers/opencv4tegra_21.5.0.bb +++ /dev/null @@ -1,45 +0,0 @@ -DESCRIPTION = "NVIDIA OpenCV4Tegra for L4T 21.x Packages" -HOMEPAGE = "https://developer.nvidia.com/" -LICENSE = "Proprietary" - -SRC_URI = "http://developer.download.nvidia.com/devzone/devcenter/mobile/jetpack_l4t/003/linux-x64/libopencv4tegra-repo_2.4.13_armhf_l4t-r21.deb" - -LIC_FILES_CHKSUM = "file://usr/share/doc/libopencv4tegra-repo/copyright;md5=99d8c0c1313afdf990f6407c07a88407" - -SRC_URI[md5sum] = "0db305a4d24a9211606bb1fb8ec2d480" -SRC_URI[sha256sum] = "9bfa9d5df0c3218f5b4000c8d9d50d136cd8e6ad82384b7781719deb7093ae21" - -DEPENDS = "dpkg-native tiff zlib jpeg glib-2.0 python gtk+ libpng12 jasper libav cudatoolkit6.5" - -INSANE_SKIP_${PN} = "ldflags" - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -S = "${WORKDIR}/opencv4tegra" - -INSANE_SKIP_${PN}-dev = "ldflags" - -FILES_${PN} = "${bindir}/* \ - ${datadir}/OpenCV/* \ - ${datadir}/lintian/* \ - ${libdir}/*" - -INHIBIT_PACKAGE_STRIP = "1" - -INSANE_SKIP_${PN} += "already-stripped dev-so" - -python do_unpack () { - locals = d.getVar('WORKDIR', True) - s = d.getVar('S', True) - d.setVar('WORKDIR', s) - d.setVar('S', s) - bb.build.exec_func('base_do_unpack', d) - d.setVar('WORKDIR', locals) -} - -do_install () { - cp -r ${WORKDIR}/opencv4tegra/usr ${D} - dpkg -x ${WORKDIR}/opencv4tegra/var/libopencv4tegra-repo/libopencv4tegra_2.4.13_armhf.deb ${D} - dpkg -x ${WORKDIR}/opencv4tegra/var/libopencv4tegra-repo/libopencv4tegra-dev_2.4.13_armhf.deb ${D} - dpkg -x ${WORKDIR}/opencv4tegra/var/libopencv4tegra-repo/libopencv4tegra-python_2.4.13_armhf.deb ${D} -} diff --git a/recipes-bsp/u-boot/files/tegra124/PM375_Hynix_2GB_H5TC4G63AFR_RDA_924MHz.bct b/recipes-bsp/u-boot/files/tegra124/PM375_Hynix_2GB_H5TC4G63AFR_RDA_924MHz.bct Binary files differdeleted file mode 100644 index 556a40e..0000000 --- a/recipes-bsp/u-boot/files/tegra124/PM375_Hynix_2GB_H5TC4G63AFR_RDA_924MHz.bct +++ /dev/null diff --git a/recipes-bsp/u-boot/files/tegra124/apalis-tk1.img.cfg b/recipes-bsp/u-boot/files/tegra124/apalis-tk1.img.cfg deleted file mode 100644 index b9d203c..0000000 --- a/recipes-bsp/u-boot/files/tegra124/apalis-tk1.img.cfg +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright (C) 2016 Toradex, Inc. -# -# This software is provided 'as-is', without any express or implied -# warranty. In no event will the authors be held liable for any damages -# arising from the use of this software. -# -# Permission is granted to anyone to use this software for any purpose, -# including commercial applications, and to alter it and redistribute it -# freely, subject to the following restrictions: -# -# 1. The origin of this software must not be misrepresented; you must not -# claim that you wrote the original software. If you use this software -# in a product, an acknowledgment in the product documentation would be -# appreciated but is not required. -# 2. Altered source versions must be plainly marked as such, and must not be -# misrepresented as being the original software. -# 3. This notice may not be removed or altered from any source distribution. - -Version = 0x00400001; -Bctcopy = 1; -Bctfile = PM375_Hynix_2GB_H5TC4G63AFR_RDA_924MHz.bct; -BootLoader = u-boot-dtb-tegra.bin,0x80108000,0x80108000,Complete; diff --git a/recipes-bsp/u-boot/files/tegra124/fw_env.config b/recipes-bsp/u-boot/files/tegra124/fw_env.config deleted file mode 100644 index 5941da2..0000000 --- a/recipes-bsp/u-boot/files/tegra124/fw_env.config +++ /dev/null @@ -1,15 +0,0 @@ -# Configuration file for fw_(printenv/setenv) utility. -# Up to two entries are valid, in this case the redundant -# environment sector is assumed present. -# Device offset must be prefixed with 0x to be parsed as a hexadecimal value. -# On a block device a negative offset is treated as a backwards offset from the -# end of the device/partition, rather than a forwards offset from the start. - -# Apalis TK1 -# U-Boot environment is stored at the end of the first eMMC boot partition -# hence use a negative value. The environment is just in front of the config -# block which occupies the last sector (hence -0x200) - -# Block device name Device offset Env. size -/dev/mmcblk0boot0 -0x2200 0x2000 - diff --git a/recipes-graphics/drm/libdrm_%.bbappend b/recipes-graphics/drm/libdrm_%.bbappend index 01a9340..556cd85 100644 --- a/recipes-graphics/drm/libdrm_%.bbappend +++ b/recipes-graphics/drm/libdrm_%.bbappend @@ -1,5 +1,4 @@ PACKAGES += " ${PN}-tegra" FILES_${PN}-tegra = "${libdir}/libdrm_tegra.so.*" -PACKAGECONFIG_append_tegra124 = " tegra" PACKAGECONFIG_append_tegra124m = " tegra" diff --git a/recipes-graphics/mesa/mesa_%.bbappend b/recipes-graphics/mesa/mesa_%.bbappend index b3f960f..7b44575 100644 --- a/recipes-graphics/mesa/mesa_%.bbappend +++ b/recipes-graphics/mesa/mesa_%.bbappend @@ -1,18 +1,4 @@ ##### -# tegra tk1 - -PACKAGE_ARCH_tegra124 = "${MACHINE_ARCH}" - -PROVIDES_remove_tegra124 = "virtual/egl virtual/libgl virtual/libgles1 virtual/libgles2" - -do_install_append_tegra124 () { - rm ${D}${libdir}/libEGL.so* - rm ${D}${libdir}/libGL.so* - rm ${D}${libdir}/libGLESv1*.so* - rm ${D}${libdir}/libGLESv2.so* -} - -##### ## Tegra TK1 mainline kernel PACKAGECONFIG_append_tegra124m = " dri3 egl gles gallium gbm " diff --git a/recipes-graphics/xorg-xserver/xserver-xf86-config/apalis-tk1/xorg.conf b/recipes-graphics/xorg-xserver/xserver-xf86-config/apalis-tk1/xorg.conf deleted file mode 100644 index e69de29..0000000 --- a/recipes-graphics/xorg-xserver/xserver-xf86-config/apalis-tk1/xorg.conf +++ /dev/null diff --git a/recipes-graphics/xorg-xserver/xserver-xf86-config_%.bbappend b/recipes-graphics/xorg-xserver/xserver-xf86-config_%.bbappend deleted file mode 100644 index 3feb3b1..0000000 --- a/recipes-graphics/xorg-xserver/xserver-xf86-config_%.bbappend +++ /dev/null @@ -1 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/xserver-xf86-config:" diff --git a/recipes-graphics/xorg-xserver/xserver-xorg/0001-compiler.h-Do-not-include-sys-io.h-on-ARM-with-glibc.patch b/recipes-graphics/xorg-xserver/xserver-xorg/0001-compiler.h-Do-not-include-sys-io.h-on-ARM-with-glibc.patch deleted file mode 100644 index da9a4f2..0000000 --- a/recipes-graphics/xorg-xserver/xserver-xorg/0001-compiler.h-Do-not-include-sys-io.h-on-ARM-with-glibc.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 2ba9510721b7a76cb7fe507449fa0ac997a4cce3 Mon Sep 17 00:00:00 2001 -From: Olivier Fourdan <ofourdan@redhat.com> -Date: Mon, 1 Jul 2019 13:20:39 +0200 -Subject: [PATCH] compiler.h: Do not include sys/io.h on ARM with glibc - -<sys/io.h> on ARM hasn't worked for a long, long time, so it was removed -it from glibc upstream. - -Remove the include to avoid a compilation failure on ARM with glibc. - -Signed-off-by: Olivier Fourdan <ofourdan@redhat.com> -Closes: https://gitlab.freedesktop.org/xorg/xserver/issues/840 -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -Upstream-Status: Backport [https://gitlab.freedesktop.org/xorg/xserver/commit/fe4cd0e7f5c58fa94db36326aadc1bd4e6d73eba] ---- - hw/xfree86/common/compiler.h | 30 ------------------------------ - 1 file changed, 30 deletions(-) - -diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h -index 7144c6a..2b2008b 100644 ---- a/hw/xfree86/common/compiler.h -+++ b/hw/xfree86/common/compiler.h -@@ -758,36 +758,6 @@ inl(unsigned short port) - return xf86ReadMmio32Le((void *) ioBase, port); - } - --#elif defined(__arm__) && defined(__linux__) -- --/* for Linux on ARM, we use the LIBC inx/outx routines */ --/* note that the appropriate setup via "ioperm" needs to be done */ --/* *before* any inx/outx is done. */ -- --#include <sys/io.h> -- --static __inline__ void --xf_outb(unsigned short port, unsigned char val) --{ -- outb(val, port); --} -- --static __inline__ void --xf_outw(unsigned short port, unsigned short val) --{ -- outw(val, port); --} -- --static __inline__ void --xf_outl(unsigned short port, unsigned int val) --{ -- outl(val, port); --} -- --#define outb xf_outb --#define outw xf_outw --#define outl xf_outl -- - #elif defined(__nds32__) - - /* --- -2.22.0 - diff --git a/recipes-graphics/xorg-xserver/xserver-xorg/0001-sysmacros.h-follow-changed-include-files.patch b/recipes-graphics/xorg-xserver/xserver-xorg/0001-sysmacros.h-follow-changed-include-files.patch deleted file mode 100644 index 87a3112..0000000 --- a/recipes-graphics/xorg-xserver/xserver-xorg/0001-sysmacros.h-follow-changed-include-files.patch +++ /dev/null @@ -1,41 +0,0 @@ -From ee80095e03efcb6ff62983939c3f7c49c291f12e Mon Sep 17 00:00:00 2001 -From: Max Krummenacher <max.krummenacher@toradex.com> -Date: Wed, 19 Sep 2018 20:37:47 +0000 -Subject: [PATCH] sysmacros.h: follow changed include files - -minor/major is no longer provided by sys/types.h. -explicitely include sysmacros.h where needed. - -Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> ---- - hw/xfree86/common/xf86Xinput.c | 1 + - hw/xfree86/os-support/linux/lnx_init.c | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c -index 1fb5b16..4fc5a65 100644 ---- a/hw/xfree86/common/xf86Xinput.c -+++ b/hw/xfree86/common/xf86Xinput.c -@@ -82,6 +82,7 @@ - #include <stdarg.h> - #include <stdint.h> /* for int64_t */ - #include <sys/types.h> -+#include <sys/sysmacros.h> - #include <sys/stat.h> - #include <unistd.h> - #ifdef HAVE_SYS_MKDEV_H -diff --git a/hw/xfree86/os-support/linux/lnx_init.c b/hw/xfree86/os-support/linux/lnx_init.c -index 4acaf33..ceae0f1 100644 ---- a/hw/xfree86/os-support/linux/lnx_init.c -+++ b/hw/xfree86/os-support/linux/lnx_init.c -@@ -37,6 +37,7 @@ - #include "xf86_OSlib.h" - - #include <sys/stat.h> -+#include <sys/sysmacros.h> - - #ifndef K_OFF - #define K_OFF 0x4 --- -2.13.6 - diff --git a/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch b/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch deleted file mode 100755 index ec0eea6..0000000 --- a/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch +++ /dev/null @@ -1,25 +0,0 @@ -This is the revised version of files/macro_tweak.patch for -xorg-server 1.8.99.904 and newer. - -Upstream-Status: Pending - -Signed-off-by: Yu Ke <ke.yu@intel.com> - -diff --git a/xorg-server.m4 b/xorg-server.m4 -index bdecf62..040fdb8 100644 ---- a/xorg-server.m4 -+++ b/xorg-server.m4 -@@ -28,10 +28,12 @@ dnl - # Checks for the $1 define in xorg-server.h (from the sdk). If it - # is defined, then add $1 to $REQUIRED_MODULES. - -+m4_pattern_allow(PKG_CONFIG_SYSROOT_DIR) -+ - AC_DEFUN([XORG_DRIVER_CHECK_EXT],[ - AC_REQUIRE([PKG_PROG_PKG_CONFIG]) - SAVE_CFLAGS="$CFLAGS" -- CFLAGS="$CFLAGS -I`$PKG_CONFIG --variable=sdkdir xorg-server`" -+ CFLAGS="$CFLAGS -I$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=sdkdir xorg-server`" - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - #include "xorg-server.h" - #if !defined $1 diff --git a/recipes-graphics/xorg-xserver/xserver-xorg_1.17.4.bb b/recipes-graphics/xorg-xserver/xserver-xorg_1.17.4.bb deleted file mode 100755 index 5e26b33..0000000 --- a/recipes-graphics/xorg-xserver/xserver-xorg_1.17.4.bb +++ /dev/null @@ -1,61 +0,0 @@ -# always latest and greatest. - -require recipes-graphics/xorg-xserver/xserver-xorg.inc - -COMPATIBLE_MACHINE = "(tegra124)" -PACKAGE_ARCH = "${MACHINE_ARCH}" -PE = "99" - -DEPENDS_append = " libxfont" - -SRC_URI[md5sum] = "1509a9daae713895e7f5bcba8bcc05b2" -SRC_URI[sha256sum] = "0c4b45c116a812a996eb432d8508cf26c2ec8c3916ff2a50781796882f8d6457" - -SRC_URI += " \ - file://0001-sysmacros.h-follow-changed-include-files.patch \ - file://0001-compiler.h-Do-not-include-sys-io.h-on-ARM-with-glibc.patch \ -" - -# These extensions are now integrated into the server, so declare the migration -# path for in-place upgrades. - -RREPLACES_${PN} = "${PN}-extension-dri \ - ${PN}-extension-dri2 \ - ${PN}-extension-record \ - ${PN}-extension-extmod \ - ${PN}-extension-dbe \ - " -RPROVIDES_${PN} = "${PN}-extension-dri \ - ${PN}-extension-dri2 \ - ${PN}-extension-record \ - ${PN}-extension-extmod \ - ${PN}-extension-dbe \ - " -RCONFLICTS_${PN} = "${PN}-extension-dri \ - ${PN}-extension-dri2 \ - ${PN}-extension-record \ - ${PN}-extension-extmod \ - ${PN}-extension-dbe \ - " - -# The NVidia driver needs xinerama enabled. - -# override setting from xserver-xorg.inc which only applies to version 1.18 -# remove systemd: -#| checking for PIXMAN... yes -#| checking for SYSTEMD_DAEMON... no -#| configure: error: systemd support requested but no library has been found -#| ERROR: Function failed: do_configure (log file is located at /build/krm/oe-core_V2.6.2/build/tmp-glibc/work/armv7at2hf-neon-angstrom-linux-gnueabi/xserver-xorg/2_1.17.2-r0/temp/log.do_configure.2158) - -# provide dga to prevent runtime error -# X: symbol lookup error: /usr/lib/xorg/modules/drivers/nvidia_drv.so: undefined symbol: DGAInit - -PACKAGECONFIG ?= "dga dri2 udev xinerama ${XORG_CRYPTO} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri', '', d)} \ - ${@bb.utils.contains("DISTRO_FEATURES", "opengl wayland", "xwayland", "", d)} \ -" - -# provided by xf86-input-evdev_2.10.0 -do_install_append () { - rm -f ${D}/usr/share/X11/xorg.conf.d/10-evdev.conf -} diff --git a/recipes-kernel/linux/linux-toradex_3.10.40.bb b/recipes-kernel/linux/linux-toradex_3.10.40.bb deleted file mode 100644 index 8e0b2e9..0000000 --- a/recipes-kernel/linux/linux-toradex_3.10.40.bb +++ /dev/null @@ -1,54 +0,0 @@ -SUMMARY = "Linux Kernel for Toradex Tegra124 based modules" -SECTION = "kernel" -LICENSE = "GPLv2" - -LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" - -inherit kernel siteinfo toradex-kernel-localversion - -LINUX_VERSION ?= "3.10.40" - -SRCREV = "063d16eceb570adeb1ae753d73d13f299cefe876" -SRCREV_use-head-next = "${AUTOREV}" - -PV = "${LINUX_VERSION}+gitr${SRCPV}" -S = "${WORKDIR}/git" -SRCBRANCH = "toradex_tk1_l4t_r21.7" -SRCBRANCH_use-head-next = "toradex_tk1_l4t_r21.7-next" -SRC_URI = "git://git.toradex.com/linux-toradex.git;protocol=git;branch=${SRCBRANCH}" - -COMPATIBLE_MACHINE = "apalis-tk1" - -KERNEL_MODULE_AUTOLOAD += "xhci-hcd" - -# since thud modules no longer load without this -# [ 9.302483] apalis_tk1_k20: Unknown symbol _GLOBAL_OFFSET_TABLE_ (err 0) -KERNEL_EXTRA_ARGS_append = "CFLAGS_MODULE=-fno-pic" - -# One possibiltiy for changes to the defconfig: -config_script () { -# #example change to the .config -# #sets CONFIG_TEGRA_CAMERA unconditionally to 'y' -# sed -i -e /CONFIG_TEGRA_CAMERA/d ${B}/.config -# echo "CONFIG_TEGRA_CAMERA=y" >> ${B}/.config - echo "dummy" > /dev/null -} - -do_configure_prepend () { - #use the defconfig provided in the kernel source tree - #assume its called ${MACHINE}_defconfig, but with '_' instead of '-' - DEFCONFIG="`echo ${MACHINE} | sed -e 's/$/_defconfig/'`" - - cd ${S} - export KBUILD_OUTPUT=${B} - oe_runmake $DEFCONFIG - - #maybe change some configuration - config_script - - cd - > /dev/null -} - -do_uboot_mkimage_prepend() { - cd ${B} -} diff --git a/recipes-kernel/perf/perf.bbappend b/recipes-kernel/perf/perf.bbappend deleted file mode 100644 index 613619b..0000000 --- a/recipes-kernel/perf/perf.bbappend +++ /dev/null @@ -1,18 +0,0 @@ -# Unfortunately perf in such obsolete kernels is not yet as nicely separated -# therefore just copy over some more stuff for it to compile again -PERF_SRC_LEGACY_TEGRAS = "Makefile \ - arch/arm/include \ - include \ - lib \ - tools \ -" -PERF_SRC_tegra124 = "${PERF_SRC_LEGACY_TEGRAS}" - -do_configure_prepend_tegra124 () { - sed -i 's$I/usr/include/slang$I=/usr/include/slang$' tools/perf/Makefile -} - -# scripting is confiugred to use python3, however this requires a build -# against a kernel of version 5.x and later or a patch to the kernel. -# see also https://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/meta/recipes-kernel/perf?id=92469aad50b623afa423c19d82ed2e3c667c5e6a -PACKAGECONFIG_remove_tegra124 = "scripting" diff --git a/recipes-multimedia/libgstnvegl/files/0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch b/recipes-multimedia/libgstnvegl/files/0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch deleted file mode 100644 index f5f73b4..0000000 --- a/recipes-multimedia/libgstnvegl/files/0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 90916f96262fa7b27a0a99788c69f9fd6df11000 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Tue, 24 Nov 2015 16:46:27 +0200 -Subject: [PATCH] introspection.m4: prefix pkgconfig paths with - PKG_CONFIG_SYSROOT_DIR - -We can't use our tweaked introspection.m4 from gobject-introspection tarball -because gstreamer also defines INTROSPECTION_INIT in its introspection.m4, which -is later supplied to g-ir-scanner. - -Upstream-Status: Pending [review on oe-core list] -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - common/m4/introspection.m4 | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/common/m4/introspection.m4 b/common/m4/introspection.m4 -index 162be57..217a6ae 100644 ---- a/common/m4/introspection.m4 -+++ b/common/m4/introspection.m4 -@@ -54,14 +54,14 @@ m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL], - INTROSPECTION_GIRDIR= - INTROSPECTION_TYPELIBDIR= - if test "x$found_introspection" = "xyes"; then -- INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` -- INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` -- INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` -+ INTROSPECTION_SCANNER=`$PKG_CONFIG --define-prefix --variable=g_ir_scanner gobject-introspection-1.0` -+ INTROSPECTION_COMPILER=`$PKG_CONFIG --define-prefix --variable=g_ir_compiler gobject-introspection-1.0` -+ INTROSPECTION_GENERATE=`$PKG_CONFIG --define-prefix --variable=g_ir_generate gobject-introspection-1.0` - INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` - INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" - INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` - INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` -- INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection -+ INTROSPECTION_MAKEFILE=`$PKG_CONFIG --define-prefix --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection - fi - AC_SUBST(INTROSPECTION_SCANNER) - AC_SUBST(INTROSPECTION_COMPILER) --- -2.6.2 - diff --git a/recipes-multimedia/libgstnvegl/files/0001-pkg-config-files-fix-qa-error.patch b/recipes-multimedia/libgstnvegl/files/0001-pkg-config-files-fix-qa-error.patch deleted file mode 100644 index 8a2d899..0000000 --- a/recipes-multimedia/libgstnvegl/files/0001-pkg-config-files-fix-qa-error.patch +++ /dev/null @@ -1,85 +0,0 @@ -From cf6c5e221c1e1c73bd908bf36d9a09d0fcb02ba8 Mon Sep 17 00:00:00 2001 -From: Max Krummenacher <max.krummenacher@toradex.com> -Date: Sat, 22 Oct 2016 13:06:09 +0200 -Subject: [PATCH] pkg-config files: fix qa error - -| ERROR: libgstnvegl-21.5.0-r5 do_populate_sysroot: QA Issue: gstreamer-egl-1.0.pc failed sanity test (tmpdir) in path -| /build/krm/oe-core_V2.6.2/build/tmp-glibc/work/armv7at2hf-neon-angstrom-linux-gnueabi/libgstnvegl/21.5.0-r5/sysroot-destdir/usr/lib/pkgconfig [pkgconfig] -| ERROR: libgstnvegl-21.5.0-r5 do_populate_sysroot: QA staging was broken by the package built above -| ERROR: libgstnvegl-21.5.0-r5 do_populate_sysroot: Function failed: do_qa_staging - -Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> ---- - configure.ac | 3 +++ - pkgconfig/Makefile.in | 1 + - pkgconfig/gstreamer-egl-uninstalled.pc.in | 2 +- - pkgconfig/gstreamer-egl.pc.in | 2 +- - 4 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 7df8267..62ceb40 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -367,6 +367,7 @@ case "$EGL_WINDOW_SYSTEM" in - HAVE_EGL="yes" - EGL_LIBS="-lEGL" - EGL_CFLAGS="" -+ EGL_CFLAGS_SYSROOT="" - ] - ) - ] -@@ -383,6 +384,8 @@ case "$EGL_WINDOW_SYSTEM" in - else -+ AC_ARG_VAR(PKG_CONFIG_SYSROOT_DIR, "OE path to sysroot") - AC_DEFINE(USE_EGL_X11, [1], [Use X11 EGL window system]) - EGL_CFLAGS="$EGL_CFLAGS $X11_CFLAGS" -+ EGL_CFLAGS_SYSROOT=`echo $EGL_CFLAGS|sed "s;${PKG_CONFIG_SYSROOT_DIR};;"` -- EGL_LIBS="$EGL_LIBS $X11_LIBS" -+ EGL_LIBS=`echo "$EGL_LIBS $X11_LIBS"|sed "s;${PKG_CONFIG_SYSROOT_DIR};;"` - fi - fi -@@ -398,6 +401,7 @@ esac - - AC_SUBST(EGL_LIBS) - AC_SUBST(EGL_CFLAGS) -+AC_SUBST(EGL_CFLAGS_SYSROOT) - AM_CONDITIONAL(HAVE_EGL, test x"$HAVE_EGL" = x"yes") - - dnl *** ext plug-ins *** -diff --git a/pkgconfig/Makefile.in b/pkgconfig/Makefile.in -index f420abf..9e25a26 100644 ---- a/pkgconfig/Makefile.in -+++ b/pkgconfig/Makefile.in -@@ -212,6 +212,7 @@ ECHO_T = @ECHO_T@ - EGLGLES_CFLAGS = @EGLGLES_CFLAGS@ - EGLGLES_LIBS = @EGLGLES_LIBS@ - EGL_CFLAGS = @EGL_CFLAGS@ -+EGL_CFLAGS_SYSROOT = @EGL_CFLAGS_SYSROOT@ - EGL_LIBS = @EGL_LIBS@ - EGREP = @EGREP@ - ERROR_CFLAGS = @ERROR_CFLAGS@ -diff --git a/pkgconfig/gstreamer-egl-uninstalled.pc.in b/pkgconfig/gstreamer-egl-uninstalled.pc.in -index ae9d406..271123e 100644 ---- a/pkgconfig/gstreamer-egl-uninstalled.pc.in -+++ b/pkgconfig/gstreamer-egl-uninstalled.pc.in -@@ -8,5 +8,5 @@ Description: GStreamer EGL Library, uninstalled - Requires: gstreamer-@GST_API_VERSION@ - Version: @VERSION@ - Libs: -L${libdir} ${libdir}/libgstnvegl-@GST_API_VERSION@.la @EGL_LIBS@ --Cflags: -I${includedir} @EGL_CFLAGS@ -+Cflags: -I${includedir} @EGL_CFLAGS_SYSROOT@ - -diff --git a/pkgconfig/gstreamer-egl.pc.in b/pkgconfig/gstreamer-egl.pc.in -index bfc7994..eea84af 100644 ---- a/pkgconfig/gstreamer-egl.pc.in -+++ b/pkgconfig/gstreamer-egl.pc.in -@@ -8,5 +8,5 @@ Description: GStreamer EGL library - Requires: gstreamer-@GST_API_VERSION@ - Version: @VERSION@ - Libs: -L${libdir} -lgstegl-@GST_API_VERSION@ @EGL_LIBS@ --Cflags: -I${includedir} @EGL_CFLAGS@ -+Cflags: -I${includedir} @EGL_CFLAGS_SYSROOT@ - --- -2.5.5 - diff --git a/recipes-multimedia/libgstnvegl/files/0001-rename-gstegl-to-gstnvegl.patch b/recipes-multimedia/libgstnvegl/files/0001-rename-gstegl-to-gstnvegl.patch deleted file mode 100644 index 6038aa8..0000000 --- a/recipes-multimedia/libgstnvegl/files/0001-rename-gstegl-to-gstnvegl.patch +++ /dev/null @@ -1,447 +0,0 @@ -From 0c99333b0e38ec48aa704ec18e8b11bcc9ec9ccd Mon Sep 17 00:00:00 2001 -From: Stefano Cordibella <stefano.cordibella@edalab.it> -Date: Mon, 2 Nov 2015 16:45:24 +0100 -Subject: [PATCH] rename gstegl to gstnvegl - ---- - ext/eglgles/Makefile.am | 2 +- - ext/eglgles/Makefile.in | 2 +- - ext/eglgles/libgsteglglessink.la | 4 +- - gst-libs/gst/egl/Makefile.am | 34 +++++----- - gst-libs/gst/egl/Makefile.in | 104 +++++++++++++++--------------- - gst-plugins-bad.spec.in | 6 +- - pkgconfig/gstreamer-egl-uninstalled.pc.in | 2 +- - 7 files changed, 77 insertions(+), 77 deletions(-) - -diff --git a/ext/eglgles/Makefile.am b/ext/eglgles/Makefile.am -index afa78a8..87e336d 100644 ---- a/ext/eglgles/Makefile.am -+++ b/ext/eglgles/Makefile.am -@@ -1,7 +1,7 @@ - plugin_LTLIBRARIES = libgstnveglglessink.la - - DISTRO_SRC = gstegladaptation_egl.c video_platform_wrapper.c --GST_EGL_LIBS = $(top_builddir)/gst-libs/gst/egl/libgstegl-$(GST_API_VERSION).la -+GST_EGL_LIBS = $(top_builddir)/gst-libs/gst/egl/libgstnvegl-$(GST_API_VERSION).la - - libgstnveglglessink_la_SOURCES = gsteglglessink.c gstegladaptation.c $(DISTRO_SRC) - -diff --git a/ext/eglgles/Makefile.in b/ext/eglgles/Makefile.in -index 1484b12..9c1ea74 100644 ---- a/ext/eglgles/Makefile.in -+++ b/ext/eglgles/Makefile.in -@@ -517,7 +517,7 @@ top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - plugin_LTLIBRARIES = libgstnveglglessink.la - DISTRO_SRC = gstegladaptation_egl.c video_platform_wrapper.c --GST_EGL_LIBS = $(top_builddir)/gst-libs/gst/egl/libgstegl-$(GST_API_VERSION).la -+GST_EGL_LIBS = $(top_builddir)/gst-libs/gst/egl/libgstnvegl-$(GST_API_VERSION).la - libgstnveglglessink_la_SOURCES = gsteglglessink.c gstegladaptation.c $(DISTRO_SRC) - libgstnveglglessink_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) \ - $(GST_PLUGINS_BASE_CFLAGS) \ -diff --git a/ext/eglgles/libgsteglglessink.la b/ext/eglgles/libgsteglglessink.la -index 30d14ed..39b6912 100644 ---- a/ext/eglgles/libgsteglglessink.la -+++ b/ext/eglgles/libgsteglglessink.la -@@ -17,7 +17,7 @@ old_library='' - inherited_linker_flags=' -pthread' - - # Libraries that this one depends upon. --dependency_libs=' -L/usr/lib/arm-linux-gnueabihf/tegra-egl -lGLESv2 /home/ubuntu/gst-nveglglessink/gst-libs/gst/egl/libgstegl-1.0.la /usr/lib/libgstvideo-1.0.la -lgstbase-1.0 -lgstreamer-1.0 -lgobject-2.0 -lglib-2.0 -lEGL -lX11' -+dependency_libs=' -L/usr/lib/arm-linux-gnueabihf/tegra-egl -lGLESv2 /home/ubuntu/gst-nveglglessink/gst-libs/gst/egl/libgstnvegl-1.0.la /usr/lib/libgstvideo-1.0.la -lgstbase-1.0 -lgstreamer-1.0 -lgobject-2.0 -lglib-2.0 -lEGL -lX11' - - # Names of additional weak libraries provided by this library - weak_library_names='' -@@ -39,4 +39,4 @@ dlpreopen='' - - # Directory that this library needs to be installed in: - libdir='/usr/local/lib/gstreamer-1.0' --relink_command="(cd /home/ubuntu/gst-nveglglessink/ext/eglgles; /bin/bash /home/ubuntu/gst-nveglglessink/libtool --silent --tag CC --tag CC --tag disable-static --mode=relink gcc -std=gnu99 -I../../gst-libs -I../../gst-libs -pthread -I/usr/include/gstreamer-1.0 -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/gstreamer-1.0 -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/gstreamer-1.0 -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DGST_USE_UNSTABLE_API -DG_THREADS_MANDATORY -DG_DISABLE_CAST_CHECKS -DG_DISABLE_ASSERT -Wall -Wdeclaration-after-statement -Wvla -Wpointer-arith -Wmissing-declarations -Wmissing-prototypes -Wredundant-decls -Wwrite-strings -Wformat-security -Wold-style-definition -Winit-self -Wmissing-include-dirs -Waddress -Wno-multichar -Wnested-externs -g -I/usr/include/libdrm -I/usr/include/libdrm -DUSE_EGL_TEGRA -g -O2 -module -avoid-version -export-symbols-regex \"^_*gst_plugin_.*\" -no-undefined -o libgsteglglessink.la -rpath /usr/local/lib/gstreamer-1.0 libgsteglglessink_la-gsteglglessink.lo libgsteglglessink_la-gstegladaptation.lo libgsteglglessink_la-gstegladaptation_egl.lo libgsteglglessink_la-video_platform_wrapper.lo -lgstreamer-1.0 -lgobject-2.0 -lglib-2.0 -lgstbase-1.0 -lgstreamer-1.0 -lgobject-2.0 -lglib-2.0 -lgstreamer-1.0 -lgobject-2.0 -lglib-2.0 -L/usr/lib/arm-linux-gnueabihf/tegra-egl -lEGL -lX11 -L/usr/lib/arm-linux-gnueabihf/tegra-egl -lEGL -lGLESv2 -lgstvideo-1.0 ../../gst-libs/gst/egl/libgstegl-1.0.la @inst_prefix_dir@)" -+relink_command="(cd /home/ubuntu/gst-nveglglessink/ext/eglgles; /bin/bash /home/ubuntu/gst-nveglglessink/libtool --silent --tag CC --tag CC --tag disable-static --mode=relink gcc -std=gnu99 -I../../gst-libs -I../../gst-libs -pthread -I/usr/include/gstreamer-1.0 -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/gstreamer-1.0 -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/gstreamer-1.0 -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DGST_USE_UNSTABLE_API -DG_THREADS_MANDATORY -DG_DISABLE_CAST_CHECKS -DG_DISABLE_ASSERT -Wall -Wdeclaration-after-statement -Wvla -Wpointer-arith -Wmissing-declarations -Wmissing-prototypes -Wredundant-decls -Wwrite-strings -Wformat-security -Wold-style-definition -Winit-self -Wmissing-include-dirs -Waddress -Wno-multichar -Wnested-externs -g -I/usr/include/libdrm -I/usr/include/libdrm -DUSE_EGL_TEGRA -g -O2 -module -avoid-version -export-symbols-regex \"^_*gst_plugin_.*\" -no-undefined -o libgsteglglessink.la -rpath /usr/local/lib/gstreamer-1.0 libgsteglglessink_la-gsteglglessink.lo libgsteglglessink_la-gstegladaptation.lo libgsteglglessink_la-gstegladaptation_egl.lo libgsteglglessink_la-video_platform_wrapper.lo -lgstreamer-1.0 -lgobject-2.0 -lglib-2.0 -lgstbase-1.0 -lgstreamer-1.0 -lgobject-2.0 -lglib-2.0 -lgstreamer-1.0 -lgobject-2.0 -lglib-2.0 -L/usr/lib/arm-linux-gnueabihf/tegra-egl -lEGL -lX11 -L/usr/lib/arm-linux-gnueabihf/tegra-egl -lEGL -lGLESv2 -lgstvideo-1.0 ../../gst-libs/gst/egl/libgstnvegl-1.0.la @inst_prefix_dir@)" -diff --git a/gst-libs/gst/egl/Makefile.am b/gst-libs/gst/egl/Makefile.am -index 66289c4..a4c33ea 100644 ---- a/gst-libs/gst/egl/Makefile.am -+++ b/gst-libs/gst/egl/Makefile.am -@@ -1,25 +1,25 @@ --lib_LTLIBRARIES = libgstegl-@GST_API_VERSION@.la -+lib_LTLIBRARIES = libgstnvegl-@GST_API_VERSION@.la - --libgstegl_@GST_API_VERSION@_la_SOURCES = egl.c -+libgstnvegl_@GST_API_VERSION@_la_SOURCES = egl.c - --libgstegl_@GST_API_VERSION@includedir = \ -+libgstnvegl_@GST_API_VERSION@includedir = \ - $(includedir)/gstreamer-@GST_API_VERSION@/gst/egl - --libgstegl_@GST_API_VERSION@include_HEADERS = egl.h -+libgstnvegl_@GST_API_VERSION@include_HEADERS = egl.h - --libgstegl_@GST_API_VERSION@_la_CFLAGS = \ -+libgstnvegl_@GST_API_VERSION@_la_CFLAGS = \ - $(GST_PLUGINS_BAD_CFLAGS) \ - $(GST_PLUGINS_BASE_CFLAGS) \ - $(GST_CFLAGS) \ - $(EGL_CFLAGS) - --libgstegl_@GST_API_VERSION@_la_LIBADD = \ -+libgstnvegl_@GST_API_VERSION@_la_LIBADD = \ - $(GST_PLUGINS_BASE_LIBS) \ - -lgstvideo-@GST_API_VERSION@ \ - $(GST_LIBS) \ - $(EGL_LIBS) - --libgstegl_@GST_API_VERSION@_la_LDFLAGS = \ -+libgstnvegl_@GST_API_VERSION@_la_LDFLAGS = \ - $(GST_LIB_LDFLAGS) \ - $(GST_ALL_LDFLAGS) \ - $(GST_LT_LDFLAGS) -@@ -28,12 +28,12 @@ libgstegl_@GST_API_VERSION@_la_LDFLAGS = \ - if HAVE_INTROSPECTION - BUILT_GIRSOURCES = GstEGL-@GST_API_VERSION@.gir - --gir_headers=$(patsubst %,$(srcdir)/%, $(libgstegl_@GST_API_VERSION@include_HEADERS)) -+gir_headers=$(patsubst %,$(srcdir)/%, $(libgstnvegl_@GST_API_VERSION@include_HEADERS)) - gir_headers+=$(patsubst %,$(builddir)/%, $(built_headers)) --gir_sources=$(patsubst %,$(srcdir)/%, $(libgstegl_@GST_API_VERSION@_la_SOURCES)) -+gir_sources=$(patsubst %,$(srcdir)/%, $(libgstnvegl_@GST_API_VERSION@_la_SOURCES)) - gir_sources+=$(patsubst %,$(builddir)/%, $(built_sources)) - --GstEGL-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstegl-@GST_API_VERSION@.la -+GstEGL-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstnvegl-@GST_API_VERSION@.la - $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \ - GST_PLUGIN_SYSTEM_PATH_1_0="" GST_PLUGIN_PATH_1_0="" GST_REGISTRY_UPDATE=no \ - $(INTROSPECTION_SCANNER) -v --namespace GstEGL \ -@@ -45,7 +45,7 @@ GstEGL-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstegl-@GST_API_VERSIO - -I$(top_builddir)/gst-libs \ - --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ - --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-video-@GST_API_VERSION@` \ -- --library=libgstegl-@GST_API_VERSION@.la \ -+ --library=libgstnvegl-@GST_API_VERSION@.la \ - --include=Gst-@GST_API_VERSION@ \ - --libtool="$(top_builddir)/libtool" \ - --pkg gstreamer-@GST_API_VERSION@ \ -@@ -79,17 +79,17 @@ CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) - endif - - Android.mk: $(BUILT_SOURCES) Makefile.am -- androgenizer -:PROJECT libgstegl -:STATIC libgstegl-@GST_API_VERSION@ \ -+ androgenizer -:PROJECT libgstnvegl -:STATIC libgstnvegl-@GST_API_VERSION@ \ - -:TAGS eng debug \ - -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ -- -:SOURCES $(libgstegl_@GST_API_VERSION@_la_SOURCES) \ -+ -:SOURCES $(libgstnvegl_@GST_API_VERSION@_la_SOURCES) \ - $(built_sources) \ -- -:CFLAGS $(DEFS) $(libgstegl_@GST_API_VERSION@_la_CFLAGS) \ -- -:LDFLAGS $(libgstegl_@GST_API_VERSION@_la_LDFLAGS) \ -- $(libgstegl@GST_API_VERSION@_la_LIBADD) \ -+ -:CFLAGS $(DEFS) $(libgstnvegl_@GST_API_VERSION@_la_CFLAGS) \ -+ -:LDFLAGS $(libgstnvegl_@GST_API_VERSION@_la_LDFLAGS) \ -+ $(libgstnvegl@GST_API_VERSION@_la_LIBADD) \ - -ldl \ - -:HEADER_TARGET gstreamer-@GST_API_VERSION@/gst/egl \ -- -:HEADERS $(libgsteglinclude_HEADERS) \ -+ -:HEADERS $(libgstnveglinclude_HEADERS) \ - $(built_headers) \ - -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ - > $@ -diff --git a/gst-libs/gst/egl/Makefile.in b/gst-libs/gst/egl/Makefile.in -index dfa0d43..9e2235b 100644 ---- a/gst-libs/gst/egl/Makefile.in -+++ b/gst-libs/gst/egl/Makefile.in -@@ -84,7 +84,7 @@ target_triplet = @target@ - subdir = gst-libs/gst/egl - DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/depcomp \ -- $(libgstegl_@GST_API_VERSION@include_HEADERS) -+ $(libgstnvegl_@GST_API_VERSION@include_HEADERS) - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ - $(top_srcdir)/common/m4/as-auto-alt.m4 \ -@@ -153,23 +153,23 @@ am__uninstall_files_from_dir = { \ - } - am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(girdir)" \ - "$(DESTDIR)$(typelibsdir)" \ -- "$(DESTDIR)$(libgstegl_@GST_API_VERSION@includedir)" -+ "$(DESTDIR)$(libgstnvegl_@GST_API_VERSION@includedir)" - LTLIBRARIES = $(lib_LTLIBRARIES) - am__DEPENDENCIES_1 = --libgstegl_@GST_API_VERSION@_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ -+libgstnvegl_@GST_API_VERSION@_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) --am_libgstegl_@GST_API_VERSION@_la_OBJECTS = \ -- libgstegl_@GST_API_VERSION@_la-egl.lo --libgstegl_@GST_API_VERSION@_la_OBJECTS = \ -- $(am_libgstegl_@GST_API_VERSION@_la_OBJECTS) -+am_libgstnvegl_@GST_API_VERSION@_la_OBJECTS = \ -+ libgstnvegl_@GST_API_VERSION@_la-egl.lo -+libgstnvegl_@GST_API_VERSION@_la_OBJECTS = \ -+ $(am_libgstnvegl_@GST_API_VERSION@_la_OBJECTS) - AM_V_lt = $(am__v_lt_@AM_V@) - am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) - am__v_lt_0 = --silent - am__v_lt_1 = --libgstegl_@GST_API_VERSION@_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ -+libgstnvegl_@GST_API_VERSION@_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ - $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -- $(libgstegl_@GST_API_VERSION@_la_CFLAGS) $(CFLAGS) \ -- $(libgstegl_@GST_API_VERSION@_la_LDFLAGS) $(LDFLAGS) -o $@ -+ $(libgstnvegl_@GST_API_VERSION@_la_CFLAGS) $(CFLAGS) \ -+ $(libgstnvegl_@GST_API_VERSION@_la_LDFLAGS) $(LDFLAGS) -o $@ - AM_V_P = $(am__v_P_@AM_V@) - am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) - am__v_P_0 = false -@@ -204,15 +204,15 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) - am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) - am__v_CCLD_0 = @echo " CCLD " $@; - am__v_CCLD_1 = --SOURCES = $(libgstegl_@GST_API_VERSION@_la_SOURCES) --DIST_SOURCES = $(libgstegl_@GST_API_VERSION@_la_SOURCES) -+SOURCES = $(libgstnvegl_@GST_API_VERSION@_la_SOURCES) -+DIST_SOURCES = $(libgstnvegl_@GST_API_VERSION@_la_SOURCES) - am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac - DATA = $(gir_DATA) $(typelibs_DATA) --HEADERS = $(libgstegl_@GST_API_VERSION@include_HEADERS) -+HEADERS = $(libgstnvegl_@GST_API_VERSION@include_HEADERS) - am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ -@@ -499,36 +499,36 @@ target_vendor = @target_vendor@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ --lib_LTLIBRARIES = libgstegl-@GST_API_VERSION@.la --libgstegl_@GST_API_VERSION@_la_SOURCES = egl.c --libgstegl_@GST_API_VERSION@includedir = \ -+lib_LTLIBRARIES = libgstnvegl-@GST_API_VERSION@.la -+libgstnvegl_@GST_API_VERSION@_la_SOURCES = egl.c -+libgstnvegl_@GST_API_VERSION@includedir = \ - $(includedir)/gstreamer-@GST_API_VERSION@/gst/egl - --libgstegl_@GST_API_VERSION@include_HEADERS = egl.h --libgstegl_@GST_API_VERSION@_la_CFLAGS = \ -+libgstnvegl_@GST_API_VERSION@include_HEADERS = egl.h -+libgstnvegl_@GST_API_VERSION@_la_CFLAGS = \ - $(GST_PLUGINS_BAD_CFLAGS) \ - $(GST_PLUGINS_BASE_CFLAGS) \ - $(GST_CFLAGS) \ - $(EGL_CFLAGS) - --libgstegl_@GST_API_VERSION@_la_LIBADD = \ -+libgstnvegl_@GST_API_VERSION@_la_LIBADD = \ - $(GST_PLUGINS_BASE_LIBS) \ - -lgstvideo-@GST_API_VERSION@ \ - $(GST_LIBS) \ - $(EGL_LIBS) - --libgstegl_@GST_API_VERSION@_la_LDFLAGS = \ -+libgstnvegl_@GST_API_VERSION@_la_LDFLAGS = \ - $(GST_LIB_LDFLAGS) \ - $(GST_ALL_LDFLAGS) \ - $(GST_LT_LDFLAGS) - - @HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GstEGL-@GST_API_VERSION@.gir - @HAVE_INTROSPECTION_TRUE@gir_headers = $(patsubst %,$(srcdir)/%, \ --@HAVE_INTROSPECTION_TRUE@ $(libgstegl_@GST_API_VERSION@include_HEADERS)) \ -+@HAVE_INTROSPECTION_TRUE@ $(libgstnvegl_@GST_API_VERSION@include_HEADERS)) \ - @HAVE_INTROSPECTION_TRUE@ $(patsubst %,$(builddir)/%, \ - @HAVE_INTROSPECTION_TRUE@ $(built_headers)) - @HAVE_INTROSPECTION_TRUE@gir_sources = $(patsubst %,$(srcdir)/%, \ --@HAVE_INTROSPECTION_TRUE@ $(libgstegl_@GST_API_VERSION@_la_SOURCES)) \ -+@HAVE_INTROSPECTION_TRUE@ $(libgstnvegl_@GST_API_VERSION@_la_SOURCES)) \ - @HAVE_INTROSPECTION_TRUE@ $(patsubst %,$(builddir)/%, \ - @HAVE_INTROSPECTION_TRUE@ $(built_sources)) - -@@ -609,8 +609,8 @@ clean-libLTLIBRARIES: - rm -f $${locs}; \ - } - --libgstegl-@GST_API_VERSION@.la: $(libgstegl_@GST_API_VERSION@_la_OBJECTS) $(libgstegl_@GST_API_VERSION@_la_DEPENDENCIES) $(EXTRA_libgstegl_@GST_API_VERSION@_la_DEPENDENCIES) -- $(AM_V_CCLD)$(libgstegl_@GST_API_VERSION@_la_LINK) -rpath $(libdir) $(libgstegl_@GST_API_VERSION@_la_OBJECTS) $(libgstegl_@GST_API_VERSION@_la_LIBADD) $(LIBS) -+libgstnvegl-@GST_API_VERSION@.la: $(libgstnvegl_@GST_API_VERSION@_la_OBJECTS) $(libgstnvegl_@GST_API_VERSION@_la_DEPENDENCIES) $(EXTRA_libgstnvegl_@GST_API_VERSION@_la_DEPENDENCIES) -+ $(AM_V_CCLD)$(libgstnvegl_@GST_API_VERSION@_la_LINK) -rpath $(libdir) $(libgstnvegl_@GST_API_VERSION@_la_OBJECTS) $(libgstnvegl_@GST_API_VERSION@_la_LIBADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -618,7 +618,7 @@ mostlyclean-compile: - distclean-compile: - -rm -f *.tab.c - --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstegl_@GST_API_VERSION@_la-egl.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstnvegl_@GST_API_VERSION@_la-egl.Plo@am__quote@ - - .c.o: - @am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ -@@ -644,12 +644,12 @@ distclean-compile: - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< - --libgstegl_@GST_API_VERSION@_la-egl.lo: egl.c --@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstegl_@GST_API_VERSION@_la_CFLAGS) $(CFLAGS) -MT libgstegl_@GST_API_VERSION@_la-egl.lo -MD -MP -MF $(DEPDIR)/libgstegl_@GST_API_VERSION@_la-egl.Tpo -c -o libgstegl_@GST_API_VERSION@_la-egl.lo `test -f 'egl.c' || echo '$(srcdir)/'`egl.c --@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstegl_@GST_API_VERSION@_la-egl.Tpo $(DEPDIR)/libgstegl_@GST_API_VERSION@_la-egl.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='egl.c' object='libgstegl_@GST_API_VERSION@_la-egl.lo' libtool=yes @AMDEPBACKSLASH@ -+libgstnvegl_@GST_API_VERSION@_la-egl.lo: egl.c -+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstnvegl_@GST_API_VERSION@_la_CFLAGS) $(CFLAGS) -MT libgstnvegl_@GST_API_VERSION@_la-egl.lo -MD -MP -MF $(DEPDIR)/libgstnvegl_@GST_API_VERSION@_la-egl.Tpo -c -o libgstnvegl_@GST_API_VERSION@_la-egl.lo `test -f 'egl.c' || echo '$(srcdir)/'`egl.c -+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstnvegl_@GST_API_VERSION@_la-egl.Tpo $(DEPDIR)/libgstnvegl_@GST_API_VERSION@_la-egl.Plo -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='egl.c' object='libgstnvegl_@GST_API_VERSION@_la-egl.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstegl_@GST_API_VERSION@_la_CFLAGS) $(CFLAGS) -c -o libgstegl_@GST_API_VERSION@_la-egl.lo `test -f 'egl.c' || echo '$(srcdir)/'`egl.c -+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstnvegl_@GST_API_VERSION@_la_CFLAGS) $(CFLAGS) -c -o libgstnvegl_@GST_API_VERSION@_la-egl.lo `test -f 'egl.c' || echo '$(srcdir)/'`egl.c - - mostlyclean-libtool: - -rm -f *.lo -@@ -698,27 +698,27 @@ uninstall-typelibsDATA: - @list='$(typelibs_DATA)'; test -n "$(typelibsdir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(typelibsdir)'; $(am__uninstall_files_from_dir) --install-libgstegl_@GST_API_VERSION@includeHEADERS: $(libgstegl_@GST_API_VERSION@include_HEADERS) -+install-libgstnvegl_@GST_API_VERSION@includeHEADERS: $(libgstnvegl_@GST_API_VERSION@include_HEADERS) - @$(NORMAL_INSTALL) -- @list='$(libgstegl_@GST_API_VERSION@include_HEADERS)'; test -n "$(libgstegl_@GST_API_VERSION@includedir)" || list=; \ -+ @list='$(libgstnvegl_@GST_API_VERSION@include_HEADERS)'; test -n "$(libgstnvegl_@GST_API_VERSION@includedir)" || list=; \ - if test -n "$$list"; then \ -- echo " $(MKDIR_P) '$(DESTDIR)$(libgstegl_@GST_API_VERSION@includedir)'"; \ -- $(MKDIR_P) "$(DESTDIR)$(libgstegl_@GST_API_VERSION@includedir)" || exit 1; \ -+ echo " $(MKDIR_P) '$(DESTDIR)$(libgstnvegl_@GST_API_VERSION@includedir)'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(libgstnvegl_@GST_API_VERSION@includedir)" || exit 1; \ - fi; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ -- echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libgstegl_@GST_API_VERSION@includedir)'"; \ -- $(INSTALL_HEADER) $$files "$(DESTDIR)$(libgstegl_@GST_API_VERSION@includedir)" || exit $$?; \ -+ echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libgstnvegl_@GST_API_VERSION@includedir)'"; \ -+ $(INSTALL_HEADER) $$files "$(DESTDIR)$(libgstnvegl_@GST_API_VERSION@includedir)" || exit $$?; \ - done - --uninstall-libgstegl_@GST_API_VERSION@includeHEADERS: -+uninstall-libgstnvegl_@GST_API_VERSION@includeHEADERS: - @$(NORMAL_UNINSTALL) -- @list='$(libgstegl_@GST_API_VERSION@include_HEADERS)'; test -n "$(libgstegl_@GST_API_VERSION@includedir)" || list=; \ -+ @list='$(libgstnvegl_@GST_API_VERSION@include_HEADERS)'; test -n "$(libgstnvegl_@GST_API_VERSION@includedir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ -- dir='$(DESTDIR)$(libgstegl_@GST_API_VERSION@includedir)'; $(am__uninstall_files_from_dir) -+ dir='$(DESTDIR)$(libgstnvegl_@GST_API_VERSION@includedir)'; $(am__uninstall_files_from_dir) - tags TAGS: - - ctags CTAGS: -@@ -760,7 +760,7 @@ check-am: all-am - check: check-am - all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) - installdirs: -- for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(girdir)" "$(DESTDIR)$(typelibsdir)" "$(DESTDIR)$(libgstegl_@GST_API_VERSION@includedir)"; do \ -+ for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(girdir)" "$(DESTDIR)$(typelibsdir)" "$(DESTDIR)$(libgstnvegl_@GST_API_VERSION@includedir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done - install: install-am -@@ -817,7 +817,7 @@ info: info-am - info-am: - - install-data-am: install-girDATA \ -- install-libgstegl_@GST_API_VERSION@includeHEADERS \ -+ install-libgstnvegl_@GST_API_VERSION@includeHEADERS \ - install-typelibsDATA - - install-dvi: install-dvi-am -@@ -865,7 +865,7 @@ ps: ps-am - ps-am: - - uninstall-am: uninstall-girDATA uninstall-libLTLIBRARIES \ -- uninstall-libgstegl_@GST_API_VERSION@includeHEADERS \ -+ uninstall-libgstnvegl_@GST_API_VERSION@includeHEADERS \ - uninstall-typelibsDATA - - .MAKE: install-am install-strip -@@ -878,7 +878,7 @@ uninstall-am: uninstall-girDATA uninstall-libLTLIBRARIES \ - install-dvi-am install-exec install-exec-am install-girDATA \ - install-html install-html-am install-info install-info-am \ - install-libLTLIBRARIES \ -- install-libgstegl_@GST_API_VERSION@includeHEADERS install-man \ -+ install-libgstnvegl_@GST_API_VERSION@includeHEADERS install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip install-typelibsDATA installcheck \ - installcheck-am installdirs maintainer-clean \ -@@ -886,11 +886,11 @@ uninstall-am: uninstall-girDATA uninstall-libLTLIBRARIES \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags-am uninstall uninstall-am uninstall-girDATA \ - uninstall-libLTLIBRARIES \ -- uninstall-libgstegl_@GST_API_VERSION@includeHEADERS \ -+ uninstall-libgstnvegl_@GST_API_VERSION@includeHEADERS \ - uninstall-typelibsDATA - - --@HAVE_INTROSPECTION_TRUE@GstEGL-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstegl-@GST_API_VERSION@.la -+@HAVE_INTROSPECTION_TRUE@GstEGL-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstnvegl-@GST_API_VERSION@.la - @HAVE_INTROSPECTION_TRUE@ $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \ - @HAVE_INTROSPECTION_TRUE@ GST_PLUGIN_SYSTEM_PATH_1_0="" GST_PLUGIN_PATH_1_0="" GST_REGISTRY_UPDATE=no \ - @HAVE_INTROSPECTION_TRUE@ $(INTROSPECTION_SCANNER) -v --namespace GstEGL \ -@@ -902,7 +902,7 @@ uninstall-am: uninstall-girDATA uninstall-libLTLIBRARIES \ - @HAVE_INTROSPECTION_TRUE@ -I$(top_builddir)/gst-libs \ - @HAVE_INTROSPECTION_TRUE@ --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ - @HAVE_INTROSPECTION_TRUE@ --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-video-@GST_API_VERSION@` \ --@HAVE_INTROSPECTION_TRUE@ --library=libgstegl-@GST_API_VERSION@.la \ -+@HAVE_INTROSPECTION_TRUE@ --library=libgstnvegl-@GST_API_VERSION@.la \ - @HAVE_INTROSPECTION_TRUE@ --include=Gst-@GST_API_VERSION@ \ - @HAVE_INTROSPECTION_TRUE@ --libtool="$(top_builddir)/libtool" \ - @HAVE_INTROSPECTION_TRUE@ --pkg gstreamer-@GST_API_VERSION@ \ -@@ -924,17 +924,17 @@ uninstall-am: uninstall-girDATA uninstall-libLTLIBRARIES \ - @HAVE_INTROSPECTION_TRUE@ $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) - - Android.mk: $(BUILT_SOURCES) Makefile.am -- androgenizer -:PROJECT libgstegl -:STATIC libgstegl-@GST_API_VERSION@ \ -+ androgenizer -:PROJECT libgstnvegl -:STATIC libgstnvegl-@GST_API_VERSION@ \ - -:TAGS eng debug \ - -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ -- -:SOURCES $(libgstegl_@GST_API_VERSION@_la_SOURCES) \ -+ -:SOURCES $(libgstnvegl_@GST_API_VERSION@_la_SOURCES) \ - $(built_sources) \ -- -:CFLAGS $(DEFS) $(libgstegl_@GST_API_VERSION@_la_CFLAGS) \ -- -:LDFLAGS $(libgstegl_@GST_API_VERSION@_la_LDFLAGS) \ -- $(libgstegl@GST_API_VERSION@_la_LIBADD) \ -+ -:CFLAGS $(DEFS) $(libgstnvegl_@GST_API_VERSION@_la_CFLAGS) \ -+ -:LDFLAGS $(libgstnvegl_@GST_API_VERSION@_la_LDFLAGS) \ -+ $(libgstnvegl@GST_API_VERSION@_la_LIBADD) \ - -ldl \ - -:HEADER_TARGET gstreamer-@GST_API_VERSION@/gst/egl \ -- -:HEADERS $(libgsteglinclude_HEADERS) \ -+ -:HEADERS $(libgstnveglinclude_HEADERS) \ - $(built_headers) \ - -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ - > $@ -diff --git a/gst-plugins-bad.spec.in b/gst-plugins-bad.spec.in -index 0a4f38d..8d3d0fc 100644 ---- a/gst-plugins-bad.spec.in -+++ b/gst-plugins-bad.spec.in -@@ -278,9 +278,9 @@ make ERROR_CFLAGS='' ERROR_CXXFLAGS='' - %{_libdir}/libgstbasecamerabinsrc-1.0.so - %{_libdir}/libgstbasecamerabinsrc-1.0.so.0 - %{_libdir}/libgstbasecamerabinsrc-1.0.so.0.102.0 --%{_libdir}/libgstegl-1.0.so --%{_libdir}/libgstegl-1.0.so.0 --%{_libdir}/libgstegl-1.0.so.0.102.0 -+%{_libdir}/libgstnvegl-1.0.so -+%{_libdir}/libgstnvegl-1.0.so.0 -+%{_libdir}/libgstnvegl-1.0.so.0.102.0 - %{_libdir}/libgstmpegts-1.0.so - %{_libdir}/libgstmpegts-1.0.so.0 - %{_libdir}/libgstmpegts-1.0.so.0.102.0 -diff --git a/pkgconfig/gstreamer-egl-uninstalled.pc.in b/pkgconfig/gstreamer-egl-uninstalled.pc.in -index 525bda8..ae9d406 100644 ---- a/pkgconfig/gstreamer-egl-uninstalled.pc.in -+++ b/pkgconfig/gstreamer-egl-uninstalled.pc.in -@@ -7,6 +7,6 @@ Name: GStreamer EGL, Uninstalled - Description: GStreamer EGL Library, uninstalled - Requires: gstreamer-@GST_API_VERSION@ - Version: @VERSION@ --Libs: -L${libdir} ${libdir}/libgstegl-@GST_API_VERSION@.la @EGL_LIBS@ -+Libs: -L${libdir} ${libdir}/libgstnvegl-@GST_API_VERSION@.la @EGL_LIBS@ - Cflags: -I${includedir} @EGL_CFLAGS@ - --- -1.9.1 - diff --git a/recipes-multimedia/libgstnvegl/libgstnvegl_21.7.0.bb b/recipes-multimedia/libgstnvegl/libgstnvegl_21.7.0.bb deleted file mode 100644 index 5645510..0000000 --- a/recipes-multimedia/libgstnvegl/libgstnvegl_21.7.0.bb +++ /dev/null @@ -1,46 +0,0 @@ -DESCRIPTION = "NVIDIA Linux Driver Packages" -HOMEPAGE = "https://developer.nvidia.com/" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=73a5855a8119deb017f5f13cf327095d" - -SRC_URI = " \ - https://developer.download.nvidia.com/embedded/L4T/r21_Release_v7.0/r21.7.0-sources.tbz2 \ - file://0001-rename-gstegl-to-gstnvegl.patch \ - file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \ - file://0001-pkg-config-files-fix-qa-error.patch \ -" - -SRC_URI[md5sum] = "620d0979ffbbc8cbe8cb36faacee386b" -SRC_URI[sha256sum] = "4523ce03e18d2507a180a0b67e3ef136d4b73837f48063146c471fe575282440" - -S = "${WORKDIR}/gstegl_src/gst-egl" - -inherit autotools pkgconfig -# gobject-introspection - -EXTRA_OECONF = "--disable-nls --disable-static-plugins --enable-introspection=no" - -DEPENDS += " libffi glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base libpcre libxml2 zlib \ - virtual/egl virtual/mesa virtual/libgles2 wayland gdbm drm tar-native" - -nvidia_unpack() { - cd "${WORKDIR}" - # NVIDIA now packages packages in one big package! - tar xjf gstegl_src.tbz2 -} - -do_unpack[postfuncs] += "nvidia_unpack" - -FILES_${PN}-dbg = " \ - /usr/src/debug/* \ - /usr/lib/gstreamer-1.0/.debug/* \ - /usr/lib/.debug/* \ -" - -FILES_${PN} = " \ - /usr/lib/gstreamer-1.0/libgstnveglglessink.so \ - /usr/lib/gstreamer-1.0/libgstnveglglessink.la \ - /usr/lib/libgstnvegl-1.0.so \ - /usr/lib/libgstnvegl-1.0.so.0 \ - /usr/lib/libgstnvegl-1.0.so.0.203.0 \ -" diff --git a/recipes-multimedia/libgstomx-1.0/files/gstomx-1.0.patch b/recipes-multimedia/libgstomx-1.0/files/gstomx-1.0.patch deleted file mode 100644 index 9e5a702..0000000 --- a/recipes-multimedia/libgstomx-1.0/files/gstomx-1.0.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur a/omx/gstomxvideoenc.c b/omx/gstomxvideoenc.c ---- a/omx/gstomxvideoenc.c 2016-06-08 06:17:32.000000000 +0200 -+++ b/omx/gstomxvideoenc.c 2017-01-08 23:54:18.217242233 +0100 -@@ -2440,7 +2440,7 @@ - - err = - gst_omx_component_get_index (self->enc, -- NVX_INDEX_CONFIG_VIDEO_ENCODE_TEMPORALTRADEOFF, &eIndex); -+ (char *) NVX_INDEX_CONFIG_VIDEO_ENCODE_TEMPORALTRADEOFF, &eIndex); - if (err != OMX_ErrorNone) { - return FALSE; - } diff --git a/recipes-multimedia/libgstomx-1.0/files/r21.6.0-sources-gstomx1_src.patch b/recipes-multimedia/libgstomx-1.0/files/r21.6.0-sources-gstomx1_src.patch deleted file mode 100644 index f74f278..0000000 --- a/recipes-multimedia/libgstomx-1.0/files/r21.6.0-sources-gstomx1_src.patch +++ /dev/null @@ -1,90 +0,0 @@ -diff -Naur r21.5.0-sources-gstomx1_src-gst-omx1/omx/gstomxh264enc.c r21.6.0-sources-gstomx1_src-gst-omx1/omx/gstomxh264enc.c ---- r21.5.0-sources-gstomx1_src-gst-omx1/omx/gstomxh264enc.c 2016-06-08 06:17:32.000000000 +0200 -+++ r21.6.0-sources-gstomx1_src-gst-omx1/omx/gstomxh264enc.c 2017-10-14 03:23:25.000000000 +0200 -@@ -48,13 +48,15 @@ - { - PROP_0, - PROP_INSERT_SPS_PPS, -- PROP_NO_BFRAMES, -+ PROP_NUM_BFRAMES, - PROP_SLICE_HEADER_SPACING, - PROP_PROFILE - }; - - #define DEFAULT_SLICE_HEADER_SPACING 0 - #define DEFAULT_PROFILE OMX_VIDEO_AVCProfileBaseline -+#define DEFAULT_NUM_B_FRAMES 0 -+#define MAX_NUM_B_FRAMES 2 - - - #define GST_TYPE_OMX_VID_ENC_PROFILE (gst_omx_videnc_profile_get_type ()) -@@ -132,11 +134,12 @@ - "Insert H.264 SPS, PPS at every IDR frame", - FALSE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); - -- g_object_class_install_property (gobject_class, PROP_NO_BFRAMES, -- g_param_spec_boolean ("no-B-Frames", -- "Do not encode B Frames", -- "Do not use B Frames while encoding", -- FALSE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | -+ g_object_class_install_property (gobject_class, PROP_NUM_BFRAMES, -+ g_param_spec_uint ("num-B-Frames", -+ "B Frames between two reference frames", -+ "Number of B Frames between two reference frames (not recommended)", -+ 0, MAX_NUM_B_FRAMES, DEFAULT_NUM_B_FRAMES, -+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | - GST_PARAM_MUTABLE_READY)); - - g_object_class_install_property (gobject_class, PROP_PROFILE, -@@ -151,7 +154,7 @@ - gst_omx_h264_enc_init (GstOMXH264Enc * self) - { - self->insert_sps_pps = FALSE; -- self->no_BFrames = FALSE; -+ self->nBFrames = 0; - self->slice_header_spacing = DEFAULT_SLICE_HEADER_SPACING; - self->profile = DEFAULT_PROFILE; - } -@@ -679,8 +682,8 @@ - case PROP_INSERT_SPS_PPS: - self->insert_sps_pps = g_value_get_boolean (value); - break; -- case PROP_NO_BFRAMES: -- self->no_BFrames = g_value_get_boolean (value); -+ case PROP_NUM_BFRAMES: -+ self->nBFrames = g_value_get_uint (value); - break; - case PROP_SLICE_HEADER_SPACING: - self->slice_header_spacing = g_value_get_ulong (value); -@@ -704,8 +707,8 @@ - case PROP_INSERT_SPS_PPS: - g_value_set_boolean (value, self->insert_sps_pps); - break; -- case PROP_NO_BFRAMES: -- g_value_set_boolean (value, self->no_BFrames); -+ case PROP_NUM_BFRAMES: -+ g_value_set_uint (value, self->nBFrames); - break; - case PROP_SLICE_HEADER_SPACING: - g_value_set_ulong (value, self->slice_header_spacing); -@@ -734,7 +737,7 @@ - gst_omx_component_get_parameter (GST_OMX_VIDEO_ENC (self)->enc, - OMX_IndexParamVideoAvc, &oH264Type); - if (eError == OMX_ErrorNone) { -- oH264Type.nBFrames = self->no_BFrames; -+ oH264Type.nBFrames = self->nBFrames; - oH264Type.nSliceHeaderSpacing = self->slice_header_spacing; - oH264Type.eProfile = self->profile; - -diff -Naur r21.5.0-sources-gstomx1_src-gst-omx1/omx/gstomxh264enc.h r21.6.0-sources-gstomx1_src-gst-omx1/omx/gstomxh264enc.h ---- r21.5.0-sources-gstomx1_src-gst-omx1/omx/gstomxh264enc.h 2016-06-08 06:17:32.000000000 +0200 -+++ r21.6.0-sources-gstomx1_src-gst-omx1/omx/gstomxh264enc.h 2017-10-14 03:23:25.000000000 +0200 -@@ -56,7 +56,7 @@ - GstOMXVideoEnc parent; - h264_sf stream_format; - gboolean insert_sps_pps; -- gboolean no_BFrames; -+ gboolean nBFrames; - glong slice_header_spacing; - guint profile; - }; diff --git a/recipes-multimedia/libgstomx-1.0/files/r21.7.0-sources-gstomx1_src.patch b/recipes-multimedia/libgstomx-1.0/files/r21.7.0-sources-gstomx1_src.patch deleted file mode 100644 index aa4c6d5..0000000 --- a/recipes-multimedia/libgstomx-1.0/files/r21.7.0-sources-gstomx1_src.patch +++ /dev/null @@ -1,71 +0,0 @@ -diff -Naur r21.6.0-sources-gstomx1_src-gst-omx1/omx/gstomxvideosink.c r21.7.0-sources-gstomx1_src-gst-omx1/omx/gstomxvideosink.c ---- r21.6.0-sources-gstomx1_src-gst-omx1/omx/gstomxvideosink.c 2017-10-14 03:23:25.000000000 +0200 -+++ r21.7.0-sources-gstomx1_src-gst-omx1/omx/gstomxvideosink.c 2018-05-29 22:13:29.000000000 +0200 -@@ -942,6 +942,32 @@ - return TRUE; - } - -+static OMX_ERRORTYPE -+gst_omx_set_stride_alignment (GstOmxVideoSink * self, -+ guint32 align) -+{ -+ OMX_INDEXTYPE eIndex; -+ OMX_ERRORTYPE eError; -+ -+ eError = gst_omx_component_get_index (self->sink, -+ (char *) NVX_INDEX_CONFIG_VIDEOSTRIDEALIGN, -+ &eIndex); -+ -+ if (eError == OMX_ErrorNone) { -+ NVX_CONFIG_VIDEO_STRIDEALIGN oStride; -+ -+ GST_OMX_INIT_STRUCT (&oStride); -+ -+ eError = gst_omx_component_get_config (self->sink, eIndex, &oStride); -+ -+ if (eError == OMX_ErrorNone) { -+ oStride.nAlign = (unsigned long) align; -+ eError = gst_omx_component_set_config (self->sink, eIndex, &oStride); -+ } -+ } -+ return eError; -+} -+ - static void - gst_omx_video_sink_check_nvfeatures (GstOmxVideoSink * self, GstCaps * caps) - { -@@ -950,6 +976,13 @@ - if (gst_caps_features_contains (feature, "memory:NVMM")) { - self->hw_path = TRUE; - } -+ -+ if (!self->hw_path) { -+ if (gst_omx_set_stride_alignment (self, 4) -+ != OMX_ErrorNone) { -+ g_warning ("Failed to set stride alignment.\n"); -+ } -+ } - } - - static OMX_ERRORTYPE -@@ -1087,6 +1120,20 @@ - min = MAX (port_def.nBufferCountMin, 4); - port_def.nBufferCountActual = min; - -+ switch (info.finfo->format) { -+ case GST_VIDEO_FORMAT_I420: -+ port_def.format.video.eColorFormat = OMX_COLOR_FormatYUV420Planar; -+ break; -+ case GST_VIDEO_FORMAT_NV12: -+ port_def.format.video.eColorFormat = OMX_COLOR_FormatYUV420SemiPlanar; -+ break; -+ default: -+ GST_ERROR_OBJECT (self, "Unsupported format %s", -+ gst_video_format_to_string (info.finfo->format)); -+ return FALSE; -+ break; -+ } -+ - GST_DEBUG_OBJECT (self, "Setting inport port definition"); - - if (gst_omx_port_update_port_definition (self->sink_in_port, diff --git a/recipes-multimedia/libgstomx-1.0/libgstomx-1.0_21.7.0.bb b/recipes-multimedia/libgstomx-1.0/libgstomx-1.0_21.7.0.bb deleted file mode 100644 index 0e57dd4..0000000 --- a/recipes-multimedia/libgstomx-1.0/libgstomx-1.0_21.7.0.bb +++ /dev/null @@ -1,44 +0,0 @@ -DESCRIPTION = "NVIDIA Linux Driver Packages" -HOMEPAGE = "https://developer.nvidia.com/" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" - -SRC_URI = " \ - http://developer.download.nvidia.com/embedded/L4T/r21_Release_v5.0/source/gstomx1_src.tbz2 \ - file://r21.6.0-sources-gstomx1_src.patch \ - file://r21.7.0-sources-gstomx1_src.patch \ - file://gstomx-1.0.patch \ -" - -SRC_URI[md5sum] = "d5714a9533b210b30ef0e97e28ebc77d" -SRC_URI[sha256sum] = "b1c62a41467f2ff6661a3ba7d0e30e85e7ed126005f67b39ff6ebf2d704fd222" - -DEPENDS += " libgstnvegl libffi glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base libpcre libxml2 zlib " -DEPENDS += " virtual/egl virtual/mesa virtual/libgles2 wayland gdbm drm " - -S = "${WORKDIR}/gstomx1_src/gst-omx1" - -inherit autotools pkgconfig - -EXTRA_OECONF = " --with-omx-target=tegra --disable-static-plugins" - -CXXFLAGS += " -I${S}/omx/openmax " -CFLAGS += " -I${S}/omx/openmax " - -do_configure_prepend() { - export NOCONFIGURE="true" - export GST_EGL_LIBS="-lgstnvegl-1.0 -lEGL -lX11 -lgstreamer-1.0 -lgobject-2.0 -lglib-2.0" - export GST_EGL_CFLAGS="-I${STAGING_INCDIR}/libdrm " -# export GST_EGL_CFLAGS="-pthread -I${STAGING_INCDIR}/gstreamer-1.0 -I${STAGING_INCDIR}/libdrm -I${STAGING_INCDIR}/glib-2.0 -I${STAGING_LIBDIR}/glib-2.0/include" -} - -FILES_${PN}-dbg = " \ - /usr/src/debug/* \ - /usr/lib/gstreamer-1.0/.debug/* \ - /usr/lib/.debug/* \ -" - -FILES_${PN} = " \ - /usr/lib/gstreamer-1.0/libgstomx.la \ - /usr/lib/gstreamer-1.0/libgstomx.so \ -" diff --git a/recipes-multimedia/libpng/libpng12_1.2.57.bb b/recipes-multimedia/libpng/libpng12_1.2.57.bb deleted file mode 100644 index 9f74f5f..0000000 --- a/recipes-multimedia/libpng/libpng12_1.2.57.bb +++ /dev/null @@ -1,36 +0,0 @@ -SUMMARY = "PNG image format decoding library" -HOMEPAGE = "http://www.libpng.org/" -SECTION = "libs" -LICENSE = "Libpng" -LIC_FILES_CHKSUM = "file://LICENSE;md5=597b8a91994a3e27ae6aa79bf02677d9 \ - file://png.h;beginline=19;endline=109;md5=166406397718925b660f0033f7558ef7" -DEPENDS = "zlib" - -PN = "libpng12" -S = "${WORKDIR}/libpng-${PV}" - -SRC_URI = "${GENTOO_MIRROR}/libpng-${PV}.tar.xz" - -SRC_URI[md5sum] = "307052e5e8af97b82b17b64fb1b3677a" -SRC_URI[sha256sum] = "0f4620e11fa283fedafb474427c8e96bf149511a1804bdc47350963ae5cf54d8" - -UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/libpng/files/libpng12/" -UPSTREAM_CHECK_REGEX = "/libpng12/(?P<pver>(\d+[\.\-_]*)+)/" - -BINCONFIG_GLOB = "${PN}-config" - -inherit autotools binconfig pkgconfig - -do_install_append() { - # The follow link files link to corresponding png12*.h and libpng12* files - # They conflict with higher verison, so drop them - rm ${D}/${includedir}/png.h - rm ${D}/${includedir}/pngconf.h - - rm ${D}/${libdir}/libpng.la - rm ${D}/${libdir}/libpng.so - rm ${D}/${libdir}/libpng.a || true - rm ${D}/${libdir}/pkgconfig/libpng.pc - - rm ${D}/${bindir}/libpng-config -} |