Skip to contentSkip to conversation

xorg-lib-common.inc: set default value of XORG_EXT

PATCH New [email protected] 1 participant 4 messages Dec 29, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/4 xorg-lib-common.inc: set default value of XORG_EXT

From: Kai Kang <[email protected]>

It replaced tar.bz2 tar archieves with tar.xz from the middle of 2021 on page https://www.x.org/releases/individual/lib/. So set the default value of XORG_EXT with 'tar.xz', and update related recipes accordingly.

---
 meta/recipes-graphics/xorg-lib/libdmx_1.1.4.bb        | 3 ++-
 meta/recipes-graphics/xorg-lib/libfontenc_1.1.7.bb    | 2 --
 meta/recipes-graphics/xorg-lib/libice_1.1.1.bb        | 1 -
 meta/recipes-graphics/xorg-lib/libpciaccess_0.17.bb   | 1 -
 meta/recipes-graphics/xorg-lib/libxau_1.0.11.bb       | 1 -
 meta/recipes-graphics/xorg-lib/libxcomposite_0.4.6.bb | 1 -
 meta/recipes-graphics/xorg-lib/libxdamage_1.1.6.bb    | 1 -
 meta/recipes-graphics/xorg-lib/libxdmcp_1.1.4.bb      | 1 -
 meta/recipes-graphics/xorg-lib/libxext_1.3.5.bb       | 1 -
 meta/recipes-graphics/xorg-lib/libxfixes_6.0.0.bb     | 1 +
 meta/recipes-graphics/xorg-lib/libxfont2_2.0.6.bb     | 1 -
 meta/recipes-graphics/xorg-lib/libxfont_1.5.4.bb      | 1 +
 meta/recipes-graphics/xorg-lib/libxft_2.3.7.bb        | 1 -
 meta/recipes-graphics/xorg-lib/libxi_1.8.bb           | 1 +
 meta/recipes-graphics/xorg-lib/libxinerama_1.1.5.bb   | 1 -
 meta/recipes-graphics/xorg-lib/libxkbfile_1.1.2.bb    | 1 -
 meta/recipes-graphics/xorg-lib/libxmu_1.1.4.bb        | 1 -
 meta/recipes-graphics/xorg-lib/libxpm_3.5.14.bb       | 1 -
 meta/recipes-graphics/xorg-lib/libxrandr_1.5.3.bb     | 1 -
 meta/recipes-graphics/xorg-lib/libxrender_0.9.11.bb   | 1 -
 meta/recipes-graphics/xorg-lib/libxres_1.2.2.bb       | 1 -
 meta/recipes-graphics/xorg-lib/libxscrnsaver_1.2.4.bb | 1 -
 meta/recipes-graphics/xorg-lib/libxshmfence_1.3.2.bb  | 1 -
 meta/recipes-graphics/xorg-lib/libxt_1.2.1.bb         | 1 +
 meta/recipes-graphics/xorg-lib/libxtst_1.2.4.bb       | 1 -
 meta/recipes-graphics/xorg-lib/libxv_1.0.12.bb        | 1 -
 meta/recipes-graphics/xorg-lib/libxxf86vm_1.1.5.bb    | 1 -
 meta/recipes-graphics/xorg-lib/xorg-lib-common.inc    | 2 +-
 meta/recipes-graphics/xorg-lib/xtrans_1.4.0.bb        | 2 ++
 29 files changed, 9 insertions(+), 25 deletions(-)
meta/recipes-graphics/xorg-lib/libdmx_1.1.4.bb +2 -1
index 66172cb30c..3634d53208 100644
@@ -15,6 +15,7 @@ DEPENDS += "libxext xorgproto"
 
 PE = "1"
 
+XORG_EXT = "tar.bz2"
+
 SRC_URI[md5sum] = "d2f1f0ec68ac3932dd7f1d9aa0a7a11c"
 SRC_URI[sha256sum] = "253f90005d134fa7a209fbcbc5a3024335367c930adf0f3203e754cf32747243"
