summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/xorg-lib
diff options
context:
space:
mode:
authorLaurentiu Palcu <laurentiu.palcu@intel.com>2012-07-04 11:05:17 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-07-09 16:58:55 +0100
commitf013f72285fcd116253780d0b05c69c432e3a1ee (patch)
treec9e80435f748d003e1dd14c89afc8a516b58fad7 /meta/recipes-graphics/xorg-lib
parent9d2e665d71a2c358f4c9e52df961fc13127ebdd4 (diff)
downloadpoky-f013f72285fcd116253780d0b05c69c432e3a1ee.tar.gz
libx11-trim: upgrade to 1.5.0
(From OE-Core rev: 817742fa1a5261b3b2c697de3c14e602d55713e2) Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/xorg-lib')
-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 @@
1Upstream-Status: Pending 1Upstream-Status: Pending
2 2
3Index: libX11-1.3.4/src/util/Makefile.am 3Index: libX11-1.5.0/src/util/Makefile.am
4=================================================================== 4===================================================================
5--- libX11-1.3.4.orig/src/util/Makefile.am 5--- libX11-1.5.0.orig/src/util/Makefile.am
6+++ libX11-1.3.4/src/util/Makefile.am 6+++ libX11-1.5.0/src/util/Makefile.am
7@@ -1,24 +1 @@ 7@@ -1,27 +1,2 @@
8- 8-
9-noinst_PROGRAMS=makekeys 9-noinst_PROGRAMS=makekeys
10- 10-
@@ -12,13 +12,16 @@ Index: libX11-1.3.4/src/util/Makefile.am
12- $(X11_CFLAGS) \ 12- $(X11_CFLAGS) \
13- $(CWARNFLAGS) 13- $(CWARNFLAGS)
14- 14-
15-makekeys_CPPFLAGS = \
16- -I$(top_srcdir)/include
17-
15-CC = @CC_FOR_BUILD@ 18-CC = @CC_FOR_BUILD@
16-CPPFLAGS = @CPPFLAGS_FOR_BUILD@ 19-CPPFLAGS = @CPPFLAGS_FOR_BUILD@
17-CFLAGS = @CFLAGS_FOR_BUILD@ 20-CFLAGS = @CFLAGS_FOR_BUILD@
18-LDFLAGS = @LDFLAGS_FOR_BUILD@ 21-LDFLAGS = @LDFLAGS_FOR_BUILD@
19- 22-
20 EXTRA_DIST = mkks.sh 23 EXTRA_DIST = mkks.sh
21- 24
22-if LINT 25-if LINT
23-# Check source code with tools like lint & sparse 26-# Check source code with tools like lint & sparse
24- 27-
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."
5LICENSE = "MIT & MIT-style & BSD" 5LICENSE = "MIT & MIT-style & BSD"
6LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7" 6LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7"
7 7
8PR = "r1" 8PR = "r0"
9 9
10DEPENDS += "libxcb xproto xextproto xtrans libxau kbproto inputproto xf86bigfontproto xproto-native" 10DEPENDS += "libxcb xproto xextproto xtrans libxau kbproto inputproto xf86bigfontproto xproto-native"
11 11
@@ -16,7 +16,7 @@ SRC_URI += "file://x11_disable_makekeys.patch \
16RPROVIDES_${PN}-dev = "libx11-dev" 16RPROVIDES_${PN}-dev = "libx11-dev"
17RPROVIDES_${PN}-locale = "libx11-locale" 17RPROVIDES_${PN}-locale = "libx11-locale"
18 18
19SRC_URI[md5sum] = "ed7c382cbf8c13425b6a66bcac0ca5d9" 19SRC_URI[md5sum] = "78b4b3bab4acbdf0abcfca30a8c70cc6"
20SRC_URI[sha256sum] = "7fe62180f08ef5f0a0062fb444591e349cae2ab5af6ad834599f5c654e6c840d" 20SRC_URI[sha256sum] = "c382efd7e92bfc3cef39a4b7f1ecf2744ba4414a705e3bc1e697f75502bd4d86"
21 21
22EXTRA_OECONF += "--with-keysymdefdir=${STAGING_INCDIR}/X11/ --disable-xcms " 22EXTRA_OECONF += "--with-keysymdefdir=${STAGING_INCDIR}/X11/ --disable-xcms "