[oe-commits] org.oe.dev wxwidgets: fix packaging/staging.

[xjqian commit]

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

Author: xjqian at openembedded.org
Branch: org.openembedded.dev
Revision: 290d13f5204ac50425e5a0fd373b84838a68cbc2
ViewMTN: http://monotone.openembedded.org/revision/info/290d13f5204ac50425e5a0fd373b84838a68cbc2
Files:
1
packages/wxwidgets/wxwidgets_2.6.3.bb
packages/wxwidgets/wxwidgets_2.8.7.bb
packages/wxwidgets/wxwidgets.inc
packages/wxwidgets/wxwidgets_2.6.4.bb
Diffs:

#
# mt diff -re451e643804112f13df8ec67c5e1833a5c6771f9 -r290d13f5204ac50425e5a0fd373b84838a68cbc2
#
#
#
# rename "packages/wxwidgets/wxwidgets_2.6.3.bb"
#     to "packages/wxwidgets/wxwidgets_2.8.7.bb"
# 
# add_file "packages/wxwidgets/wxwidgets.inc"
#  content [eccb35a8930a1ba389f737f0dba48b967cdee4b1]
# 
# add_file "packages/wxwidgets/wxwidgets_2.6.4.bb"
#  content [53e280a19decc87006f8d10412a482d67ada6c82]
# 
# patch "packages/wxwidgets/wxwidgets_2.8.7.bb"
#  from [fc1afd8d31bcfa1da4f98844e54b445e550ec02b]
#    to [ae1f88cb8a91f0395b7105c031dd88471e2709c0]
#
============================================================
--- packages/wxwidgets/wxwidgets.inc	eccb35a8930a1ba389f737f0dba48b967cdee4b1
+++ packages/wxwidgets/wxwidgets.inc	eccb35a8930a1ba389f737f0dba48b967cdee4b1
@@ -0,0 +1,20 @@
+DESCRIPTION = "wxWidgets is a cross platform application framework utilizing native widgets."
+HOMEPAGE = "http://www.wxwidgets.org"
+SECTION = "x11/libs"
+LICENSE = "GPL"
+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
+}
+
+FILES_${PN} += "${libdir}/wx/config"
+FILES_${PN}-dev += "${libdir}/wx/include ${datadir}/bakefile"
============================================================
--- packages/wxwidgets/wxwidgets_2.6.4.bb	53e280a19decc87006f8d10412a482d67ada6c82
+++ packages/wxwidgets/wxwidgets_2.6.4.bb	53e280a19decc87006f8d10412a482d67ada6c82
@@ -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}
+}
============================================================
--- packages/wxwidgets/wxwidgets_2.6.3.bb	fc1afd8d31bcfa1da4f98844e54b445e550ec02b
+++ packages/wxwidgets/wxwidgets_2.8.7.bb	ae1f88cb8a91f0395b7105c031dd88471e2709c0
@@ -1,17 +1,25 @@
-DESCRIPTION = "wxWidgets is a cross platform application framework utilizing native widgets."
-HOMEPAGE = "http://www.wxwidgets.org"
-SECTION = "x11/libs"
-LICENSE = "GPL"
-DEPENDS = "gtk+"
+require wxwidgets.inc
+
 PR = "r0"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/wxwindows/wxWidgets-${PV}.tar.gz"
-S = "${WORKDIR}/wxWidgets-${PV}"
+LEAD_SONAME = "libwx_gtk2_core-2.8.so"
 
-inherit autotools pkgconfig
-
-do_configure() {
-	oe_runconf
+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
+}
-#FIXME add sane packaging