diff mbox series

[2/4] libx11-compose-data: 1.6.8 -> 1.8.3

Message ID 20221229131147.26534-2-kai.kang@windriver.com
State Accepted, archived
Commit 8192091b461123a377d2ef64a0e75d6fbefc999a
Headers show
Series [1/4] xorg-lib-common.inc: set default value of XORG_EXT | expand

Commit Message

Kai Dec. 29, 2022, 1:11 p.m. UTC 
From: Kai Kang <kai.kang@windriver.com>

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

Signed-off-by: Kai Kang <kai.kang@windriver.com>
---
 .../0001-Drop-x11-dependencies.patch          | 12 ++++++++----
 ..._1.6.8.bb => libx11-compose-data_1.8.3.bb} | 19 +++++++++----------
 2 files changed, 17 insertions(+), 14 deletions(-)
 rename meta/recipes-graphics/xorg-lib/{libx11-compose-data_1.6.8.bb => libx11-compose-data_1.8.3.bb} (71%)
diff mbox series

Patch

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
 Upstream-Status: Inappropriate [OE-Specific]
 
 Signed-off-by: Ming Liu <ming.liu@toradex.com>
+
+Rebase for version 1.8.3.
+
+Signed-off-by: Kai Kang <kai.kang@windriver.com>
 ---
  configure.ac | 44 --------------------------------------------
  1 file changed, 44 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index a5fd706..b42488c 100644
+index 33d0102..50e2d93 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -76,27 +76,8 @@ fi
@@ -20,7 +24,7 @@  index a5fd706..b42488c 100644
  # Checks for pkg-config packages
 -
 -# Always required
--X11_REQUIRES='xproto >= 7.0.17 xextproto xtrans xcb >= 1.11.1'
+-X11_REQUIRES='xproto >= 7.0.25 xextproto xtrans xcb >= 1.11.1'
 -X11_EXTRA_DEPS="xcb >= 1.11.1"
 -
  PKG_PROG_PKG_CONFIG()
@@ -42,7 +46,7 @@  index a5fd706..b42488c 100644
  # Check for dlopen
  AC_MSG_CHECKING([if run-time linking is supported])
  AC_SEARCH_LIBS(dlopen,[dl svld])
-@@ -237,30 +218,6 @@ AC_SUBST(XTHREAD_CFLAGS)
+@@ -255,30 +236,6 @@ AC_SUBST(USE_THREAD_LIBS)
  
  AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL, 1, [poll() function is available])], )
  
@@ -73,7 +77,7 @@  index a5fd706..b42488c 100644
  AC_ARG_ENABLE(xcms,
                AS_HELP_STRING([--disable-xcms],
                  [Disable Xlib support for CMS *EXPERIMENTAL*]),
-@@ -340,7 +297,6 @@ X11_LIBDIR="${libdir}/X11"
+@@ -358,7 +315,6 @@ X11_LIBDIR="${libdir}/X11"
  AX_DEFINE_DIR(X11_LIBDIR, X11_LIBDIR, [Location of libX11 library data])
  AC_SUBST(X11_LIBDIR)
  
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
similarity index 71%
rename from meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.8.bb
rename to 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 () {
 
 require xorg-lib-common.inc
 
-LICENSE = "MIT & MIT & BSD-1-Clause & HPND & HPND-sell-variant"
-LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7"
+LICENSE = "MIT & BSD-1-Clause & HPND & HPND-sell-variant & ISC"
+LIC_FILES_CHKSUM = "file://COPYING;md5=1d49cdd2b386c5db11ec636d680b7116"
 
-SRC_URI[md5sum] = "c5fa5a86a20e3591bed6c046498d4b8f"
-SRC_URI[sha256sum] = "b289a845c189e251e0e884cc0f9269bbe97c238df3741e854ec4c17c21e473d5"
+XORG_PN = "libX11"
 
 SRC_URI += "file://0001-Drop-x11-dependencies.patch \
            "
 
-XORG_PN = "libX11"
-
-EXTRA_OECONF += "--disable-xkb"
+SRC_URI[sha256sum] = "e31565c84006b6b8e01dc9399c806085739710bc2db2e0930f1511ed9d6585bd"
 
-PACKAGES = "${PN}"
+REQUIRED_DISTRO_FEATURES = ""
 
-FILES:${PN} = "${datadir}/X11/locale ${libdir}/X11/locale"
+EXTRA_OECONF += "--disable-xkb"
 
 do_compile() {
     oe_runmake -C nls
@@ -33,4 +30,6 @@  do_install() {
     oe_runmake DESTDIR=${D} -C nls install
 }
 
-REQUIRED_DISTRO_FEATURES = ""
+PACKAGES = "${PN}"
+
+FILES:${PN} = "${datadir}/X11/locale ${libdir}/X11/locale"