-
meta/recipes-graphics/xorg-lib/libfontenc_1.1.7.bb +0 -2
index 297bfbe4e6..056a29af25 100644
@@ -11,8 +11,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=96254c20ab81c63e65b26f0dbcd4a1c1"
 DEPENDS += "zlib xorgproto font-util"
 PE = "1"
 
-XORG_EXT = "tar.xz"
-
 SRC_URI[sha256sum] = "c0d36991faee06551ddbaf5d99266e97becdc05edfae87a833c3ff7bf73cfec2"
 
 BBCLASSEXTEND = "native"
meta/recipes-graphics/xorg-lib/libice_1.1.1.bb +0 -1
index 5c8f732fa3..d5e3d28e06 100644
@@ -20,7 +20,6 @@ XORG_PN = "libICE"
 
 BBCLASSEXTEND = "native nativesdk"
 
-XORG_EXT = "tar.xz"
 SRC_URI[sha256sum] = "03e77afaf72942c7ac02ccebb19034e6e20f456dcf8dddadfeb572aa5ad3e451"
 
 PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"
meta/recipes-graphics/xorg-lib/libpciaccess_0.17.bb +0 -1
index 309354e872..54bdb08976 100644
@@ -7,7 +7,6 @@ require xorg-lib-common.inc
 
 SRC_URI += "file://0001-linux_sysfs-Use-pwrite-pread-instead-of-64bit-versio.patch"
 
-XORG_EXT = "tar.xz"
 SRC_URI[sha256sum] = "74283ba3c974913029e7a547496a29145b07ec51732bbb5b5c58d5025ad95b73"
 
 LICENSE = "MIT & MIT"
meta/recipes-graphics/xorg-lib/libxau_1.0.11.bb +0 -1
index e2c06fd14a..f1b492c39f 100644
@@ -17,7 +17,6 @@ PROVIDES = "xau"
 PE = "1"
 
 XORG_PN = "libXau"
-XORG_EXT = "tar.xz"
 
 BBCLASSEXTEND = "native nativesdk"
 
meta/recipes-graphics/xorg-lib/libxcomposite_0.4.6.bb +0 -1
index cd7d56e810..77b3db5cf9 100644
@@ -24,5 +24,4 @@ XORG_PN = "libXcomposite"
 
 SRC_URI += " file://change-include-order.patch"
 
-XORG_EXT = "tar.xz"
 SRC_URI[sha256sum] = "fe40bcf0ae1a09070eba24088a5eb9810efe57453779ec1e20a55080c6dc2c87"
meta/recipes-graphics/xorg-lib/libxdamage_1.1.6.bb +0 -1
index 1d297ecd80..279d6c33dc 100644
@@ -23,7 +23,6 @@ PE = "1"
 
 XORG_PN = "libXdamage"
 
-XORG_EXT = "tar.xz"
 SRC_URI[sha256sum] = "52733c1f5262fca35f64e7d5060c6fcd81a880ba8e1e65c9621cf0727afb5d11"
 
 BBCLASSEXTEND = "native nativesdk"
meta/recipes-graphics/xorg-lib/libxdmcp_1.1.4.bb +0 -1
index a3f9c04e68..bf5d2d6721 100644
@@ -19,7 +19,6 @@ PROVIDES = "xdmcp"
 PE = "1"
 
 XORG_PN = "libXdmcp"
-XORG_EXT = "tar.xz"
 
 BBCLASSEXTEND = "native nativesdk"
 
meta/recipes-graphics/xorg-lib/libxext_1.3.5.bb +0 -1
index d4d4119485..7d0597ef1d 100644
@@ -19,7 +19,6 @@ PROVIDES = "xext"
 PE = "1"
 
 XORG_PN = "libXext"
