* [PATCH 0/4] libX11 Update & Valgrind patch
@ 2013-08-21 23:14 Saul Wold
2013-08-21 23:14 ` [PATCH 1/4] libx11: upgrade to 1.6.1 Saul Wold
` (3 more replies)
0 siblings, 4 replies; 6+ messages in thread
From: Saul Wold @ 2013-08-21 23:14 UTC (permalink / raw)
To: kai.kang, openembedded-core
This is a set of updates for libX11 and a couple of
backport patches to address issues with libX11 and
the eglibc update
The x11 update fixes issues with Fedora 19 and SDL.
Sau!
Kai Kang (2):
libx11: upgrade to 1.6.1
libx11-diet: upgrade to 1.6.1
Saul Wold (2):
libsdl: Backport xData32 patch for x11 update
valgrind: Backport patch for eglibc 2.18
.../valgrind/valgrind-3.8.1/eglibc-2.18.patch | 27 ++++++++++++++
meta/recipes-devtools/valgrind/valgrind_3.8.1.bb | 1 +
.../libsdl-1.2.15/libsdl-1.2.15-xdata32.patch | 19 ++++++++++
meta/recipes-graphics/libsdl/libsdl_1.2.15.bb | 3 +-
.../{libx11-diet_1.5.0.bb => libx11-diet_1.6.1.bb} | 7 ++--
meta/recipes-graphics/xorg-lib/libx11.inc | 3 +-
.../xorg-lib/libx11/disable_tests.patch | 9 +++--
.../xorg-lib/libx11/keysymdef_include.patch | 42 ----------------------
meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb | 13 -------
meta/recipes-graphics/xorg-lib/libx11_1.6.1.bb | 10 ++++++
10 files changed, 69 insertions(+), 65 deletions(-)
create mode 100644 meta/recipes-devtools/valgrind/valgrind-3.8.1/eglibc-2.18.patch
create mode 100644 meta/recipes-graphics/libsdl/libsdl-1.2.15/libsdl-1.2.15-xdata32.patch
rename meta/recipes-graphics/xorg-lib/{libx11-diet_1.5.0.bb => libx11-diet_1.6.1.bb} (65%)
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11/keysymdef_include.patch
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb
create mode 100644 meta/recipes-graphics/xorg-lib/libx11_1.6.1.bb
--
1.8.3.1
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/4] libx11: upgrade to 1.6.1
2013-08-21 23:14 [PATCH 0/4] libX11 Update & Valgrind patch Saul Wold
@ 2013-08-21 23:14 ` Saul Wold
2013-08-21 23:23 ` Martin Jansa
2013-08-21 23:14 ` [PATCH 2/4] libx11-diet: " Saul Wold
` (2 subsequent siblings)
3 siblings, 1 reply; 6+ messages in thread
From: Saul Wold @ 2013-08-21 23:14 UTC (permalink / raw)
To: kai.kang, openembedded-core
From: Kai Kang <kai.kang@windriver.com>
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]
Signed-off-by: Kai Kang <kai.kang@windriver.com>
[sgw - Removed PR and INC_PR]
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-graphics/xorg-lib/libx11.inc | 3 +--
meta/recipes-graphics/xorg-lib/libx11/disable_tests.patch | 9 +++++++--
meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb | 13 -------------
meta/recipes-graphics/xorg-lib/libx11_1.6.1.bb | 10 ++++++++++
4 files changed, 18 insertions(+), 17 deletions(-)
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb
create mode 100644 meta/recipes-graphics/xorg-lib/libx11_1.6.1.bb
diff --git a/meta/recipes-graphics/xorg-lib/libx11.inc b/meta/recipes-graphics/xorg-lib/libx11.inc
index b4eb7d8..e07d42d 100644
--- a/meta/recipes-graphics/xorg-lib/libx11.inc
+++ b/meta/recipes-graphics/xorg-lib/libx11.inc
@@ -11,7 +11,6 @@ inherit siteinfo
FILESPATH = "${FILE_DIRNAME}/libx11"
PE = "1"
-INC_PR = "r10"
PROVIDES = "virtual/libx11"
@@ -33,7 +32,7 @@ CPPFLAGS_FOR_BUILD += "-D_GNU_SOURCE"
PACKAGES =+ "${PN}-xcb"
-FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt"
+FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${datadir}/X11/Xcms.txt"
FILES_${PN}-xcb += "${libdir}/libX11-xcb.so.*"
FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale"
diff --git a/meta/recipes-graphics/xorg-lib/libx11/disable_tests.patch b/meta/recipes-graphics/xorg-lib/libx11/disable_tests.patch
index c570e45..c1b6cde 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 @@
Upstream-Status: Inappropriate [disable feature]
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
+
+Update for 1.6.1
+
+Signed-off-by: Kai Kang <kai.kang@windriver.com>
+
diff -Nurd libX11-1.5.0/nls/Makefile.am libX11-1.5.0/nls/Makefile.am
--- libX11-1.5.0/nls/Makefile.am 2012-06-02 09:37:18.000000000 +0300
+++ 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
cat locale.dir.l2 locale.dir.l1 > locale.dir
-if HAVE_PERL
--TESTS_ENVIRONMENT = $(PERL)
--TESTS = $(srcdir)/compose-check.pl
+-LOG_COMPILER = $(PERL)
+-TESTS = compose-check.pl
-endif HAVE_PERL
-
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 7f18824..0000000
--- a/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require libx11.inc
-inherit gettext
-
-PR = "${INC_PR}.3"
-
-BBCLASSEXTEND = "native nativesdk"
-
-SRC_URI += "file://keysymdef_include.patch \
- file://disable_tests.patch \
- "
-
-SRC_URI[md5sum] = "78b4b3bab4acbdf0abcfca30a8c70cc6"
-SRC_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 0000000..b9fb832
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libx11_1.6.1.bb
@@ -0,0 +1,10 @@
+require libx11.inc
+inherit gettext
+
+BBCLASSEXTEND = "native nativesdk"
+
+SRC_URI += "file://disable_tests.patch \
+ "
+
+SRC_URI[md5sum] = "bc5fc459ec25a50c5a7e27035b89e579"
+SRC_URI[sha256sum] = "10a54fc16b58b4f5a5eed4d080c357a82fd2f42d09af625c1f5df50650701892"
--
1.8.3.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/4] libx11-diet: upgrade to 1.6.1
2013-08-21 23:14 [PATCH 0/4] libX11 Update & Valgrind patch Saul Wold
2013-08-21 23:14 ` [PATCH 1/4] libx11: upgrade to 1.6.1 Saul Wold
@ 2013-08-21 23:14 ` Saul Wold
2013-08-21 23:14 ` [PATCH 3/4] libsdl: Backport xData32 patch for x11 update Saul Wold
2013-08-21 23:14 ` [PATCH 4/4] valgrind: Backport patch for eglibc 2.18 Saul Wold
3 siblings, 0 replies; 6+ messages in thread
From: Saul Wold @ 2013-08-21 23:14 UTC (permalink / raw)
To: kai.kang, openembedded-core
From: Kai Kang <kai.kang@windriver.com>
Deleted keysymdef_include patch
Signed-off-by: Kai Kang <kai.kang@windriver.com>
[sgw - Removed PR]
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../{libx11-diet_1.5.0.bb => libx11-diet_1.6.1.bb} | 7 ++--
.../xorg-lib/libx11/keysymdef_include.patch | 42 ----------------------
2 files changed, 2 insertions(+), 47 deletions(-)
rename meta/recipes-graphics/xorg-lib/{libx11-diet_1.5.0.bb => libx11-diet_1.6.1.bb} (65%)
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11/keysymdef_include.patch
diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb b/meta/recipes-graphics/xorg-lib/libx11-diet_1.6.1.bb
similarity index 65%
rename from meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb
rename to meta/recipes-graphics/xorg-lib/libx11-diet_1.6.1.bb
index 0b50f09..3c3b8e7 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11-diet_1.6.1.bb
@@ -3,10 +3,7 @@ require libx11.inc
DESCRIPTION += " Support for XCMS and XLOCALE is disabled in \
this version."
-PR = "${INC_PR}.4"
-
SRC_URI += "file://X18NCMSstubs.diff \
- file://keysymdef_include.patch \
file://fix-disable-xlocale.diff \
file://fix-utf8-wrong-define.patch \
"
@@ -14,8 +11,8 @@ SRC_URI += "file://X18NCMSstubs.diff \
RPROVIDES_${PN}-dev = "libx11-dev"
RPROVIDES_${PN}-locale = "libx11-locale"
-SRC_URI[md5sum] = "78b4b3bab4acbdf0abcfca30a8c70cc6"
-SRC_URI[sha256sum] = "c382efd7e92bfc3cef39a4b7f1ecf2744ba4414a705e3bc1e697f75502bd4d86"
+SRC_URI[md5sum] = "bc5fc459ec25a50c5a7e27035b89e579"
+SRC_URI[sha256sum] = "10a54fc16b58b4f5a5eed4d080c357a82fd2f42d09af625c1f5df50650701892"
EXTRA_OECONF += "--disable-xlocale"
diff --git a/meta/recipes-graphics/xorg-lib/libx11/keysymdef_include.patch b/meta/recipes-graphics/xorg-lib/libx11/keysymdef_include.patch
deleted file mode 100644
index 8c50bb7..0000000
--- a/meta/recipes-graphics/xorg-lib/libx11/keysymdef_include.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From d45b3fc19fbe95c41afc4e51d768df6d42332010 Mon Sep 17 00:00:00 2001
-From: Ross Burton <ross.burton@intel.com>
-Date: Wed, 12 Sep 2012 13:39:40 +0000
-Subject: Allow overriding location of keysymdef.h
-
-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.
-
-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: Backport
-Signed-off-by: Ross Burton <ross.burton@intel.com>
-Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
-Reviewed-by: Daniel Stone <daniel@fooishbar.org>
----
-diff --git a/configure.ac b/configure.ac
-index 48a0c8a..a45f9d9 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -306,7 +306,15 @@ 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 (defaults to xproto include dir)])],
-+ [KEYSYMDEFDIR=$withval],
-+ [KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11])
-+
-+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
---
-cgit v0.9.0.2-2-gbebe
--
1.8.3.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 3/4] libsdl: Backport xData32 patch for x11 update
2013-08-21 23:14 [PATCH 0/4] libX11 Update & Valgrind patch Saul Wold
2013-08-21 23:14 ` [PATCH 1/4] libx11: upgrade to 1.6.1 Saul Wold
2013-08-21 23:14 ` [PATCH 2/4] libx11-diet: " Saul Wold
@ 2013-08-21 23:14 ` Saul Wold
2013-08-21 23:14 ` [PATCH 4/4] valgrind: Backport patch for eglibc 2.18 Saul Wold
3 siblings, 0 replies; 6+ messages in thread
From: Saul Wold @ 2013-08-21 23:14 UTC (permalink / raw)
To: kai.kang, openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../libsdl/libsdl-1.2.15/libsdl-1.2.15-xdata32.patch | 19 +++++++++++++++++++
meta/recipes-graphics/libsdl/libsdl_1.2.15.bb | 3 ++-
2 files changed, 21 insertions(+), 1 deletion(-)
create mode 100644 meta/recipes-graphics/libsdl/libsdl-1.2.15/libsdl-1.2.15-xdata32.patch
diff --git a/meta/recipes-graphics/libsdl/libsdl-1.2.15/libsdl-1.2.15-xdata32.patch b/meta/recipes-graphics/libsdl/libsdl-1.2.15/libsdl-1.2.15-xdata32.patch
new file mode 100644
index 0000000..f98b927
--- /dev/null
+++ b/meta/recipes-graphics/libsdl/libsdl-1.2.15/libsdl-1.2.15-xdata32.patch
@@ -0,0 +1,19 @@
+libX11-1.5.99.901 has changed prototype of _XData32
+
+Upstream-Status: Backport
+<http://bugzilla.libsdl.org/show_bug.cgi?id=1769>
+
+Signed-off-by: Saul Wold <sgw@linux.intel.com>
+
+diff -r b6b2829cd7ef src/video/x11/SDL_x11sym.h
+--- a/src/video/x11/SDL_x11sym.h Wed Feb 27 15:20:31 2013 -0800
++++ b/src/video/x11/SDL_x11sym.h Wed Mar 27 16:07:23 2013 +0100
+@@ -165,7 +165,7 @@
+ */
+ #ifdef LONG64
+ SDL_X11_MODULE(IO_32BIT)
+-SDL_X11_SYM(int,_XData32,(Display *dpy,register long *data,unsigned len),(dpy,data,len),return)
++SDL_X11_SYM(int,_XData32,(Display *dpy,register _Xconst long *data,unsigned len),(dpy,data,len),return)
+ SDL_X11_SYM(void,_XRead32,(Display *dpy,register long *data,long len),(dpy,data,len),)
+ #endif
+
diff --git a/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb b/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb
index 1bee364..4209f37 100644
--- a/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb
+++ b/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb
@@ -22,7 +22,8 @@ PR = "r2"
SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \
file://configure_tweak.patch \
- "
+ file://libsdl-1.2.15-xdata32.patch \
+ "
S = "${WORKDIR}/SDL-${PV}"
--
1.8.3.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 4/4] valgrind: Backport patch for eglibc 2.18
2013-08-21 23:14 [PATCH 0/4] libX11 Update & Valgrind patch Saul Wold
` (2 preceding siblings ...)
2013-08-21 23:14 ` [PATCH 3/4] libsdl: Backport xData32 patch for x11 update Saul Wold
@ 2013-08-21 23:14 ` Saul Wold
3 siblings, 0 replies; 6+ messages in thread
From: Saul Wold @ 2013-08-21 23:14 UTC (permalink / raw)
To: kai.kang, openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../valgrind/valgrind-3.8.1/eglibc-2.18.patch | 27 ++++++++++++++++++++++
meta/recipes-devtools/valgrind/valgrind_3.8.1.bb | 1 +
2 files changed, 28 insertions(+)
create mode 100644 meta/recipes-devtools/valgrind/valgrind-3.8.1/eglibc-2.18.patch
diff --git a/meta/recipes-devtools/valgrind/valgrind-3.8.1/eglibc-2.18.patch b/meta/recipes-devtools/valgrind/valgrind-3.8.1/eglibc-2.18.patch
new file mode 100644
index 0000000..1fa8127
--- /dev/null
+++ b/meta/recipes-devtools/valgrind/valgrind-3.8.1/eglibc-2.18.patch
@@ -0,0 +1,27 @@
+
+
+Found in the SVN valgrind code
+svn diff -c 13504 configure.in
+
+Upstream-Status: Backport
+
+Signed-off-by: Saul Wold <sgw@linux.intel.com>
+
+Index: valgrind-3.8.1/configure.in
+===================================================================
+--- valgrind-3.8.1.orig/configure.in
++++ valgrind-3.8.1/configure.in
+@@ -924,6 +924,13 @@ case "${GLIBC_VERSION}" in
+ DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
+ DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}"
+ ;;
++ 2.18)
++ AC_MSG_RESULT(2.18 family)
++ AC_DEFINE([GLIBC_2_18], 1, [Define to 1 if you're using glibc 2.18.x])
++ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
++ DEFAULT_SUPP="$srcdir/glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
++ DEFAULT_SUPP="$srcdir/glibc-2.X-drd.supp ${DEFAULT_SUPP}"
++ ;;
+ darwin)
+ AC_MSG_RESULT(Darwin)
+ AC_DEFINE([DARWIN_LIBC], 1, [Define to 1 if you're using Darwin])
diff --git a/meta/recipes-devtools/valgrind/valgrind_3.8.1.bb b/meta/recipes-devtools/valgrind/valgrind_3.8.1.bb
index 33f178c..9630960 100644
--- a/meta/recipes-devtools/valgrind/valgrind_3.8.1.bb
+++ b/meta/recipes-devtools/valgrind/valgrind_3.8.1.bb
@@ -18,6 +18,7 @@ SRC_URI = "http://www.valgrind.org/downloads/valgrind-${PV}.tar.bz2 \
file://Added-support-for-PPC-instructions-mfatbu-mfatbl.patch \
file://configure-with-newer-glibc.patch \
file://sepbuildfix.patch \
+ file://eglibc-2.18.patch \
"
SRC_URI[md5sum] = "288758010b271119a0ffc0183f1d6e38"
--
1.8.3.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/4] libx11: upgrade to 1.6.1
2013-08-21 23:14 ` [PATCH 1/4] libx11: upgrade to 1.6.1 Saul Wold
@ 2013-08-21 23:23 ` Martin Jansa
0 siblings, 0 replies; 6+ messages in thread
From: Martin Jansa @ 2013-08-21 23:23 UTC (permalink / raw)
To: Saul Wold; +Cc: openembedded-core
[-- Attachment #1: Type: text/plain, Size: 4656 bytes --]
On Wed, Aug 21, 2013 at 04:14:32PM -0700, Saul Wold wrote:
> From: Kai Kang <kai.kang@windriver.com>
>
> Upgrade libx11 to version 1.6.1.
>
> Update:
> * Remove PR and INC_PR.
FWIW: if someone was using this libx11.inc in his layer e.g. to provide
different version or another libx11 variant, removing INC_PR can cause
issues, but I don't have such recipe in my layers and having INC_PR in
.inc without including it in PR in recipes is a bit confusing, so it's
fine with me.
> * File Xcms.txt position changes.
> * Drop backport patch keysymdef_include.patch.
> * Update disable_tests.patch.
>
> [YOCTO #4973]
>
> Signed-off-by: Kai Kang <kai.kang@windriver.com>
>
> [sgw - Removed PR and INC_PR]
>
> Signed-off-by: Saul Wold <sgw@linux.intel.com>
> ---
> meta/recipes-graphics/xorg-lib/libx11.inc | 3 +--
> meta/recipes-graphics/xorg-lib/libx11/disable_tests.patch | 9 +++++++--
> meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb | 13 -------------
> meta/recipes-graphics/xorg-lib/libx11_1.6.1.bb | 10 ++++++++++
> 4 files changed, 18 insertions(+), 17 deletions(-)
> delete mode 100644 meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb
> create mode 100644 meta/recipes-graphics/xorg-lib/libx11_1.6.1.bb
>
> diff --git a/meta/recipes-graphics/xorg-lib/libx11.inc b/meta/recipes-graphics/xorg-lib/libx11.inc
> index b4eb7d8..e07d42d 100644
> --- a/meta/recipes-graphics/xorg-lib/libx11.inc
> +++ b/meta/recipes-graphics/xorg-lib/libx11.inc
> @@ -11,7 +11,6 @@ inherit siteinfo
> FILESPATH = "${FILE_DIRNAME}/libx11"
>
> PE = "1"
> -INC_PR = "r10"
>
> PROVIDES = "virtual/libx11"
>
> @@ -33,7 +32,7 @@ CPPFLAGS_FOR_BUILD += "-D_GNU_SOURCE"
>
> PACKAGES =+ "${PN}-xcb"
>
> -FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt"
> +FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${datadir}/X11/Xcms.txt"
> FILES_${PN}-xcb += "${libdir}/libX11-xcb.so.*"
> FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale"
>
> diff --git a/meta/recipes-graphics/xorg-lib/libx11/disable_tests.patch b/meta/recipes-graphics/xorg-lib/libx11/disable_tests.patch
> index c570e45..c1b6cde 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 @@
> Upstream-Status: Inappropriate [disable feature]
>
> Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
> +
> +Update for 1.6.1
> +
> +Signed-off-by: Kai Kang <kai.kang@windriver.com>
> +
> diff -Nurd libX11-1.5.0/nls/Makefile.am libX11-1.5.0/nls/Makefile.am
> --- libX11-1.5.0/nls/Makefile.am 2012-06-02 09:37:18.000000000 +0300
> +++ 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
> cat locale.dir.l2 locale.dir.l1 > locale.dir
>
> -if HAVE_PERL
> --TESTS_ENVIRONMENT = $(PERL)
> --TESTS = $(srcdir)/compose-check.pl
> +-LOG_COMPILER = $(PERL)
> +-TESTS = compose-check.pl
> -endif HAVE_PERL
> -
>
> 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 7f18824..0000000
> --- a/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb
> +++ /dev/null
> @@ -1,13 +0,0 @@
> -require libx11.inc
> -inherit gettext
> -
> -PR = "${INC_PR}.3"
> -
> -BBCLASSEXTEND = "native nativesdk"
> -
> -SRC_URI += "file://keysymdef_include.patch \
> - file://disable_tests.patch \
> - "
> -
> -SRC_URI[md5sum] = "78b4b3bab4acbdf0abcfca30a8c70cc6"
> -SRC_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 0000000..b9fb832
> --- /dev/null
> +++ b/meta/recipes-graphics/xorg-lib/libx11_1.6.1.bb
> @@ -0,0 +1,10 @@
> +require libx11.inc
> +inherit gettext
> +
> +BBCLASSEXTEND = "native nativesdk"
> +
> +SRC_URI += "file://disable_tests.patch \
> + "
> +
> +SRC_URI[md5sum] = "bc5fc459ec25a50c5a7e27035b89e579"
> +SRC_URI[sha256sum] = "10a54fc16b58b4f5a5eed4d080c357a82fd2f42d09af625c1f5df50650701892"
> --
> 1.8.3.1
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-08-21 23:22 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-08-21 23:14 [PATCH 0/4] libX11 Update & Valgrind patch Saul Wold
2013-08-21 23:14 ` [PATCH 1/4] libx11: upgrade to 1.6.1 Saul Wold
2013-08-21 23:23 ` Martin Jansa
2013-08-21 23:14 ` [PATCH 2/4] libx11-diet: " Saul Wold
2013-08-21 23:14 ` [PATCH 3/4] libsdl: Backport xData32 patch for x11 update Saul Wold
2013-08-21 23:14 ` [PATCH 4/4] valgrind: Backport patch for eglibc 2.18 Saul Wold
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.