summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2013-08-21 15:26:50 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-08-22 18:30:05 +0100
commitf0a690dd9daf8098306a9776975b537e28e07dfa (patch)
treeda2ae1504550a0a4f611053fabc490e553a8940f /meta
parent81f99896fae94f3340d2bf3cce672afd28b38361 (diff)
downloadpoky-f0a690dd9daf8098306a9776975b537e28e07dfa.tar.gz
libx11: upgrade to 1.6.1
Upgrade libx11 to version 1.6.1. Update: * Remove PR and INC_PR. * File Xcms.txt position changes. * Drop backport patch keysymdef_include.patch. * Update disable_tests.patch. [YOCTO #4973] (From OE-Core rev: 9e2d9608464c189ec460930570557c48d78108bb) Signed-off-by: Kai Kang <kai.kang@windriver.com> [sgw - Removed PR and INC_PR] Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11.inc3
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11/disable_tests.patch9
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb13
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11_1.6.1.bb10
4 files changed, 18 insertions, 17 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libx11.inc b/meta/recipes-graphics/xorg-lib/libx11.inc
index b4eb7d8cc6..e07d42dcad 100644
--- a/meta/recipes-graphics/xorg-lib/libx11.inc
+++ b/meta/recipes-graphics/xorg-lib/libx11.inc
@@ -11,7 +11,6 @@ inherit siteinfo
11FILESPATH = "${FILE_DIRNAME}/libx11" 11FILESPATH = "${FILE_DIRNAME}/libx11"
12 12
13PE = "1" 13PE = "1"
14INC_PR = "r10"
15 14
16PROVIDES = "virtual/libx11" 15PROVIDES = "virtual/libx11"
17 16
@@ -33,7 +32,7 @@ CPPFLAGS_FOR_BUILD += "-D_GNU_SOURCE"
33 32
34PACKAGES =+ "${PN}-xcb" 33PACKAGES =+ "${PN}-xcb"
35 34
36FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt" 35FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${datadir}/X11/Xcms.txt"
37FILES_${PN}-xcb += "${libdir}/libX11-xcb.so.*" 36FILES_${PN}-xcb += "${libdir}/libX11-xcb.so.*"
38FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale" 37FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale"
39 38
diff --git a/meta/recipes-graphics/xorg-lib/libx11/disable_tests.patch b/meta/recipes-graphics/xorg-lib/libx11/disable_tests.patch
index c570e45991..c1b6cde534 100644
--- a/meta/recipes-graphics/xorg-lib/libx11/disable_tests.patch
+++ b/meta/recipes-graphics/xorg-lib/libx11/disable_tests.patch
@@ -1,6 +1,11 @@
1Upstream-Status: Inappropriate [disable feature] 1Upstream-Status: Inappropriate [disable feature]
2 2
3Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> 3Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
4
5Update for 1.6.1
6
7Signed-off-by: Kai Kang <kai.kang@windriver.com>
8
4diff -Nurd libX11-1.5.0/nls/Makefile.am libX11-1.5.0/nls/Makefile.am 9diff -Nurd libX11-1.5.0/nls/Makefile.am libX11-1.5.0/nls/Makefile.am
5--- libX11-1.5.0/nls/Makefile.am 2012-06-02 09:37:18.000000000 +0300 10--- libX11-1.5.0/nls/Makefile.am 2012-06-02 09:37:18.000000000 +0300
6+++ libX11-1.5.0/nls/Makefile.am 2013-01-02 16:10:24.960156131 +0200 11+++ libX11-1.5.0/nls/Makefile.am 2013-01-02 16:10:24.960156131 +0200
@@ -9,8 +14,8 @@ diff -Nurd libX11-1.5.0/nls/Makefile.am libX11-1.5.0/nls/Makefile.am
9 cat locale.dir.l2 locale.dir.l1 > locale.dir 14 cat locale.dir.l2 locale.dir.l1 > locale.dir
10 15
11-if HAVE_PERL 16-if HAVE_PERL
12-TESTS_ENVIRONMENT = $(PERL) 17-LOG_COMPILER = $(PERL)
13-TESTS = $(srcdir)/compose-check.pl 18-TESTS = compose-check.pl
14-endif HAVE_PERL 19-endif HAVE_PERL
15- 20-
16 21
diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb b/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb
deleted file mode 100644
index 7f18824850..0000000000
--- a/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb
+++ /dev/null
@@ -1,13 +0,0 @@
1require libx11.inc
2inherit gettext
3
4PR = "${INC_PR}.3"
5
6BBCLASSEXTEND = "native nativesdk"
7
8SRC_URI += "file://keysymdef_include.patch \
9 file://disable_tests.patch \
10 "
11
12SRC_URI[md5sum] = "78b4b3bab4acbdf0abcfca30a8c70cc6"
13SRC_URI[sha256sum] = "c382efd7e92bfc3cef39a4b7f1ecf2744ba4414a705e3bc1e697f75502bd4d86"
diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.6.1.bb b/meta/recipes-graphics/xorg-lib/libx11_1.6.1.bb
new file mode 100644
index 0000000000..b9fb83242b
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libx11_1.6.1.bb
@@ -0,0 +1,10 @@
1require libx11.inc
2inherit gettext
3
4BBCLASSEXTEND = "native nativesdk"
5
6SRC_URI += "file://disable_tests.patch \
7 "
8
9SRC_URI[md5sum] = "bc5fc459ec25a50c5a7e27035b89e579"
10SRC_URI[sha256sum] = "10a54fc16b58b4f5a5eed4d080c357a82fd2f42d09af625c1f5df50650701892"