libX11 Update & Valgrind patch

index b4eb7d8..e07d42d 100644
@@ -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"
 

index c570e45..c1b6cde 100644
@@ -1,6 +1,11 @@
 Upstream-Status: Inappropriate [disable feature]
 
 Signed-off-by: Marko Lindqvist <[email protected]>
+
+Update for 1.6.1
+
+Signed-off-by: Kai Kang <[email protected]>
+
 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
 -
 

deleted file mode 100644
index 7f18824..0000000
@@ -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"

new file mode 100644
index 0000000..b9fb832
@@ -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"

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
@@ -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"
 

42 lines not on this page · raw message

new file mode 100644
index 0000000..f98b927
@@ -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 <[email protected]>
+
+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
+

index 1bee364..4209f37 100644
@@ -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}"
 

new file mode 100644
index 0000000..1fa8127
@@ -0,0 +1,27 @@
+
+
+Found in the SVN valgrind code
+svn diff -c 13504 configure.in 
+
+Upstream-Status: Backport
+
+Signed-off-by: Saul Wold <[email protected]>
+
+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])

index 33f178c..9630960 100644
@@ -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"