From: Kai Kang <kai.k...@windriver.com> 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 Signed-off-by: Kai Kang <kai.k...@windriver.com> --- .../{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%) diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.8.1.bb b/meta/recipes-graphics/xorg-lib/libx11_1.8.3.bb 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 --- a/meta/recipes-graphics/xorg-lib/libx11_1.8.1.bb +++ b/meta/recipes-graphics/xorg-lib/libx11_1.8.3.bb @@ -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" -- 2.17.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#175099): https://lists.openembedded.org/g/openembedded-core/message/175099 Mute This Topic: https://lists.openembedded.org/mt/95936034/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
