diff options
| author | Richard Purdie <rpurdie@linux.intel.com> | 2010-01-07 17:01:35 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-01-07 17:01:35 +0000 |
| commit | 4863664ca61c25f9e4616aa282a0a8d412b62188 (patch) | |
| tree | 02615552782b186361aa8fd763a21f71ba6fb1b0 /meta/packages/xcb | |
| parent | 7111f8318b1db2d93a6795172f23108589364e16 (diff) | |
| parent | d273811c5bb132d27f5616a80db9e9888ce0e4cd (diff) | |
| download | openembedded-core-4863664ca61c25f9e4616aa282a0a8d412b62188.tar.gz openembedded-core-4863664ca61c25f9e4616aa282a0a8d412b62188.tar.bz2 openembedded-core-4863664ca61c25f9e4616aa282a0a8d412b62188.tar.xz openembedded-core-4863664ca61c25f9e4616aa282a0a8d412b62188.zip | |
Merge branch 'master' of ssh://gitserver@git.pokylinux.org/poky
Diffstat (limited to 'meta/packages/xcb')
| -rw-r--r-- | meta/packages/xcb/libxcb.inc | 4 | ||||
| -rw-r--r-- | meta/packages/xcb/xcb-proto.inc | 5 | ||||
| -rw-r--r-- | meta/packages/xcb/xcb-proto_1.5.bb | 2 | ||||
| -rw-r--r-- | meta/packages/xcb/xcb-proto_git.bb | 4 |
4 files changed, 8 insertions, 7 deletions
diff --git a/meta/packages/xcb/libxcb.inc b/meta/packages/xcb/libxcb.inc index ee46f598c..53c4e1b18 100644 --- a/meta/packages/xcb/libxcb.inc +++ b/meta/packages/xcb/libxcb.inc @@ -4,7 +4,7 @@ LICENSE = "MIT-X" HOMEPAGE = "http://xcb.freedesktop.org" PARALLEL_MAKE = "" -DEPENDS = "xcb-proto xproto libxau libxslt-native" +DEPENDS = "xcb-proto xproto libxau libxslt-native xcb-proto-native" # DEPENDS += "xsltproc-native gperf-native" SRC_URI = "http://xcb.freedesktop.org/dist/libxcb-${PV}.tar.bz2" @@ -40,7 +40,7 @@ FILES_libxcb-xtest = "${libdir}/libxcb-xtest.so.*" FILES_libxcb-xv = "${libdir}/libxcb-xv.so.*" FILES_libxcb-xvmc = "${libdir}/libxcb-xvmc.so.*" -inherit autotools_stage pkgconfig +inherit autotools pkgconfig # XCBPROTO_XCBINCLUDEDIR is setup based on `pkg-config --variable=xcbincludedir xcb-proto` # but the xcbincludedir variable doesn't point into the staging area, so it needs some diff --git a/meta/packages/xcb/xcb-proto.inc b/meta/packages/xcb/xcb-proto.inc index b294d1ac5..2a3d9ea20 100644 --- a/meta/packages/xcb/xcb-proto.inc +++ b/meta/packages/xcb/xcb-proto.inc @@ -5,9 +5,12 @@ HOMEPAGE = "http://xcb.freedesktop.org" SRC_URI = "http://xcb.freedesktop.org/dist/xcb-proto-${PV}.tar.bz2" -inherit autotools_stage pkgconfig +inherit autotools pkgconfig FILES_${PN}-dev += "${datadir}/xcb/*.xml" RDEPENDS_${PN}-dev = "" RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPV})" + +DEPENDS_append_virtclass-native = " python-native" +BBCLASSEXTEND = "native" diff --git a/meta/packages/xcb/xcb-proto_1.5.bb b/meta/packages/xcb/xcb-proto_1.5.bb index e602252d9..8aaa9a0c5 100644 --- a/meta/packages/xcb/xcb-proto_1.5.bb +++ b/meta/packages/xcb/xcb-proto_1.5.bb @@ -1,2 +1,2 @@ include xcb-proto.inc -PR = "r1" +PR = "r2" diff --git a/meta/packages/xcb/xcb-proto_git.bb b/meta/packages/xcb/xcb-proto_git.bb index 6eaa0dd27..b96fc121c 100644 --- a/meta/packages/xcb/xcb-proto_git.bb +++ b/meta/packages/xcb/xcb-proto_git.bb @@ -2,9 +2,7 @@ DEFAULT_PREFERENCE = "-1" include xcb-proto.inc PV = "1.2+gitr${SRCREV}" +PR = "r1" SRC_URI = "git://anongit.freedesktop.org/git/xcb/proto;protocol=git" S = "${WORKDIR}/git" - -DEPENDS_append_virtclass-native = " python-native" -BBCLASSEXTEND = "native" |