-XORG_EXT = "tar.xz"
 BBCLASSEXTEND = "native nativesdk"
 
 SRC_URI[sha256sum] = "db14c0c895c57ea33a8559de8cb2b93dc76c42ea4a39e294d175938a133d7bca"
meta/recipes-graphics/xorg-lib/libxfixes_6.0.0.bb +1 -0
index 3a8543171e..018138f11d 100644
@@ -16,5 +16,6 @@ DEPENDS += "virtual/libx11 xorgproto"
 PE = "1"
 
 XORG_PN = "libXfixes"
+XORG_EXT = "tar.bz2"
 
 BBCLASSEXTEND = "native nativesdk"
meta/recipes-graphics/xorg-lib/libxfont2_2.0.6.bb +0 -1
index 59d63e7150..535e7f629e 100644
@@ -12,7 +12,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a46c8040f2f737bcd0c435feb2ab1c2c"
 DEPENDS += "freetype xtrans xorgproto libfontenc zlib"
 
 XORG_PN = "libXfont2"
-XORG_EXT = "tar.xz"
 
 BBCLASSEXTEND = "native"
 
meta/recipes-graphics/xorg-lib/libxfont_1.5.4.bb +1 -0
index 27e686b087..fa6585d6dc 100644
@@ -15,6 +15,7 @@ PROVIDES = "xfont"
 PE = "1"
 
 XORG_PN = "libXfont"
+XORG_EXT = "tar.bz2"
 
 BBCLASSEXTEND = "native"
 
meta/recipes-graphics/xorg-lib/libxft_2.3.7.bb +0 -1
index da25b0a05a..ad126d2092 100644
@@ -20,7 +20,6 @@ PROVIDES = "xft"
 
 PE = "1"
 
-XORG_EXT = "tar.xz"
 SRC_URI[sha256sum] = "79f0b37c45007381c371a790c2754644ad955166dbf2a48e3625032e9bdd4f71"
 
 XORG_PN = "libXft"
meta/recipes-graphics/xorg-lib/libxi_1.8.bb +1 -0
index 2aa75148d1..a6cf9b3002 100644
@@ -16,6 +16,7 @@ DEPENDS += "libxext xorgproto libxfixes"
 PE = "1"
 
 XORG_PN = "libXi"
+XORG_EXT = "tar.bz2"
 
 SRC_URI[sha256sum] = "2ed181446a61c7337576467870bc5336fc9e222a281122d96c4d39a3298bba00"
 
meta/recipes-graphics/xorg-lib/libxinerama_1.1.5.bb +0 -1
index 966edf6792..421b64e68d 100644
@@ -15,7 +15,6 @@ PROVIDES = "xinerama"
 PE = "1"
 
 XORG_PN = "libXinerama"
-XORG_EXT = "tar.xz"
 SRC_URI[sha256sum] = "5094d1f0fcc1828cb1696d0d39d9e866ae32520c54d01f618f1a3c1e30c2085c"
 
 BBCLASSEXTEND = "native nativesdk"
meta/recipes-graphics/xorg-lib/libxkbfile_1.1.2.bb +0 -1
index 6494d5e0f1..58dec8ae95 100644
@@ -13,5 +13,4 @@ DEPENDS += "virtual/libx11 xorgproto"
 PE = "1"
 
 BBCLASSEXTEND = "native"
-XORG_EXT = "tar.xz"
 SRC_URI[sha256sum] = "b8a3784fac420b201718047cfb6c2d5ee7e8b9481564c2667b4215f6616644b1"
meta/recipes-graphics/xorg-lib/libxmu_1.1.4.bb +0 -1
index 22632aa5a7..3aae4030b7 100644
@@ -18,7 +18,6 @@ PROVIDES = "xmu"
 PE = "1"
 
 XORG_PN = "libXmu"
-XORG_EXT = "tar.xz"
 
 LEAD_SONAME = "libXmu"
 
