diff options
author | Junqian Gordon Xu <xjqian@gmail.com> | 2008-09-27 19:53:32 +0000 |
---|---|---|
committer | Junqian Gordon Xu <xjqian@gmail.com> | 2008-09-27 19:53:32 +0000 |
commit | 4b480ed9b5e8b00979544cc87551e5c677f2da8b (patch) | |
tree | 77769760a9b2a0ba14153ee94ce9d40d68cc5d15 | |
parent | 3126ae1b52cd8a69e52d474bb48fdc14d3322b44 (diff) | |
download | openembedded-4b480ed9b5e8b00979544cc87551e5c677f2da8b.tar.gz |
wxbase/wxwidgets: update to 2.8.9
* fix 2.6.4 (old upstream stable)
* close bug# 4038
plucked revisions from dev
d6af6dba9834b2c5eb9f897be65fe07603a9495f
e451e643804112f13df8ec67c5e1833a5c6771f9
290d13f5204ac50425e5a0fd373b84838a68cbc2
719de3c75109455b02f16d45f275877124af83ac
acked by xjqian
applied changes from 73025f379fa2b46b633e0fd0512bd0f9fc655491
through 719de3c75109455b02f16d45f275877124af83ac
-rw-r--r-- | conf/distro/include/angstrom-2007-preferred-versions.inc | 3 | ||||
-rw-r--r-- | packages/wxbase/wxbase_2.7+cvs.bb | 53 | ||||
-rw-r--r-- | packages/wxwidgets/wxbase-2.8.9/.mtn2git_empty | 0 | ||||
-rw-r--r-- | packages/wxwidgets/wxbase-2.8.9/Makefile.in.patch | 18 | ||||
-rw-r--r-- | packages/wxwidgets/wxbase.inc | 17 | ||||
-rw-r--r-- | packages/wxwidgets/wxbase_2.6.4.bb (renamed from packages/wxbase/wxbase_2.6.2.bb) | 29 | ||||
-rw-r--r-- | packages/wxwidgets/wxbase_2.8.9.bb | 36 | ||||
-rw-r--r-- | packages/wxwidgets/wxwidgets.inc (renamed from packages/wxwidgets/wxwidgets_2.6.3.bb) | 11 | ||||
-rw-r--r-- | packages/wxwidgets/wxwidgets_2.6.4.bb | 30 | ||||
-rw-r--r-- | packages/wxwidgets/wxwidgets_2.8.9.bb | 25 |
10 files changed, 140 insertions, 82 deletions
diff --git a/conf/distro/include/angstrom-2007-preferred-versions.inc b/conf/distro/include/angstrom-2007-preferred-versions.inc index d649b546b9..a2828a701b 100644 --- a/conf/distro/include/angstrom-2007-preferred-versions.inc +++ b/conf/distro/include/angstrom-2007-preferred-versions.inc @@ -1971,7 +1971,8 @@ PREFERRED_VERSION_wview-vpro ?= "3.1.3" PREFERRED_VERSION_wview-vpro-mysql ?= "3.1.3" PREFERRED_VERSION_wview-wxt510 ?= "3.1.3" PREFERRED_VERSION_wview-wxt510-mysql ?= "3.1.3" -PREFERRED_VERSION_wxwidgets ?= "2.6.3" +PREFERRED_VERSION_wxbase ?= "2.8.9" +PREFERRED_VERSION_wxwidgets ?= "2.8.9" PREFERRED_VERSION_x11perf ?= "1.4.1" PREFERRED_VERSION_x11vnc ?= "0.9.3" PREFERRED_VERSION_xaos ?= "3.2.3" diff --git a/packages/wxbase/wxbase_2.7+cvs.bb b/packages/wxbase/wxbase_2.7+cvs.bb deleted file mode 100644 index 772ea4e27f..0000000000 --- a/packages/wxbase/wxbase_2.7+cvs.bb +++ /dev/null @@ -1,53 +0,0 @@ -DESCRIPTION = "wxBase is a library for programming \ -non-GUI (console) applications using the base wxWidgets functionality." -HOMEPAGE = "http://www.wxwidgets.org/" -LICENSE = "GPL" -SECTION = "libs" -PRIORITY = "optional" -DEPENDS = "jpeg libpng zlib" - - -SRC_URI = "http://biolpc22.york.ac.uk/pub/CVS_HEAD/v1/wx-cvs-Gtk.tar.bz2" -#SRC_URI = "${SOURCEFORGE_MIRROR}/wxwindows/wxBase-${PV}.tar.bz2" - -S = "${WORKDIR}/wxGTK" - -inherit autotools pkgconfig - -EXTRA_OECONF = "--disable-gui --enable-largefile" - -LEAD_SONAME = "libwx_base-2.7*" - -do_configure() { - oe_runconf -} - -do_stage() { - install -d ${STAGING_INCDIR}/wx-2.7/wx - cp -pR include/wx ${STAGING_INCDIR}/wx-2.7 - 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}base-ansi-release-2.7 ${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}base-ansi-release-2.7 -} - -FILES_${PN} += " \ - ${libdir}/wx/config" - -FILES_${PN}-dev += " \ - ${libdir}/wx/include \ - ${datadir}/bakefile" - -do_install() { - oe_runmake 'DESTDIR=${D}' install - ln -sf ${libdir}/wx/config/${TARGET_PREFIX}base-ansi-release-2.7 ${D}${bindir}/wx-config - install -d ${D}${docdir}/${PN}-${PV} - install -m 644 -p docs/*.txt ${D}${docdir}/${PN}-${PV} - install -m 644 -p docs/*.htm ${D}${docdir}/${PN}-${PV} -} diff --git a/packages/wxwidgets/wxbase-2.8.9/.mtn2git_empty b/packages/wxwidgets/wxbase-2.8.9/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/wxwidgets/wxbase-2.8.9/.mtn2git_empty diff --git a/packages/wxwidgets/wxbase-2.8.9/Makefile.in.patch b/packages/wxwidgets/wxbase-2.8.9/Makefile.in.patch new file mode 100644 index 0000000000..4081212bc5 --- /dev/null +++ b/packages/wxwidgets/wxbase-2.8.9/Makefile.in.patch @@ -0,0 +1,18 @@ +--- wxBase-2.8.9/Makefile.in.old 2008-09-22 10:13:30.000000000 -0500 ++++ wxBase-2.8.9/Makefile.in 2008-09-22 10:17:44.000000000 -0500 +@@ -11339,13 +11339,11 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = + + ### Targets: ### + +-all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxodbc___depname) $(__wxexpat___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__wxrc___depname) $(__cocoa_res___depname) ++all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxodbc___depname) $(__wxexpat___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__qadll___depname) $(__qalib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__wxrc___depname) $(__cocoa_res___depname) + +-install: all $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxodbc___depname) $(__install_wxexpat___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_mediadll___depname) $(__install_medialib___depname) $(__install_odbcdll___depname) $(__install_odbclib___depname) $(__install_dbgriddll___depname) $(__install_dbgridlib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_auidll___depname) $(__install_auilib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install $(__cocoa_res_install___depname) ++install: all $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxodbc___depname) $(__install_wxexpat___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_mediadll___depname) $(__install_medialib___depname) $(__install_odbcdll___depname) $(__install_odbclib___depname) $(__install_dbgriddll___depname) $(__install_dbgridlib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_auidll___depname) $(__install_auilib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install $(__cocoa_res_install___depname) + $(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal + (cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal) +- $(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets +- (cd $(srcdir)/build/bakefiles/wxpresets/presets ; $(INSTALL_DATA) wx.bkl wx_unix.bkl wx_win32.bkl $(DESTDIR)$(datadir)/bakefile/presets) + $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx + for f in setup.h $(RCDEFS_H); do \ + if test ! -d $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx/`dirname $$f` ; then \ diff --git a/packages/wxwidgets/wxbase.inc b/packages/wxwidgets/wxbase.inc new file mode 100644 index 0000000000..2976dec289 --- /dev/null +++ b/packages/wxwidgets/wxbase.inc @@ -0,0 +1,17 @@ +DESCRIPTION = "wxBase is a library for programming \ +non-GUI (console) applications using the base wxWidgets functionality." +HOMEPAGE = "http://www.wxwidgets.org/" +LICENSE = "GPL" +SECTION = "libs" +PRIORITY = "optional" +DEPENDS = "zlib expat" + +SRC_URI = "${SOURCEFORGE_MIRROR}/wxwindows/wxBase-${PV}.tar.bz2" + +S = "${WORKDIR}/wxBase-${PV}" + +inherit autotools pkgconfig + +do_configure() { + oe_runconf +} diff --git a/packages/wxbase/wxbase_2.6.2.bb b/packages/wxwidgets/wxbase_2.6.4.bb index 07d9199ae1..c8350d8aa5 100644 --- a/packages/wxbase/wxbase_2.6.2.bb +++ b/packages/wxwidgets/wxbase_2.6.4.bb @@ -1,25 +1,10 @@ -DESCRIPTION = "wxBase is a library for programming \ -non-GUI (console) applications using the base wxWidgets functionality." -HOMEPAGE = "http://www.wxwidgets.org/" -LICENSE = "GPL" -SECTION = "libs" -PRIORITY = "optional" -DEPENDS = "jpeg libpng zlib" +require wxbase.inc - -SRC_URI = "${SOURCEFORGE_MIRROR}/wxwindows/wxBase-${PV}.tar.bz2" - -S = "${WORKDIR}/wxBase-${PV}" - -inherit autotools pkgconfig +PR = "r0" EXTRA_OECONF = "--enable-largefile" -LEAD_SONAME = "libwx_base-2.6.so*" - -do_configure() { - oe_runconf -} +LEAD_SONAME = "libwx_base-2.6.so" do_stage() { install -d ${STAGING_INCDIR}/wx-2.6/wx @@ -36,12 +21,8 @@ do_stage() { -i ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}base-ansi-release-2.6 } -FILES_${PN} += " \ - ${libdir}/wx/config" - -FILES_${PN}-dev += " \ - ${libdir}/wx/include \ - ${datadir}/bakefile" +FILES_${PN} += "${libdir}/wx/config" +FILES_${PN}-dev += "${libdir}/wx/include ${datadir}/bakefile" do_install() { oe_runmake 'DESTDIR=${D}' install diff --git a/packages/wxwidgets/wxbase_2.8.9.bb b/packages/wxwidgets/wxbase_2.8.9.bb new file mode 100644 index 0000000000..bb46a52a88 --- /dev/null +++ b/packages/wxwidgets/wxbase_2.8.9.bb @@ -0,0 +1,36 @@ +require wxbase.inc + +DEFAULT_PREFERENCE = "-1" + +PR = "r0" + +SRC_URI += "file://Makefile.in.patch;patch=1" + +EXTRA_OECONF = " --disable-gui \ + --enable-largefile \ + --enable-gpe \ + --without-subdirs" + +LEAD_SONAME = "libwx_base-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 wxwin.m4 ${STAGING_DATADIR}/aclocal + ln -sf ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}base-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}base-ansi-release-2.8 +} + +FILES_${PN} += "${libdir}/wx/config" +FILES_${PN}-dev += "${libdir}/wx/include" + +do_install() { + oe_runmake 'DESTDIR=${D}' install + ln -sf ${libdir}/wx/config/${TARGET_PREFIX}base-ansi-release-2.8 ${D}${bindir}/wx-config +} 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.9.bb b/packages/wxwidgets/wxwidgets_2.8.9.bb new file mode 100644 index 0000000000..8e8d3565fd --- /dev/null +++ b/packages/wxwidgets/wxwidgets_2.8.9.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 +} |