summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb2
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb2
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11.inc4
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb2
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 dd9e7d9450..9a7de33d56 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 \
25 25
26FILESDIR = "${@os.path.dirname(d.getVar('FILE', True))}/libx11" 26FILESDIR = "${@os.path.dirname(d.getVar('FILE', True))}/libx11"
27 27
28EXTRA_OECONF += "--disable-xlocale --with-keysymdefdir=${STAGING_INCDIR}/X11" 28EXTRA_OECONF += "--disable-xlocale"
29CFLAGS += "-D_GNU_SOURCE" 29CFLAGS += "-D_GNU_SOURCE"
30 30
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 9e88d456f8..714b9931c1 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"
18 18
19SRC_URI[md5sum] = "78b4b3bab4acbdf0abcfca30a8c70cc6" 19SRC_URI[md5sum] = "78b4b3bab4acbdf0abcfca30a8c70cc6"
20SRC_URI[sha256sum] = "c382efd7e92bfc3cef39a4b7f1ecf2744ba4414a705e3bc1e697f75502bd4d86" 20SRC_URI[sha256sum] = "c382efd7e92bfc3cef39a4b7f1ecf2744ba4414a705e3bc1e697f75502bd4d86"
21
22EXTRA_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 22b26cc277..a524c5f6e3 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
9inherit siteinfo 9inherit siteinfo
10 10
11PE = "1" 11PE = "1"
12INC_PR = "r3" 12INC_PR = "r4"
13 13
14PROVIDES = "virtual/libx11" 14PROVIDES = "virtual/libx11"
15 15
@@ -23,6 +23,8 @@ FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/X
23FILES_${PN}-xcb += "${libdir}/libX11-xcb.so.*" 23FILES_${PN}-xcb += "${libdir}/libX11-xcb.so.*"
24FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale" 24FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale"
25 25
26EXTRA_OECONF += "--with-keysymdefdir=${STAGING_INCDIR}/X11/"
27
26# Almost nothing uses XCMS 28# Almost nothing uses XCMS
27PACKAGECONFIG ??= "" 29PACKAGECONFIG ??= ""
28PACKAGECONFIG[xcms] = "--enable-xcms,--disable-xcms" 30PACKAGECONFIG[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 2e47899491..0ba0f9b0d6 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"
5 5
6BBCLASSEXTEND = "native nativesdk" 6BBCLASSEXTEND = "native nativesdk"
7 7
8EXTRA_OECONF += "--with-keysymdefdir=${STAGING_INCDIR}/X11"
9
10DEPENDS += "util-macros xtrans libxdmcp libxau \ 8DEPENDS += "util-macros xtrans libxdmcp libxau \
11 bigreqsproto xproto xextproto xcmiscproto \ 9 bigreqsproto xproto xextproto xcmiscproto \
12 xf86bigfontproto kbproto inputproto libxcb \ 10 xf86bigfontproto kbproto inputproto libxcb \