Merge bk://oe-devel.bkbits.net/openembedded

into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/01/18 16:56:52-05:00 handhelds.org!kergoth
Merge oe-devel@oe-devel.bkbits.net:openembedded
into handhelds.org:/home/kergoth/code/openembedded

2005/01/18 16:56:36-05:00 handhelds.org!kergoth
libmatchbox: consolodate metadata into a .inc, remove version 1.1, add patch to fix build with automake 1.9.x.

BKrev: 41ed9048YWbLJhGGoGGKXLiWwKtPqQ

diff --git a/packages/libmatchbox/libmatchbox_1.1.bb b/packages/libmatchbox/files/autofoo.patch
similarity index 100%
rename from packages/libmatchbox/libmatchbox_1.1.bb
rename to packages/libmatchbox/files/autofoo.patch

diff --git a/packages/libmatchbox/libmatchbox.inc b/packages/libmatchbox/libmatchbox.inc
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/libmatchbox/libmatchbox_1.2.bb b/packages/libmatchbox/libmatchbox_1.2.bb
index e69de29..533577b 100644 (file)
--- a/packages/libmatchbox/libmatchbox_1.2.bb
+++ b/packages/libmatchbox/libmatchbox_1.2.bb
@@ -0,0 +1,6 @@
+include libmatchbox.inc
+
+PR = "r2"
+
+SRC_URI = "ftp://ftp.handhelds.org/matchbox/sources/libmatchbox/${PV}/libmatchbox-${PV}.tar.bz2 \
+          file://autofoo.patch;patch=1"

diff --git a/packages/libmatchbox/libmatchbox_1.3.bb b/packages/libmatchbox/libmatchbox_1.3.bb
index e69de29..876b052 100644 (file)
--- a/packages/libmatchbox/libmatchbox_1.3.bb
+++ b/packages/libmatchbox/libmatchbox_1.3.bb
@@ -0,0 +1,6 @@
+include libmatchbox.inc
+
+PR = "r1"
+
+SRC_URI = "ftp://ftp.handhelds.org/matchbox/sources/libmatchbox/${PV}/libmatchbox-${PV}.tar.bz2 \
+          file://autofoo.patch;patch=1"

diff --git a/packages/libmatchbox/libmatchbox_1.4.bb b/packages/libmatchbox/libmatchbox_1.4.bb
index e69de29..876b052 100644 (file)
--- a/packages/libmatchbox/libmatchbox_1.4.bb
+++ b/packages/libmatchbox/libmatchbox_1.4.bb
@@ -0,0 +1,6 @@
+include libmatchbox.inc
+
+PR = "r1"
+
+SRC_URI = "ftp://ftp.handhelds.org/matchbox/sources/libmatchbox/${PV}/libmatchbox-${PV}.tar.bz2 \
+          file://autofoo.patch;patch=1"

diff --git a/packages/libmatchbox/libmatchbox_1.5.bb b/packages/libmatchbox/libmatchbox_1.5.bb
index e69de29..dc049b3 100644 (file)
--- a/packages/libmatchbox/libmatchbox_1.5.bb
+++ b/packages/libmatchbox/libmatchbox_1.5.bb
@@ -0,0 +1,11 @@
+include libmatchbox.inc
+
+PR = "r1"
+
+SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/${PV}/${PN}-${PV}.tar.gz \
+          file://check.m4 \
+          file://autofoo.patch;patch=1"
+
+do_configure_prepend () {
+       mv ${WORKDIR}/check.m4 ${S}/
+}

diff --git a/packages/libmatchbox/libmatchbox_svn.bb b/packages/libmatchbox/libmatchbox_svn.bb
index 8aeac87..6e0245b 100644 (file)
--- a/packages/libmatchbox/libmatchbox_svn.bb
+++ b/packages/libmatchbox/libmatchbox_svn.bb
@@ -1,32 +1,12 @@
-SECTION = "x11/libs"
-DESCRIPTION = "Matchbox window manager core library"
-LICENSE = "GPL"
-DEPENDS = "x11 xext libxft pango jpeg libpng zlib libxsettings-client"
+include libmatchbox.inc
+
 PV = "1.5cvs${CVSDATE}"
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http\
-               file://check.m4"
-inherit autotools  pkgconfig
-
-EXTRA_OECONF = "--enable-jpeg --enable-pango --enable-xsettings"
-
-S = ${WORKDIR}/${PN}
-
-headers = "hash.h mbconfig.h mbdotdesktop.h mbexp.h \
-          mb.h mbmenu.h mbpixbuf.h mbtray.h mbutil.h"
+          file://check.m4"
+S = "${WORKDIR}/libmatchbox"
 
 do_configure_prepend () {
         mv ${WORKDIR}/check.m4 ${S}/
 }
-
-
-
-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}
-}