From: Shane Wang <shane.wang@intel.com>
Date: Sat, 21 Jan 2012 13:40:37 +0000 (+0800)
Subject: xcb-proto: upgrade to 1.7
X-Git-Tag: 2015-4~11933
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=15780c7d7bb5d242aa688c1c1d9842a1004222d9;p=openembedded-core.git

xcb-proto: upgrade to 1.7

Upgrade xcb-proto from 1.6 to 1.7
Since xcb-proto-libdir.patch is there, the file is removed.

Signed-off-by: Shane Wang <shane.wang@intel.com>
---

diff --git a/meta/recipes-graphics/xcb/xcb-proto-1.6/xcb-proto-libdir.patch b/meta/recipes-graphics/xcb/xcb-proto-1.6/xcb-proto-libdir.patch
deleted file mode 100644
index 708f329590..0000000000
--- a/meta/recipes-graphics/xcb/xcb-proto-1.6/xcb-proto-libdir.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Upstream-Status: Inappropriate [embedded specific]
-
-Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
-
-Index: xcb-proto-1.6/xcb-proto.pc.in
-===================================================================
---- xcb-proto-1.6.orig/xcb-proto.pc.in
-+++ xcb-proto-1.6/xcb-proto.pc.in
-@@ -1,4 +1,5 @@
- prefix=@prefix@
-+libdir=@libdir@
- datarootdir=@datarootdir@
- datadir=@datadir@
- xcbincludedir=@xcbincludedir@
diff --git a/meta/recipes-graphics/xcb/xcb-proto.inc b/meta/recipes-graphics/xcb/xcb-proto.inc
index bab51121e1..e93b1a2ff1 100644
--- a/meta/recipes-graphics/xcb/xcb-proto.inc
+++ b/meta/recipes-graphics/xcb/xcb-proto.inc
@@ -9,8 +9,7 @@ BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=XCB"
 SECTION = "x11/libs"
 LICENSE = "MIT-X"
 
-SRC_URI = "http://xcb.freedesktop.org/dist/xcb-proto-${PV}.tar.bz2 \
-           file://xcb-proto-libdir.patch"
+SRC_URI = "http://xcb.freedesktop.org/dist/xcb-proto-${PV}.tar.bz2"
 
 inherit autotools pkgconfig
 
diff --git a/meta/recipes-graphics/xcb/xcb-proto_1.6.bb b/meta/recipes-graphics/xcb/xcb-proto_1.7.bb
similarity index 58%
rename from meta/recipes-graphics/xcb/xcb-proto_1.6.bb
rename to meta/recipes-graphics/xcb/xcb-proto_1.7.bb
index 7ac7ad5dc9..fac24df69f 100644
--- a/meta/recipes-graphics/xcb/xcb-proto_1.6.bb
+++ b/meta/recipes-graphics/xcb/xcb-proto_1.7.bb
@@ -4,7 +4,7 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d763b081cb10c223435b01e00dc0aba7 \
                     file://src/dri2.xml;beginline=2;endline=28;md5=f8763b13ff432e8597e0d610cf598e65"
 
-PR = "r4"
+PR = "r0"
 
-SRC_URI[md5sum] = "04313e1d914b44d0e457f6c494fc178b"
-SRC_URI[sha256sum] = "f52bc1159b12496f002404eb5793c01277b20c82cb72c5ff076d7b25da9b5ca2"
+SRC_URI[md5sum] = "f5d73ec841ed055f5e80535819f18400"
+SRC_URI[sha256sum] = "e67eb7263f222133fb9d1de70928724bea3a448cdcd99d0fa4c63c04fc124b38"