diff options
author | Kai Kang <kai.kang@windriver.com> | 2022-12-29 21:11:45 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-12-31 17:08:29 +0000 |
commit | 3f07d77ab16647963ac4ba1cb23236fc0737110c (patch) | |
tree | 160832d9e8b2d19485121187e16af034f425dba8 /meta | |
parent | 02c98c4994b5cb704756df6dd96319962bff3eef (diff) | |
download | poky-3f07d77ab16647963ac4ba1cb23236fc0737110c.tar.gz |
libx11-compose-data: 1.6.8 -> 1.8.3
Update libx11-compose-data from 1.6.8 to 1.8.3
* add 'ISC' to LICENSE because of commit
https://github.com/freedesktop/xorg-libX11/commit/a04b84f0
* adjust ordering according to
https://www.openembedded.org/wiki/Styleguide#Ordering_and_grouping
(From OE-Core rev: 8192091b461123a377d2ef64a0e75d6fbefc999a)
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-graphics/xorg-lib/libx11-compose-data/0001-Drop-x11-dependencies.patch | 12 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-lib/libx11-compose-data_1.8.3.bb (renamed from meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.8.bb) | 19 |
2 files changed, 17 insertions, 14 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libx11-compose-data/0001-Drop-x11-dependencies.patch b/meta/recipes-graphics/xorg-lib/libx11-compose-data/0001-Drop-x11-dependencies.patch index 46a53a17f2..61af98d95e 100644 --- a/meta/recipes-graphics/xorg-lib/libx11-compose-data/0001-Drop-x11-dependencies.patch +++ b/meta/recipes-graphics/xorg-lib/libx11-compose-data/0001-Drop-x11-dependencies.patch | |||
@@ -6,12 +6,16 @@ Subject: [PATCH] Drop x11 dependencies | |||
6 | Upstream-Status: Inappropriate [OE-Specific] | 6 | Upstream-Status: Inappropriate [OE-Specific] |
7 | 7 | ||
8 | Signed-off-by: Ming Liu <ming.liu@toradex.com> | 8 | Signed-off-by: Ming Liu <ming.liu@toradex.com> |
9 | |||
10 | Rebase for version 1.8.3. | ||
11 | |||
12 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | ||
9 | --- | 13 | --- |
10 | configure.ac | 44 -------------------------------------------- | 14 | configure.ac | 44 -------------------------------------------- |
11 | 1 file changed, 44 deletions(-) | 15 | 1 file changed, 44 deletions(-) |
12 | 16 | ||
13 | diff --git a/configure.ac b/configure.ac | 17 | diff --git a/configure.ac b/configure.ac |
14 | index a5fd706..b42488c 100644 | 18 | index 33d0102..50e2d93 100644 |
15 | --- a/configure.ac | 19 | --- a/configure.ac |
16 | +++ b/configure.ac | 20 | +++ b/configure.ac |
17 | @@ -76,27 +76,8 @@ fi | 21 | @@ -76,27 +76,8 @@ fi |
@@ -20,7 +24,7 @@ index a5fd706..b42488c 100644 | |||
20 | # Checks for pkg-config packages | 24 | # Checks for pkg-config packages |
21 | - | 25 | - |
22 | -# Always required | 26 | -# Always required |
23 | -X11_REQUIRES='xproto >= 7.0.17 xextproto xtrans xcb >= 1.11.1' | 27 | -X11_REQUIRES='xproto >= 7.0.25 xextproto xtrans xcb >= 1.11.1' |
24 | -X11_EXTRA_DEPS="xcb >= 1.11.1" | 28 | -X11_EXTRA_DEPS="xcb >= 1.11.1" |
25 | - | 29 | - |
26 | PKG_PROG_PKG_CONFIG() | 30 | PKG_PROG_PKG_CONFIG() |
@@ -42,7 +46,7 @@ index a5fd706..b42488c 100644 | |||
42 | # Check for dlopen | 46 | # Check for dlopen |
43 | AC_MSG_CHECKING([if run-time linking is supported]) | 47 | AC_MSG_CHECKING([if run-time linking is supported]) |
44 | AC_SEARCH_LIBS(dlopen,[dl svld]) | 48 | AC_SEARCH_LIBS(dlopen,[dl svld]) |
45 | @@ -237,30 +218,6 @@ AC_SUBST(XTHREAD_CFLAGS) | 49 | @@ -255,30 +236,6 @@ AC_SUBST(USE_THREAD_LIBS) |
46 | 50 | ||
47 | AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL, 1, [poll() function is available])], ) | 51 | AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL, 1, [poll() function is available])], ) |
48 | 52 | ||
@@ -73,7 +77,7 @@ index a5fd706..b42488c 100644 | |||
73 | AC_ARG_ENABLE(xcms, | 77 | AC_ARG_ENABLE(xcms, |
74 | AS_HELP_STRING([--disable-xcms], | 78 | AS_HELP_STRING([--disable-xcms], |
75 | [Disable Xlib support for CMS *EXPERIMENTAL*]), | 79 | [Disable Xlib support for CMS *EXPERIMENTAL*]), |
76 | @@ -340,7 +297,6 @@ X11_LIBDIR="${libdir}/X11" | 80 | @@ -358,7 +315,6 @@ X11_LIBDIR="${libdir}/X11" |
77 | AX_DEFINE_DIR(X11_LIBDIR, X11_LIBDIR, [Location of libX11 library data]) | 81 | AX_DEFINE_DIR(X11_LIBDIR, X11_LIBDIR, [Location of libX11 library data]) |
78 | AC_SUBST(X11_LIBDIR) | 82 | AC_SUBST(X11_LIBDIR) |
79 | 83 | ||
diff --git a/meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.8.bb b/meta/recipes-graphics/xorg-lib/libx11-compose-data_1.8.3.bb index b231f8b34d..e734a215fd 100644 --- a/meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.8.bb +++ b/meta/recipes-graphics/xorg-lib/libx11-compose-data_1.8.3.bb | |||
@@ -8,22 +8,19 @@ python () { | |||
8 | 8 | ||
9 | require xorg-lib-common.inc | 9 | require xorg-lib-common.inc |
10 | 10 | ||
11 | LICENSE = "MIT & MIT & BSD-1-Clause & HPND & HPND-sell-variant" | 11 | LICENSE = "MIT & BSD-1-Clause & HPND & HPND-sell-variant & ISC" |
12 | LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7" | 12 | LIC_FILES_CHKSUM = "file://COPYING;md5=1d49cdd2b386c5db11ec636d680b7116" |
13 | 13 | ||
14 | SRC_URI[md5sum] = "c5fa5a86a20e3591bed6c046498d4b8f" | 14 | XORG_PN = "libX11" |
15 | SRC_URI[sha256sum] = "b289a845c189e251e0e884cc0f9269bbe97c238df3741e854ec4c17c21e473d5" | ||
16 | 15 | ||
17 | SRC_URI += "file://0001-Drop-x11-dependencies.patch \ | 16 | SRC_URI += "file://0001-Drop-x11-dependencies.patch \ |
18 | " | 17 | " |
19 | 18 | ||
20 | XORG_PN = "libX11" | 19 | SRC_URI[sha256sum] = "e31565c84006b6b8e01dc9399c806085739710bc2db2e0930f1511ed9d6585bd" |
21 | |||
22 | EXTRA_OECONF += "--disable-xkb" | ||
23 | 20 | ||
24 | PACKAGES = "${PN}" | 21 | REQUIRED_DISTRO_FEATURES = "" |
25 | 22 | ||
26 | FILES:${PN} = "${datadir}/X11/locale ${libdir}/X11/locale" | 23 | EXTRA_OECONF += "--disable-xkb" |
27 | 24 | ||
28 | do_compile() { | 25 | do_compile() { |
29 | oe_runmake -C nls | 26 | oe_runmake -C nls |
@@ -33,4 +30,6 @@ do_install() { | |||
33 | oe_runmake DESTDIR=${D} -C nls install | 30 | oe_runmake DESTDIR=${D} -C nls install |
34 | } | 31 | } |
35 | 32 | ||
36 | REQUIRED_DISTRO_FEATURES = "" | 33 | PACKAGES = "${PN}" |
34 | |||
35 | FILES:${PN} = "${datadir}/X11/locale ${libdir}/X11/locale" | ||