diff options
Diffstat (limited to 'poky/meta/recipes-graphics')
-rw-r--r-- | poky/meta/recipes-graphics/cogl/cogl-1.0_1.22.6.bb | 6 | ||||
-rw-r--r-- | poky/meta/recipes-graphics/cogl/cogl-1.0_1.22.8.bb | 5 | ||||
-rw-r--r-- | poky/meta/recipes-graphics/drm/libdrm_2.4.102.bb (renamed from poky/meta/recipes-graphics/drm/libdrm_2.4.101.bb) | 3 | ||||
-rw-r--r-- | poky/meta/recipes-graphics/harfbuzz/harfbuzz_2.6.7.bb (renamed from poky/meta/recipes-graphics/harfbuzz/harfbuzz_2.6.4.bb) | 11 | ||||
-rw-r--r-- | poky/meta/recipes-graphics/libva/libva.inc | 2 | ||||
-rw-r--r-- | poky/meta/recipes-graphics/vulkan/vulkan-demos_git.bb | 2 | ||||
-rw-r--r-- | poky/meta/recipes-graphics/xorg-font/encodings_1.0.5.bb | 4 | ||||
-rw-r--r-- | poky/meta/recipes-graphics/xorg-lib/xkeyboard-config/0001-fix-python3-support.patch | 34 | ||||
-rw-r--r-- | poky/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.30.bb (renamed from poky/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.29.bb) | 7 |
9 files changed, 21 insertions, 53 deletions
diff --git a/poky/meta/recipes-graphics/cogl/cogl-1.0_1.22.6.bb b/poky/meta/recipes-graphics/cogl/cogl-1.0_1.22.6.bb deleted file mode 100644 index 86bbdbff69..0000000000 --- a/poky/meta/recipes-graphics/cogl/cogl-1.0_1.22.6.bb +++ /dev/null @@ -1,6 +0,0 @@ -require cogl-1.0.inc - -SRC_URI[archive.md5sum] = "7bcc01edb5462d4d08d01bf893feddb0" -SRC_URI[archive.sha256sum] = "6d134bd3e48c067507167c001200b275997fb9c68b08b48ff038211c8c251b75" - -LIC_FILES_CHKSUM = "file://COPYING;md5=1b1a508d91d25ca607c83f92f3e31c84" diff --git a/poky/meta/recipes-graphics/cogl/cogl-1.0_1.22.8.bb b/poky/meta/recipes-graphics/cogl/cogl-1.0_1.22.8.bb new file mode 100644 index 0000000000..78f6b0e7a3 --- /dev/null +++ b/poky/meta/recipes-graphics/cogl/cogl-1.0_1.22.8.bb @@ -0,0 +1,5 @@ +require cogl-1.0.inc + +SRC_URI[archive.sha256sum] = "a805b2b019184710ff53d0496f9f0ce6dcca420c141a0f4f6fcc02131581d759" + +LIC_FILES_CHKSUM = "file://COPYING;md5=1b1a508d91d25ca607c83f92f3e31c84" diff --git a/poky/meta/recipes-graphics/drm/libdrm_2.4.101.bb b/poky/meta/recipes-graphics/drm/libdrm_2.4.102.bb index 8ec566faa9..fb9a94207f 100644 --- a/poky/meta/recipes-graphics/drm/libdrm_2.4.101.bb +++ b/poky/meta/recipes-graphics/drm/libdrm_2.4.102.bb @@ -11,8 +11,7 @@ PROVIDES = "drm" DEPENDS = "libpthread-stubs" SRC_URI = "http://dri.freedesktop.org/libdrm/${BP}.tar.xz" -SRC_URI[md5sum] = "e6a6f1b88963210b3d62acd7310a1cc7" -SRC_URI[sha256sum] = "ddf31baa8e49473624860bd166ce654dc349873f7a6c7b3305964249315c78a7" +SRC_URI[sha256sum] = "8bcbf9336c28e393d76c1f16d7e79e394a7fce8a2e929d52d3ad7ad8525ba05b" inherit meson pkgconfig manpages diff --git a/poky/meta/recipes-graphics/harfbuzz/harfbuzz_2.6.4.bb b/poky/meta/recipes-graphics/harfbuzz/harfbuzz_2.6.7.bb index ee08c12bee..4f79da4170 100644 --- a/poky/meta/recipes-graphics/harfbuzz/harfbuzz_2.6.4.bb +++ b/poky/meta/recipes-graphics/harfbuzz/harfbuzz_2.6.7.bb @@ -4,12 +4,15 @@ HOMEPAGE = "http://www.freedesktop.org/wiki/Software/HarfBuzz" BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=HarfBuzz" SECTION = "libs" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=e11f5c3149cdec4bb309babb020b32b9 \ +LIC_FILES_CHKSUM = "file://COPYING;md5=8f787620b7d3866d9552fd1924c07572 \ file://src/hb-ucd.cc;beginline=1;endline=15;md5=29d4dcb6410429195df67efe3382d8bc" -SRC_URI = "http://www.freedesktop.org/software/harfbuzz/release/${BP}.tar.xz" -SRC_URI[md5sum] = "2b3a4dfdb3e5e50055f941978944da9f" -SRC_URI[sha256sum] = "9413b8d96132d699687ef914ebb8c50440efc87b3f775d25856d7ec347c03c12" +UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases" +UPSTREAM_CHECK_REGEX = "harfbuzz-(?P<pver>\d+(\.\d+)+).tar" + +SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BPN}-${PV}.tar.xz" +SRC_URI[md5sum] = "3b884586a09328c5fae76d8c200b0e1c" +SRC_URI[sha256sum] = "49e481d06cdff97bf68d99fa26bdf785331f411614485d892ea4c78eb479b218" inherit autotools pkgconfig lib_package gtk-doc diff --git a/poky/meta/recipes-graphics/libva/libva.inc b/poky/meta/recipes-graphics/libva/libva.inc index ac39e92de7..e7bec80c14 100644 --- a/poky/meta/recipes-graphics/libva/libva.inc +++ b/poky/meta/recipes-graphics/libva/libva.inc @@ -24,4 +24,4 @@ UPSTREAM_CHECK_URI = "https://github.com/intel/libva/releases" DEPENDS = "libdrm" -inherit meson pkgconfig features_check +inherit meson pkgconfig diff --git a/poky/meta/recipes-graphics/vulkan/vulkan-demos_git.bb b/poky/meta/recipes-graphics/vulkan/vulkan-demos_git.bb index 9d7cb2b1e8..9484f010c0 100644 --- a/poky/meta/recipes-graphics/vulkan/vulkan-demos_git.bb +++ b/poky/meta/recipes-graphics/vulkan/vulkan-demos_git.bb @@ -14,7 +14,7 @@ SRC_URI = "git://github.com/SaschaWillems/Vulkan.git \ file://0001-Don-t-build-demos-with-questionably-licensed-data.patch \ " UPSTREAM_CHECK_COMMITS = "1" -SRCREV = "10a1ecaf7bbcbc316c83f7c52742baaba0ae2f45" +SRCREV = "4818f85916bf88c1ca8c2ed1a46e0e758651489e" UPSTREAM_CHECK_GITTAGREGEX = "These are not the releases you're looking for" S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-graphics/xorg-font/encodings_1.0.5.bb b/poky/meta/recipes-graphics/xorg-font/encodings_1.0.5.bb index 4d61aed183..713fcfb935 100644 --- a/poky/meta/recipes-graphics/xorg-font/encodings_1.0.5.bb +++ b/poky/meta/recipes-graphics/xorg-font/encodings_1.0.5.bb @@ -19,3 +19,7 @@ SRC_URI[sha256sum] = "bd96e16143a044b19e87f217cf6a3763a70c561d1076aad6f6d862ec41 inherit allarch EXTRA_OECONF += "--with-encodingsdir=${datadir}/fonts/X11/encodings" + +# postinst from .inc doesn't apply to this recipe +pkg_postinst_${PN} () { +} diff --git a/poky/meta/recipes-graphics/xorg-lib/xkeyboard-config/0001-fix-python3-support.patch b/poky/meta/recipes-graphics/xorg-lib/xkeyboard-config/0001-fix-python3-support.patch deleted file mode 100644 index f723f70332..0000000000 --- a/poky/meta/recipes-graphics/xorg-lib/xkeyboard-config/0001-fix-python3-support.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 168ac446cdd9a1b59d6b708360a9556515ba56b9 Mon Sep 17 00:00:00 2001 -From: MilhouseVH <milhouseVH.github@nmacleod.com> -Date: Sun, 16 Feb 2020 09:41:43 +0000 -Subject: [PATCH] fix python3 support - -https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/issues/197 - -Upstream-Status: Backport -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - rules/compat/map-variants.py | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/rules/compat/map-variants.py b/rules/compat/map-variants.py -index ebbfec9..979ba43 100755 ---- a/rules/compat/map-variants.py -+++ b/rules/compat/map-variants.py -@@ -1,4 +1,4 @@ --#!/usr/bin/python3 -+#!/usr/bin/env python3 - - import argparse - import re -@@ -12,8 +12,8 @@ class Layout(object): - assert variant is None - # parse a layout(variant) string - match = re.match(r'([^(]+)\(([^)]+)\)', layout) -- self.layout = match[1] -- self.variant = match[2] -+ self.layout = match.groups()[0] -+ self.variant = match.groups()[1] - - def __str__(self): - if self.variant: diff --git a/poky/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.29.bb b/poky/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.30.bb index 598b584787..a4d67cd2ce 100644 --- a/poky/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.29.bb +++ b/poky/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.30.bb @@ -12,11 +12,8 @@ BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=xkeyboard-confi LICENSE = "MIT & MIT-style" LIC_FILES_CHKSUM = "file://COPYING;md5=0e7f21ca7db975c63467d2e7624a12f9" -SRC_URI = "${XORG_MIRROR}/individual/data/xkeyboard-config/${BPN}-${PV}.tar.bz2 \ - file://0001-fix-python3-support.patch \ - " -SRC_URI[md5sum] = "b5980bdc6c7d79f6dcccba8c76bb6c5d" -SRC_URI[sha256sum] = "1d4175278bf06000683656763a8b1d3282c61a314b6db41260c8efe92d621802" +SRC_URI = "${XORG_MIRROR}/individual/data/xkeyboard-config/${BPN}-${PV}.tar.bz2" +SRC_URI[sha256sum] = "095a524f7b633ed257617202d06c9c71fe020c8897b106cf0dcdd0c6e8b797d4" SECTION = "x11/libs" DEPENDS = "util-macros libxslt-native" |