meta/recipes-graphics/xorg-lib/libxpm_3.5.14.bb +0 -1
index 1eafd8dbf9..2740341807 100644
@@ -16,7 +16,6 @@ DEPENDS += "libxext libsm libxt gettext-native"
 PE = "1"
 
 XORG_PN = "libXpm"
-XORG_EXT = "tar.xz"
 
 PACKAGES =+ "sxpm cxpm"
 FILES:cxpm = "${bindir}/cxpm"
meta/recipes-graphics/xorg-lib/libxrandr_1.5.3.bb +0 -1
index b74459263e..98572bd969 100644
@@ -16,7 +16,6 @@ DEPENDS += "virtual/libx11 xorgproto libxrender libxext"
 PE = "1"
 
 XORG_PN = "libXrandr"
-XORG_EXT = "tar.xz"
 
 BBCLASSEXTEND = "native nativesdk"
 
meta/recipes-graphics/xorg-lib/libxrender_0.9.11.bb +0 -1
index 302cc56e86..e138764dff 100644
@@ -18,6 +18,5 @@ PE = "1"
 XORG_PN = "libXrender"
 
 BBCLASSEXTEND = "native nativesdk"
-XORG_EXT = "tar.xz"
 SRC_URI[sha256sum] = "bc53759a3a83d1ff702fb59641b3d2f7c56e05051fa0cfa93501166fa782dc24"
 
meta/recipes-graphics/xorg-lib/libxres_1.2.2.bb +0 -1
index cddecbb9d2..72b28d9107 100644
@@ -16,5 +16,4 @@ PE = "1"
 
 XORG_PN = "libXres"
 
-XORG_EXT = "tar.xz"
 SRC_URI[sha256sum] = "9a7446f3484b9b7538ac5ee30d2c1ce9e5b7fbbaf1440e02f6cca186a1fa745f"
meta/recipes-graphics/xorg-lib/libxscrnsaver_1.2.4.bb +0 -1
index b69727b696..1b407f52f0 100644
@@ -19,5 +19,4 @@ PE = "1"
 
 XORG_PN = "libXScrnSaver"
 
-XORG_EXT = "tar.xz"
 SRC_URI[sha256sum] = "75cd2859f38e207a090cac980d76bc71e9da99d48d09703584e00585abc920fe"
meta/recipes-graphics/xorg-lib/libxshmfence_1.3.2.bb +0 -1
index 6b9ed20ae7..0a7da938e1 100644
@@ -15,7 +15,6 @@ EXTRA_OECONF += "--with-shared-memory-dir=/dev/shm"
 
 SRC_URI += "file://0001-xshmfence_futex.h-Define-SYS_futex-if-it-does-not-ex.patch"
 
-XORG_EXT = "tar.xz"
 SRC_URI[sha256sum] = "870df257bc40b126d91b5a8f1da6ca8a524555268c50b59c0acd1a27f361606f"
 
 BBCLASSEXTEND = "native nativesdk"
meta/recipes-graphics/xorg-lib/libxt_1.2.1.bb +1 -0
index eef561dbba..f56e106ee1 100644
@@ -21,6 +21,7 @@ PROVIDES = "xt"
 PE = "1"
 
 XORG_PN = "libXt"
+XORG_EXT = "tar.bz2"
 
 SRC_URI += "file://libxt_fix_for_x32.patch"
 
meta/recipes-graphics/xorg-lib/libxtst_1.2.4.bb +0 -1
index 7ed8f3d89d..db0621ba2e 100644
@@ -15,7 +15,6 @@ PROVIDES = "xtst"
 PE = "1"
 
 XORG_PN = "libXtst"
-XORG_EXT = "tar.xz"
 SRC_URI[sha256sum] = "84f5f30b9254b4ffee14b5b0940e2622153b0d3aed8286a3c5b7eeb340ca33c8"
 
 BBCLASSEXTEND = "native nativesdk"
meta/recipes-graphics/xorg-lib/libxv_1.0.12.bb +0 -1
index c587000c28..7f9c5e5cbc 100644
@@ -14,6 +14,5 @@ DEPENDS += "libxext xorgproto"
 
 XORG_PN = "libXv"
 
