summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKumar Gala <galak@kernel.crashing.org>2011-08-11 01:26:34 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-08-12 17:21:55 +0100
commit86504a12ad96b555a9a6b3d9b26a31ef7bf2732a (patch)
tree95284f71edf7587ae5dfc4ba070e3e84804c6622
parent7449a372ebbc7d27f0e067754c4c0748d15f4ede (diff)
downloadpoky-86504a12ad96b555a9a6b3d9b26a31ef7bf2732a.tar.gz
xcb-proto: update based on changes to python.m4 in automake
1. We dont need the aclocal patch as this will be handled by automake 2. We need to update xcb-proto.pc.in to know about ${libdir} since we'll end up with something like: pythondir=${libdir}/python2.6/site-packages (From OE-Core rev: 4de2ba0eeaefbd6813443c6906108b815af9e109) Signed-off-by: Kumar Gala <galak@kernel.crashing.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/xcb/xcb-proto-1.6/aclocal.patch22
-rw-r--r--meta/recipes-graphics/xcb/xcb-proto-1.6/xcb-proto-libdir.patch14
-rw-r--r--meta/recipes-graphics/xcb/xcb-proto.inc2
-rw-r--r--meta/recipes-graphics/xcb/xcb-proto_1.6.bb2
-rw-r--r--meta/recipes-graphics/xcb/xcb-proto_git.bb2
5 files changed, 17 insertions, 25 deletions
diff --git a/meta/recipes-graphics/xcb/xcb-proto-1.6/aclocal.patch b/meta/recipes-graphics/xcb/xcb-proto-1.6/aclocal.patch
deleted file mode 100644
index 124f146345..0000000000
--- a/meta/recipes-graphics/xcb/xcb-proto-1.6/aclocal.patch
+++ /dev/null
@@ -1,22 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3diff -ruN xcb-proto-1.6-orig/aclocal.m4 xcb-proto-1.6/aclocal.m4
4--- xcb-proto-1.6-orig/aclocal.m4 2011-07-08 15:45:33.000000000 +0800
5+++ xcb-proto-1.6/aclocal.m4 2011-07-08 15:48:19.000000000 +0800
6@@ -518,6 +518,7 @@
7 dnl general consensus is that you shouldn't need this ability.
8
9 AC_SUBST([PYTHON_PREFIX], ['${prefix}'])
10+ AC_SUBST([PYTHON_LIB_PREFIX], ['${libdir}'])
11 AC_SUBST([PYTHON_EXEC_PREFIX], ['${exec_prefix}'])
12
13 dnl At times (like when building shared libraries) you may want
14@@ -546,7 +547,7 @@
15 am_py_prefix=$prefix
16 fi
17 am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null ||
18- echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
19+ echo "$PYTHON_LIB_PREFIX/python$PYTHON_VERSION/site-packages"`
20 case $am_cv_python_pythondir in
21 $am_py_prefix*)
22 am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
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
new file mode 100644
index 0000000000..708f329590
--- /dev/null
+++ b/meta/recipes-graphics/xcb/xcb-proto-1.6/xcb-proto-libdir.patch
@@ -0,0 +1,14 @@
1Upstream-Status: Inappropriate [embedded specific]
2
3Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
4
5Index: xcb-proto-1.6/xcb-proto.pc.in
6===================================================================
7--- xcb-proto-1.6.orig/xcb-proto.pc.in
8+++ xcb-proto-1.6/xcb-proto.pc.in
9@@ -1,4 +1,5 @@
10 prefix=@prefix@
11+libdir=@libdir@
12 datarootdir=@datarootdir@
13 datadir=@datadir@
14 xcbincludedir=@xcbincludedir@
diff --git a/meta/recipes-graphics/xcb/xcb-proto.inc b/meta/recipes-graphics/xcb/xcb-proto.inc
index 76688c9ebc..85f89be48d 100644
--- a/meta/recipes-graphics/xcb/xcb-proto.inc
+++ b/meta/recipes-graphics/xcb/xcb-proto.inc
@@ -10,7 +10,7 @@ SECTION = "x11/libs"
10LICENSE = "MIT-X" 10LICENSE = "MIT-X"
11 11
12SRC_URI = "http://xcb.freedesktop.org/dist/xcb-proto-${PV}.tar.bz2 \ 12SRC_URI = "http://xcb.freedesktop.org/dist/xcb-proto-${PV}.tar.bz2 \
13 file://aclocal.patch" 13 file://xcb-proto-libdir.patch"
14 14
15inherit autotools pkgconfig 15inherit autotools pkgconfig
16 16
diff --git a/meta/recipes-graphics/xcb/xcb-proto_1.6.bb b/meta/recipes-graphics/xcb/xcb-proto_1.6.bb
index 1868f1aa86..9d35596627 100644
--- a/meta/recipes-graphics/xcb/xcb-proto_1.6.bb
+++ b/meta/recipes-graphics/xcb/xcb-proto_1.6.bb
@@ -4,7 +4,7 @@ LICENSE = "MIT"
4LIC_FILES_CHKSUM = "file://COPYING;md5=d763b081cb10c223435b01e00dc0aba7 \ 4LIC_FILES_CHKSUM = "file://COPYING;md5=d763b081cb10c223435b01e00dc0aba7 \
5 file://src/dri2.xml;beginline=2;endline=28;md5=f8763b13ff432e8597e0d610cf598e65" 5 file://src/dri2.xml;beginline=2;endline=28;md5=f8763b13ff432e8597e0d610cf598e65"
6 6
7PR = "r2" 7PR = "r3"
8 8
9SRC_URI[md5sum] = "04313e1d914b44d0e457f6c494fc178b" 9SRC_URI[md5sum] = "04313e1d914b44d0e457f6c494fc178b"
10SRC_URI[sha256sum] = "f52bc1159b12496f002404eb5793c01277b20c82cb72c5ff076d7b25da9b5ca2" 10SRC_URI[sha256sum] = "f52bc1159b12496f002404eb5793c01277b20c82cb72c5ff076d7b25da9b5ca2"
diff --git a/meta/recipes-graphics/xcb/xcb-proto_git.bb b/meta/recipes-graphics/xcb/xcb-proto_git.bb
index 27112137d0..4358feee71 100644
--- a/meta/recipes-graphics/xcb/xcb-proto_git.bb
+++ b/meta/recipes-graphics/xcb/xcb-proto_git.bb
@@ -3,7 +3,7 @@ DEFAULT_PREFERENCE = "-1"
3include xcb-proto.inc 3include xcb-proto.inc
4SRCREV = "d81ca233e98be8fa59e8c90d262c0516944c5a66" 4SRCREV = "d81ca233e98be8fa59e8c90d262c0516944c5a66"
5PV = "1.2+gitr${SRCPV}" 5PV = "1.2+gitr${SRCPV}"
6PR = "r2" 6PR = "r3"
7 7
8SRC_URI = "git://anongit.freedesktop.org/git/xcb/proto;protocol=git" 8SRC_URI = "git://anongit.freedesktop.org/git/xcb/proto;protocol=git"
9S = "${WORKDIR}/git" 9S = "${WORKDIR}/git"