summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
authorYi Zhao <yi.zhao@windriver.com>2019-08-07 15:52:27 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-08-08 10:19:56 +0100
commit8195341e9ef6b709a06df1dcdce8326cbeb6e780 (patch)
treea8830cffc8fa8933a35d96c3e018aae23e336319 /meta/recipes-graphics
parent7029258a65b41a254497e6c7c9b31f0fd70afcd4 (diff)
downloadpoky-8195341e9ef6b709a06df1dcdce8326cbeb6e780.tar.gz
libx11-compose-data: upgrade 1.6.7 -> 1.6.8
Refresh the patch to fix the do_patch QA warning. (From OE-Core rev: 72e6919bab390494103472401a563199ab339e85) Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-compose-data/0001-Drop-x11-dependencies.patch12
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.8.bb (renamed from meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.7.bb)4
2 files changed, 8 insertions, 8 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 fbd968483d..46a53a17f2 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
@@ -1,4 +1,4 @@
1From a60f5058136aeadceebfccadf606d8210f8d3ca6 Mon Sep 17 00:00:00 2001 1From e1f9b0b531c6ddb11a85c0664051e2e4efc589fb Mon Sep 17 00:00:00 2001
2From: Ming Liu <ming.liu@toradex.com> 2From: Ming Liu <ming.liu@toradex.com>
3Date: Sun, 5 May 2019 11:55:14 +0200 3Date: Sun, 5 May 2019 11:55:14 +0200
4Subject: [PATCH] Drop x11 dependencies 4Subject: [PATCH] Drop x11 dependencies
@@ -11,11 +11,11 @@ Signed-off-by: Ming Liu <ming.liu@toradex.com>
11 1 file changed, 44 deletions(-) 11 1 file changed, 44 deletions(-)
12 12
13diff --git a/configure.ac b/configure.ac 13diff --git a/configure.ac b/configure.ac
14index 3090845..d14063f 100644 14index a5fd706..b42488c 100644
15--- a/configure.ac 15--- a/configure.ac
16+++ b/configure.ac 16+++ b/configure.ac
17@@ -66,27 +66,8 @@ fi 17@@ -76,27 +76,8 @@ fi
18 AC_SUBST(LDFLAGS_FOR_BUILD) 18 AC_SUBST([EXEEXT_FOR_BUILD])
19 19
20 # Checks for pkg-config packages 20 # Checks for pkg-config packages
21- 21-
@@ -42,7 +42,7 @@ index 3090845..d14063f 100644
42 # Check for dlopen 42 # Check for dlopen
43 AC_MSG_CHECKING([if run-time linking is supported]) 43 AC_MSG_CHECKING([if run-time linking is supported])
44 AC_SEARCH_LIBS(dlopen,[dl svld]) 44 AC_SEARCH_LIBS(dlopen,[dl svld])
45@@ -226,30 +207,6 @@ AC_SUBST(XTHREAD_CFLAGS) 45@@ -237,30 +218,6 @@ AC_SUBST(XTHREAD_CFLAGS)
46 46
47 AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL, 1, [poll() function is available])], ) 47 AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL, 1, [poll() function is available])], )
48 48
@@ -73,7 +73,7 @@ index 3090845..d14063f 100644
73 AC_ARG_ENABLE(xcms, 73 AC_ARG_ENABLE(xcms,
74 AS_HELP_STRING([--disable-xcms], 74 AS_HELP_STRING([--disable-xcms],
75 [Disable Xlib support for CMS *EXPERIMENTAL*]), 75 [Disable Xlib support for CMS *EXPERIMENTAL*]),
76@@ -329,7 +286,6 @@ X11_LIBDIR="${libdir}/X11" 76@@ -340,7 +297,6 @@ X11_LIBDIR="${libdir}/X11"
77 AX_DEFINE_DIR(X11_LIBDIR, X11_LIBDIR, [Location of libX11 library data]) 77 AX_DEFINE_DIR(X11_LIBDIR, X11_LIBDIR, [Location of libX11 library data])
78 AC_SUBST(X11_LIBDIR) 78 AC_SUBST(X11_LIBDIR)
79 79
diff --git a/meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.7.bb b/meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.8.bb
index 9dace701a5..cabb84e686 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.7.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.8.bb
@@ -11,8 +11,8 @@ require xorg-lib-common.inc
11LICENSE = "MIT & MIT-style & BSD" 11LICENSE = "MIT & MIT-style & BSD"
12LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7" 12LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7"
13 13
14SRC_URI[md5sum] = "034fdd6cc5393974d88aec6f5bc96162" 14SRC_URI[md5sum] = "c5fa5a86a20e3591bed6c046498d4b8f"
15SRC_URI[sha256sum] = "910e9e30efba4ad3672ca277741c2728aebffa7bc526f04dcfa74df2e52a1348" 15SRC_URI[sha256sum] = "b289a845c189e251e0e884cc0f9269bbe97c238df3741e854ec4c17c21e473d5"
16 16
17SRC_URI += "file://0001-Drop-x11-dependencies.patch" 17SRC_URI += "file://0001-Drop-x11-dependencies.patch"
18 18