-XORG_EXT = "tar.xz"
 SRC_URI[sha256sum] = "aaf7fa09f689f7a2000fe493c0d64d1487a1210db154053e9e2336b860c63848"
 
meta/recipes-graphics/xorg-lib/libxxf86vm_1.1.5.bb +0 -1
index a586159ee3..16fd29ebcd 100644
@@ -15,7 +15,6 @@ DEPENDS += "libxext xorgproto"
 PE = "1"
 
 XORG_PN = "libXxf86vm"
-XORG_EXT = "tar.xz"
 SRC_URI[sha256sum] = "247fef48b3e0e7e67129e41f1e789e8d006ba47dba1c0cdce684b9b703f888e7"
 
 BBCLASSEXTEND = "native nativesdk"
meta/recipes-graphics/xorg-lib/xorg-lib-common.inc +1 -1
index 68137c4147..15c7ecf782 100644
@@ -6,7 +6,7 @@ LICENSE = "MIT"
 DEPENDS = "util-macros"
 
 XORG_PN = "${BPN}"
-XORG_EXT ?= "tar.bz2"
+XORG_EXT ?= "tar.xz"
 
 SRC_URI = "${XORG_MIRROR}/individual/lib/${XORG_PN}-${PV}.${XORG_EXT}"
 
meta/recipes-graphics/xorg-lib/xtrans_1.4.0.bb +2 -0
index 83f11769f5..cd5aedb59d 100644
@@ -12,6 +12,8 @@ require xorg-lib-common.inc
 LICENSE = "MIT & MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=49347921d4d5268021a999f250edc9ca"
 
+XORG_EXT = "tar.bz2"
+
 SRC_URI += "file://multilibfix.patch"
 
 PE = "1"
Signature · 1 line
2.17.1
#1 lore raw

PATCH 2/4 libx11-compose-data: 1.6.8 -> 1.8.3

From: Kai Kang <[email protected]>

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

---
 .../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%)
meta/recipes-graphics/xorg-lib/libx11-compose-data/0001-Drop-x11-dependencies.patch +8 -4
index 46a53a17f2..61af98d95e 100644
@@ -6,12 +6,16 @@ Subject: [PATCH] Drop x11 dependencies
 Upstream-Status: Inappropriate [OE-Specific]
 
 Signed-off-by: Ming Liu <[email protected]>
+
+Rebase for version 1.8.3.
+
+Signed-off-by: Kai Kang <[email protected]>
 ---
  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)
  
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 +9 -10
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
@@ -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"
Signature · 1 line
2.17.1
#2 lore raw

PATCH 3/4 libx11: 1.8.1 -> 1.8.3

In reply to [email protected]

From: Kai Kang <[email protected]>

Update libx11 from 1.8.1 to 1.8.3.

* add LICENSE 'ISC' which is added by
https://github.com/freedesktop/xorg-libX11/commit/a04b84f0
* adjust the ordering according to
https://www.openembedded.org/wiki/Styleguide#Ordering_and_grouping

---
 .../{libx11_1.8.1.bb => libx11_1.8.3.bb}      | 36 +++++++++----------
 1 file changed, 16 insertions(+), 20 deletions(-)
 rename meta/recipes-graphics/xorg-lib/{libx11_1.8.1.bb => libx11_1.8.3.bb} (65%)
meta/recipes-graphics/xorg-lib/libx11_1.8.3.bb renamed from meta/recipes-graphics/xorg-lib/libx11_1.8.1.bb +16 -20
similarity index 65%
rename from meta/recipes-graphics/xorg-lib/libx11_1.8.1.bb
rename to meta/recipes-graphics/xorg-lib/libx11_1.8.3.bb
index 9ff196c897..06519df5da 100644
@@ -6,31 +6,29 @@ basic functions of the window system."
 
 require xorg-lib-common.inc
 
