gatesgarth migration: libdrm: Sync with upstream and BSP release rel_imx_5.10.9_1.0.0
Sync with BSP release rel_imx_5.10.9_1.0.0 and remove unnecesary files after most of them were updated in meta-freescale layer. https://jira.digi.com/browse/DEL-7508 Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
This commit is contained in:
Arturo Buzarra
parent
5eaa4d2d42
commit
2006018343
|
|
@ -14,8 +14,6 @@ BBFILE_COLLECTIONS += "digi-dey"
|
|||
BBFILE_PATTERN_digi-dey := "^${LAYERDIR}/"
|
||||
BBFILE_PRIORITY_digi-dey = "6"
|
||||
|
||||
BBMASK += "meta-freescale/recipes-graphics/drm/libdrm_%.bbappend"
|
||||
|
||||
LAYERDEPENDS_digi-dey = "core digi-arm"
|
||||
LAYERDEPENDS_digi-dey += "openembedded-layer networking-layer webserver qt5-layer swupdate"
|
||||
|
||||
|
|
|
|||
|
|
@ -1,35 +0,0 @@
|
|||
Upstream-Status: Submitted
|
||||
Signed-off-by: Ross Burton <ross.burton@intel.com>
|
||||
|
||||
From 46c0fd6c827a8cb4d04e067bf04fab579ac4712e Mon Sep 17 00:00:00 2001
|
||||
From: Ross Burton <ross.burton@intel.com>
|
||||
Date: Mon, 18 Jun 2018 15:07:03 +0100
|
||||
Subject: [PATCH] tests/nouveau/threaded: adapt ioctl signature
|
||||
|
||||
POSIX says ioctl() has the signature (int, int, ...) but glibc has decided to
|
||||
use (int, unsigned long int, ...) instead.
|
||||
|
||||
Use a #ifdef to adapt the replacement function as appropriate.
|
||||
---
|
||||
tests/nouveau/threaded.c | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/tests/nouveau/threaded.c b/tests/nouveau/threaded.c
|
||||
index 3669bcd3..e1c27c01 100644
|
||||
--- a/tests/nouveau/threaded.c
|
||||
+++ b/tests/nouveau/threaded.c
|
||||
@@ -36,7 +36,11 @@ static int failed;
|
||||
|
||||
static int import_fd;
|
||||
|
||||
+#ifdef __GLIBC__
|
||||
int ioctl(int fd, unsigned long request, ...)
|
||||
+#else
|
||||
+int ioctl(int fd, int request, ...)
|
||||
+#endif
|
||||
{
|
||||
va_list va;
|
||||
int ret;
|
||||
--
|
||||
2.11.0
|
||||
|
||||
|
|
@ -1,9 +1,74 @@
|
|||
require libdrm_2.4.99.imx.bb
|
||||
SUMMARY = "Userspace interface to the kernel DRM services"
|
||||
DESCRIPTION = "The runtime library for accessing the kernel DRM services. DRM \
|
||||
stands for \"Direct Rendering Manager\", which is the kernel portion of the \
|
||||
\"Direct Rendering Infrastructure\" (DRI). DRI is required for many hardware \
|
||||
accelerated OpenGL drivers."
|
||||
HOMEPAGE = "http://dri.freedesktop.org"
|
||||
SECTION = "x11/base"
|
||||
LICENSE = "MIT"
|
||||
LIC_FILES_CHKSUM = "file://xf86drm.c;beginline=9;endline=32;md5=c8a3b961af7667c530816761e949dc71"
|
||||
PROVIDES = "drm"
|
||||
DEPENDS = "libpthread-stubs"
|
||||
|
||||
FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
|
||||
|
||||
LIC_FILES_CHKSUM = "file://xf86drm.c;beginline=9;endline=32;md5=c8a3b961af7667c530816761e949dc71"
|
||||
IMX_LIBDRM_SRC ?= "git://source.codeaurora.org/external/imx/libdrm-imx.git;protocol=https;nobranch=1"
|
||||
IMX_LIBDRM_BRANCH = "libdrm-imx-2.4.102"
|
||||
SRCREV = "f525ae649cd6e81e5d4e459799b0f7a120c4e174"
|
||||
SRC_URI = "${IMX_LIBDRM_SRC};branch=${IMX_LIBDRM_BRANCH} \
|
||||
file://0001-meson-add-libdrm-vivante-to-the-meson-meta-data.patch "
|
||||
SRCREV = "40ea53973b99b7df07f472318918a8c2b310e4a7"
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
SRC_URI_remove = "file://musl-ioctl.patch"
|
||||
DEFAULT_PREFERENCE = "-1"
|
||||
|
||||
inherit meson pkgconfig manpages
|
||||
|
||||
PACKAGECONFIG ??= "libkms intel radeon amdgpu nouveau vmwgfx omap freedreno vc4 etnaviv install-test-programs"
|
||||
PACKAGECONFIG[libkms] = "-Dlibkms=true,-Dlibkms=false"
|
||||
PACKAGECONFIG[intel] = "-Dintel=true,-Dintel=false,libpciaccess"
|
||||
PACKAGECONFIG[radeon] = "-Dradeon=true,-Dradeon=false"
|
||||
PACKAGECONFIG[amdgpu] = "-Damdgpu=true,-Damdgpu=false"
|
||||
PACKAGECONFIG[nouveau] = "-Dnouveau=true,-Dnouveau=false"
|
||||
PACKAGECONFIG[vmwgfx] = "-Dvmwgfx=true,-Dvmwgfx=false"
|
||||
PACKAGECONFIG[omap] = "-Domap=true,-Domap=false"
|
||||
PACKAGECONFIG[exynos] = "-Dexynos=true,-Dexynos=false"
|
||||
PACKAGECONFIG[freedreno] = "-Dfreedreno=true,-Dfreedreno=false"
|
||||
PACKAGECONFIG[tegra] = "-Dtegra=true,-Dtegra=false"
|
||||
PACKAGECONFIG[vc4] = "-Dvc4=true,-Dvc4=false"
|
||||
PACKAGECONFIG[etnaviv] = "-Detnaviv=true,-Detnaviv=false"
|
||||
PACKAGECONFIG[freedreno-kgsl] = "-Dfreedreno-kgsl=true,-Dfreedreno-kgsl=false"
|
||||
PACKAGECONFIG[valgrind] = "-Dvalgrind=true,-Dvalgrind=false,valgrind"
|
||||
PACKAGECONFIG[install-test-programs] = "-Dinstall-test-programs=true,-Dinstall-test-programs=false"
|
||||
PACKAGECONFIG[cairo-tests] = "-Dcairo-tests=true,-Dcairo-tests=false"
|
||||
PACKAGECONFIG[udev] = "-Dudev=true,-Dudev=false,udev"
|
||||
PACKAGECONFIG[manpages] = "-Dman-pages=true,-Dman-pages=false,libxslt-native xmlto-native"
|
||||
|
||||
ALLOW_EMPTY_${PN}-drivers = "1"
|
||||
PACKAGES =+ "${PN}-tests ${PN}-drivers ${PN}-radeon ${PN}-nouveau ${PN}-omap \
|
||||
${PN}-intel ${PN}-exynos ${PN}-kms ${PN}-freedreno ${PN}-amdgpu \
|
||||
${PN}-etnaviv"
|
||||
|
||||
RRECOMMENDS_${PN}-drivers = "${PN}-radeon ${PN}-nouveau ${PN}-omap ${PN}-intel \
|
||||
${PN}-exynos ${PN}-freedreno ${PN}-amdgpu \
|
||||
${PN}-etnaviv"
|
||||
|
||||
FILES_${PN}-tests = "${bindir}/*"
|
||||
FILES_${PN}-radeon = "${libdir}/libdrm_radeon.so.*"
|
||||
FILES_${PN}-nouveau = "${libdir}/libdrm_nouveau.so.*"
|
||||
FILES_${PN}-omap = "${libdir}/libdrm_omap.so.*"
|
||||
FILES_${PN}-intel = "${libdir}/libdrm_intel.so.*"
|
||||
FILES_${PN}-exynos = "${libdir}/libdrm_exynos.so.*"
|
||||
FILES_${PN}-kms = "${libdir}/libkms*.so.*"
|
||||
FILES_${PN}-freedreno = "${libdir}/libdrm_freedreno.so.*"
|
||||
FILES_${PN}-amdgpu = "${libdir}/libdrm_amdgpu.so.* ${datadir}/${PN}/amdgpu.ids"
|
||||
FILES_${PN}-etnaviv = "${libdir}/libdrm_etnaviv.so.*"
|
||||
|
||||
BBCLASSEXTEND = "native nativesdk"
|
||||
|
||||
PACKAGES_prepend_imxgpu = "${PN}-vivante "
|
||||
RRECOMMENDS_${PN}-drivers_append_imxgpu = " ${PN}-vivante"
|
||||
FILES_${PN}-vivante = "${libdir}/libdrm_vivante.so.*"
|
||||
PACKAGECONFIG_append_imxgpu = " vivante"
|
||||
PACKAGECONFIG[vivante] = "-Dvivante=true,-Dvivante=false"
|
||||
|
||||
PACKAGE_ARCH = "${MACHINE_SOCARCH}"
|
||||
|
|
|
|||
|
|
@ -1,73 +0,0 @@
|
|||
SUMMARY = "Userspace interface to the kernel DRM services"
|
||||
DESCRIPTION = "The runtime library for accessing the kernel DRM services. DRM \
|
||||
stands for \"Direct Rendering Manager\", which is the kernel portion of the \
|
||||
\"Direct Rendering Infrastructure\" (DRI). DRI is required for many hardware \
|
||||
accelerated OpenGL drivers."
|
||||
HOMEPAGE = "http://dri.freedesktop.org"
|
||||
SECTION = "x11/base"
|
||||
LICENSE = "MIT"
|
||||
LIC_FILES_CHKSUM = "file://xf86drm.c;beginline=9;endline=32;md5=c8a3b961af7667c530816761e949dc71"
|
||||
PROVIDES = "drm"
|
||||
DEPENDS = "libpthread-stubs"
|
||||
|
||||
IMX_LIBDRM_SRC ?= "git://source.codeaurora.org/external/imx/libdrm-imx.git;protocol=https;nobranch=1"
|
||||
IMX_LIBDRM_BRANCH ?= "libdrm-imx-2.4.99"
|
||||
SRC_URI = "${IMX_LIBDRM_SRC};branch=${IMX_LIBDRM_BRANCH} \
|
||||
file://musl-ioctl.patch \
|
||||
file://0001-meson-add-libdrm-vivante-to-the-meson-meta-data.patch "
|
||||
SRCREV = "f421c9c8c4b8fe48d9e6ef43910e98569c94a4b2"
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
DEFAULT_PREFERENCE = "-1"
|
||||
|
||||
inherit meson pkgconfig manpages
|
||||
|
||||
PACKAGECONFIG ??= "libkms intel radeon amdgpu nouveau vmwgfx omap freedreno vc4 etnaviv install-test-programs"
|
||||
PACKAGECONFIG[libkms] = "-Dlibkms=true,-Dlibkms=false"
|
||||
PACKAGECONFIG[intel] = "-Dintel=true,-Dintel=false,libpciaccess"
|
||||
PACKAGECONFIG[radeon] = "-Dradeon=true,-Dradeon=false"
|
||||
PACKAGECONFIG[amdgpu] = "-Damdgpu=true,-Damdgpu=false"
|
||||
PACKAGECONFIG[nouveau] = "-Dnouveau=true,-Dnouveau=false"
|
||||
PACKAGECONFIG[vmwgfx] = "-Dvmwgfx=true,-Dvmwgfx=false"
|
||||
PACKAGECONFIG[omap] = "-Domap=true,-Domap=false"
|
||||
PACKAGECONFIG[exynos] = "-Dexynos=true,-Dexynos=false"
|
||||
PACKAGECONFIG[freedreno] = "-Dfreedreno=true,-Dfreedreno=false"
|
||||
PACKAGECONFIG[tegra] = "-Dtegra=true,-Dtegra=false"
|
||||
PACKAGECONFIG[vc4] = "-Dvc4=true,-Dvc4=false"
|
||||
PACKAGECONFIG[etnaviv] = "-Detnaviv=true,-Detnaviv=false"
|
||||
PACKAGECONFIG[freedreno-kgsl] = "-Dfreedreno-kgsl=true,-Dfreedreno-kgsl=false"
|
||||
PACKAGECONFIG[valgrind] = "-Dvalgrind=true,-Dvalgrind=false,valgrind"
|
||||
PACKAGECONFIG[install-test-programs] = "-Dinstall-test-programs=true,-Dinstall-test-programs=false"
|
||||
PACKAGECONFIG[cairo-tests] = "-Dcairo-tests=true,-Dcairo-tests=false"
|
||||
PACKAGECONFIG[udev] = "-Dudev=true,-Dudev=false,udev"
|
||||
PACKAGECONFIG[manpages] = "-Dman-pages=true,-Dman-pages=false,libxslt-native xmlto-native"
|
||||
|
||||
ALLOW_EMPTY_${PN}-drivers = "1"
|
||||
PACKAGES =+ "${PN}-tests ${PN}-drivers ${PN}-radeon ${PN}-nouveau ${PN}-omap \
|
||||
${PN}-intel ${PN}-exynos ${PN}-kms ${PN}-freedreno ${PN}-amdgpu \
|
||||
${PN}-etnaviv"
|
||||
|
||||
RRECOMMENDS_${PN}-drivers = "${PN}-radeon ${PN}-nouveau ${PN}-omap ${PN}-intel \
|
||||
${PN}-exynos ${PN}-freedreno ${PN}-amdgpu \
|
||||
${PN}-etnaviv"
|
||||
|
||||
FILES_${PN}-tests = "${bindir}/*"
|
||||
FILES_${PN}-radeon = "${libdir}/libdrm_radeon.so.*"
|
||||
FILES_${PN}-nouveau = "${libdir}/libdrm_nouveau.so.*"
|
||||
FILES_${PN}-omap = "${libdir}/libdrm_omap.so.*"
|
||||
FILES_${PN}-intel = "${libdir}/libdrm_intel.so.*"
|
||||
FILES_${PN}-exynos = "${libdir}/libdrm_exynos.so.*"
|
||||
FILES_${PN}-kms = "${libdir}/libkms*.so.*"
|
||||
FILES_${PN}-freedreno = "${libdir}/libdrm_freedreno.so.*"
|
||||
FILES_${PN}-amdgpu = "${libdir}/libdrm_amdgpu.so.* ${datadir}/${PN}/amdgpu.ids"
|
||||
FILES_${PN}-etnaviv = "${libdir}/libdrm_etnaviv.so.*"
|
||||
|
||||
BBCLASSEXTEND = "native nativesdk"
|
||||
|
||||
PACKAGES_prepend_imxgpu = "${PN}-vivante "
|
||||
RRECOMMENDS_${PN}-drivers_append_imxgpu = " ${PN}-vivante"
|
||||
FILES_${PN}-vivante = "${libdir}/libdrm_vivante.so.*"
|
||||
PACKAGECONFIG_append_imxgpu = " vivante"
|
||||
PACKAGECONFIG[vivante] = "-Dvivante=true,-Dvivante=false"
|
||||
|
||||
PACKAGE_ARCH = "${MACHINE_SOCARCH}"
|
||||
Loading…
Reference in New Issue