* [RFC 01/18] libx11: use INC_PR
@ 2012-09-11 19:17 Ross Burton
2012-09-11 19:17 ` [RFC 02/18] libx11-diet: you can't disable XCB anymore, so don't try Ross Burton
` (16 more replies)
0 siblings, 17 replies; 20+ messages in thread
From: Ross Burton @ 2012-09-11 19:17 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb | 2 +-
meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb | 2 +-
meta/recipes-graphics/xorg-lib/libx11.inc | 1 +
meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb | 2 +-
4 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb b/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb
index 7d4facd..ed5a890 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb
@@ -5,7 +5,7 @@ this version."
LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7"
-PR = "r1"
+PR = "${INC_PR}.0"
SRC_URI += "file://x11_disable_makekeys.patch \
file://X18NCMSstubs.diff \
diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb b/meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb
index 3d5a306..e8661f3 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb
@@ -5,7 +5,7 @@ DESCRIPTION += " Support for XCMS is disabled in this version."
LICENSE = "MIT & MIT-style & BSD"
LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7"
-PR = "r1"
+PR = "${INC_PR}.0"
DEPENDS += "libxcb xproto xextproto xtrans libxau kbproto inputproto xf86bigfontproto xproto-native"
diff --git a/meta/recipes-graphics/xorg-lib/libx11.inc b/meta/recipes-graphics/xorg-lib/libx11.inc
index 592f116..9e8c863 100644
--- a/meta/recipes-graphics/xorg-lib/libx11.inc
+++ b/meta/recipes-graphics/xorg-lib/libx11.inc
@@ -9,6 +9,7 @@ require xorg-lib-common.inc
inherit siteinfo
PE = "1"
+INC_PR = "r1"
PROVIDES = "virtual/libx11"
diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb b/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb
index a65ab1f..2e47899 100644
--- a/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb
@@ -1,7 +1,7 @@
require libx11.inc
inherit gettext
-PR = "r1"
+PR = "${INC_PR}.0"
BBCLASSEXTEND = "native nativesdk"
--
1.7.10
^ permalink raw reply related [flat|nested] 20+ messages in thread* [RFC 02/18] libx11-diet: you can't disable XCB anymore, so don't try 2012-09-11 19:17 [RFC 01/18] libx11: use INC_PR Ross Burton @ 2012-09-11 19:17 ` Ross Burton 2012-09-11 19:17 ` [RFC 03/18] libx11-diet: you can't disable UDC, because it's always disabled Ross Burton ` (15 subsequent siblings) 16 siblings, 0 replies; 20+ messages in thread From: Ross Burton @ 2012-09-11 19:17 UTC (permalink / raw) To: openembedded-core Signed-off-by: Ross Burton <ross.burton@intel.com> --- meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb b/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb index ed5a890..d821744 100644 --- a/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb +++ b/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb @@ -1,11 +1,11 @@ require libx11.inc -DESCRIPTION += " Support for XCB, UDC, XCMS and XLOCALE is disabled in \ +DESCRIPTION += " Support for UDC, XCMS and XLOCALE is disabled in \ this version." LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7" -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" SRC_URI += "file://x11_disable_makekeys.patch \ file://X18NCMSstubs.diff \ @@ -20,11 +20,11 @@ RPROVIDES_${PN}-locale = "libx11-locale" SRC_URI[md5sum] = "78b4b3bab4acbdf0abcfca30a8c70cc6" SRC_URI[sha256sum] = "c382efd7e92bfc3cef39a4b7f1ecf2744ba4414a705e3bc1e697f75502bd4d86" -DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \ +DEPENDS += "libxcb bigreqsproto xproto xextproto xtrans libxau xcmiscproto \ libxdmcp xf86bigfontproto kbproto inputproto xproto-native" FILESDIR = "${@os.path.dirname(d.getVar('FILE', True))}/libx11" -EXTRA_OECONF += "--without-xcb --disable-udc --disable-xcms --disable-xlocale --with-keysymdefdir=${STAGING_INCDIR}/X11" +EXTRA_OECONF += "--disable-udc --disable-xcms --disable-xlocale --with-keysymdefdir=${STAGING_INCDIR}/X11" CFLAGS += "-D_GNU_SOURCE" -- 1.7.10 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [RFC 03/18] libx11-diet: you can't disable UDC, because it's always disabled 2012-09-11 19:17 [RFC 01/18] libx11: use INC_PR Ross Burton 2012-09-11 19:17 ` [RFC 02/18] libx11-diet: you can't disable XCB anymore, so don't try Ross Burton @ 2012-09-11 19:17 ` Ross Burton 2012-09-11 19:17 ` [RFC 04/18] xorg-lib: move options to disable documentation to xorg-lib-common Ross Burton ` (14 subsequent siblings) 16 siblings, 0 replies; 20+ messages in thread From: Ross Burton @ 2012-09-11 19:17 UTC (permalink / raw) To: openembedded-core Signed-off-by: Ross Burton <ross.burton@intel.com> --- meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb b/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb index d821744..e6aa63f 100644 --- a/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb +++ b/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb @@ -1,11 +1,11 @@ require libx11.inc -DESCRIPTION += " Support for UDC, XCMS and XLOCALE is disabled in \ +DESCRIPTION += " Support for XCMS and XLOCALE is disabled in \ this version." LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7" -PR = "${INC_PR}.1" +PR = "${INC_PR}.2" SRC_URI += "file://x11_disable_makekeys.patch \ file://X18NCMSstubs.diff \ @@ -25,6 +25,6 @@ DEPENDS += "libxcb bigreqsproto xproto xextproto xtrans libxau xcmiscproto \ FILESDIR = "${@os.path.dirname(d.getVar('FILE', True))}/libx11" -EXTRA_OECONF += "--disable-udc --disable-xcms --disable-xlocale --with-keysymdefdir=${STAGING_INCDIR}/X11" +EXTRA_OECONF += "--disable-xcms --disable-xlocale --with-keysymdefdir=${STAGING_INCDIR}/X11" CFLAGS += "-D_GNU_SOURCE" -- 1.7.10 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [RFC 04/18] xorg-lib: move options to disable documentation to xorg-lib-common 2012-09-11 19:17 [RFC 01/18] libx11: use INC_PR Ross Burton 2012-09-11 19:17 ` [RFC 02/18] libx11-diet: you can't disable XCB anymore, so don't try Ross Burton 2012-09-11 19:17 ` [RFC 03/18] libx11-diet: you can't disable UDC, because it's always disabled Ross Burton @ 2012-09-11 19:17 ` Ross Burton 2012-09-11 19:17 ` [RFC 05/18] libx11: move xcms disabling to PACKAGECONFIG in libx11.inc Ross Burton ` (13 subsequent siblings) 16 siblings, 0 replies; 20+ messages in thread From: Ross Burton @ 2012-09-11 19:17 UTC (permalink / raw) To: openembedded-core Signed-off-by: Ross Burton <ross.burton@intel.com> --- meta/recipes-graphics/xorg-lib/libx11.inc | 4 +--- meta/recipes-graphics/xorg-lib/libxi_1.6.1.bb | 4 +--- meta/recipes-graphics/xorg-lib/xorg-lib-common.inc | 3 ++- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/meta/recipes-graphics/xorg-lib/libx11.inc b/meta/recipes-graphics/xorg-lib/libx11.inc index 9e8c863..fb1daf2 100644 --- a/meta/recipes-graphics/xorg-lib/libx11.inc +++ b/meta/recipes-graphics/xorg-lib/libx11.inc @@ -9,7 +9,7 @@ require xorg-lib-common.inc inherit siteinfo PE = "1" -INC_PR = "r1" +INC_PR = "r2" PROVIDES = "virtual/libx11" @@ -17,8 +17,6 @@ XORG_PN = "libX11" LICENSE = "MIT & MIT-style & BSD" LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7" -EXTRA_OECONF += "--with-groff=no --with-ps2pdf=no --with-fop=no --disable-specs" - PACKAGES =+ "${PN}-xcb" FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt" diff --git a/meta/recipes-graphics/xorg-lib/libxi_1.6.1.bb b/meta/recipes-graphics/xorg-lib/libxi_1.6.1.bb index 575d130..c327f25 100644 --- a/meta/recipes-graphics/xorg-lib/libxi_1.6.1.bb +++ b/meta/recipes-graphics/xorg-lib/libxi_1.6.1.bb @@ -14,11 +14,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=17b064789fab936a1c58c4e13d965b0f \ DEPENDS += "libxext inputproto" PE = "1" -PR = "r0" +PR = "r1" XORG_PN = "libXi" -EXTRA_OECONF_append = " --enable-specs=no" - SRC_URI[md5sum] = "78ee882e1ff3b192cf54070bdb19938e" SRC_URI[sha256sum] = "f2e3627d7292ec5eff488ab58867fba14a62f06e72a8d3337ab6222c09873109" diff --git a/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc b/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc index 55eaf49..c911925 100644 --- a/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc +++ b/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc @@ -13,7 +13,8 @@ S = "${WORKDIR}/${XORG_PN}-${PV}" inherit autotools pkgconfig -EXTRA_OECONF = "--enable-malloc0returnsnull --with-fop=no --without-xmlto" +EXTRA_OECONF = "--enable-malloc0returnsnull \ + --disable-specs --with-groff=no --with-ps2pdf=no --with-fop=no --without-xmlto" python () { whitelist = [ "pixman", "libpciaccess" ] -- 1.7.10 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [RFC 05/18] libx11: move xcms disabling to PACKAGECONFIG in libx11.inc 2012-09-11 19:17 [RFC 01/18] libx11: use INC_PR Ross Burton ` (2 preceding siblings ...) 2012-09-11 19:17 ` [RFC 04/18] xorg-lib: move options to disable documentation to xorg-lib-common Ross Burton @ 2012-09-11 19:17 ` Ross Burton 2012-09-11 19:17 ` [RFC 06/18] libx11: move keysymdefdir option to .inc Ross Burton ` (12 subsequent siblings) 16 siblings, 0 replies; 20+ messages in thread From: Ross Burton @ 2012-09-11 19:17 UTC (permalink / raw) To: openembedded-core Signed-off-by: Ross Burton <ross.burton@intel.com> --- meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb | 2 +- meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb | 2 +- meta/recipes-graphics/xorg-lib/libx11.inc | 6 +++++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb b/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb index e6aa63f..dd9e7d9 100644 --- a/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb +++ b/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb @@ -25,6 +25,6 @@ DEPENDS += "libxcb bigreqsproto xproto xextproto xtrans libxau xcmiscproto \ FILESDIR = "${@os.path.dirname(d.getVar('FILE', True))}/libx11" -EXTRA_OECONF += "--disable-xcms --disable-xlocale --with-keysymdefdir=${STAGING_INCDIR}/X11" +EXTRA_OECONF += "--disable-xlocale --with-keysymdefdir=${STAGING_INCDIR}/X11" CFLAGS += "-D_GNU_SOURCE" diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb b/meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb index e8661f3..9e88d45 100644 --- a/meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb +++ b/meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb @@ -19,4 +19,4 @@ RPROVIDES_${PN}-locale = "libx11-locale" SRC_URI[md5sum] = "78b4b3bab4acbdf0abcfca30a8c70cc6" SRC_URI[sha256sum] = "c382efd7e92bfc3cef39a4b7f1ecf2744ba4414a705e3bc1e697f75502bd4d86" -EXTRA_OECONF += "--with-keysymdefdir=${STAGING_INCDIR}/X11/ --disable-xcms " +EXTRA_OECONF += "--with-keysymdefdir=${STAGING_INCDIR}/X11/" diff --git a/meta/recipes-graphics/xorg-lib/libx11.inc b/meta/recipes-graphics/xorg-lib/libx11.inc index fb1daf2..22b26cc 100644 --- a/meta/recipes-graphics/xorg-lib/libx11.inc +++ b/meta/recipes-graphics/xorg-lib/libx11.inc @@ -9,7 +9,7 @@ require xorg-lib-common.inc inherit siteinfo PE = "1" -INC_PR = "r2" +INC_PR = "r3" PROVIDES = "virtual/libx11" @@ -23,6 +23,10 @@ FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/X FILES_${PN}-xcb += "${libdir}/libX11-xcb.so.*" FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale" +# Almost nothing uses XCMS +PACKAGECONFIG ??= "" +PACKAGECONFIG[xcms] = "--enable-xcms,--disable-xcms" + do_compile_prepend() { cd ${S}/src/util mv makekeys.c.orig makekeys.c || true -- 1.7.10 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [RFC 06/18] libx11: move keysymdefdir option to .inc 2012-09-11 19:17 [RFC 01/18] libx11: use INC_PR Ross Burton ` (3 preceding siblings ...) 2012-09-11 19:17 ` [RFC 05/18] libx11: move xcms disabling to PACKAGECONFIG in libx11.inc Ross Burton @ 2012-09-11 19:17 ` Ross Burton 2012-09-11 19:17 ` [RFC 07/18] libx11: remove redundant license data Ross Burton ` (11 subsequent siblings) 16 siblings, 0 replies; 20+ messages in thread From: Ross Burton @ 2012-09-11 19:17 UTC (permalink / raw) To: openembedded-core Signed-off-by: Ross Burton <ross.burton@intel.com> --- meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb | 2 +- meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb | 2 -- meta/recipes-graphics/xorg-lib/libx11.inc | 4 +++- meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb | 2 -- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb b/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb index dd9e7d9..9a7de33 100644 --- a/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb +++ b/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb @@ -25,6 +25,6 @@ DEPENDS += "libxcb bigreqsproto xproto xextproto xtrans libxau xcmiscproto \ FILESDIR = "${@os.path.dirname(d.getVar('FILE', True))}/libx11" -EXTRA_OECONF += "--disable-xlocale --with-keysymdefdir=${STAGING_INCDIR}/X11" +EXTRA_OECONF += "--disable-xlocale" CFLAGS += "-D_GNU_SOURCE" diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb b/meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb index 9e88d45..714b993 100644 --- a/meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb +++ b/meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb @@ -18,5 +18,3 @@ RPROVIDES_${PN}-locale = "libx11-locale" SRC_URI[md5sum] = "78b4b3bab4acbdf0abcfca30a8c70cc6" SRC_URI[sha256sum] = "c382efd7e92bfc3cef39a4b7f1ecf2744ba4414a705e3bc1e697f75502bd4d86" - -EXTRA_OECONF += "--with-keysymdefdir=${STAGING_INCDIR}/X11/" diff --git a/meta/recipes-graphics/xorg-lib/libx11.inc b/meta/recipes-graphics/xorg-lib/libx11.inc index 22b26cc..a524c5f 100644 --- a/meta/recipes-graphics/xorg-lib/libx11.inc +++ b/meta/recipes-graphics/xorg-lib/libx11.inc @@ -9,7 +9,7 @@ require xorg-lib-common.inc inherit siteinfo PE = "1" -INC_PR = "r3" +INC_PR = "r4" PROVIDES = "virtual/libx11" @@ -23,6 +23,8 @@ FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/X FILES_${PN}-xcb += "${libdir}/libX11-xcb.so.*" FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale" +EXTRA_OECONF += "--with-keysymdefdir=${STAGING_INCDIR}/X11/" + # Almost nothing uses XCMS PACKAGECONFIG ??= "" PACKAGECONFIG[xcms] = "--enable-xcms,--disable-xcms" diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb b/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb index 2e47899..0ba0f9b 100644 --- a/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb +++ b/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb @@ -5,8 +5,6 @@ PR = "${INC_PR}.0" BBCLASSEXTEND = "native nativesdk" -EXTRA_OECONF += "--with-keysymdefdir=${STAGING_INCDIR}/X11" - DEPENDS += "util-macros xtrans libxdmcp libxau \ bigreqsproto xproto xextproto xcmiscproto \ xf86bigfontproto kbproto inputproto libxcb \ -- 1.7.10 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [RFC 07/18] libx11: remove redundant license data 2012-09-11 19:17 [RFC 01/18] libx11: use INC_PR Ross Burton ` (4 preceding siblings ...) 2012-09-11 19:17 ` [RFC 06/18] libx11: move keysymdefdir option to .inc Ross Burton @ 2012-09-11 19:17 ` Ross Burton 2012-09-11 19:17 ` [RFC 08/18] libx11: merge patches into a single directory Ross Burton ` (10 subsequent siblings) 16 siblings, 0 replies; 20+ messages in thread From: Ross Burton @ 2012-09-11 19:17 UTC (permalink / raw) To: openembedded-core Signed-off-by: Ross Burton <ross.burton@intel.com> --- meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb | 2 -- meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb | 3 --- 2 files changed, 5 deletions(-) diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb b/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb index 9a7de33..04ee1b8 100644 --- a/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb +++ b/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb @@ -3,8 +3,6 @@ require libx11.inc DESCRIPTION += " Support for XCMS and XLOCALE is disabled in \ this version." -LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7" - PR = "${INC_PR}.2" SRC_URI += "file://x11_disable_makekeys.patch \ diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb b/meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb index 714b993..6550903 100644 --- a/meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb +++ b/meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb @@ -2,9 +2,6 @@ require libx11.inc DESCRIPTION += " Support for XCMS is disabled in this version." -LICENSE = "MIT & MIT-style & BSD" -LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7" - PR = "${INC_PR}.0" DEPENDS += "libxcb xproto xextproto xtrans libxau kbproto inputproto xf86bigfontproto xproto-native" -- 1.7.10 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [RFC 08/18] libx11: merge patches into a single directory 2012-09-11 19:17 [RFC 01/18] libx11: use INC_PR Ross Burton ` (5 preceding siblings ...) 2012-09-11 19:17 ` [RFC 07/18] libx11: remove redundant license data Ross Burton @ 2012-09-11 19:17 ` Ross Burton 2012-09-11 19:17 ` [RFC 09/18] libx11: refresh dependencies, and centralise into libx11.inc Ross Burton ` (9 subsequent siblings) 16 siblings, 0 replies; 20+ messages in thread From: Ross Burton @ 2012-09-11 19:17 UTC (permalink / raw) To: openembedded-core [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #1: Type: text/plain; charset=UTF-8, Size: 49291 bytes --] Signed-off-by: Ross Burton <ross.burton@intel.com> --- .../xorg-lib/libx11-1.5.0/keysymdef_include.patch | 23 - .../libx11-1.5.0/makekeys_crosscompile.patch | 76 --- .../libx11-1.5.0/x11_disable_makekeys.patch | 34 -- .../xorg-lib/libx11-diet-1.5.0/X18NCMSstubs.diff | 541 -------------------- .../libx11-diet-1.5.0/fix-disable-xlocale.diff | 17 - .../libx11-diet-1.5.0/fix-utf8-wrong-define.patch | 19 - .../libx11-diet-1.5.0/keysymdef_include.patch | 23 - .../libx11-diet-1.5.0/x11_disable_makekeys.patch | 34 -- .../libx11-trim-1.5.0/keysymdef_include.patch | 23 - .../libx11-trim-1.5.0/makekeys_crosscompile.patch | 76 --- .../libx11-trim-1.5.0/x11_disable_makekeys.patch | 34 -- meta/recipes-graphics/xorg-lib/libx11.inc | 4 +- .../xorg-lib/libx11/X18NCMSstubs.diff | 541 ++++++++++++++++++++ .../xorg-lib/libx11/fix-disable-xlocale.diff | 17 + .../xorg-lib/libx11/fix-utf8-wrong-define.patch | 19 + .../xorg-lib/libx11/keysymdef_include.patch | 23 + .../xorg-lib/libx11/makekeys_crosscompile.patch | 76 +++ .../xorg-lib/libx11/x11_disable_makekeys.patch | 34 ++ 18 files changed, 713 insertions(+), 901 deletions(-) delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-1.5.0/keysymdef_include.patch delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-1.5.0/makekeys_crosscompile.patch delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-1.5.0/x11_disable_makekeys.patch delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet-1.5.0/X18NCMSstubs.diff delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet-1.5.0/fix-disable-xlocale.diff delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet-1.5.0/fix-utf8-wrong-define.patch delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet-1.5.0/keysymdef_include.patch delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet-1.5.0/x11_disable_makekeys.patch delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-trim-1.5.0/keysymdef_include.patch delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-trim-1.5.0/makekeys_crosscompile.patch delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-trim-1.5.0/x11_disable_makekeys.patch create mode 100644 meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff create mode 100644 meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.diff create mode 100644 meta/recipes-graphics/xorg-lib/libx11/fix-utf8-wrong-define.patch create mode 100644 meta/recipes-graphics/xorg-lib/libx11/keysymdef_include.patch create mode 100644 meta/recipes-graphics/xorg-lib/libx11/makekeys_crosscompile.patch create mode 100644 meta/recipes-graphics/xorg-lib/libx11/x11_disable_makekeys.patch diff --git a/meta/recipes-graphics/xorg-lib/libx11-1.5.0/keysymdef_include.patch b/meta/recipes-graphics/xorg-lib/libx11-1.5.0/keysymdef_include.patch deleted file mode 100644 index d1bdab9..0000000 --- a/meta/recipes-graphics/xorg-lib/libx11-1.5.0/keysymdef_include.patch +++ /dev/null @@ -1,23 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Martin Jansa <martin.jansa@gmail.com> - -diff -uNr libX11-1.3.6.orig//configure.ac libX11-1.3.6/configure.ac ---- libX11-1.3.6.orig//configure.ac 2010-09-20 08:04:16.000000000 +0200 -+++ libX11-1.3.6/configure.ac 2010-09-28 16:29:26.000000000 +0200 -@@ -355,7 +355,14 @@ - # Find keysymdef.h - # - AC_MSG_CHECKING([keysym definitions]) --KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11 -+AC_ARG_WITH(keysymdefdir, -+ AC_HELP_STRING([--with-keysymdefdir=DIR], [The location of keysymdef.h]), -+ KEYSYMDEFDIR=$withval, KEYSYMDEFDIR="") -+ -+if test x$KEYSYMDEFDIR = x; then -+ KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11 -+fi -+ - FILES="keysymdef.h XF86keysym.h Sunkeysym.h DECkeysym.h HPkeysym.h" - for i in $FILES; do - if test -f "$KEYSYMDEFDIR/$i"; then diff --git a/meta/recipes-graphics/xorg-lib/libx11-1.5.0/makekeys_crosscompile.patch b/meta/recipes-graphics/xorg-lib/libx11-1.5.0/makekeys_crosscompile.patch deleted file mode 100644 index daf3696..0000000 --- a/meta/recipes-graphics/xorg-lib/libx11-1.5.0/makekeys_crosscompile.patch +++ /dev/null @@ -1,76 +0,0 @@ -Because the size of "unsigned long" is different between 32-bit -and 64-bit, judge whether target is 32-bit or 64-bit and tell -"makekey". - -The error information from LSB Test suite is as follow: -VSW5TESTSUITE PURPOSE 7 -Assertion XStringToKeysym-7.(A) -When the string argument is the name of a KeySym in the -table with the prefix XK_ removed, then a call to -XStringToKeysym returns that KeySym. -METH: For each KeySym name in table with code G: -METH: Call XStringToKeysym to obtain the KeySym defined for that string. -METH: Verify that XStringToKeysym did not return NoSymbol. -METH: Verify that the returned string is correct. -CHECK: XStringToKeysym-7 1, line 130 -CHECK: XStringToKeysym-7 2, line 140 -CHECK: XStringToKeysym-7 3, line 150 -CHECK: XStringToKeysym-7 4, line 160 -CHECK: XStringToKeysym-7 5, line 170 -CHECK: XStringToKeysym-7 6, line 180 -CHECK: XStringToKeysym-7 7, line 190 -CHECK: XStringToKeysym-7 8, line 200 -CHECK: XStringToKeysym-7 9, line 210 -CHECK: XStringToKeysym-7 10, line 220 -CHECK: XStringToKeysym-7 11, line 230 -CHECK: XStringToKeysym-7 12, line 240 -CHECK: XStringToKeysym-7 13, line 250 -CHECK: XStringToKeysym-7 14, line 260 -CHECK: XStringToKeysym-7 15, line 270 -CHECK: XStringToKeysym-7 16, line 280 -CHECK: XStringToKeysym-7 17, line 290 -CHECK: XStringToKeysym-7 18, line 300 -CHECK: XStringToKeysym-7 19, line 310 -CHECK: XStringToKeysym-7 20, line 320 - -Upstream-Status: Pending - -Signed-off-by: dbuitenh@windriver.com - ---- libX11-1.3.4.orig/src/util/makekeys.c 2010-01-15 09:11:36.000000000 +0800 -+++ libX11-1.3.4/src/util/makekeys.c 2011-05-24 19:04:25.454774908 +0800 -@@ -33,6 +33,7 @@ - #include <X11/keysymdef.h> - #include <stdio.h> - #include <stdlib.h> -+#include <stdint.h> - - typedef unsigned long Signature; - -@@ -124,7 +125,12 @@ - name = info[i].name; - sig = 0; - while ((c = *name++)) -- sig = (sig << 1) + c; -+#ifdef USE32 -+ sig = (uint32_t)(sig << 1) + c; -+#else -+ sig = (uint64_t)(sig << 1) + c; -+#endif -+ - first = j = sig % z; - for (k = 0; tab[j]; k++) { - j += first + 1; -@@ -163,7 +169,11 @@ - name = info[i].name; - sig = 0; - while ((c = *name++)) -- sig = (sig << 1) + c; -+#ifdef USE32 -+ sig = (uint32_t)(sig << 1) + c; -+#else -+ sig = (uint64_t)(sig << 1) + c; -+#endif - first = j = sig % z; - while (offsets[j]) { - j += first + 1; diff --git a/meta/recipes-graphics/xorg-lib/libx11-1.5.0/x11_disable_makekeys.patch b/meta/recipes-graphics/xorg-lib/libx11-1.5.0/x11_disable_makekeys.patch deleted file mode 100644 index 69f9e6c..0000000 --- a/meta/recipes-graphics/xorg-lib/libx11-1.5.0/x11_disable_makekeys.patch +++ /dev/null @@ -1,34 +0,0 @@ -Upstream-Status: Pending - -Index: libX11-1.5.0/src/util/Makefile.am -=================================================================== ---- libX11-1.5.0.orig/src/util/Makefile.am -+++ libX11-1.5.0/src/util/Makefile.am -@@ -1,27 +1,2 @@ -- --noinst_PROGRAMS=makekeys -- --makekeys_CFLAGS = \ -- $(X11_CFLAGS) \ -- $(CWARNFLAGS) -- --makekeys_CPPFLAGS = \ -- -I$(top_srcdir)/include -- --CC = @CC_FOR_BUILD@ --CPPFLAGS = @CPPFLAGS_FOR_BUILD@ --CFLAGS = @CFLAGS_FOR_BUILD@ --LDFLAGS = @LDFLAGS_FOR_BUILD@ -- - EXTRA_DIST = mkks.sh - --if LINT --# Check source code with tools like lint & sparse -- --ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) -- --lint: -- $(LINT) $(ALL_LINT_FLAGS) makekeys.c -- --endif LINT diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet-1.5.0/X18NCMSstubs.diff b/meta/recipes-graphics/xorg-lib/libx11-diet-1.5.0/X18NCMSstubs.diff deleted file mode 100644 index 8cd1870..0000000 --- a/meta/recipes-graphics/xorg-lib/libx11-diet-1.5.0/X18NCMSstubs.diff +++ /dev/null @@ -1,541 +0,0 @@ -Upstream-Status: Pending - -Upstream-Status: Inappropriate [configuration] -Index: libX11-1.3/src/imConv.c -=================================================================== ---- libX11-1.3.orig/src/imConv.c -+++ libX11-1.3/src/imConv.c -@@ -83,6 +83,7 @@ static const struct SubstRec SubstTable[ - * from UCS char to specified charset char. - * This converter is needed for _XimGetCharCode subroutine. - */ -+#ifdef XLOCALE - XPointer - _XimGetLocaleCode ( - _Xconst char* encoding_name) -@@ -96,6 +97,7 @@ _XimGetLocaleCode ( - } - return cvt; - } -+#endif - - /* - * Returns the locale dependent representation of a keysym. -@@ -106,6 +108,7 @@ _XimGetLocaleCode ( - * terminating NUL byte. Return 0 if the keysym is not representable in the - * locale - */ -+#ifdef XLOCALE - /*ARGSUSED*/ - int - _XimGetCharCode ( -@@ -135,6 +138,7 @@ _XimGetCharCode ( - buf[count]= '\0'; - return count; - } -+#endif - - #ifdef XKB - static int lookup_string( -Index: libX11-1.3/src/X18NCMSstubs.c -=================================================================== ---- /dev/null -+++ libX11-1.3/src/X18NCMSstubs.c -@@ -0,0 +1,428 @@ -+/* -+ * X18NCMSstubs.c -+ * - Provides stubs and dummy funcs needed when Xcms and XLocale stuff removed -+ * -+ * Copyright © 2003 Matthew Allum -+ * -+ * Permission to use, copy, modify, distribute, and sell this software and its -+ * documentation for any purpose is hereby granted without fee, provided that -+ * the above copyright notice appear in all copies and that both that -+ * copyright notice and this permission notice appear in supporting -+ * documentation, and that the name of Matthew Allum not be used in -+ * advertising or publicity pertaining to distribution of the software without -+ * specific, written prior permission. Keith Packard and Compaq makes no -+ * representations about the suitability of this software for any purpose. It -+ * is provided "as is" without express or implied warranty. -+ * -+ * MATTHEW ALLUM DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS -+ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, -+ * IN NO EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR -+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER -+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -+ * PERFORMANCE OF THIS SOFTWARE. -+ */ -+ -+#include <stdlib.h> -+#include "Xlibint.h" -+#include "Xlcint.h" -+#include <X11/Xlocale.h> -+#include <X11/Xos.h> -+#ifdef WIN32 -+#undef close -+#endif -+#include <X11/Xutil.h> -+#include "XlcPubI.h" -+ -+#include "Xcmsint.h" /* for XcmsCCC type */ -+#include "XlcPubI.h" /* for XLCd type */ -+#include "config.h" -+ -+#if ! XLOCALE -+ -+Bool -+XSupportsLocale() -+{ -+ return False; -+} -+ -+char * -+XSetLocaleModifiers( -+ const char *modifiers) -+{ -+ return NULL; -+} -+ -+XLCd -+_XOpenLC( -+ char *name) -+{ -+ return NULL; -+} -+ -+XLCd -+_XlcCurrentLC() -+{ -+ return NULL; -+} -+ -+void -+_XlcVaToArgList( -+ va_list var, -+ int count, -+ XlcArgList *args_ret) -+{ -+ return; -+} -+ -+void -+_XlcCountVaList( -+ va_list var, -+ int *count_ret) -+{ -+ return; -+} -+ -+void -+_XCloseLC( -+ XLCd lcd) -+{ -+ return; -+} -+ -+int -+_XlcConvert( -+ XlcConv conv, -+ XPointer *from, -+ int *from_left, -+ XPointer *to, -+ int *to_left, -+ XPointer *args, -+ int num_args) -+{ -+ return 0; -+} -+ -+/* XIM Stubs */ -+ -+XPointer -+_XimGetLocaleCode ( _Xconst char* encoding_name ) -+{ -+ return NULL; -+} -+ -+int -+_XimGetCharCode ( -+ XPointer ucs_conv, -+ KeySym keysym, -+ unsigned char* buf, -+ int nbytes) -+{ -+ return 0; -+} -+ -+/* Xrm Stubs */ -+ -+XrmMethods -+_XrmInitParseInfo( -+ XPointer *state) -+{ -+ return (XrmMethods) NULL; -+} -+ -+/* Xwc Stubs */ -+ -+int -+XwcTextExtents( -+ XFontSet font_set, -+ _Xconst wchar_t *text, -+ int text_len, -+ XRectangle *overall_ink_extents, -+ XRectangle *overall_logical_extents) -+{ -+ return 0; -+} -+ -+void -+XwcDrawString(Display *display, -+ Drawable d, -+ XFontSet font_set, -+ GC gc, -+ int x, int y, -+ _Xconst wchar_t *string, -+ int num_wchars) -+{ -+ ; -+} -+ -+void -+XwcDrawText( -+ Display *dpy, -+ Drawable d, -+ GC gc, -+ int x, -+ int y, -+ XwcTextItem *text_items, -+ int nitems) -+{ -+ ; -+} -+ -+void -+XwcDrawImageString( -+ Display *dpy, -+ Drawable d, -+ XFontSet font_set, -+ GC gc, -+ int x, -+ int y, -+ _Xconst wchar_t *text, -+ int text_len) -+{ -+ ; -+} -+ -+int -+XwcTextEscapement( -+ XFontSet font_set, -+ _Xconst wchar_t *text, -+ int text_len) -+{ -+ return 0; -+} -+ -+Status -+XwcTextPerCharExtents( -+ XFontSet font_set, -+ _Xconst wchar_t *text, -+ int text_len, -+ XRectangle *ink_extents_buffer, -+ XRectangle *logical_extents_buffer, -+ int buffer_size, -+ int *num_chars, -+ XRectangle *max_ink_extents, -+ XRectangle *max_logical_extents) -+{ -+ return(XcmsFailure); -+} -+ -+int -+XwcTextPropertyToTextList( -+ Display *dpy, -+ const XTextProperty *text_prop, -+ wchar_t ***list_ret, -+ int *count_ret) -+{ -+ return 0; -+} -+ -+int -+XwcTextListToTextProperty( -+ Display *dpy, -+ wchar_t **list, -+ int count, -+ XICCEncodingStyle style, -+ XTextProperty *text_prop) -+{ -+ return 0; -+} -+ -+void -+XwcFreeStringList(wchar_t **list) -+{ -+ return; -+} -+ -+ -+void XmbSetWMProperties ( /* Actually from mbWMProps.c */ -+ Display *dpy, -+ Window w, -+ _Xconst char *windowName, -+ _Xconst char *iconName, -+ char **argv, -+ int argc, -+ XSizeHints *sizeHints, -+ XWMHints *wmHints, -+ XClassHint *classHints) -+{ -+ return; -+} -+ -+int -+XmbTextPropertyToTextList( -+ Display *dpy, -+ const XTextProperty *text_prop, -+ char ***list_ret, -+ int *count_ret) -+{ -+ return XLocaleNotSupported; -+} -+ -+int -+XmbTextListToTextProperty( -+ Display *dpy, -+ char **list, -+ int count, -+ XICCEncodingStyle style, -+ XTextProperty *text_prop) -+{ -+ return XLocaleNotSupported; -+} -+ -+int -+XmbTextExtents( -+ XFontSet font_set, -+ _Xconst char *text, -+ int text_len, -+ XRectangle *overall_ink_extents, -+ XRectangle *overall_logical_extents) -+{ -+ return 0; -+} -+ -+void -+XmbDrawText( -+ Display *dpy, -+ Drawable d, -+ GC gc, -+ int x, -+ int y, -+ XmbTextItem *text_items, -+ int nitems) -+{ -+ ; -+} -+ -+void -+XmbDrawString( -+ Display *dpy, -+ Drawable d, -+ XFontSet font_set, -+ GC gc, -+ int x, -+ int y, -+ _Xconst char *text, -+ int text_len) -+{ -+ ; -+} -+ -+void -+XmbDrawImageString( -+ Display *dpy, -+ Drawable d, -+ XFontSet font_set, -+ GC gc, -+ int x, -+ int y, -+ _Xconst char *text, -+ int text_len) -+{ -+ ; -+} -+ -+int -+XmbTextEscapement( -+ XFontSet font_set, -+ _Xconst char *text, -+ int text_len) -+{ -+ return 0; -+} -+ -+Status -+XmbTextPerCharExtents( -+ XFontSet font_set, -+ _Xconst char *text, -+ int text_len, -+ XRectangle *ink_extents_buffer, -+ XRectangle *logical_extents_buffer, -+ int buffer_size, -+ int *num_chars, -+ XRectangle *max_ink_extents, -+ XRectangle *max_logical_extents) -+{ -+ return 0; -+} -+ -+unsigned int -+KeySymToUcs4(KeySym keysym) -+{ -+ return 0; -+} -+ -+#endif -+ -+#if ! XCMS -+ -+XcmsCCC -+XcmsCCCOfColormap(dpy, cmap) -+ Display *dpy; -+ Colormap cmap; -+{ -+ return NULL; -+} -+ -+Status -+_XcmsResolveColorString ( -+ XcmsCCC ccc, -+ const char **color_string, -+ XcmsColor *pColor_exact_return, -+ XcmsColorFormat result_format) -+{ -+ return(XcmsFailure); -+} -+ -+void -+_XcmsUnresolveColor( -+ XcmsCCC ccc, -+ XcmsColor *pColor) -+{ -+ return; -+} -+ -+void -+_XUnresolveColor( -+ XcmsCCC ccc, -+ XColor *pXColor) -+{ -+ return; -+} -+ -+XcmsCmapRec * -+_XcmsAddCmapRec(dpy, cmap, windowID, visual) -+ Display *dpy; -+ Colormap cmap; -+ Window windowID; -+ Visual *visual; -+{ -+ return NULL; -+} -+ -+void -+_XcmsRGB_to_XColor( -+ XcmsColor *pColors, -+ XColor *pXColors, -+ unsigned int nColors) -+{ -+ return; -+} -+ -+XcmsCmapRec * -+_XcmsCopyCmapRecAndFree( -+ Display *dpy, -+ Colormap src_cmap, -+ Colormap copy_cmap) -+{ -+ return NULL; -+} -+ -+void -+_XcmsDeleteCmapRec( -+ Display *dpy, -+ Colormap cmap) -+{ -+ return; -+} -+ -+#endif -Index: libX11-1.3/src/Makefile.am -=================================================================== ---- libX11-1.3.orig/src/Makefile.am -+++ libX11-1.3/src/Makefile.am -@@ -335,6 +335,8 @@ if THRSTUBS - libX11_la_SOURCES+=UIThrStubs.c - endif - -+libX11_la_SOURCES+=X18NCMSstubs.c -+ - x11datadir = @X11_DATADIR@ - x11data_DATA = XKeysymDB XErrorDB - -@@ -342,7 +344,8 @@ EXTRA_DIST = \ - $(x11data_DATA) \ - os2Stubs.c \ - udcInf.c \ -- UIThrStubs.c -+ UIThrStubs.c \ -+ X18NCMSstubs.c - - if XCB - libX11_la_SOURCES += \ -Index: libX11-1.3/src/locking.c -=================================================================== ---- libX11-1.3.orig/src/locking.c -+++ libX11-1.3/src/locking.c -@@ -66,7 +66,9 @@ in this Software without prior written a - #define NUM_FREE_CVLS 4 - - /* in lcWrap.c */ -+#ifdef XLOCALE - extern LockInfoPtr _Xi18n_lock; -+#endif - - #ifdef WIN32 - static DWORD _X_TlsIndex = (DWORD)-1; -@@ -594,9 +596,11 @@ Status XInitThreads(void) - _Xglobal_lock = &global_lock; - xmutex_init(_Xglobal_lock->lock); - xmutex_set_name(_Xglobal_lock->lock, "Xlib global"); -+#ifdef XLOCALE - _Xi18n_lock = &i18n_lock; - xmutex_init(_Xi18n_lock->lock); - xmutex_set_name(_Xi18n_lock->lock, "Xlib i18n"); -+#endif - _XLockMutex_fn = _XLockMutex; - _XUnlockMutex_fn = _XUnlockMutex; - _XCreateMutex_fn = _XCreateMutex; -Index: libX11-1.3/configure.ac -=================================================================== ---- libX11-1.3.orig/configure.ac -+++ libX11-1.3/configure.ac -@@ -289,7 +289,14 @@ else - fi - AC_SUBST(KEYSYMDEF) - --AM_CONDITIONAL(UDC, test xfalse = xtrue) -+AC_ARG_ENABLE(udc, -+ AC_HELP_STRING([--disable-udc], -+ [Disable Xlib support for UDC *EXPERIMENTAL*]), -+ [UDC=$enableval],[UDC=yes]) -+AM_CONDITIONAL(UDC, [test x$UDC = xyes ]) -+if test x"$UDC" = "xyes"; then -+ AC_DEFINE(UDC,1,[Include support for UDC]) -+fi - - AC_ARG_ENABLE(xcms, - AC_HELP_STRING([--disable-xcms], diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet-1.5.0/fix-disable-xlocale.diff b/meta/recipes-graphics/xorg-lib/libx11-diet-1.5.0/fix-disable-xlocale.diff deleted file mode 100644 index a7c3984..0000000 --- a/meta/recipes-graphics/xorg-lib/libx11-diet-1.5.0/fix-disable-xlocale.diff +++ /dev/null @@ -1,17 +0,0 @@ -Upstream-Status: Pending - -Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com> ---- libX11-X11R7.0-1.0.0/src/Font.c.orig 2006-03-12 18:35:42.000000000 +0100 -+++ libX11-X11R7.0-1.0.0/src/Font.c 2006-03-12 18:40:27.000000000 +0100 -@@ -701,7 +701,11 @@ - } - if (l - 2 - (p - charset) < 0) - return 0; -+#ifdef XLOCALE - if (_XlcNCompareISOLatin1(name + l - 2 - (p - charset), charset, p - charset)) -+#else -+ if (strncasecmp(name + l - 2 - (p - charset), charset, p - charset)) -+#endif - return 0; - if (strlen(p + 1) + l - 1 >= sizeof(buf) - 1) - return 0; diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet-1.5.0/fix-utf8-wrong-define.patch b/meta/recipes-graphics/xorg-lib/libx11-diet-1.5.0/fix-utf8-wrong-define.patch deleted file mode 100644 index c6347f5..0000000 --- a/meta/recipes-graphics/xorg-lib/libx11-diet-1.5.0/fix-utf8-wrong-define.patch +++ /dev/null @@ -1,19 +0,0 @@ -Upstream-Status: Pending - -Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com> - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- libX11-X11R7.0-1.0.0/include/X11/Xlib.h~fix-utf8-wrong-define -+++ libX11-X11R7.0-1.0.0/include/X11/Xlib.h -@@ -103,7 +103,7 @@ - - /* API mentioning "UTF8" or "utf8" is an XFree86 extension, introduced in - November 2000. Its presence is indicated through the following macro. */ --#define X_HAVE_UTF8_STRING 1 -+#undef X_HAVE_UTF8_STRING - - typedef char *XPointer; - diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet-1.5.0/keysymdef_include.patch b/meta/recipes-graphics/xorg-lib/libx11-diet-1.5.0/keysymdef_include.patch deleted file mode 100644 index d1bdab9..0000000 --- a/meta/recipes-graphics/xorg-lib/libx11-diet-1.5.0/keysymdef_include.patch +++ /dev/null @@ -1,23 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Martin Jansa <martin.jansa@gmail.com> - -diff -uNr libX11-1.3.6.orig//configure.ac libX11-1.3.6/configure.ac ---- libX11-1.3.6.orig//configure.ac 2010-09-20 08:04:16.000000000 +0200 -+++ libX11-1.3.6/configure.ac 2010-09-28 16:29:26.000000000 +0200 -@@ -355,7 +355,14 @@ - # Find keysymdef.h - # - AC_MSG_CHECKING([keysym definitions]) --KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11 -+AC_ARG_WITH(keysymdefdir, -+ AC_HELP_STRING([--with-keysymdefdir=DIR], [The location of keysymdef.h]), -+ KEYSYMDEFDIR=$withval, KEYSYMDEFDIR="") -+ -+if test x$KEYSYMDEFDIR = x; then -+ KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11 -+fi -+ - FILES="keysymdef.h XF86keysym.h Sunkeysym.h DECkeysym.h HPkeysym.h" - for i in $FILES; do - if test -f "$KEYSYMDEFDIR/$i"; then diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet-1.5.0/x11_disable_makekeys.patch b/meta/recipes-graphics/xorg-lib/libx11-diet-1.5.0/x11_disable_makekeys.patch deleted file mode 100644 index 69f9e6c..0000000 --- a/meta/recipes-graphics/xorg-lib/libx11-diet-1.5.0/x11_disable_makekeys.patch +++ /dev/null @@ -1,34 +0,0 @@ -Upstream-Status: Pending - -Index: libX11-1.5.0/src/util/Makefile.am -=================================================================== ---- libX11-1.5.0.orig/src/util/Makefile.am -+++ libX11-1.5.0/src/util/Makefile.am -@@ -1,27 +1,2 @@ -- --noinst_PROGRAMS=makekeys -- --makekeys_CFLAGS = \ -- $(X11_CFLAGS) \ -- $(CWARNFLAGS) -- --makekeys_CPPFLAGS = \ -- -I$(top_srcdir)/include -- --CC = @CC_FOR_BUILD@ --CPPFLAGS = @CPPFLAGS_FOR_BUILD@ --CFLAGS = @CFLAGS_FOR_BUILD@ --LDFLAGS = @LDFLAGS_FOR_BUILD@ -- - EXTRA_DIST = mkks.sh - --if LINT --# Check source code with tools like lint & sparse -- --ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) -- --lint: -- $(LINT) $(ALL_LINT_FLAGS) makekeys.c -- --endif LINT diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim-1.5.0/keysymdef_include.patch b/meta/recipes-graphics/xorg-lib/libx11-trim-1.5.0/keysymdef_include.patch deleted file mode 100644 index d1bdab9..0000000 --- a/meta/recipes-graphics/xorg-lib/libx11-trim-1.5.0/keysymdef_include.patch +++ /dev/null @@ -1,23 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Martin Jansa <martin.jansa@gmail.com> - -diff -uNr libX11-1.3.6.orig//configure.ac libX11-1.3.6/configure.ac ---- libX11-1.3.6.orig//configure.ac 2010-09-20 08:04:16.000000000 +0200 -+++ libX11-1.3.6/configure.ac 2010-09-28 16:29:26.000000000 +0200 -@@ -355,7 +355,14 @@ - # Find keysymdef.h - # - AC_MSG_CHECKING([keysym definitions]) --KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11 -+AC_ARG_WITH(keysymdefdir, -+ AC_HELP_STRING([--with-keysymdefdir=DIR], [The location of keysymdef.h]), -+ KEYSYMDEFDIR=$withval, KEYSYMDEFDIR="") -+ -+if test x$KEYSYMDEFDIR = x; then -+ KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11 -+fi -+ - FILES="keysymdef.h XF86keysym.h Sunkeysym.h DECkeysym.h HPkeysym.h" - for i in $FILES; do - if test -f "$KEYSYMDEFDIR/$i"; then diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim-1.5.0/makekeys_crosscompile.patch b/meta/recipes-graphics/xorg-lib/libx11-trim-1.5.0/makekeys_crosscompile.patch deleted file mode 100644 index daf3696..0000000 --- a/meta/recipes-graphics/xorg-lib/libx11-trim-1.5.0/makekeys_crosscompile.patch +++ /dev/null @@ -1,76 +0,0 @@ -Because the size of "unsigned long" is different between 32-bit -and 64-bit, judge whether target is 32-bit or 64-bit and tell -"makekey". - -The error information from LSB Test suite is as follow: -VSW5TESTSUITE PURPOSE 7 -Assertion XStringToKeysym-7.(A) -When the string argument is the name of a KeySym in the -table with the prefix XK_ removed, then a call to -XStringToKeysym returns that KeySym. -METH: For each KeySym name in table with code G: -METH: Call XStringToKeysym to obtain the KeySym defined for that string. -METH: Verify that XStringToKeysym did not return NoSymbol. -METH: Verify that the returned string is correct. -CHECK: XStringToKeysym-7 1, line 130 -CHECK: XStringToKeysym-7 2, line 140 -CHECK: XStringToKeysym-7 3, line 150 -CHECK: XStringToKeysym-7 4, line 160 -CHECK: XStringToKeysym-7 5, line 170 -CHECK: XStringToKeysym-7 6, line 180 -CHECK: XStringToKeysym-7 7, line 190 -CHECK: XStringToKeysym-7 8, line 200 -CHECK: XStringToKeysym-7 9, line 210 -CHECK: XStringToKeysym-7 10, line 220 -CHECK: XStringToKeysym-7 11, line 230 -CHECK: XStringToKeysym-7 12, line 240 -CHECK: XStringToKeysym-7 13, line 250 -CHECK: XStringToKeysym-7 14, line 260 -CHECK: XStringToKeysym-7 15, line 270 -CHECK: XStringToKeysym-7 16, line 280 -CHECK: XStringToKeysym-7 17, line 290 -CHECK: XStringToKeysym-7 18, line 300 -CHECK: XStringToKeysym-7 19, line 310 -CHECK: XStringToKeysym-7 20, line 320 - -Upstream-Status: Pending - -Signed-off-by: dbuitenh@windriver.com - ---- libX11-1.3.4.orig/src/util/makekeys.c 2010-01-15 09:11:36.000000000 +0800 -+++ libX11-1.3.4/src/util/makekeys.c 2011-05-24 19:04:25.454774908 +0800 -@@ -33,6 +33,7 @@ - #include <X11/keysymdef.h> - #include <stdio.h> - #include <stdlib.h> -+#include <stdint.h> - - typedef unsigned long Signature; - -@@ -124,7 +125,12 @@ - name = info[i].name; - sig = 0; - while ((c = *name++)) -- sig = (sig << 1) + c; -+#ifdef USE32 -+ sig = (uint32_t)(sig << 1) + c; -+#else -+ sig = (uint64_t)(sig << 1) + c; -+#endif -+ - first = j = sig % z; - for (k = 0; tab[j]; k++) { - j += first + 1; -@@ -163,7 +169,11 @@ - name = info[i].name; - sig = 0; - while ((c = *name++)) -- sig = (sig << 1) + c; -+#ifdef USE32 -+ sig = (uint32_t)(sig << 1) + c; -+#else -+ sig = (uint64_t)(sig << 1) + c; -+#endif - first = j = sig % z; - while (offsets[j]) { - j += first + 1; diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim-1.5.0/x11_disable_makekeys.patch b/meta/recipes-graphics/xorg-lib/libx11-trim-1.5.0/x11_disable_makekeys.patch deleted file mode 100644 index 69f9e6c..0000000 --- a/meta/recipes-graphics/xorg-lib/libx11-trim-1.5.0/x11_disable_makekeys.patch +++ /dev/null @@ -1,34 +0,0 @@ -Upstream-Status: Pending - -Index: libX11-1.5.0/src/util/Makefile.am -=================================================================== ---- libX11-1.5.0.orig/src/util/Makefile.am -+++ libX11-1.5.0/src/util/Makefile.am -@@ -1,27 +1,2 @@ -- --noinst_PROGRAMS=makekeys -- --makekeys_CFLAGS = \ -- $(X11_CFLAGS) \ -- $(CWARNFLAGS) -- --makekeys_CPPFLAGS = \ -- -I$(top_srcdir)/include -- --CC = @CC_FOR_BUILD@ --CPPFLAGS = @CPPFLAGS_FOR_BUILD@ --CFLAGS = @CFLAGS_FOR_BUILD@ --LDFLAGS = @LDFLAGS_FOR_BUILD@ -- - EXTRA_DIST = mkks.sh - --if LINT --# Check source code with tools like lint & sparse -- --ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) -- --lint: -- $(LINT) $(ALL_LINT_FLAGS) makekeys.c -- --endif LINT diff --git a/meta/recipes-graphics/xorg-lib/libx11.inc b/meta/recipes-graphics/xorg-lib/libx11.inc index a524c5f..1e9f942 100644 --- a/meta/recipes-graphics/xorg-lib/libx11.inc +++ b/meta/recipes-graphics/xorg-lib/libx11.inc @@ -8,8 +8,10 @@ require xorg-lib-common.inc inherit siteinfo +FILESPATH = "${FILE_DIRNAME}/libx11" + PE = "1" -INC_PR = "r4" +INC_PR = "r5" PROVIDES = "virtual/libx11" diff --git a/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff b/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff new file mode 100644 index 0000000..8cd1870 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff @@ -0,0 +1,541 @@ +Upstream-Status: Pending + +Upstream-Status: Inappropriate [configuration] +Index: libX11-1.3/src/imConv.c +=================================================================== +--- libX11-1.3.orig/src/imConv.c ++++ libX11-1.3/src/imConv.c +@@ -83,6 +83,7 @@ static const struct SubstRec SubstTable[ + * from UCS char to specified charset char. + * This converter is needed for _XimGetCharCode subroutine. + */ ++#ifdef XLOCALE + XPointer + _XimGetLocaleCode ( + _Xconst char* encoding_name) +@@ -96,6 +97,7 @@ _XimGetLocaleCode ( + } + return cvt; + } ++#endif + + /* + * Returns the locale dependent representation of a keysym. +@@ -106,6 +108,7 @@ _XimGetLocaleCode ( + * terminating NUL byte. Return 0 if the keysym is not representable in the + * locale + */ ++#ifdef XLOCALE + /*ARGSUSED*/ + int + _XimGetCharCode ( +@@ -135,6 +138,7 @@ _XimGetCharCode ( + buf[count]= '\0'; + return count; + } ++#endif + + #ifdef XKB + static int lookup_string( +Index: libX11-1.3/src/X18NCMSstubs.c +=================================================================== +--- /dev/null ++++ libX11-1.3/src/X18NCMSstubs.c +@@ -0,0 +1,428 @@ ++/* ++ * X18NCMSstubs.c ++ * - Provides stubs and dummy funcs needed when Xcms and XLocale stuff removed ++ * ++ * Copyright © 2003 Matthew Allum ++ * ++ * Permission to use, copy, modify, distribute, and sell this software and its ++ * documentation for any purpose is hereby granted without fee, provided that ++ * the above copyright notice appear in all copies and that both that ++ * copyright notice and this permission notice appear in supporting ++ * documentation, and that the name of Matthew Allum not be used in ++ * advertising or publicity pertaining to distribution of the software without ++ * specific, written prior permission. Keith Packard and Compaq makes no ++ * representations about the suitability of this software for any purpose. It ++ * is provided "as is" without express or implied warranty. ++ * ++ * MATTHEW ALLUM DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS ++ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, ++ * IN NO EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR ++ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, ++ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER ++ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ++ * PERFORMANCE OF THIS SOFTWARE. ++ */ ++ ++#include <stdlib.h> ++#include "Xlibint.h" ++#include "Xlcint.h" ++#include <X11/Xlocale.h> ++#include <X11/Xos.h> ++#ifdef WIN32 ++#undef close ++#endif ++#include <X11/Xutil.h> ++#include "XlcPubI.h" ++ ++#include "Xcmsint.h" /* for XcmsCCC type */ ++#include "XlcPubI.h" /* for XLCd type */ ++#include "config.h" ++ ++#if ! XLOCALE ++ ++Bool ++XSupportsLocale() ++{ ++ return False; ++} ++ ++char * ++XSetLocaleModifiers( ++ const char *modifiers) ++{ ++ return NULL; ++} ++ ++XLCd ++_XOpenLC( ++ char *name) ++{ ++ return NULL; ++} ++ ++XLCd ++_XlcCurrentLC() ++{ ++ return NULL; ++} ++ ++void ++_XlcVaToArgList( ++ va_list var, ++ int count, ++ XlcArgList *args_ret) ++{ ++ return; ++} ++ ++void ++_XlcCountVaList( ++ va_list var, ++ int *count_ret) ++{ ++ return; ++} ++ ++void ++_XCloseLC( ++ XLCd lcd) ++{ ++ return; ++} ++ ++int ++_XlcConvert( ++ XlcConv conv, ++ XPointer *from, ++ int *from_left, ++ XPointer *to, ++ int *to_left, ++ XPointer *args, ++ int num_args) ++{ ++ return 0; ++} ++ ++/* XIM Stubs */ ++ ++XPointer ++_XimGetLocaleCode ( _Xconst char* encoding_name ) ++{ ++ return NULL; ++} ++ ++int ++_XimGetCharCode ( ++ XPointer ucs_conv, ++ KeySym keysym, ++ unsigned char* buf, ++ int nbytes) ++{ ++ return 0; ++} ++ ++/* Xrm Stubs */ ++ ++XrmMethods ++_XrmInitParseInfo( ++ XPointer *state) ++{ ++ return (XrmMethods) NULL; ++} ++ ++/* Xwc Stubs */ ++ ++int ++XwcTextExtents( ++ XFontSet font_set, ++ _Xconst wchar_t *text, ++ int text_len, ++ XRectangle *overall_ink_extents, ++ XRectangle *overall_logical_extents) ++{ ++ return 0; ++} ++ ++void ++XwcDrawString(Display *display, ++ Drawable d, ++ XFontSet font_set, ++ GC gc, ++ int x, int y, ++ _Xconst wchar_t *string, ++ int num_wchars) ++{ ++ ; ++} ++ ++void ++XwcDrawText( ++ Display *dpy, ++ Drawable d, ++ GC gc, ++ int x, ++ int y, ++ XwcTextItem *text_items, ++ int nitems) ++{ ++ ; ++} ++ ++void ++XwcDrawImageString( ++ Display *dpy, ++ Drawable d, ++ XFontSet font_set, ++ GC gc, ++ int x, ++ int y, ++ _Xconst wchar_t *text, ++ int text_len) ++{ ++ ; ++} ++ ++int ++XwcTextEscapement( ++ XFontSet font_set, ++ _Xconst wchar_t *text, ++ int text_len) ++{ ++ return 0; ++} ++ ++Status ++XwcTextPerCharExtents( ++ XFontSet font_set, ++ _Xconst wchar_t *text, ++ int text_len, ++ XRectangle *ink_extents_buffer, ++ XRectangle *logical_extents_buffer, ++ int buffer_size, ++ int *num_chars, ++ XRectangle *max_ink_extents, ++ XRectangle *max_logical_extents) ++{ ++ return(XcmsFailure); ++} ++ ++int ++XwcTextPropertyToTextList( ++ Display *dpy, ++ const XTextProperty *text_prop, ++ wchar_t ***list_ret, ++ int *count_ret) ++{ ++ return 0; ++} ++ ++int ++XwcTextListToTextProperty( ++ Display *dpy, ++ wchar_t **list, ++ int count, ++ XICCEncodingStyle style, ++ XTextProperty *text_prop) ++{ ++ return 0; ++} ++ ++void ++XwcFreeStringList(wchar_t **list) ++{ ++ return; ++} ++ ++ ++void XmbSetWMProperties ( /* Actually from mbWMProps.c */ ++ Display *dpy, ++ Window w, ++ _Xconst char *windowName, ++ _Xconst char *iconName, ++ char **argv, ++ int argc, ++ XSizeHints *sizeHints, ++ XWMHints *wmHints, ++ XClassHint *classHints) ++{ ++ return; ++} ++ ++int ++XmbTextPropertyToTextList( ++ Display *dpy, ++ const XTextProperty *text_prop, ++ char ***list_ret, ++ int *count_ret) ++{ ++ return XLocaleNotSupported; ++} ++ ++int ++XmbTextListToTextProperty( ++ Display *dpy, ++ char **list, ++ int count, ++ XICCEncodingStyle style, ++ XTextProperty *text_prop) ++{ ++ return XLocaleNotSupported; ++} ++ ++int ++XmbTextExtents( ++ XFontSet font_set, ++ _Xconst char *text, ++ int text_len, ++ XRectangle *overall_ink_extents, ++ XRectangle *overall_logical_extents) ++{ ++ return 0; ++} ++ ++void ++XmbDrawText( ++ Display *dpy, ++ Drawable d, ++ GC gc, ++ int x, ++ int y, ++ XmbTextItem *text_items, ++ int nitems) ++{ ++ ; ++} ++ ++void ++XmbDrawString( ++ Display *dpy, ++ Drawable d, ++ XFontSet font_set, ++ GC gc, ++ int x, ++ int y, ++ _Xconst char *text, ++ int text_len) ++{ ++ ; ++} ++ ++void ++XmbDrawImageString( ++ Display *dpy, ++ Drawable d, ++ XFontSet font_set, ++ GC gc, ++ int x, ++ int y, ++ _Xconst char *text, ++ int text_len) ++{ ++ ; ++} ++ ++int ++XmbTextEscapement( ++ XFontSet font_set, ++ _Xconst char *text, ++ int text_len) ++{ ++ return 0; ++} ++ ++Status ++XmbTextPerCharExtents( ++ XFontSet font_set, ++ _Xconst char *text, ++ int text_len, ++ XRectangle *ink_extents_buffer, ++ XRectangle *logical_extents_buffer, ++ int buffer_size, ++ int *num_chars, ++ XRectangle *max_ink_extents, ++ XRectangle *max_logical_extents) ++{ ++ return 0; ++} ++ ++unsigned int ++KeySymToUcs4(KeySym keysym) ++{ ++ return 0; ++} ++ ++#endif ++ ++#if ! XCMS ++ ++XcmsCCC ++XcmsCCCOfColormap(dpy, cmap) ++ Display *dpy; ++ Colormap cmap; ++{ ++ return NULL; ++} ++ ++Status ++_XcmsResolveColorString ( ++ XcmsCCC ccc, ++ const char **color_string, ++ XcmsColor *pColor_exact_return, ++ XcmsColorFormat result_format) ++{ ++ return(XcmsFailure); ++} ++ ++void ++_XcmsUnresolveColor( ++ XcmsCCC ccc, ++ XcmsColor *pColor) ++{ ++ return; ++} ++ ++void ++_XUnresolveColor( ++ XcmsCCC ccc, ++ XColor *pXColor) ++{ ++ return; ++} ++ ++XcmsCmapRec * ++_XcmsAddCmapRec(dpy, cmap, windowID, visual) ++ Display *dpy; ++ Colormap cmap; ++ Window windowID; ++ Visual *visual; ++{ ++ return NULL; ++} ++ ++void ++_XcmsRGB_to_XColor( ++ XcmsColor *pColors, ++ XColor *pXColors, ++ unsigned int nColors) ++{ ++ return; ++} ++ ++XcmsCmapRec * ++_XcmsCopyCmapRecAndFree( ++ Display *dpy, ++ Colormap src_cmap, ++ Colormap copy_cmap) ++{ ++ return NULL; ++} ++ ++void ++_XcmsDeleteCmapRec( ++ Display *dpy, ++ Colormap cmap) ++{ ++ return; ++} ++ ++#endif +Index: libX11-1.3/src/Makefile.am +=================================================================== +--- libX11-1.3.orig/src/Makefile.am ++++ libX11-1.3/src/Makefile.am +@@ -335,6 +335,8 @@ if THRSTUBS + libX11_la_SOURCES+=UIThrStubs.c + endif + ++libX11_la_SOURCES+=X18NCMSstubs.c ++ + x11datadir = @X11_DATADIR@ + x11data_DATA = XKeysymDB XErrorDB + +@@ -342,7 +344,8 @@ EXTRA_DIST = \ + $(x11data_DATA) \ + os2Stubs.c \ + udcInf.c \ +- UIThrStubs.c ++ UIThrStubs.c \ ++ X18NCMSstubs.c + + if XCB + libX11_la_SOURCES += \ +Index: libX11-1.3/src/locking.c +=================================================================== +--- libX11-1.3.orig/src/locking.c ++++ libX11-1.3/src/locking.c +@@ -66,7 +66,9 @@ in this Software without prior written a + #define NUM_FREE_CVLS 4 + + /* in lcWrap.c */ ++#ifdef XLOCALE + extern LockInfoPtr _Xi18n_lock; ++#endif + + #ifdef WIN32 + static DWORD _X_TlsIndex = (DWORD)-1; +@@ -594,9 +596,11 @@ Status XInitThreads(void) + _Xglobal_lock = &global_lock; + xmutex_init(_Xglobal_lock->lock); + xmutex_set_name(_Xglobal_lock->lock, "Xlib global"); ++#ifdef XLOCALE + _Xi18n_lock = &i18n_lock; + xmutex_init(_Xi18n_lock->lock); + xmutex_set_name(_Xi18n_lock->lock, "Xlib i18n"); ++#endif + _XLockMutex_fn = _XLockMutex; + _XUnlockMutex_fn = _XUnlockMutex; + _XCreateMutex_fn = _XCreateMutex; +Index: libX11-1.3/configure.ac +=================================================================== +--- libX11-1.3.orig/configure.ac ++++ libX11-1.3/configure.ac +@@ -289,7 +289,14 @@ else + fi + AC_SUBST(KEYSYMDEF) + +-AM_CONDITIONAL(UDC, test xfalse = xtrue) ++AC_ARG_ENABLE(udc, ++ AC_HELP_STRING([--disable-udc], ++ [Disable Xlib support for UDC *EXPERIMENTAL*]), ++ [UDC=$enableval],[UDC=yes]) ++AM_CONDITIONAL(UDC, [test x$UDC = xyes ]) ++if test x"$UDC" = "xyes"; then ++ AC_DEFINE(UDC,1,[Include support for UDC]) ++fi + + AC_ARG_ENABLE(xcms, + AC_HELP_STRING([--disable-xcms], diff --git a/meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.diff b/meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.diff new file mode 100644 index 0000000..a7c3984 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.diff @@ -0,0 +1,17 @@ +Upstream-Status: Pending + +Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com> +--- libX11-X11R7.0-1.0.0/src/Font.c.orig 2006-03-12 18:35:42.000000000 +0100 ++++ libX11-X11R7.0-1.0.0/src/Font.c 2006-03-12 18:40:27.000000000 +0100 +@@ -701,7 +701,11 @@ + } + if (l - 2 - (p - charset) < 0) + return 0; ++#ifdef XLOCALE + if (_XlcNCompareISOLatin1(name + l - 2 - (p - charset), charset, p - charset)) ++#else ++ if (strncasecmp(name + l - 2 - (p - charset), charset, p - charset)) ++#endif + return 0; + if (strlen(p + 1) + l - 1 >= sizeof(buf) - 1) + return 0; diff --git a/meta/recipes-graphics/xorg-lib/libx11/fix-utf8-wrong-define.patch b/meta/recipes-graphics/xorg-lib/libx11/fix-utf8-wrong-define.patch new file mode 100644 index 0000000..c6347f5 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libx11/fix-utf8-wrong-define.patch @@ -0,0 +1,19 @@ +Upstream-Status: Pending + +Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com> + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- libX11-X11R7.0-1.0.0/include/X11/Xlib.h~fix-utf8-wrong-define ++++ libX11-X11R7.0-1.0.0/include/X11/Xlib.h +@@ -103,7 +103,7 @@ + + /* API mentioning "UTF8" or "utf8" is an XFree86 extension, introduced in + November 2000. Its presence is indicated through the following macro. */ +-#define X_HAVE_UTF8_STRING 1 ++#undef X_HAVE_UTF8_STRING + + typedef char *XPointer; + diff --git a/meta/recipes-graphics/xorg-lib/libx11/keysymdef_include.patch b/meta/recipes-graphics/xorg-lib/libx11/keysymdef_include.patch new file mode 100644 index 0000000..d1bdab9 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libx11/keysymdef_include.patch @@ -0,0 +1,23 @@ +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Martin Jansa <martin.jansa@gmail.com> + +diff -uNr libX11-1.3.6.orig//configure.ac libX11-1.3.6/configure.ac +--- libX11-1.3.6.orig//configure.ac 2010-09-20 08:04:16.000000000 +0200 ++++ libX11-1.3.6/configure.ac 2010-09-28 16:29:26.000000000 +0200 +@@ -355,7 +355,14 @@ + # Find keysymdef.h + # + AC_MSG_CHECKING([keysym definitions]) +-KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11 ++AC_ARG_WITH(keysymdefdir, ++ AC_HELP_STRING([--with-keysymdefdir=DIR], [The location of keysymdef.h]), ++ KEYSYMDEFDIR=$withval, KEYSYMDEFDIR="") ++ ++if test x$KEYSYMDEFDIR = x; then ++ KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11 ++fi ++ + FILES="keysymdef.h XF86keysym.h Sunkeysym.h DECkeysym.h HPkeysym.h" + for i in $FILES; do + if test -f "$KEYSYMDEFDIR/$i"; then diff --git a/meta/recipes-graphics/xorg-lib/libx11/makekeys_crosscompile.patch b/meta/recipes-graphics/xorg-lib/libx11/makekeys_crosscompile.patch new file mode 100644 index 0000000..daf3696 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libx11/makekeys_crosscompile.patch @@ -0,0 +1,76 @@ +Because the size of "unsigned long" is different between 32-bit +and 64-bit, judge whether target is 32-bit or 64-bit and tell +"makekey". + +The error information from LSB Test suite is as follow: +VSW5TESTSUITE PURPOSE 7 +Assertion XStringToKeysym-7.(A) +When the string argument is the name of a KeySym in the +table with the prefix XK_ removed, then a call to +XStringToKeysym returns that KeySym. +METH: For each KeySym name in table with code G: +METH: Call XStringToKeysym to obtain the KeySym defined for that string. +METH: Verify that XStringToKeysym did not return NoSymbol. +METH: Verify that the returned string is correct. +CHECK: XStringToKeysym-7 1, line 130 +CHECK: XStringToKeysym-7 2, line 140 +CHECK: XStringToKeysym-7 3, line 150 +CHECK: XStringToKeysym-7 4, line 160 +CHECK: XStringToKeysym-7 5, line 170 +CHECK: XStringToKeysym-7 6, line 180 +CHECK: XStringToKeysym-7 7, line 190 +CHECK: XStringToKeysym-7 8, line 200 +CHECK: XStringToKeysym-7 9, line 210 +CHECK: XStringToKeysym-7 10, line 220 +CHECK: XStringToKeysym-7 11, line 230 +CHECK: XStringToKeysym-7 12, line 240 +CHECK: XStringToKeysym-7 13, line 250 +CHECK: XStringToKeysym-7 14, line 260 +CHECK: XStringToKeysym-7 15, line 270 +CHECK: XStringToKeysym-7 16, line 280 +CHECK: XStringToKeysym-7 17, line 290 +CHECK: XStringToKeysym-7 18, line 300 +CHECK: XStringToKeysym-7 19, line 310 +CHECK: XStringToKeysym-7 20, line 320 + +Upstream-Status: Pending + +Signed-off-by: dbuitenh@windriver.com + +--- libX11-1.3.4.orig/src/util/makekeys.c 2010-01-15 09:11:36.000000000 +0800 ++++ libX11-1.3.4/src/util/makekeys.c 2011-05-24 19:04:25.454774908 +0800 +@@ -33,6 +33,7 @@ + #include <X11/keysymdef.h> + #include <stdio.h> + #include <stdlib.h> ++#include <stdint.h> + + typedef unsigned long Signature; + +@@ -124,7 +125,12 @@ + name = info[i].name; + sig = 0; + while ((c = *name++)) +- sig = (sig << 1) + c; ++#ifdef USE32 ++ sig = (uint32_t)(sig << 1) + c; ++#else ++ sig = (uint64_t)(sig << 1) + c; ++#endif ++ + first = j = sig % z; + for (k = 0; tab[j]; k++) { + j += first + 1; +@@ -163,7 +169,11 @@ + name = info[i].name; + sig = 0; + while ((c = *name++)) +- sig = (sig << 1) + c; ++#ifdef USE32 ++ sig = (uint32_t)(sig << 1) + c; ++#else ++ sig = (uint64_t)(sig << 1) + c; ++#endif + first = j = sig % z; + while (offsets[j]) { + j += first + 1; diff --git a/meta/recipes-graphics/xorg-lib/libx11/x11_disable_makekeys.patch b/meta/recipes-graphics/xorg-lib/libx11/x11_disable_makekeys.patch new file mode 100644 index 0000000..69f9e6c --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libx11/x11_disable_makekeys.patch @@ -0,0 +1,34 @@ +Upstream-Status: Pending + +Index: libX11-1.5.0/src/util/Makefile.am +=================================================================== +--- libX11-1.5.0.orig/src/util/Makefile.am ++++ libX11-1.5.0/src/util/Makefile.am +@@ -1,27 +1,2 @@ +- +-noinst_PROGRAMS=makekeys +- +-makekeys_CFLAGS = \ +- $(X11_CFLAGS) \ +- $(CWARNFLAGS) +- +-makekeys_CPPFLAGS = \ +- -I$(top_srcdir)/include +- +-CC = @CC_FOR_BUILD@ +-CPPFLAGS = @CPPFLAGS_FOR_BUILD@ +-CFLAGS = @CFLAGS_FOR_BUILD@ +-LDFLAGS = @LDFLAGS_FOR_BUILD@ +- + EXTRA_DIST = mkks.sh + +-if LINT +-# Check source code with tools like lint & sparse +- +-ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ +- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) +- +-lint: +- $(LINT) $(ALL_LINT_FLAGS) makekeys.c +- +-endif LINT -- 1.7.10 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [RFC 09/18] libx11: refresh dependencies, and centralise into libx11.inc 2012-09-11 19:17 [RFC 01/18] libx11: use INC_PR Ross Burton ` (6 preceding siblings ...) 2012-09-11 19:17 ` [RFC 08/18] libx11: merge patches into a single directory Ross Burton @ 2012-09-11 19:17 ` Ross Burton 2012-09-11 19:18 ` [RFC 10/18] libx11: make bigfont an optional (disabled by default) packageconfig option Ross Burton ` (8 subsequent siblings) 16 siblings, 0 replies; 20+ messages in thread From: Ross Burton @ 2012-09-11 19:17 UTC (permalink / raw) To: openembedded-core Signed-off-by: Ross Burton <ross.burton@intel.com> --- meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb | 3 --- meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb | 2 -- meta/recipes-graphics/xorg-lib/libx11.inc | 5 ++++- meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb | 5 ----- 4 files changed, 4 insertions(+), 11 deletions(-) diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb b/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb index 04ee1b8..50000ab 100644 --- a/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb +++ b/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb @@ -18,9 +18,6 @@ RPROVIDES_${PN}-locale = "libx11-locale" SRC_URI[md5sum] = "78b4b3bab4acbdf0abcfca30a8c70cc6" SRC_URI[sha256sum] = "c382efd7e92bfc3cef39a4b7f1ecf2744ba4414a705e3bc1e697f75502bd4d86" -DEPENDS += "libxcb bigreqsproto xproto xextproto xtrans libxau xcmiscproto \ - libxdmcp xf86bigfontproto kbproto inputproto xproto-native" - FILESDIR = "${@os.path.dirname(d.getVar('FILE', True))}/libx11" EXTRA_OECONF += "--disable-xlocale" diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb b/meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb index 6550903..6619946 100644 --- a/meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb +++ b/meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb @@ -4,8 +4,6 @@ DESCRIPTION += " Support for XCMS is disabled in this version." PR = "${INC_PR}.0" -DEPENDS += "libxcb xproto xextproto xtrans libxau kbproto inputproto xf86bigfontproto xproto-native" - SRC_URI += "file://x11_disable_makekeys.patch \ file://keysymdef_include.patch \ file://makekeys_crosscompile.patch" diff --git a/meta/recipes-graphics/xorg-lib/libx11.inc b/meta/recipes-graphics/xorg-lib/libx11.inc index 1e9f942..85fdbe7 100644 --- a/meta/recipes-graphics/xorg-lib/libx11.inc +++ b/meta/recipes-graphics/xorg-lib/libx11.inc @@ -11,7 +11,7 @@ inherit siteinfo FILESPATH = "${FILE_DIRNAME}/libx11" PE = "1" -INC_PR = "r5" +INC_PR = "r6" PROVIDES = "virtual/libx11" @@ -19,6 +19,9 @@ XORG_PN = "libX11" LICENSE = "MIT & MIT-style & BSD" LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7" +DEPENDS += "xproto xextproto xtrans libxcb kbproto inputproto" +DEPENDS += "xf86bigfontproto xproto-native" + PACKAGES =+ "${PN}-xcb" FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt" diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb b/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb index 0ba0f9b..c138785 100644 --- a/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb +++ b/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb @@ -5,11 +5,6 @@ PR = "${INC_PR}.0" BBCLASSEXTEND = "native nativesdk" -DEPENDS += "util-macros xtrans libxdmcp libxau \ - bigreqsproto xproto xextproto xcmiscproto \ - xf86bigfontproto kbproto inputproto libxcb \ - xproto-native" - SRC_URI += " file://keysymdef_include.patch \ file://x11_disable_makekeys.patch \ file://makekeys_crosscompile.patch \ -- 1.7.10 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [RFC 10/18] libx11: make bigfont an optional (disabled by default) packageconfig option 2012-09-11 19:17 [RFC 01/18] libx11: use INC_PR Ross Burton ` (7 preceding siblings ...) 2012-09-11 19:17 ` [RFC 09/18] libx11: refresh dependencies, and centralise into libx11.inc Ross Burton @ 2012-09-11 19:18 ` Ross Burton 2012-09-11 19:18 ` [RFC 11/18] libx11-diet: remove statements that are redundant Ross Burton ` (7 subsequent siblings) 16 siblings, 0 replies; 20+ messages in thread From: Ross Burton @ 2012-09-11 19:18 UTC (permalink / raw) To: openembedded-core Signed-off-by: Ross Burton <ross.burton@intel.com> --- meta/recipes-graphics/xorg-lib/libx11.inc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/meta/recipes-graphics/xorg-lib/libx11.inc b/meta/recipes-graphics/xorg-lib/libx11.inc index 85fdbe7..d56aa23 100644 --- a/meta/recipes-graphics/xorg-lib/libx11.inc +++ b/meta/recipes-graphics/xorg-lib/libx11.inc @@ -11,7 +11,7 @@ inherit siteinfo FILESPATH = "${FILE_DIRNAME}/libx11" PE = "1" -INC_PR = "r6" +INC_PR = "r7" PROVIDES = "virtual/libx11" @@ -20,7 +20,7 @@ LICENSE = "MIT & MIT-style & BSD" LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7" DEPENDS += "xproto xextproto xtrans libxcb kbproto inputproto" -DEPENDS += "xf86bigfontproto xproto-native" +DEPENDS += "xproto-native" PACKAGES =+ "${PN}-xcb" @@ -30,9 +30,11 @@ FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale" EXTRA_OECONF += "--with-keysymdefdir=${STAGING_INCDIR}/X11/" -# Almost nothing uses XCMS +# Let people with incredibly archaic requirements enable Xcms and BigFont, but +# disable them by default. PACKAGECONFIG ??= "" PACKAGECONFIG[xcms] = "--enable-xcms,--disable-xcms" +PACKAGECONFIG[bigfont] = "--enable-xf86bigfont,--disable-xf86bigfont,xf86bigfontproto" do_compile_prepend() { cd ${S}/src/util -- 1.7.10 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [RFC 11/18] libx11-diet: remove statements that are redundant 2012-09-11 19:17 [RFC 01/18] libx11: use INC_PR Ross Burton ` (8 preceding siblings ...) 2012-09-11 19:18 ` [RFC 10/18] libx11: make bigfont an optional (disabled by default) packageconfig option Ross Burton @ 2012-09-11 19:18 ` Ross Burton 2012-09-11 19:18 ` [RFC 12/18] default-providers: default to libx11, not -trim Ross Burton ` (6 subsequent siblings) 16 siblings, 0 replies; 20+ messages in thread From: Ross Burton @ 2012-09-11 19:18 UTC (permalink / raw) To: openembedded-core Signed-off-by: Ross Burton <ross.burton@intel.com> --- meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb b/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb index 50000ab..cb9a5ef 100644 --- a/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb +++ b/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb @@ -3,7 +3,7 @@ require libx11.inc DESCRIPTION += " Support for XCMS and XLOCALE is disabled in \ this version." -PR = "${INC_PR}.2" +PR = "${INC_PR}.3" SRC_URI += "file://x11_disable_makekeys.patch \ file://X18NCMSstubs.diff \ @@ -18,8 +18,4 @@ RPROVIDES_${PN}-locale = "libx11-locale" SRC_URI[md5sum] = "78b4b3bab4acbdf0abcfca30a8c70cc6" SRC_URI[sha256sum] = "c382efd7e92bfc3cef39a4b7f1ecf2744ba4414a705e3bc1e697f75502bd4d86" -FILESDIR = "${@os.path.dirname(d.getVar('FILE', True))}/libx11" - EXTRA_OECONF += "--disable-xlocale" -CFLAGS += "-D_GNU_SOURCE" - -- 1.7.10 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [RFC 12/18] default-providers: default to libx11, not -trim 2012-09-11 19:17 [RFC 01/18] libx11: use INC_PR Ross Burton ` (9 preceding siblings ...) 2012-09-11 19:18 ` [RFC 11/18] libx11-diet: remove statements that are redundant Ross Burton @ 2012-09-11 19:18 ` Ross Burton 2012-09-11 19:18 ` [RFC 13/18] libx11-trim: remove, it's the same as libx11 now Ross Burton ` (5 subsequent siblings) 16 siblings, 0 replies; 20+ messages in thread From: Ross Burton @ 2012-09-11 19:18 UTC (permalink / raw) To: openembedded-core Signed-off-by: Ross Burton <ross.burton@intel.com> --- meta/conf/distro/include/default-providers.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc index 2d8a17d..07222c2 100644 --- a/meta/conf/distro/include/default-providers.inc +++ b/meta/conf/distro/include/default-providers.inc @@ -10,7 +10,7 @@ PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa-dri" PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa-dri" PREFERRED_PROVIDER_virtual/update-alternatives ?= "update-alternatives-cworth" PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-native" -PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim" +PREFERRED_PROVIDER_virtual/libx11 ?= "libx11" PREFERRED_PROVIDER_xf86-video-intel ?= "xf86-video-intel" # -- 1.7.10 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [RFC 13/18] libx11-trim: remove, it's the same as libx11 now 2012-09-11 19:17 [RFC 01/18] libx11: use INC_PR Ross Burton ` (10 preceding siblings ...) 2012-09-11 19:18 ` [RFC 12/18] default-providers: default to libx11, not -trim Ross Burton @ 2012-09-11 19:18 ` Ross Burton 2012-09-12 11:46 ` Burton, Ross 2012-09-11 19:18 ` [RFC 14/18] distro-tracking: remove libx11-trim Ross Burton ` (4 subsequent siblings) 16 siblings, 1 reply; 20+ messages in thread From: Ross Burton @ 2012-09-11 19:18 UTC (permalink / raw) To: openembedded-core Signed-off-by: Ross Burton <ross.burton@intel.com> --- meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb b/meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb deleted file mode 100644 index 6619946..0000000 --- a/meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb +++ /dev/null @@ -1,15 +0,0 @@ -require libx11.inc - -DESCRIPTION += " Support for XCMS is disabled in this version." - -PR = "${INC_PR}.0" - -SRC_URI += "file://x11_disable_makekeys.patch \ - file://keysymdef_include.patch \ - file://makekeys_crosscompile.patch" - -RPROVIDES_${PN}-dev = "libx11-dev" -RPROVIDES_${PN}-locale = "libx11-locale" - -SRC_URI[md5sum] = "78b4b3bab4acbdf0abcfca30a8c70cc6" -SRC_URI[sha256sum] = "c382efd7e92bfc3cef39a4b7f1ecf2744ba4414a705e3bc1e697f75502bd4d86" -- 1.7.10 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* Re: [RFC 13/18] libx11-trim: remove, it's the same as libx11 now 2012-09-11 19:18 ` [RFC 13/18] libx11-trim: remove, it's the same as libx11 now Ross Burton @ 2012-09-12 11:46 ` Burton, Ross 2012-09-12 13:59 ` Richard Purdie 0 siblings, 1 reply; 20+ messages in thread From: Burton, Ross @ 2012-09-12 11:46 UTC (permalink / raw) To: openembedded-core This is the only patch in the series that isn't ready for merging as far as I'm concerned. Are there sufficient users of libx11-trim on non-debian-renaming systems that use package feeds to add conflicts/replaces for this? Ross ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [RFC 13/18] libx11-trim: remove, it's the same as libx11 now 2012-09-12 11:46 ` Burton, Ross @ 2012-09-12 13:59 ` Richard Purdie 0 siblings, 0 replies; 20+ messages in thread From: Richard Purdie @ 2012-09-12 13:59 UTC (permalink / raw) To: Burton, Ross; +Cc: openembedded-core On Wed, 2012-09-12 at 12:46 +0100, Burton, Ross wrote: > This is the only patch in the series that isn't ready for merging as > far as I'm concerned. > > Are there sufficient users of libx11-trim on non-debian-renaming > systems that use package feeds to add conflicts/replaces for this? I don't think there are many such users so I've merged the series. We've had this mess around for a long time, keep talking about fixing and now someone gives me a patch series so I really just can't resist ;-) Cheers, Richard ^ permalink raw reply [flat|nested] 20+ messages in thread
* [RFC 14/18] distro-tracking: remove libx11-trim 2012-09-11 19:17 [RFC 01/18] libx11: use INC_PR Ross Burton ` (11 preceding siblings ...) 2012-09-11 19:18 ` [RFC 13/18] libx11-trim: remove, it's the same as libx11 now Ross Burton @ 2012-09-11 19:18 ` Ross Burton 2012-09-11 19:18 ` [RFC 15/18] libx11: drop makekeys_crosscompile.patch, effectively merged upstream Ross Burton ` (3 subsequent siblings) 16 siblings, 0 replies; 20+ messages in thread From: Ross Burton @ 2012-09-11 19:18 UTC (permalink / raw) To: openembedded-core Signed-off-by: Ross Burton <ross.burton@intel.com> --- meta-yocto/conf/distro/include/distro_alias.inc | 1 - meta-yocto/conf/distro/include/maintainers.inc | 1 - meta-yocto/conf/distro/include/recipe_color.inc | 1 - 3 files changed, 3 deletions(-) diff --git a/meta-yocto/conf/distro/include/distro_alias.inc b/meta-yocto/conf/distro/include/distro_alias.inc index c63bd47..509dcde 100644 --- a/meta-yocto/conf/distro/include/distro_alias.inc +++ b/meta-yocto/conf/distro/include/distro_alias.inc @@ -183,7 +183,6 @@ DISTRO_PN_ALIAS_pn-liburcu = "Fedora=userspace-rcu Ubuntu=liburcu0" DISTRO_PN_ALIAS_pn-libusb-compat = "OSPDT" DISTRO_PN_ALIAS_pn-libx11 = "Debian=libx11-6 Fedora=libX11 Ubuntu=libx11-6 OpenSuSE=xorg-x11-libX11" DISTRO_PN_ALIAS_pn-libx11-diet = "Debian=libx11-6 Fedora=libX11 Ubuntu=libx11-6 OpenSuSE=xorg-x11-libX11" -DISTRO_PN_ALIAS_pn-libx11-trim = "Debian=libx11-6 Fedora=libX11 Ubuntu=libx11-6 OpenSuSE=xorg-x11-libX11" DISTRO_PN_ALIAS_pn-libxcalibrate = "OSPDT upstream=http://cgit.freedesktop.org/xorg/lib/libXCalibrate/" DISTRO_PN_ALIAS_pn-libxfontcache = "Mandriva=libxfontcache Debian=libxfontcache" DISTRO_PN_ALIAS_pn-libxft = "Mandriva=libxft Debian=libxft2 Ubuntu=libxft2" diff --git a/meta-yocto/conf/distro/include/maintainers.inc b/meta-yocto/conf/distro/include/maintainers.inc index dace3b9..fe8284e 100644 --- a/meta-yocto/conf/distro/include/maintainers.inc +++ b/meta-yocto/conf/distro/include/maintainers.inc @@ -358,7 +358,6 @@ RECIPE_MAINTAINER_pn-libuser = "Valentin Popa <valentin.popa@intel.com>" RECIPE_MAINTAINER_pn-libvorbis = "Cristian Iorga <cristian.iorga@intel.com>" RECIPE_MAINTAINER_pn-libx11 = "Valentin Popa <valentin.popa@intel.com>" RECIPE_MAINTAINER_pn-libx11-diet = "Kai Kang <kai.kang@windriver.com>" -RECIPE_MAINTAINER_pn-libx11-trim = "Valentin Popa <valentin.popa@intel.com>" RECIPE_MAINTAINER_pn-libxau = "Valentin Popa <valentin.popa@intel.com>" RECIPE_MAINTAINER_pn-libxaw = "Valentin Popa <valentin.popa@intel.com>" RECIPE_MAINTAINER_pn-libxcalibrate = "Valentin Popa <valentin.popa@intel.com>" diff --git a/meta-yocto/conf/distro/include/recipe_color.inc b/meta-yocto/conf/distro/include/recipe_color.inc index 612a698..894c76a 100644 --- a/meta-yocto/conf/distro/include/recipe_color.inc +++ b/meta-yocto/conf/distro/include/recipe_color.inc @@ -210,7 +210,6 @@ RECIPE_COLOR_pn-liburcu = "yellow" RECIPE_COLOR_pn-libusb1 = "yellow" RECIPE_COLOR_pn-libuser = "yellow" RECIPE_COLOR_pn-libx11 = "yellow" -RECIPE_COLOR_pn-libx11-trim = "yellow" RECIPE_COLOR_pn-libxau = "yellow" RECIPE_COLOR_pn-libxaw = "red" RECIPE_COLOR_pn-libxcalibrate = "yellow" -- 1.7.10 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [RFC 15/18] libx11: drop makekeys_crosscompile.patch, effectively merged upstream 2012-09-11 19:17 [RFC 01/18] libx11: use INC_PR Ross Burton ` (12 preceding siblings ...) 2012-09-11 19:18 ` [RFC 14/18] distro-tracking: remove libx11-trim Ross Burton @ 2012-09-11 19:18 ` Ross Burton 2012-09-11 19:18 ` [RFC 16/18] libx11: makekeys can be cross-compiled now, so don't hack around Ross Burton ` (2 subsequent siblings) 16 siblings, 0 replies; 20+ messages in thread From: Ross Burton @ 2012-09-11 19:18 UTC (permalink / raw) To: openembedded-core Signed-off-by: Ross Burton <ross.burton@intel.com> --- .../xorg-lib/libx11/makekeys_crosscompile.patch | 76 -------------------- meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb | 3 +- 2 files changed, 1 insertion(+), 78 deletions(-) delete mode 100644 meta/recipes-graphics/xorg-lib/libx11/makekeys_crosscompile.patch diff --git a/meta/recipes-graphics/xorg-lib/libx11/makekeys_crosscompile.patch b/meta/recipes-graphics/xorg-lib/libx11/makekeys_crosscompile.patch deleted file mode 100644 index daf3696..0000000 --- a/meta/recipes-graphics/xorg-lib/libx11/makekeys_crosscompile.patch +++ /dev/null @@ -1,76 +0,0 @@ -Because the size of "unsigned long" is different between 32-bit -and 64-bit, judge whether target is 32-bit or 64-bit and tell -"makekey". - -The error information from LSB Test suite is as follow: -VSW5TESTSUITE PURPOSE 7 -Assertion XStringToKeysym-7.(A) -When the string argument is the name of a KeySym in the -table with the prefix XK_ removed, then a call to -XStringToKeysym returns that KeySym. -METH: For each KeySym name in table with code G: -METH: Call XStringToKeysym to obtain the KeySym defined for that string. -METH: Verify that XStringToKeysym did not return NoSymbol. -METH: Verify that the returned string is correct. -CHECK: XStringToKeysym-7 1, line 130 -CHECK: XStringToKeysym-7 2, line 140 -CHECK: XStringToKeysym-7 3, line 150 -CHECK: XStringToKeysym-7 4, line 160 -CHECK: XStringToKeysym-7 5, line 170 -CHECK: XStringToKeysym-7 6, line 180 -CHECK: XStringToKeysym-7 7, line 190 -CHECK: XStringToKeysym-7 8, line 200 -CHECK: XStringToKeysym-7 9, line 210 -CHECK: XStringToKeysym-7 10, line 220 -CHECK: XStringToKeysym-7 11, line 230 -CHECK: XStringToKeysym-7 12, line 240 -CHECK: XStringToKeysym-7 13, line 250 -CHECK: XStringToKeysym-7 14, line 260 -CHECK: XStringToKeysym-7 15, line 270 -CHECK: XStringToKeysym-7 16, line 280 -CHECK: XStringToKeysym-7 17, line 290 -CHECK: XStringToKeysym-7 18, line 300 -CHECK: XStringToKeysym-7 19, line 310 -CHECK: XStringToKeysym-7 20, line 320 - -Upstream-Status: Pending - -Signed-off-by: dbuitenh@windriver.com - ---- libX11-1.3.4.orig/src/util/makekeys.c 2010-01-15 09:11:36.000000000 +0800 -+++ libX11-1.3.4/src/util/makekeys.c 2011-05-24 19:04:25.454774908 +0800 -@@ -33,6 +33,7 @@ - #include <X11/keysymdef.h> - #include <stdio.h> - #include <stdlib.h> -+#include <stdint.h> - - typedef unsigned long Signature; - -@@ -124,7 +125,12 @@ - name = info[i].name; - sig = 0; - while ((c = *name++)) -- sig = (sig << 1) + c; -+#ifdef USE32 -+ sig = (uint32_t)(sig << 1) + c; -+#else -+ sig = (uint64_t)(sig << 1) + c; -+#endif -+ - first = j = sig % z; - for (k = 0; tab[j]; k++) { - j += first + 1; -@@ -163,7 +169,11 @@ - name = info[i].name; - sig = 0; - while ((c = *name++)) -- sig = (sig << 1) + c; -+#ifdef USE32 -+ sig = (uint32_t)(sig << 1) + c; -+#else -+ sig = (uint64_t)(sig << 1) + c; -+#endif - first = j = sig % z; - while (offsets[j]) { - j += first + 1; diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb b/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb index c138785..5a66eb5 100644 --- a/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb +++ b/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb @@ -1,13 +1,12 @@ require libx11.inc inherit gettext -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" BBCLASSEXTEND = "native nativesdk" SRC_URI += " file://keysymdef_include.patch \ file://x11_disable_makekeys.patch \ - file://makekeys_crosscompile.patch \ " SRC_URI[md5sum] = "78b4b3bab4acbdf0abcfca30a8c70cc6" -- 1.7.10 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [RFC 16/18] libx11: makekeys can be cross-compiled now, so don't hack around 2012-09-11 19:17 [RFC 01/18] libx11: use INC_PR Ross Burton ` (13 preceding siblings ...) 2012-09-11 19:18 ` [RFC 15/18] libx11: drop makekeys_crosscompile.patch, effectively merged upstream Ross Burton @ 2012-09-11 19:18 ` Ross Burton 2012-09-11 19:18 ` [RFC 17/18] libx11-diet: remove un-needed chunk from stubs patch Ross Burton 2012-09-11 19:18 ` [RFC 18/18] libx11: revise keysymdef patch based on submission upstream Ross Burton 16 siblings, 0 replies; 20+ messages in thread From: Ross Burton @ 2012-09-11 19:18 UTC (permalink / raw) To: openembedded-core Signed-off-by: Ross Burton <ross.burton@intel.com> --- .../recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb | 5 +-- meta/recipes-graphics/xorg-lib/libx11.inc | 43 ++++++-------------- .../xorg-lib/libx11/x11_disable_makekeys.patch | 34 ---------------- meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb | 4 +- 4 files changed, 16 insertions(+), 70 deletions(-) delete mode 100644 meta/recipes-graphics/xorg-lib/libx11/x11_disable_makekeys.patch diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb b/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb index cb9a5ef..0a90f46 100644 --- a/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb +++ b/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb @@ -3,10 +3,9 @@ require libx11.inc DESCRIPTION += " Support for XCMS and XLOCALE is disabled in \ this version." -PR = "${INC_PR}.3" +PR = "${INC_PR}.4" -SRC_URI += "file://x11_disable_makekeys.patch \ - file://X18NCMSstubs.diff \ +SRC_URI += "file://X18NCMSstubs.diff \ file://keysymdef_include.patch \ file://fix-disable-xlocale.diff \ file://fix-utf8-wrong-define.patch \ diff --git a/meta/recipes-graphics/xorg-lib/libx11.inc b/meta/recipes-graphics/xorg-lib/libx11.inc index d56aa23..3ecd9e5 100644 --- a/meta/recipes-graphics/xorg-lib/libx11.inc +++ b/meta/recipes-graphics/xorg-lib/libx11.inc @@ -11,7 +11,7 @@ inherit siteinfo FILESPATH = "${FILE_DIRNAME}/libx11" PE = "1" -INC_PR = "r7" +INC_PR = "r8" PROVIDES = "virtual/libx11" @@ -22,12 +22,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7" DEPENDS += "xproto xextproto xtrans libxcb kbproto inputproto" DEPENDS += "xproto-native" -PACKAGES =+ "${PN}-xcb" - -FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt" -FILES_${PN}-xcb += "${libdir}/libX11-xcb.so.*" -FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale" - EXTRA_OECONF += "--with-keysymdefdir=${STAGING_INCDIR}/X11/" # Let people with incredibly archaic requirements enable Xcms and BigFont, but @@ -36,29 +30,18 @@ PACKAGECONFIG ??= "" PACKAGECONFIG[xcms] = "--enable-xcms,--disable-xcms" PACKAGECONFIG[bigfont] = "--enable-xf86bigfont,--disable-xf86bigfont,xf86bigfontproto" -do_compile_prepend() { - cd ${S}/src/util - mv makekeys.c.orig makekeys.c || true - touch makekeys-makekeys.o - ( - unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS - # MIN_REHASH 10 is only in 1.0.1 - sed -i -e 's:MIN_REHASH 10:MIN_REHASH 16:g' makekeys.c - sed -i -e 's:MIN_REHASH 15:MIN_REHASH 16:g' makekeys.c - touch makekeys-makekeys.o; - if [ "${SITEINFO_BITS}" == "64" ]; then - ${BUILD_CC} ${BUILD_CFLAGS} -I${STAGING_INCDIR_NATIVE} makekeys.c -I${S}/include -o makekeys - else - ${BUILD_CC} ${BUILD_CFLAGS} -I${STAGING_INCDIR_NATIVE} -DUSE32 makekeys.c -I${S}/include -o makekeys - fi - ) - if [ "$?" != "0" ]; then - exit 1 - fi - # mv to stop it getting rebuilt - mv makekeys.c makekeys.c.orig - cd ../../ -} +# src/util/makekeys needs to be compiled natively, so tell it what compiler to +# use. +export CC_FOR_BUILD = "${BUILD_CC}" +export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS}" +export CPPFLAGS_FOR_BUILD = "${BUILD_CPPFLAGS}" +export LDFLAGS_FOR_BUILD = "${BUILD_LDFLAGS}" + +PACKAGES =+ "${PN}-xcb" + +FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt" +FILES_${PN}-xcb += "${libdir}/libX11-xcb.so.*" +FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale" # Multiple libx11 derivatives from from this file and are selected by virtual/libx11 # A world build should only build the correct version, not all of them. diff --git a/meta/recipes-graphics/xorg-lib/libx11/x11_disable_makekeys.patch b/meta/recipes-graphics/xorg-lib/libx11/x11_disable_makekeys.patch deleted file mode 100644 index 69f9e6c..0000000 --- a/meta/recipes-graphics/xorg-lib/libx11/x11_disable_makekeys.patch +++ /dev/null @@ -1,34 +0,0 @@ -Upstream-Status: Pending - -Index: libX11-1.5.0/src/util/Makefile.am -=================================================================== ---- libX11-1.5.0.orig/src/util/Makefile.am -+++ libX11-1.5.0/src/util/Makefile.am -@@ -1,27 +1,2 @@ -- --noinst_PROGRAMS=makekeys -- --makekeys_CFLAGS = \ -- $(X11_CFLAGS) \ -- $(CWARNFLAGS) -- --makekeys_CPPFLAGS = \ -- -I$(top_srcdir)/include -- --CC = @CC_FOR_BUILD@ --CPPFLAGS = @CPPFLAGS_FOR_BUILD@ --CFLAGS = @CFLAGS_FOR_BUILD@ --LDFLAGS = @LDFLAGS_FOR_BUILD@ -- - EXTRA_DIST = mkks.sh - --if LINT --# Check source code with tools like lint & sparse -- --ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) -- --lint: -- $(LINT) $(ALL_LINT_FLAGS) makekeys.c -- --endif LINT diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb b/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb index 5a66eb5..793496c 100644 --- a/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb +++ b/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb @@ -5,9 +5,7 @@ PR = "${INC_PR}.1" BBCLASSEXTEND = "native nativesdk" -SRC_URI += " file://keysymdef_include.patch \ - file://x11_disable_makekeys.patch \ - " +SRC_URI += "file://keysymdef_include.patch" SRC_URI[md5sum] = "78b4b3bab4acbdf0abcfca30a8c70cc6" SRC_URI[sha256sum] = "c382efd7e92bfc3cef39a4b7f1ecf2744ba4414a705e3bc1e697f75502bd4d86" -- 1.7.10 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [RFC 17/18] libx11-diet: remove un-needed chunk from stubs patch 2012-09-11 19:17 [RFC 01/18] libx11: use INC_PR Ross Burton ` (14 preceding siblings ...) 2012-09-11 19:18 ` [RFC 16/18] libx11: makekeys can be cross-compiled now, so don't hack around Ross Burton @ 2012-09-11 19:18 ` Ross Burton 2012-09-11 19:18 ` [RFC 18/18] libx11: revise keysymdef patch based on submission upstream Ross Burton 16 siblings, 0 replies; 20+ messages in thread From: Ross Burton @ 2012-09-11 19:18 UTC (permalink / raw) To: openembedded-core Signed-off-by: Ross Burton <ross.burton@intel.com> --- .../xorg-lib/libx11/X18NCMSstubs.diff | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff b/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff index 8cd1870..9e91a8b 100644 --- a/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff +++ b/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff @@ -519,23 +519,3 @@ Index: libX11-1.3/src/locking.c _XLockMutex_fn = _XLockMutex; _XUnlockMutex_fn = _XUnlockMutex; _XCreateMutex_fn = _XCreateMutex; -Index: libX11-1.3/configure.ac -=================================================================== ---- libX11-1.3.orig/configure.ac -+++ libX11-1.3/configure.ac -@@ -289,7 +289,14 @@ else - fi - AC_SUBST(KEYSYMDEF) - --AM_CONDITIONAL(UDC, test xfalse = xtrue) -+AC_ARG_ENABLE(udc, -+ AC_HELP_STRING([--disable-udc], -+ [Disable Xlib support for UDC *EXPERIMENTAL*]), -+ [UDC=$enableval],[UDC=yes]) -+AM_CONDITIONAL(UDC, [test x$UDC = xyes ]) -+if test x"$UDC" = "xyes"; then -+ AC_DEFINE(UDC,1,[Include support for UDC]) -+fi - - AC_ARG_ENABLE(xcms, - AC_HELP_STRING([--disable-xcms], -- 1.7.10 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [RFC 18/18] libx11: revise keysymdef patch based on submission upstream 2012-09-11 19:17 [RFC 01/18] libx11: use INC_PR Ross Burton ` (15 preceding siblings ...) 2012-09-11 19:18 ` [RFC 17/18] libx11-diet: remove un-needed chunk from stubs patch Ross Burton @ 2012-09-11 19:18 ` Ross Burton 16 siblings, 0 replies; 20+ messages in thread From: Ross Burton @ 2012-09-11 19:18 UTC (permalink / raw) To: openembedded-core Signed-off-by: Ross Burton <ross.burton@intel.com> --- .../xorg-lib/libx11/keysymdef_include.patch | 38 ++++++++++++++++---- meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb | 2 +- 2 files changed, 32 insertions(+), 8 deletions(-) diff --git a/meta/recipes-graphics/xorg-lib/libx11/keysymdef_include.patch b/meta/recipes-graphics/xorg-lib/libx11/keysymdef_include.patch index d1bdab9..ba65319 100644 --- a/meta/recipes-graphics/xorg-lib/libx11/keysymdef_include.patch +++ b/meta/recipes-graphics/xorg-lib/libx11/keysymdef_include.patch @@ -1,23 +1,47 @@ -Upstream-Status: Inappropriate [configuration] +From 547937d82084f2cce7e3f0849b5112a20c467146 Mon Sep 17 00:00:00 2001 +From: Ross Burton <ross.burton@intel.com> +Date: Tue, 11 Sep 2012 17:39:12 +0100 +Subject: [PATCH] Allow overriding location of keysymdef.h -Signed-off-by: Martin Jansa <martin.jansa@gmail.com> +Currently keysymdef.h is found by using the includedir of xproto. This doesn't +work when cross-compiling with a sysroot as that ends up being /usr/include/X11, +not a path into the cross-build environment. -diff -uNr libX11-1.3.6.orig//configure.ac libX11-1.3.6/configure.ac ---- libX11-1.3.6.orig//configure.ac 2010-09-20 08:04:16.000000000 +0200 -+++ libX11-1.3.6/configure.ac 2010-09-28 16:29:26.000000000 +0200 -@@ -355,7 +355,14 @@ +So, add an option to allow explicitly specifying the location of keysymdef.h, +and verify that the specified or found path exists. + +(original patch by Martin Jansa <martin.jansa@gmail.com>, revised by myself) + +Upstream-Status: Submitted [xorg-devel] +Signed-off-by: Ross Burton <ross.burton@intel.com> +--- + configure.ac | 13 ++++++++++++- + 1 file changed, 12 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 48a0c8a..200db15 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -306,7 +306,18 @@ AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL, 1, [poll() function is available])], ) # Find keysymdef.h # AC_MSG_CHECKING([keysym definitions]) -KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11 +AC_ARG_WITH(keysymdefdir, -+ AC_HELP_STRING([--with-keysymdefdir=DIR], [The location of keysymdef.h]), ++ AC_HELP_STRING([--with-keysymdefdir=DIR], [The location of keysymdef.h (defaults to xproto include dir)]), + KEYSYMDEFDIR=$withval, KEYSYMDEFDIR="") + +if test x$KEYSYMDEFDIR = x; then + KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11 +fi + ++if test ! -d $KEYSYMDEFDIR; then ++ AC_MSG_ERROR([$KEYSYMDEFDIR doesn't exist or isn't a directory]) ++fi ++ FILES="keysymdef.h XF86keysym.h Sunkeysym.h DECkeysym.h HPkeysym.h" for i in $FILES; do if test -f "$KEYSYMDEFDIR/$i"; then +-- +1.7.10.4 + diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb b/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb index 793496c..94e2051 100644 --- a/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb +++ b/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb @@ -1,7 +1,7 @@ require libx11.inc inherit gettext -PR = "${INC_PR}.1" +PR = "${INC_PR}.2" BBCLASSEXTEND = "native nativesdk" -- 1.7.10 ^ permalink raw reply related [flat|nested] 20+ messages in thread
end of thread, other threads:[~2012-09-12 14:12 UTC | newest] Thread overview: 20+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2012-09-11 19:17 [RFC 01/18] libx11: use INC_PR Ross Burton 2012-09-11 19:17 ` [RFC 02/18] libx11-diet: you can't disable XCB anymore, so don't try Ross Burton 2012-09-11 19:17 ` [RFC 03/18] libx11-diet: you can't disable UDC, because it's always disabled Ross Burton 2012-09-11 19:17 ` [RFC 04/18] xorg-lib: move options to disable documentation to xorg-lib-common Ross Burton 2012-09-11 19:17 ` [RFC 05/18] libx11: move xcms disabling to PACKAGECONFIG in libx11.inc Ross Burton 2012-09-11 19:17 ` [RFC 06/18] libx11: move keysymdefdir option to .inc Ross Burton 2012-09-11 19:17 ` [RFC 07/18] libx11: remove redundant license data Ross Burton 2012-09-11 19:17 ` [RFC 08/18] libx11: merge patches into a single directory Ross Burton 2012-09-11 19:17 ` [RFC 09/18] libx11: refresh dependencies, and centralise into libx11.inc Ross Burton 2012-09-11 19:18 ` [RFC 10/18] libx11: make bigfont an optional (disabled by default) packageconfig option Ross Burton 2012-09-11 19:18 ` [RFC 11/18] libx11-diet: remove statements that are redundant Ross Burton 2012-09-11 19:18 ` [RFC 12/18] default-providers: default to libx11, not -trim Ross Burton 2012-09-11 19:18 ` [RFC 13/18] libx11-trim: remove, it's the same as libx11 now Ross Burton 2012-09-12 11:46 ` Burton, Ross 2012-09-12 13:59 ` Richard Purdie 2012-09-11 19:18 ` [RFC 14/18] distro-tracking: remove libx11-trim Ross Burton 2012-09-11 19:18 ` [RFC 15/18] libx11: drop makekeys_crosscompile.patch, effectively merged upstream Ross Burton 2012-09-11 19:18 ` [RFC 16/18] libx11: makekeys can be cross-compiled now, so don't hack around Ross Burton 2012-09-11 19:18 ` [RFC 17/18] libx11-diet: remove un-needed chunk from stubs patch Ross Burton 2012-09-11 19:18 ` [RFC 18/18] libx11: revise keysymdef patch based on submission upstream Ross Burton
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.