mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-19 00:49:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

libx11: upgrade to 1.6.1

Browse Source 
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>
This commit is contained in:
Kai Kang
2013-08-21 15:26:50 +08:00
committed by Richard Purdie
parent 81f99896fa
commit f0a690dd9d
4 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
meta/recipes-graphics/xorg-lib/libx11.inc
View File

@@ -11,7 +11,6 @@ inherit siteinfo
FILESPATH = "${FILE_DIRNAME}/libx11" FILESPATH = "${FILE_DIRNAME}/libx11"
PE = "1" PE = "1"
INC_PR = "r10"
PROVIDES = "virtual/libx11" PROVIDES = "virtual/libx11"
@@ -33,7 +32,7 @@ CPPFLAGS_FOR_BUILD += "-D_GNU_SOURCE"
PACKAGES =+ "${PN}-xcb" 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}-xcb += "${libdir}/libX11-xcb.so.*"
FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale" FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale"

9
meta/recipes-graphics/xorg-lib/libx11/disable_tests.patch
View File

@@ -1,6 +1,11 @@
Upstream-Status: Inappropriate [disable feature] Upstream-Status: Inappropriate [disable feature]
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> 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 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 2012-06-02 09:37:18.000000000 +0300
+++ libX11-1.5.0/nls/Makefile.am 2013-01-02 16:10:24.960156131 +0200 +++ 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 cat locale.dir.l2 locale.dir.l1 > locale.dir
-if HAVE_PERL -if HAVE_PERL
-TESTS_ENVIRONMENT = $(PERL) -LOG_COMPILER = $(PERL)
-TESTS = $(srcdir)/compose-check.pl -TESTS = compose-check.pl
-endif HAVE_PERL -endif HAVE_PERL
- -

13
meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb
View File

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

10
meta/recipes-graphics/xorg-lib/libx11_1.6.1.bb Normal file
View File

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