diff options
-rw-r--r-- | meta/recipes-graphics/xorg-font/encodings/nocompiler.patch | 8 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-font/encodings_1.0.6.bb (renamed from meta/recipes-graphics/xorg-font/encodings_1.0.5.bb) | 6 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-font/xorg-font-common.inc | 3 |
3 files changed, 9 insertions, 8 deletions
diff --git a/meta/recipes-graphics/xorg-font/encodings/nocompiler.patch b/meta/recipes-graphics/xorg-font/encodings/nocompiler.patch index ec7c7d80c1..9ee7abe775 100644 --- a/meta/recipes-graphics/xorg-font/encodings/nocompiler.patch +++ b/meta/recipes-graphics/xorg-font/encodings/nocompiler.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From b08c43a0842076e0a94e88ad6456a9326cd7ffc9 Mon Sep 17 00:00:00 2001 | 1 | From 0c0790e90a68bf8290da5c0e57142bf7c620f039 Mon Sep 17 00:00:00 2001 |
2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> | 2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> |
3 | Date: Tue, 17 May 2011 23:03:02 +0000 | 3 | Date: Tue, 17 May 2011 23:03:02 +0000 |
4 | Subject: [PATCH] Improve handling of 'all' architecture recipes and their | 4 | Subject: [PATCH] Improve handling of 'all' architecture recipes and their |
@@ -21,12 +21,12 @@ RP 17/5/2011 | |||
21 | 1 file changed, 3 insertions(+), 3 deletions(-) | 21 | 1 file changed, 3 insertions(+), 3 deletions(-) |
22 | 22 | ||
23 | diff --git a/configure.ac b/configure.ac | 23 | diff --git a/configure.ac b/configure.ac |
24 | index 622c27b..5ee84ed 100644 | 24 | index b80e3de..80208bb 100644 |
25 | --- a/configure.ac | 25 | --- a/configure.ac |
26 | +++ b/configure.ac | 26 | +++ b/configure.ac |
27 | @@ -3,12 +3,12 @@ AC_INIT([encodings], [1.0.5], | 27 | @@ -3,12 +3,12 @@ AC_INIT([encodings], [1.0.6], |
28 | [https://gitlab.freedesktop.org/xorg/font/encodings/issues]) | 28 | [https://gitlab.freedesktop.org/xorg/font/encodings/issues]) |
29 | AM_INIT_AUTOMAKE([foreign dist-bzip2]) | 29 | AM_INIT_AUTOMAKE([foreign dist-xz]) |
30 | 30 | ||
31 | -# Require xorg-macros: XORG_DEFAULT_OPTIONS | 31 | -# Require xorg-macros: XORG_DEFAULT_OPTIONS |
32 | m4_ifndef([XORG_MACROS_VERSION], | 32 | m4_ifndef([XORG_MACROS_VERSION], |
diff --git a/meta/recipes-graphics/xorg-font/encodings_1.0.5.bb b/meta/recipes-graphics/xorg-font/encodings_1.0.6.bb index 8ddbaf24dd..be82414eef 100644 --- a/meta/recipes-graphics/xorg-font/encodings_1.0.5.bb +++ b/meta/recipes-graphics/xorg-font/encodings_1.0.6.bb | |||
@@ -7,14 +7,14 @@ require xorg-font-common.inc | |||
7 | LICENSE = "PD" | 7 | LICENSE = "PD" |
8 | LIC_FILES_CHKSUM = "file://COPYING;md5=9da93f2daf2d5572faa2bfaf0dbd9e76" | 8 | LIC_FILES_CHKSUM = "file://COPYING;md5=9da93f2daf2d5572faa2bfaf0dbd9e76" |
9 | PE = "1" | 9 | PE = "1" |
10 | PR = "r3" | ||
11 | 10 | ||
12 | DEPENDS = "mkfontscale-native mkfontdir-native font-util-native" | 11 | DEPENDS = "mkfontscale-native mkfontdir-native font-util-native" |
13 | RDEPENDS:${PN} = "" | 12 | RDEPENDS:${PN} = "" |
14 | 13 | ||
15 | SRC_URI += "file://nocompiler.patch" | 14 | SRC_URI += "file://nocompiler.patch" |
16 | SRC_URI[md5sum] = "bbae4f247b88ccde0e85ed6a403da22a" | 15 | SRC_URI[sha256sum] = "77e301de661f35a622b18f60b555a7e7d8c4d5f43ed41410e830d5ac9084fc26" |
17 | SRC_URI[sha256sum] = "bd96e16143a044b19e87f217cf6a3763a70c561d1076aad6f6d862ec41774a31" | 16 | |
17 | SRC_URI_EXT = "xz" | ||
18 | 18 | ||
19 | inherit allarch | 19 | inherit allarch |
20 | 20 | ||
diff --git a/meta/recipes-graphics/xorg-font/xorg-font-common.inc b/meta/recipes-graphics/xorg-font/xorg-font-common.inc index 2df23efed4..edf7cf7642 100644 --- a/meta/recipes-graphics/xorg-font/xorg-font-common.inc +++ b/meta/recipes-graphics/xorg-font/xorg-font-common.inc | |||
@@ -9,7 +9,8 @@ RDEPENDS:${PN} = "encodings font-util font-alias" | |||
9 | 9 | ||
10 | XORG_PN = "${BPN}" | 10 | XORG_PN = "${BPN}" |
11 | 11 | ||
12 | SRC_URI = "${XORG_MIRROR}/individual/font/${XORG_PN}-${PV}.tar.bz2" | 12 | SRC_URI_EXT = "bz2" |
13 | SRC_URI = "${XORG_MIRROR}/individual/font/${XORG_PN}-${PV}.tar.${SRC_URI_EXT}" | ||
13 | S = "${WORKDIR}/${XORG_PN}-${PV}" | 14 | S = "${WORKDIR}/${XORG_PN}-${PV}" |
14 | 15 | ||
15 | inherit autotools pkgconfig features_check | 16 | inherit autotools pkgconfig features_check |