summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-07-08 13:49:49 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2009-07-08 13:49:49 +0100
commitef4165900c3eb118f809996bb9ad2aa3f7bb10e6 (patch)
tree35e59b05939a109e41aca9959475cfd475da85c8
parent2b7886853c16ebffce2582ec9a9734ed98324fac (diff)
downloadopenembedded-core-ef4165900c3eb118f809996bb9ad2aa3f7bb10e6.tar.gz
openembedded-core-ef4165900c3eb118f809996bb9ad2aa3f7bb10e6.tar.bz2
openembedded-core-ef4165900c3eb118f809996bb9ad2aa3f7bb10e6.tar.xz
openembedded-core-ef4165900c3eb118f809996bb9ad2aa3f7bb10e6.zip
libmatchbox: Drop 1.7 (old version), use autotools_stage instead of broken custom staging function
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r--meta/packages/libmatchbox/libmatchbox.inc15
-rw-r--r--meta/packages/libmatchbox/libmatchbox_1.7.bb8
-rw-r--r--meta/packages/libmatchbox/libmatchbox_1.9.bb2
-rw-r--r--meta/packages/libmatchbox/libmatchbox_svn.bb1
4 files changed, 3 insertions, 23 deletions
diff --git a/meta/packages/libmatchbox/libmatchbox.inc b/meta/packages/libmatchbox/libmatchbox.inc
index 8f9fe6d6a..da86970ca 100644
--- a/meta/packages/libmatchbox/libmatchbox.inc
+++ b/meta/packages/libmatchbox/libmatchbox.inc
@@ -2,22 +2,9 @@ SECTION = "x11/libs"
DESCRIPTION = "Matchbox window manager core library"
LICENSE = "GPL"
DEPENDS = "virtual/libx11 libxext expat libxft jpeg libpng zlib libxsettings-client startup-notification"
-PR="r3"
-inherit autotools pkgconfig
+inherit autotools_stage pkgconfig
EXTRA_OECONF = "--enable-jpeg --enable-expat --enable-xsettings --enable-startup-notification"
S = "${WORKDIR}/libmatchbox-${PV}"
-
-headers = "hash.h mbconfig.h mbdotdesktop.h mbexp.h \
- mb.h mbmenu.h mbpixbuf.h mbtray.h mbutil.h"
-
-do_stage () {
- install -d ${STAGING_INCDIR}/libmb
- for h in ${headers}; do
- install -m 0644 ${S}/libmb/$h ${STAGING_INCDIR}/libmb/
- done
-
- oe_libinstall -a -so -C libmb libmb ${STAGING_LIBDIR}
-}
diff --git a/meta/packages/libmatchbox/libmatchbox_1.7.bb b/meta/packages/libmatchbox/libmatchbox_1.7.bb
deleted file mode 100644
index be6d1884d..000000000
--- a/meta/packages/libmatchbox/libmatchbox_1.7.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require libmatchbox.inc
-
-SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/${PV}/${PN}-${PV}.tar.gz \
- file://check.m4"
-
-do_configure_prepend () {
- cp ${WORKDIR}/check.m4 ${S}/
-}
diff --git a/meta/packages/libmatchbox/libmatchbox_1.9.bb b/meta/packages/libmatchbox/libmatchbox_1.9.bb
index a0c5e272c..7e20feee2 100644
--- a/meta/packages/libmatchbox/libmatchbox_1.9.bb
+++ b/meta/packages/libmatchbox/libmatchbox_1.9.bb
@@ -1,6 +1,6 @@
require libmatchbox.inc
-PR = "r5"
+PR = "r6"
SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/${PV}/${PN}-${PV}.tar.gz \
file://16bppfixes.patch;patch=1 \
diff --git a/meta/packages/libmatchbox/libmatchbox_svn.bb b/meta/packages/libmatchbox/libmatchbox_svn.bb
index f203da56c..52c1cc572 100644
--- a/meta/packages/libmatchbox/libmatchbox_svn.bb
+++ b/meta/packages/libmatchbox/libmatchbox_svn.bb
@@ -1,6 +1,7 @@
require libmatchbox.inc
PV = "1.7+svnr${SRCREV}"
+PR = "r3"
DEFAULT_PREFERENCE = "-1"
SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \