summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-graphics/xcb/xcb-proto-1.6/aclocal.patch22
-rw-r--r--meta/recipes-graphics/xcb/xcb-proto.inc3
-rw-r--r--meta/recipes-graphics/xcb/xcb-proto_1.6.bb2
-rw-r--r--meta/recipes-graphics/xcb/xcb-proto_git.bb2
4 files changed, 26 insertions, 3 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
new file mode 100644
index 0000000000..124f146345
--- /dev/null
+++ b/meta/recipes-graphics/xcb/xcb-proto-1.6/aclocal.patch
@@ -0,0 +1,22 @@
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.inc b/meta/recipes-graphics/xcb/xcb-proto.inc
index cd7e115174..76688c9ebc 100644
--- a/meta/recipes-graphics/xcb/xcb-proto.inc
+++ b/meta/recipes-graphics/xcb/xcb-proto.inc
@@ -9,7 +9,8 @@ BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=XCB"
9SECTION = "x11/libs" 9SECTION = "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 14
14inherit autotools pkgconfig 15inherit autotools pkgconfig
15 16
diff --git a/meta/recipes-graphics/xcb/xcb-proto_1.6.bb b/meta/recipes-graphics/xcb/xcb-proto_1.6.bb
index 3133977678..1868f1aa86 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 = "r1" 7PR = "r2"
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 01a7d912f7..27112137d0 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 = "r1" 6PR = "r2"
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"