wxwidgets: fix packaging/staging.

* upgrade 2.6.3 to 2.6.4 (old stable)
* add 2.8.7 (new stable, DEFAULT)
* fix packaging/staging following wxbase, unify

3 files changed, 62 insertions, 4 deletions

diff --git a/packages/wxwidgets/wxwidgets_2.6.3.bb b/packages/wxwidgets/wxwidgets.inc
index 0cd88334b3..1e4cd0b6bb 100644
--- a/packages/wxwidgets/wxwidgets_2.6.3.bb
+++ b/packages/wxwidgets/wxwidgets.inc
@@ -2,16 +2,19 @@ DESCRIPTION = "wxWidgets is a cross platform application framework utilizing nat
 HOMEPAGE = "http://www.wxwidgets.org"
 SECTION = "x11/libs"
 LICENSE = "GPL"
-DEPENDS = "gtk+"
-PR = "r0"
+DEPENDS = "gtk+ jpeg tiff libpng zlib expat"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/wxwindows/wxWidgets-${PV}.tar.gz"
+
 S = "${WORKDIR}/wxWidgets-${PV}"
 
 inherit autotools pkgconfig
 
+EXTRA_OECONF = " --enable-gpe "
+
 do_configure() {
-	oe_runconf
+       oe_runconf
 }
 
-#FIXME add sane packaging
+FILES_${PN} += "${libdir}/wx/config"
+FILES_${PN}-dev += "${libdir}/wx/include ${datadir}/bakefile"
diff --git a/packages/wxwidgets/wxwidgets_2.6.4.bb b/packages/wxwidgets/wxwidgets_2.6.4.bb
new file mode 100644
index 0000000000..775cf90587
--- /dev/null
+++ b/packages/wxwidgets/wxwidgets_2.6.4.bb
@@ -0,0 +1,30 @@
+require wxwidgets.inc
+
+PR = "r0"
+
+LEAD_SONAME = "libwx_gtk2_core-2.6.so"
+
+do_stage() {
+       install -d ${STAGING_INCDIR}/wx-2.6/wx
+       cp -pR include/wx ${STAGING_INCDIR}/wx-2.6
+       cp -pR lib/libwx* ${STAGING_LIBDIR}
+       cp -pR lib/wx     ${STAGING_LIBDIR}
+       cp -pR build/bakefiles/wxpresets/presets  ${STAGING_DATADIR}/bakefile
+       cp -pR wxwin.m4                           ${STAGING_DATADIR}/aclocal
+       ln -sf ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}gtk2-ansi-release-2.6 ${STAGING_BINDIR_CROSS}/wx-config
+       sed -e s,'wxconfdir=".*"','wxconfigdir="${STAGING_LIBDIR}/wx/config"', \
+           -e s,'bindir=".*"','bindir="${STAGING_BINDIR}"', \
+           -e s,'libdir=".*"','libdir="${STAGING_LIBDIR}"', \
+           -e s,'includedir=".*"','includedir="${STAGING_INCDIR}"', \
+           -i ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}gtk2-ansi-release-2.6
+}
+
+do_install() {
+       oe_runmake 'DESTDIR=${D}' install
+       ln -sf  ${libdir}/wx/config/${TARGET_PREFIX}gtk2-ansi-release-2.6 ${D}${bindir}/wx-config
+       install -d ${D}${docdir}/${PN}-${PV}
+       install -m 644 -p CHANGES.txt     ${D}${docdir}/${PN}-${PV}
+       install -m 644 -p COPYING.LIB     ${D}${docdir}/${PN}-${PV}
+       install -m 644 -p LICENCE.txt     ${D}${docdir}/${PN}-${PV}
+       install -m 644 -p README.txt      ${D}${docdir}/${PN}-${PV}
+}
diff --git a/packages/wxwidgets/wxwidgets_2.8.7.bb b/packages/wxwidgets/wxwidgets_2.8.7.bb
new file mode 100644
index 0000000000..8e8d3565fd
--- /dev/null
+++ b/packages/wxwidgets/wxwidgets_2.8.7.bb
@@ -0,0 +1,25 @@
+require wxwidgets.inc
+
+PR = "r0"
+
+LEAD_SONAME = "libwx_gtk2_core-2.8.so"
+
+do_stage() {
+       install -d ${STAGING_INCDIR}/wx-2.8/wx
+       cp -pR include/wx ${STAGING_INCDIR}/wx-2.8
+       cp -pR lib/libwx* ${STAGING_LIBDIR}
+       cp -pR lib/wx     ${STAGING_LIBDIR}
+       cp -pR build/bakefiles/wxpresets/presets  ${STAGING_DATADIR}/bakefile
+       cp -pR wxwin.m4                           ${STAGING_DATADIR}/aclocal
+       ln -sf ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}gtk2-ansi-release-2.8 ${STAGING_BINDIR_CROSS}/wx-config
+       sed -e s,'wxconfdir=".*"','wxconfigdir="${STAGING_LIBDIR}/wx/config"', \
+           -e s,'bindir=".*"','bindir="${STAGING_BINDIR}"', \
+           -e s,'libdir=".*"','libdir="${STAGING_LIBDIR}"', \
+           -e s,'includedir=".*"','includedir="${STAGING_INCDIR}"', \
+           -i ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}gtk2-ansi-release-2.8
+}
+
+do_install() {
+       oe_runmake 'DESTDIR=${D}' install
+       ln -sf  ${libdir}/wx/config/${TARGET_PREFIX}gtk2-ansi-release-2.8 ${D}${bindir}/wx-config
+}