diff options
| author | Laurentiu Palcu <laurentiu.palcu@intel.com> | 2012-07-04 11:05:17 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-07-09 16:51:20 +0100 |
| commit | 817742fa1a5261b3b2c697de3c14e602d55713e2 (patch) | |
| tree | 953ab4670ff681cf714e2601855bc46b607962ae | |
| parent | 52d4ff7b35602faa52360a3e7a800891ef60c739 (diff) | |
| download | openembedded-core-817742fa1a5261b3b2c697de3c14e602d55713e2.tar.gz openembedded-core-817742fa1a5261b3b2c697de3c14e602d55713e2.tar.bz2 openembedded-core-817742fa1a5261b3b2c697de3c14e602d55713e2.zip | |
libx11-trim: upgrade to 1.5.0
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
| -rw-r--r-- | meta/recipes-graphics/xorg-lib/libx11-trim-1.5.0/keysymdef_include.patch (renamed from meta/recipes-graphics/xorg-lib/libx11-trim-1.4.4/keysymdef_include.patch) | 0 | ||||
| -rw-r--r-- | meta/recipes-graphics/xorg-lib/libx11-trim-1.5.0/makekeys_crosscompile.patch (renamed from meta/recipes-graphics/xorg-lib/libx11-trim-1.4.4/makekeys_crosscompile.patch) | 0 | ||||
| -rw-r--r-- | meta/recipes-graphics/xorg-lib/libx11-trim-1.5.0/x11_disable_makekeys.patch (renamed from meta/recipes-graphics/xorg-lib/libx11-trim-1.4.4/x11_disable_makekeys.patch) | 13 | ||||
| -rw-r--r-- | meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb (renamed from meta/recipes-graphics/xorg-lib/libx11-trim_1.4.4.bb) | 6 |
4 files changed, 11 insertions, 8 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim-1.4.4/keysymdef_include.patch b/meta/recipes-graphics/xorg-lib/libx11-trim-1.5.0/keysymdef_include.patch index d1bdab9778..d1bdab9778 100644 --- a/meta/recipes-graphics/xorg-lib/libx11-trim-1.4.4/keysymdef_include.patch +++ b/meta/recipes-graphics/xorg-lib/libx11-trim-1.5.0/keysymdef_include.patch diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim-1.4.4/makekeys_crosscompile.patch b/meta/recipes-graphics/xorg-lib/libx11-trim-1.5.0/makekeys_crosscompile.patch index daf3696b34..daf3696b34 100644 --- a/meta/recipes-graphics/xorg-lib/libx11-trim-1.4.4/makekeys_crosscompile.patch +++ b/meta/recipes-graphics/xorg-lib/libx11-trim-1.5.0/makekeys_crosscompile.patch diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim-1.4.4/x11_disable_makekeys.patch b/meta/recipes-graphics/xorg-lib/libx11-trim-1.5.0/x11_disable_makekeys.patch index e3782a5557..69f9e6c4d6 100644 --- a/meta/recipes-graphics/xorg-lib/libx11-trim-1.4.4/x11_disable_makekeys.patch +++ b/meta/recipes-graphics/xorg-lib/libx11-trim-1.5.0/x11_disable_makekeys.patch @@ -1,10 +1,10 @@ Upstream-Status: Pending -Index: libX11-1.3.4/src/util/Makefile.am +Index: libX11-1.5.0/src/util/Makefile.am =================================================================== ---- libX11-1.3.4.orig/src/util/Makefile.am -+++ libX11-1.3.4/src/util/Makefile.am -@@ -1,24 +1 @@ +--- libX11-1.5.0.orig/src/util/Makefile.am ++++ libX11-1.5.0/src/util/Makefile.am +@@ -1,27 +1,2 @@ - -noinst_PROGRAMS=makekeys - @@ -12,13 +12,16 @@ Index: libX11-1.3.4/src/util/Makefile.am - $(X11_CFLAGS) \ - $(CWARNFLAGS) - +-makekeys_CPPFLAGS = \ +- -I$(top_srcdir)/include +- -CC = @CC_FOR_BUILD@ -CPPFLAGS = @CPPFLAGS_FOR_BUILD@ -CFLAGS = @CFLAGS_FOR_BUILD@ -LDFLAGS = @LDFLAGS_FOR_BUILD@ - EXTRA_DIST = mkks.sh -- + -if LINT -# Check source code with tools like lint & sparse - diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim_1.4.4.bb b/meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb index a86e13a5f5..89c45974f3 100644 --- a/meta/recipes-graphics/xorg-lib/libx11-trim_1.4.4.bb +++ b/meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb @@ -5,7 +5,7 @@ DESCRIPTION += " Support for XCMS is disabled in this version." LICENSE = "MIT & MIT-style & BSD" LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7" -PR = "r1" +PR = "r0" DEPENDS += "libxcb xproto xextproto xtrans libxau kbproto inputproto xf86bigfontproto xproto-native" @@ -16,7 +16,7 @@ SRC_URI += "file://x11_disable_makekeys.patch \ RPROVIDES_${PN}-dev = "libx11-dev" RPROVIDES_${PN}-locale = "libx11-locale" -SRC_URI[md5sum] = "ed7c382cbf8c13425b6a66bcac0ca5d9" -SRC_URI[sha256sum] = "7fe62180f08ef5f0a0062fb444591e349cae2ab5af6ad834599f5c654e6c840d" +SRC_URI[md5sum] = "78b4b3bab4acbdf0abcfca30a8c70cc6" +SRC_URI[sha256sum] = "c382efd7e92bfc3cef39a4b7f1ecf2744ba4414a705e3bc1e697f75502bd4d86" EXTRA_OECONF += "--with-keysymdefdir=${STAGING_INCDIR}/X11/ --disable-xcms " |