From 2a7bcfb27159de5aed39c4ac42fab1186ccde2be Mon Sep 17 00:00:00 2001 From: Ronan Le Martret Date: Thu, 16 Apr 2020 09:32:50 +0200 Subject: [Community] Update libdrm for yocto 3.1 Bug-AGL: SPEC-3328 Signed-off-by: Ronan Le Martret Change-Id: I00edecc1a0d38c731a411f66be8d798ad74d9d02 --- meta-rcar-gen3/conf/machine/ebisu.conf | 2 +- meta-rcar-gen3/conf/machine/h3ulcb.conf | 2 +- meta-rcar-gen3/conf/machine/m3nulcb.conf | 2 +- meta-rcar-gen3/conf/machine/m3ulcb.conf | 2 +- meta-rcar-gen3/conf/machine/salvator-x.conf | 2 +- .../recipes-graphics/drm/libdrm_2.4.85.bb | 52 ---------------------- .../recipes-graphics/drm/libdrm_2.4.86.bb | 52 ++++++++++++++++++++++ 7 files changed, 57 insertions(+), 57 deletions(-) delete mode 100644 meta-rcar-gen3/recipes-graphics/drm/libdrm_2.4.85.bb create mode 100644 meta-rcar-gen3/recipes-graphics/drm/libdrm_2.4.86.bb diff --git a/meta-rcar-gen3/conf/machine/ebisu.conf b/meta-rcar-gen3/conf/machine/ebisu.conf index a541474..5c05a3f 100644 --- a/meta-rcar-gen3/conf/machine/ebisu.conf +++ b/meta-rcar-gen3/conf/machine/ebisu.conf @@ -43,7 +43,7 @@ UBOOT_CONFIG[ebisu] = "r8a77990_ebisu_defconfig" UBOOT_CONFIG[ebisu-4d] = "r8a77990_ebisu-4d_defconfig" # libdrm -PREFERRED_VERSION_libdrm = "2.4.85" +PREFERRED_VERSION_libdrm = "2.4.86" # Add variable to Build Configuration in build log BUILDCFG_VARS_append = " SOC_FAMILY" diff --git a/meta-rcar-gen3/conf/machine/h3ulcb.conf b/meta-rcar-gen3/conf/machine/h3ulcb.conf index 9bc9e42..cbea1e8 100644 --- a/meta-rcar-gen3/conf/machine/h3ulcb.conf +++ b/meta-rcar-gen3/conf/machine/h3ulcb.conf @@ -41,7 +41,7 @@ UBOOT_CONFIG[h3ulcb] = "r8a7795_ulcb_defconfig" UBOOT_CONFIG[h3ulcb-4x2g] = "r8a7795_ulcb-4x2g_defconfig" # libdrm -PREFERRED_VERSION_libdrm = "2.4.85" +PREFERRED_VERSION_libdrm = "2.4.86" # Add variable to Build Configuration in build log BUILDCFG_VARS_append = " SOC_FAMILY" diff --git a/meta-rcar-gen3/conf/machine/m3nulcb.conf b/meta-rcar-gen3/conf/machine/m3nulcb.conf index 06fb9a7..37fa42f 100644 --- a/meta-rcar-gen3/conf/machine/m3nulcb.conf +++ b/meta-rcar-gen3/conf/machine/m3nulcb.conf @@ -34,7 +34,7 @@ EXTRA_IMAGEDEPENDS += " u-boot" UBOOT_MACHINE = "r8a77965_ulcb_defconfig" # libdrm -PREFERRED_VERSION_libdrm = "2.4.85" +PREFERRED_VERSION_libdrm = "2.4.86" # Add variable to Build Configuration in build log BUILDCFG_VARS_append = " SOC_FAMILY" diff --git a/meta-rcar-gen3/conf/machine/m3ulcb.conf b/meta-rcar-gen3/conf/machine/m3ulcb.conf index 79a4175..b0d6217 100644 --- a/meta-rcar-gen3/conf/machine/m3ulcb.conf +++ b/meta-rcar-gen3/conf/machine/m3ulcb.conf @@ -34,7 +34,7 @@ EXTRA_IMAGEDEPENDS += " u-boot" UBOOT_MACHINE = "r8a7796_ulcb_defconfig" # libdrm -PREFERRED_VERSION_libdrm = "2.4.85" +PREFERRED_VERSION_libdrm = "2.4.86" # Add variable to Build Configuration in build log BUILDCFG_VARS_append = " SOC_FAMILY" diff --git a/meta-rcar-gen3/conf/machine/salvator-x.conf b/meta-rcar-gen3/conf/machine/salvator-x.conf index e2c658e..eff55b0 100644 --- a/meta-rcar-gen3/conf/machine/salvator-x.conf +++ b/meta-rcar-gen3/conf/machine/salvator-x.conf @@ -72,7 +72,7 @@ UBOOT_CONFIG[r8a77965_salvator-x] = "r8a77965_salvator-x_defconfig" UBOOT_CONFIG[r8a77965_salvator-xs] = "r8a77965_salvator-xs_defconfig" # libdrm -PREFERRED_VERSION_libdrm = "2.4.85" +PREFERRED_VERSION_libdrm = "2.4.86" # Add variable to Build Configuration in build log BUILDCFG_VARS_append = " SOC_FAMILY" diff --git a/meta-rcar-gen3/recipes-graphics/drm/libdrm_2.4.85.bb b/meta-rcar-gen3/recipes-graphics/drm/libdrm_2.4.85.bb deleted file mode 100644 index b9955ed..0000000 --- a/meta-rcar-gen3/recipes-graphics/drm/libdrm_2.4.85.bb +++ /dev/null @@ -1,52 +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 libpciaccess" -COMPATIBLE_MACHINE = "(salvator-x|ebisu|ulcb)" - -SRC_URI = "http://dri.freedesktop.org/libdrm/${BP}.tar.bz2 \ - file://installtests.patch \ - file://fix_O_CLOEXEC_undeclared.patch \ - file://0001-configure.ac-Allow-explicit-enabling-of-cunit-tests.patch \ - " - -SRC_URI[md5sum] = "7aa540aeea4a1f3d1e9b0828f1772543" -SRC_URI[sha256sum] = "64e4cd87eaee38ae60b2984ef02b66159b9bdd33030040db2a04339cf15f6173" - -inherit autotools pkgconfig manpages - -EXTRA_OECONF += "--disable-cairo-tests \ - --without-cunit \ - --enable-omap-experimental-api \ - --enable-etnaviv-experimental-api \ - --enable-install-test-programs \ - --disable-valgrind \ - " -PACKAGECONFIG[manpages] = "--enable-manpages, --disable-manpages, 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.*" -FILES_${PN}-etnaviv = "${libdir}/libdrm_etnaviv.so.*" diff --git a/meta-rcar-gen3/recipes-graphics/drm/libdrm_2.4.86.bb b/meta-rcar-gen3/recipes-graphics/drm/libdrm_2.4.86.bb new file mode 100644 index 0000000..ff0b408 --- /dev/null +++ b/meta-rcar-gen3/recipes-graphics/drm/libdrm_2.4.86.bb @@ -0,0 +1,52 @@ +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 libpciaccess" +COMPATIBLE_MACHINE = "(salvator-x|ebisu|ulcb)" + +SRC_URI = "http://dri.freedesktop.org/libdrm/${BP}.tar.bz2 \ + file://installtests.patch \ + file://fix_O_CLOEXEC_undeclared.patch \ + file://0001-configure.ac-Allow-explicit-enabling-of-cunit-tests.patch \ + " + +SRC_URI[md5sum] = "8dabf172c9695c24d000cbddfa849a82" +SRC_URI[sha256sum] = "4b010002ce158b4b6537ddb5a0f94a628be19727a71f1ab556a276829989072b" + +inherit autotools pkgconfig manpages + +EXTRA_OECONF += "--disable-cairo-tests \ + --without-cunit \ + --enable-omap-experimental-api \ + --enable-etnaviv-experimental-api \ + --enable-install-test-programs \ + --disable-valgrind \ + " +PACKAGECONFIG[manpages] = "--enable-manpages, --disable-manpages, 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.*" +FILES_${PN}-etnaviv = "${libdir}/libdrm_etnaviv.so.*" -- cgit 1.2.3-korg