summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorValentin Popa <valentin.popa@intel.com>2013-10-29 14:50:44 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-10-30 17:33:14 +0000
commit3d204a58b38c5513e29aefacf190ab37c8a76505 (patch)
tree3c883f1c1005417794f1f031f2c200461be74eac
parent1d8cfc7fea59c2b550840cfdb7eb6f1b4c7e1b80 (diff)
downloadast2050-yocto-poky-3d204a58b38c5513e29aefacf190ab37c8a76505.zip
ast2050-yocto-poky-3d204a58b38c5513e29aefacf190ab37c8a76505.tar.gz
libx11: upgrade to 1.6.2
Adapted X18NCMSstubs.diff to correctly apply. Tested on core-image-sato (for both libx11 and libx11-diet) (From OE-Core rev: 1179a6dc039fc4ce7a540450de55f5a39681370e) Signed-off-by: Valentin Popa <valentin.popa@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-diet_1.6.2.bb (renamed from meta/recipes-graphics/xorg-lib/libx11-diet_1.6.1.bb)4
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff3
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11_1.6.1.bb10
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11_1.6.2.bb10
4 files changed, 13 insertions, 14 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet_1.6.1.bb b/meta/recipes-graphics/xorg-lib/libx11-diet_1.6.2.bb
index 3c3b8e7..89b0716 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-diet_1.6.1.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11-diet_1.6.2.bb
@@ -11,8 +11,8 @@ SRC_URI += "file://X18NCMSstubs.diff \
RPROVIDES_${PN}-dev = "libx11-dev"
RPROVIDES_${PN}-locale = "libx11-locale"
-SRC_URI[md5sum] = "bc5fc459ec25a50c5a7e27035b89e579"
-SRC_URI[sha256sum] = "10a54fc16b58b4f5a5eed4d080c357a82fd2f42d09af625c1f5df50650701892"
+SRC_URI[md5sum] = "c35d6ad95b06635a524579e88622fdb5"
+SRC_URI[sha256sum] = "2aa027e837231d2eeea90f3a4afe19948a6eb4c8b2bec0241eba7dbc8106bd16"
EXTRA_OECONF += "--disable-xlocale"
diff --git a/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff b/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff
index 9e91a8b..744cedc 100644
--- a/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff
+++ b/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff
@@ -483,10 +483,9 @@ Index: libX11-1.3/src/Makefile.am
x11datadir = @X11_DATADIR@
x11data_DATA = XKeysymDB XErrorDB
-@@ -342,7 +344,8 @@ EXTRA_DIST = \
+@@ -342,6 +344,7 @@ EXTRA_DIST = \
$(x11data_DATA) \
os2Stubs.c \
- udcInf.c \
- UIThrStubs.c
+ UIThrStubs.c \
+ X18NCMSstubs.c
diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.6.1.bb b/meta/recipes-graphics/xorg-lib/libx11_1.6.1.bb
deleted file mode 100644
index b9fb832..0000000
--- a/meta/recipes-graphics/xorg-lib/libx11_1.6.1.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require libx11.inc
-inherit gettext
-
-BBCLASSEXTEND = "native nativesdk"
-
-SRC_URI += "file://disable_tests.patch \
- "
-
-SRC_URI[md5sum] = "bc5fc459ec25a50c5a7e27035b89e579"
-SRC_URI[sha256sum] = "10a54fc16b58b4f5a5eed4d080c357a82fd2f42d09af625c1f5df50650701892"
diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.6.2.bb b/meta/recipes-graphics/xorg-lib/libx11_1.6.2.bb
new file mode 100644
index 0000000..2377d61
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libx11_1.6.2.bb
@@ -0,0 +1,10 @@
+require libx11.inc
+inherit gettext
+
+BBCLASSEXTEND = "native nativesdk"
+
+SRC_URI += "file://disable_tests.patch \
+ "
+
+SRC_URI[md5sum] = "c35d6ad95b06635a524579e88622fdb5"
+SRC_URI[sha256sum] = "2aa027e837231d2eeea90f3a4afe19948a6eb4c8b2bec0241eba7dbc8106bd16"
OpenPOWER on IntegriCloud