summaryrefslogtreecommitdiffstats
path: root/meta/packages/libmatchbox
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 /meta/packages/libmatchbox
parent2b7886853c16ebffce2582ec9a9734ed98324fac (diff)
downloadpoky-ef4165900c3eb118f809996bb9ad2aa3f7bb10e6.tar.gz
libmatchbox: Drop 1.7 (old version), use autotools_stage instead of broken custom staging function
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/packages/libmatchbox')
-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 8f9fe6d6a0..da86970ca6 100644
--- a/meta/packages/libmatchbox/libmatchbox.inc
+++ b/meta/packages/libmatchbox/libmatchbox.inc
@@ -2,22 +2,9 @@ SECTION = "x11/libs"
2DESCRIPTION = "Matchbox window manager core library" 2DESCRIPTION = "Matchbox window manager core library"
3LICENSE = "GPL" 3LICENSE = "GPL"
4DEPENDS = "virtual/libx11 libxext expat libxft jpeg libpng zlib libxsettings-client startup-notification" 4DEPENDS = "virtual/libx11 libxext expat libxft jpeg libpng zlib libxsettings-client startup-notification"
5PR="r3"
6 5
7inherit autotools pkgconfig 6inherit autotools_stage pkgconfig
8 7
9EXTRA_OECONF = "--enable-jpeg --enable-expat --enable-xsettings --enable-startup-notification" 8EXTRA_OECONF = "--enable-jpeg --enable-expat --enable-xsettings --enable-startup-notification"
10 9
11S = "${WORKDIR}/libmatchbox-${PV}" 10S = "${WORKDIR}/libmatchbox-${PV}"
12
13headers = "hash.h mbconfig.h mbdotdesktop.h mbexp.h \
14 mb.h mbmenu.h mbpixbuf.h mbtray.h mbutil.h"
15
16do_stage () {
17 install -d ${STAGING_INCDIR}/libmb
18 for h in ${headers}; do
19 install -m 0644 ${S}/libmb/$h ${STAGING_INCDIR}/libmb/
20 done
21
22 oe_libinstall -a -so -C libmb libmb ${STAGING_LIBDIR}
23}
diff --git a/meta/packages/libmatchbox/libmatchbox_1.7.bb b/meta/packages/libmatchbox/libmatchbox_1.7.bb
deleted file mode 100644
index be6d1884d6..0000000000
--- a/meta/packages/libmatchbox/libmatchbox_1.7.bb
+++ /dev/null
@@ -1,8 +0,0 @@
1require libmatchbox.inc
2
3SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/${PV}/${PN}-${PV}.tar.gz \
4 file://check.m4"
5
6do_configure_prepend () {
7 cp ${WORKDIR}/check.m4 ${S}/
8}
diff --git a/meta/packages/libmatchbox/libmatchbox_1.9.bb b/meta/packages/libmatchbox/libmatchbox_1.9.bb
index a0c5e272c0..7e20feee2c 100644
--- a/meta/packages/libmatchbox/libmatchbox_1.9.bb
+++ b/meta/packages/libmatchbox/libmatchbox_1.9.bb
@@ -1,6 +1,6 @@
1require libmatchbox.inc 1require libmatchbox.inc
2 2
3PR = "r5" 3PR = "r6"
4 4
5SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/${PV}/${PN}-${PV}.tar.gz \ 5SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/${PV}/${PN}-${PV}.tar.gz \
6 file://16bppfixes.patch;patch=1 \ 6 file://16bppfixes.patch;patch=1 \
diff --git a/meta/packages/libmatchbox/libmatchbox_svn.bb b/meta/packages/libmatchbox/libmatchbox_svn.bb
index f203da56c5..52c1cc5728 100644
--- a/meta/packages/libmatchbox/libmatchbox_svn.bb
+++ b/meta/packages/libmatchbox/libmatchbox_svn.bb
@@ -1,6 +1,7 @@
1require libmatchbox.inc 1require libmatchbox.inc
2 2
3PV = "1.7+svnr${SRCREV}" 3PV = "1.7+svnr${SRCREV}"
4PR = "r3"
4DEFAULT_PREFERENCE = "-1" 5DEFAULT_PREFERENCE = "-1"
5 6
6SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \ 7SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \