summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/packages/xorg-lib/libx11-diet_git.bb11
-rw-r--r--meta/packages/xorg-lib/libx11-sdk_git.bb10
-rw-r--r--meta/packages/xorg-lib/libx11-trim_git.bb12
-rw-r--r--meta/packages/xorg-lib/libx11_git.bb7
-rw-r--r--meta/packages/xorg-lib/libx11_git.inc10
5 files changed, 20 insertions, 30 deletions
diff --git a/meta/packages/xorg-lib/libx11-diet_git.bb b/meta/packages/xorg-lib/libx11-diet_git.bb
index 220df234d2..d1f0a753fa 100644
--- a/meta/packages/xorg-lib/libx11-diet_git.bb
+++ b/meta/packages/xorg-lib/libx11-diet_git.bb
@@ -1,19 +1,12 @@
1require libx11.inc 1require libx11.inc
2PV = "1.1.99.1+gitr${SRCREV}" 2require libx11_git.inc
3 3
4SRC_URI = "git://anongit.freedesktop.org/git/xorg/lib/libX11;protocol=git" 4SRC_URI += "file://X18NCMSstubs.diff;patch=1 \
5S = "${WORKDIR}/git"
6
7SRC_URI += "file://x11_disable_makekeys.patch;patch=1 \
8 file://include_fix.patch;patch=1 \
9 file://X18NCMSstubs.diff;patch=1 \
10 file://fix-disable-xlocale.diff;patch=1 \ 5 file://fix-disable-xlocale.diff;patch=1 \
11 file://fix-utf8-wrong-define.patch;patch=1" 6 file://fix-utf8-wrong-define.patch;patch=1"
12 7
13DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \ 8DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
14 libxdmcp xf86bigfontproto kbproto inputproto xproto-native" 9 libxdmcp xf86bigfontproto kbproto inputproto xproto-native"
15 10
16FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11-git"
17
18EXTRA_OECONF += "--without-xcb --disable-udc --disable-xcms --disable-xlocale" 11EXTRA_OECONF += "--without-xcb --disable-udc --disable-xcms --disable-xlocale"
19CFLAGS += "-D_GNU_SOURCE" 12CFLAGS += "-D_GNU_SOURCE"
diff --git a/meta/packages/xorg-lib/libx11-sdk_git.bb b/meta/packages/xorg-lib/libx11-sdk_git.bb
index 904ca4d636..04558d2ad6 100644
--- a/meta/packages/xorg-lib/libx11-sdk_git.bb
+++ b/meta/packages/xorg-lib/libx11-sdk_git.bb
@@ -1,11 +1,9 @@
1require libx11_${PV}.bb 1require libx11.inc
2 2require libx11_git.inc
3FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11-git"
4 3
5DEPENDS = "xproto-sdk xextproto-sdk libxau-sdk xtrans-sdk libxdmcp-sdk xcmiscproto-sdk xf86bigfontproto-sdk kbproto-sdk inputproto-sdk bigreqsproto-sdk util-macros-sdk xproto-native" 4DEPENDS = "xproto-sdk xextproto-sdk libxau-sdk xtrans-sdk libxdmcp-sdk xcmiscproto-sdk xf86bigfontproto-sdk kbproto-sdk inputproto-sdk bigreqsproto-sdk util-macros-sdk xproto-native"
6PROVIDES = "" 5PROVIDES = ""
7PV = "1.1.99.1+gitr${SRCREV}"
8 6
9inherit sdk 7EXTRA_OECONF += "--without-xcb"
10 8
11EXTRA_OECONF += "--without-xcb --disable-udc --disable-xcms --disable-xlocale" 9inherit sdk
diff --git a/meta/packages/xorg-lib/libx11-trim_git.bb b/meta/packages/xorg-lib/libx11-trim_git.bb
index be0af38dbd..45ec225b43 100644
--- a/meta/packages/xorg-lib/libx11-trim_git.bb
+++ b/meta/packages/xorg-lib/libx11-trim_git.bb
@@ -1,18 +1,10 @@
1require libx11.inc 1require libx11.inc
2PV = "1.1.99.1+gitr${SRCREV}" 2require libx11_git.inc
3PR = "r1"
4
5SRC_URI = "git://anongit.freedesktop.org/git/xorg/lib/libX11;protocol=git"
6S = "${WORKDIR}/git"
7 3
8SRC_URI += "file://x11_disable_makekeys.patch;patch=1 \ 4PR = "r1"
9 file://include_fix.patch;patch=1"
10 5
11DEPENDS += "libxcb xproto xextproto xtrans libxau kbproto inputproto xf86bigfontproto xproto-native" 6DEPENDS += "libxcb xproto xextproto xtrans libxau kbproto inputproto xf86bigfontproto xproto-native"
12 7
13FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11-git"
14
15EXTRA_OECONF += "--disable-xcms --with-xcb" 8EXTRA_OECONF += "--disable-xcms --with-xcb"
16CFLAGS += "-D_GNU_SOURCE" 9CFLAGS += "-D_GNU_SOURCE"
17 10
18FILESPATH = "${FILE_DIRNAME}/libx11-git"
diff --git a/meta/packages/xorg-lib/libx11_git.bb b/meta/packages/xorg-lib/libx11_git.bb
index f1aeb00ac5..b4278ffc27 100644
--- a/meta/packages/xorg-lib/libx11_git.bb
+++ b/meta/packages/xorg-lib/libx11_git.bb
@@ -1,11 +1,8 @@
1DEFAULT_PREFERENCE = "-1"
2
3require libx11.inc 1require libx11.inc
2require libx11_git.inc
4 3
5DEPENDS = "xproto xextproto xcmiscproto xf86bigfontproto kbproto inputproto \ 4DEPENDS = "xproto xextproto xcmiscproto xf86bigfontproto kbproto inputproto \
6 bigreqsproto xtrans libxau libxcb libxdmcp util-macros" 5 bigreqsproto xtrans libxau libxcb libxdmcp util-macros"
7PV = "1.1.99.1+gitr${SRCREV}"
8 6
9SRC_URI = "git://anongit.freedesktop.org/git/xorg/lib/libX11;protocol=git" 7DEFAULT_PREFERENCE = "-1"
10S = "${WORKDIR}/git"
11 8
diff --git a/meta/packages/xorg-lib/libx11_git.inc b/meta/packages/xorg-lib/libx11_git.inc
new file mode 100644
index 0000000000..1949544528
--- /dev/null
+++ b/meta/packages/xorg-lib/libx11_git.inc
@@ -0,0 +1,10 @@
1PV = "1.1.99.1+gitr${SRCREV}"
2
3SRC_URI = "git://anongit.freedesktop.org/git/xorg/lib/libX11;protocol=git"
4S = "${WORKDIR}/git"
5
6SRC_URI += "file://x11_disable_makekeys.patch;patch=1 \
7 file://include_fix.patch;patch=1"
8
9FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11-git"
10FILESPATH = "${FILE_DIRNAME}/libx11-git"