-FILESEXTRAPATHS =. "${FILE_DIRNAME}/libx11:"
+LICENSE = "MIT & BSD-1-Clause & HPND & HPND-sell-variant & ISC"
+LIC_FILES_CHKSUM = "file://COPYING;md5=1d49cdd2b386c5db11ec636d680b7116"
 
-PE = "1"
+DEPENDS += "xorgproto \
+            xtrans \
+            libxcb \
+            xorgproto-native \
+            autoconf-archive \
+            "
 
-# temporarily override SRC_URI which is hard-coded in xorg-lib-common.inc
-# since new versions of packages use a new compression format - .tar.gz
-SRC_URI = "${XORG_MIRROR}/individual/lib/${XORG_PN}-${PV}.tar.xz"
+PROVIDES = "virtual/libx11"
 
-SRC_URI += "file://disable_tests.patch \
-            file://0001-fix-a-memory-leak-in-XRegisterIMInstantiateCallback.patch \
-           "
-SRC_URI[sha256sum] = "1bc41aa1bbe01401f330d76dfa19f386b79c51881c7bbfee9eb4e27f22f2d9f7"
+FILESEXTRAPATHS =. "${FILE_DIRNAME}/libx11:"
 
-PROVIDES = "virtual/libx11"
+PE = "1"
 
 XORG_PN = "libX11"
-LICENSE = "MIT & MIT & BSD-1-Clause & HPND & HPND-sell-variant"
-LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7"
 
-DEPENDS += "xorgproto \
-            xtrans \
-            libxcb \
-            xorgproto-native \
-            autoconf-archive \
-           "
+SRC_URI += "file://disable_tests.patch \
+            "
+SRC_URI[sha256sum] = "e31565c84006b6b8e01dc9399c806085739710bc2db2e0930f1511ed9d6585bd"
+
+inherit gettext
 
 EXTRA_OECONF += "--with-keysymdefdir=${STAGING_INCDIR}/X11/ --disable-xf86bigfont"
 EXTRA_OEMAKE += 'CWARNFLAGS=""'
@@ -40,8 +38,6 @@ PACKAGECONFIG[xcms] = "--enable-xcms,--disable-xcms"
 
 PACKAGES =+ "${PN}-xcb"
 
-inherit gettext
-
 FILES:${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${datadir}/X11/Xcms.txt"
 FILES:${PN}-xcb += "${libdir}/libX11-xcb.so.*"
 FILES:${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale"
Signature · 1 line
2.17.1
#3 lore raw

PATCH 4/4 libsm: 1.2.3 > 1.2.4

In reply to [email protected]

From: Kai Kang <[email protected]>

---
 .../xorg-lib/{libsm_1.2.3.bb => libsm_1.2.4.bb}                | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
 rename meta/recipes-graphics/xorg-lib/{libsm_1.2.3.bb => libsm_1.2.4.bb} (87%)
meta/recipes-graphics/xorg-lib/libsm_1.2.4.bb renamed from meta/recipes-graphics/xorg-lib/libsm_1.2.3.bb +1 -2
similarity index 87%
rename from meta/recipes-graphics/xorg-lib/libsm_1.2.3.bb
rename to meta/recipes-graphics/xorg-lib/libsm_1.2.4.bb
index 90917ef437..ab030723c6 100644
@@ -22,8 +22,7 @@ PE = "1"
 
 XORG_PN = "libSM"
 
-SRC_URI[md5sum] = "87c7fad1c1813517979184c8ccd76628"
-SRC_URI[sha256sum] = "2d264499dcb05f56438dee12a1b4b71d76736ce7ba7aa6efbf15ebb113769cbb"
+SRC_URI[sha256sum] = "fdcbe51e4d1276b1183da77a8a4e74a137ca203e0bcfb20972dd5f3347e97b84"
 
 PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"
 PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
Signature · 1 line
2.17.1