From e20736242e2dc4d241731def08a32bf9f174f394 Mon Sep 17 00:00:00 2001
From: Junqian Gordon Xu <xjqian@gmail.com>
Date: Sun, 30 Mar 2008 06:39:41 +0000
Subject: wxbase: fix broken, unify * upgrade 2.6.2 to 2.6.4 (upstream old
 stable, DEFAULT) * upgrade 2.7+cvs to 2.8.7 (upstream new stable) * NOTE:
 upstream only provide mwg build targets for > 2.7 * 2.8.7: patch Makefile
 non-sense

---
 packages/wxwidgets/wxbase-2.8.7/.mtn2git_empty    |  0
 packages/wxwidgets/wxbase-2.8.7/Makefile.in.patch | 18 ++++++++
 packages/wxwidgets/wxbase.inc                     | 17 +++++++
 packages/wxwidgets/wxbase_2.6.2.bb                | 54 -----------------------
 packages/wxwidgets/wxbase_2.6.4.bb                | 35 +++++++++++++++
 packages/wxwidgets/wxbase_2.7+cvs.bb              | 53 ----------------------
 packages/wxwidgets/wxbase_2.8.7.bb                | 33 ++++++++++++++
 7 files changed, 103 insertions(+), 107 deletions(-)
 create mode 100644 packages/wxwidgets/wxbase-2.8.7/.mtn2git_empty
 create mode 100644 packages/wxwidgets/wxbase-2.8.7/Makefile.in.patch
 create mode 100644 packages/wxwidgets/wxbase.inc
 delete mode 100644 packages/wxwidgets/wxbase_2.6.2.bb
 create mode 100644 packages/wxwidgets/wxbase_2.6.4.bb
 delete mode 100644 packages/wxwidgets/wxbase_2.7+cvs.bb
 create mode 100644 packages/wxwidgets/wxbase_2.8.7.bb

(limited to 'packages')

diff --git a/packages/wxwidgets/wxbase-2.8.7/.mtn2git_empty b/packages/wxwidgets/wxbase-2.8.7/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/wxwidgets/wxbase-2.8.7/Makefile.in.patch b/packages/wxwidgets/wxbase-2.8.7/Makefile.in.patch
new file mode 100644
index 0000000000..2c495d7884
--- /dev/null
+++ b/packages/wxwidgets/wxbase-2.8.7/Makefile.in.patch
@@ -0,0 +1,18 @@
+--- wxBase-2.8.7/Makefile.in.old	2008-03-30 01:04:57.000000000 -0500
++++ wxBase-2.8.7/Makefile.in	2008-03-30 01:05:58.000000000 -0500
+@@ -11331,13 +11331,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/wxwidgets/wxbase_2.6.2.bb b/packages/wxwidgets/wxbase_2.6.2.bb
deleted file mode 100644
index 07d9199ae1..0000000000
--- a/packages/wxwidgets/wxbase_2.6.2.bb
+++ /dev/null
@@ -1,54 +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 = "${SOURCEFORGE_MIRROR}/wxwindows/wxBase-${PV}.tar.bz2"
-
-S = "${WORKDIR}/wxBase-${PV}"
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF = "--enable-largefile"
-
-LEAD_SONAME = "libwx_base-2.6.so*"
-
-do_configure() {
-       oe_runconf
-}
-
-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}base-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}base-ansi-release-2.6
-}
-
-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.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/wxbase_2.6.4.bb b/packages/wxwidgets/wxbase_2.6.4.bb
new file mode 100644
index 0000000000..c8350d8aa5
--- /dev/null
+++ b/packages/wxwidgets/wxbase_2.6.4.bb
@@ -0,0 +1,35 @@
+require wxbase.inc
+
+PR = "r0"
+
+EXTRA_OECONF = "--enable-largefile"
+
+LEAD_SONAME = "libwx_base-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}base-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}base-ansi-release-2.6
+}
+
+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.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/wxbase_2.7+cvs.bb b/packages/wxwidgets/wxbase_2.7+cvs.bb
deleted file mode 100644
index 772ea4e27f..0000000000
--- a/packages/wxwidgets/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.7.bb b/packages/wxwidgets/wxbase_2.8.7.bb
new file mode 100644
index 0000000000..816b96de6e
--- /dev/null
+++ b/packages/wxwidgets/wxbase_2.8.7.bb
@@ -0,0 +1,33 @@
+require wxbase.inc
+
+DEFAULT_PREFERENCE = "-1"
+
+PR = "r0"
+
+SRC_URI += "file://Makefile.in.patch;patch=1"
+
+EXTRA_OECONF = " --disable-gui --enable-largefile --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
+}
-- 
cgit v1.2.3


From fdbf600f648dec8b7494badd3fff59deab50329e Mon Sep 17 00:00:00 2001
From: Junqian Gordon Xu <xjqian@gmail.com>
Date: Sun, 30 Mar 2008 08:30:47 +0000
Subject: 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

---
 packages/wxwidgets/wxwidgets.inc      | 20 ++++++++++++++++++++
 packages/wxwidgets/wxwidgets_2.6.3.bb | 17 -----------------
 packages/wxwidgets/wxwidgets_2.6.4.bb | 30 ++++++++++++++++++++++++++++++
 packages/wxwidgets/wxwidgets_2.8.7.bb | 25 +++++++++++++++++++++++++
 4 files changed, 75 insertions(+), 17 deletions(-)
 create mode 100644 packages/wxwidgets/wxwidgets.inc
 delete mode 100644 packages/wxwidgets/wxwidgets_2.6.3.bb
 create mode 100644 packages/wxwidgets/wxwidgets_2.6.4.bb
 create mode 100644 packages/wxwidgets/wxwidgets_2.8.7.bb

(limited to 'packages')

diff --git a/packages/wxwidgets/wxwidgets.inc b/packages/wxwidgets/wxwidgets.inc
new file mode 100644
index 0000000000..1e4cd0b6bb
--- /dev/null
+++ b/packages/wxwidgets/wxwidgets.inc
@@ -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"
diff --git a/packages/wxwidgets/wxwidgets_2.6.3.bb b/packages/wxwidgets/wxwidgets_2.6.3.bb
deleted file mode 100644
index 0cd88334b3..0000000000
--- a/packages/wxwidgets/wxwidgets_2.6.3.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-DESCRIPTION = "wxWidgets is a cross platform application framework utilizing native widgets."
-HOMEPAGE = "http://www.wxwidgets.org"
-SECTION = "x11/libs"
-LICENSE = "GPL"
-DEPENDS = "gtk+"
-PR = "r0"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/wxwindows/wxWidgets-${PV}.tar.gz"
-S = "${WORKDIR}/wxWidgets-${PV}"
-
-inherit autotools pkgconfig
-
-do_configure() {
-	oe_runconf
-}
-
-#FIXME add sane packaging
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
+}
-- 
cgit v1.2.3


From 45a272895388fdcd5a02579ecbdb1fea8ac65c3f Mon Sep 17 00:00:00 2001
From: Junqian Gordon Xu <xjqian@gmail.com>
Date: Sun, 30 Mar 2008 13:02:59 +0000
Subject: tosa asound.state: fix default values

---
 packages/alsa/alsa-state/tosa/asound.state         | 237 +++++++++++++--------
 .../zaurusd/files/alsa-6000x-default.state.patch   |  18 +-
 2 files changed, 159 insertions(+), 96 deletions(-)

(limited to 'packages')

diff --git a/packages/alsa/alsa-state/tosa/asound.state b/packages/alsa/alsa-state/tosa/asound.state
index 12eaf2e036..c38265d792 100644
--- a/packages/alsa/alsa-state/tosa/asound.state
+++ b/packages/alsa/alsa-state/tosa/asound.state
@@ -36,6 +36,16 @@ state.Tosa {
 		value true
 	}
 	control.5 {
+		comment.access 'read write'
+		comment.type INTEGER
+		comment.count 2
+		comment.range '0 - 31'
+		iface MIXER
+		name 'PCM Playback Volume'
+		value.0 23
+		value.1 23
+	}
+	control.6 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -43,7 +53,7 @@ state.Tosa {
 		name 'Speaker Playback ZC Switch'
 		value true
 	}
-	control.6 {
+	control.7 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -51,7 +61,7 @@ state.Tosa {
 		name 'Speaker Playback Invert Switch'
 		value true
 	}
-	control.7 {
+	control.8 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -59,7 +69,7 @@ state.Tosa {
 		name 'Headphone Playback ZC Switch'
 		value true
 	}
-	control.8 {
+	control.9 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -67,7 +77,7 @@ state.Tosa {
 		name 'Mono Playback ZC Switch'
 		value false
 	}
-	control.9 {
+	control.10 {
 		comment.access 'read write'
 		comment.type INTEGER
 		comment.count 1
@@ -76,7 +86,7 @@ state.Tosa {
 		name 'Mono Playback Volume'
 		value 0
 	}
-	control.10 {
+	control.11 {
 		comment.access 'read write'
 		comment.type INTEGER
 		comment.count 1
@@ -85,16 +95,16 @@ state.Tosa {
 		name 'ALC Target Volume'
 		value 11
 	}
-	control.11 {
+	control.12 {
 		comment.access 'read write'
 		comment.type INTEGER
 		comment.count 1
 		comment.range '0 - 15'
 		iface MIXER
 		name 'ALC Hold Time'
-		value 0
+		value 2
 	}
-	control.12 {
+	control.13 {
 		comment.access 'read write'
 		comment.type INTEGER
 		comment.count 1
@@ -103,7 +113,7 @@ state.Tosa {
 		name 'ALC Decay Time'
 		value 3
 	}
-	control.13 {
+	control.14 {
 		comment.access 'read write'
 		comment.type INTEGER
 		comment.count 1
@@ -112,7 +122,7 @@ state.Tosa {
 		name 'ALC Attack Time'
 		value 2
 	}
-	control.14 {
+	control.15 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -124,7 +134,7 @@ state.Tosa {
 		name 'ALC Function'
 		value None
 	}
-	control.15 {
+	control.16 {
 		comment.access 'read write'
 		comment.type INTEGER
 		comment.count 1
@@ -133,7 +143,7 @@ state.Tosa {
 		name 'ALC Max Volume'
 		value 7
 	}
-	control.16 {
+	control.17 {
 		comment.access 'read write'
 		comment.type INTEGER
 		comment.count 1
@@ -142,7 +152,7 @@ state.Tosa {
 		name 'ALC ZC Timeout'
 		value 0
 	}
-	control.17 {
+	control.18 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -150,7 +160,7 @@ state.Tosa {
 		name 'ALC ZC Switch'
 		value false
 	}
-	control.18 {
+	control.19 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -158,7 +168,7 @@ state.Tosa {
 		name 'ALC NG Switch'
 		value false
 	}
-	control.19 {
+	control.20 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -168,7 +178,7 @@ state.Tosa {
 		name 'ALC NG Type'
 		value 'Constant Gain'
 	}
-	control.20 {
+	control.21 {
 		comment.access 'read write'
 		comment.type INTEGER
 		comment.count 1
@@ -177,16 +187,16 @@ state.Tosa {
 		name 'ALC NG Threshold'
 		value 31
 	}
-	control.21 {
+	control.22 {
 		comment.access 'read write'
 		comment.type INTEGER
 		comment.count 1
 		comment.range '0 - 7'
 		iface MIXER
 		name 'Mic Headphone  Volume'
-		value 3
+		value 7
 	}
-	control.22 {
+	control.23 {
 		comment.access 'read write'
 		comment.type INTEGER
 		comment.count 1
@@ -195,7 +205,7 @@ state.Tosa {
 		name 'ALC Headphone Volume'
 		value 5
 	}
-	control.23 {
+	control.24 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -203,7 +213,7 @@ state.Tosa {
 		name 'Out3 Switch'
 		value false
 	}
-	control.24 {
+	control.25 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -211,7 +221,7 @@ state.Tosa {
 		name 'Out3 ZC Switch'
 		value true
 	}
-	control.25 {
+	control.26 {
 		comment.access 'read write'
 		comment.type INTEGER
 		comment.count 1
@@ -220,7 +230,7 @@ state.Tosa {
 		name 'Out3 Volume'
 		value 0
 	}
-	control.26 {
+	control.27 {
 		comment.access 'read write'
 		comment.type INTEGER
 		comment.count 1
@@ -229,7 +239,7 @@ state.Tosa {
 		name 'PCBeep Bypass Headphone Volume'
 		value 0
 	}
-	control.27 {
+	control.28 {
 		comment.access 'read write'
 		comment.type INTEGER
 		comment.count 1
@@ -238,7 +248,7 @@ state.Tosa {
 		name 'PCBeep Bypass Speaker Volume'
 		value 0
 	}
-	control.28 {
+	control.29 {
 		comment.access 'read write'
 		comment.type INTEGER
 		comment.count 1
@@ -247,16 +257,16 @@ state.Tosa {
 		name 'PCBeep Bypass Phone Volume'
 		value 0
 	}
-	control.29 {
+	control.30 {
 		comment.access 'read write'
 		comment.type INTEGER
 		comment.count 1
 		comment.range '0 - 7'
 		iface MIXER
 		name 'Aux Playback Headphone Volume'
-		value 6
+		value 5
 	}
-	control.30 {
+	control.31 {
 		comment.access 'read write'
 		comment.type INTEGER
 		comment.count 1
@@ -265,7 +275,7 @@ state.Tosa {
 		name 'Aux Playback Speaker Volume'
 		value 0
 	}
-	control.31 {
+	control.32 {
 		comment.access 'read write'
 		comment.type INTEGER
 		comment.count 1
@@ -274,7 +284,7 @@ state.Tosa {
 		name 'Aux Playback Phone Volume'
 		value 0
 	}
-	control.32 {
+	control.33 {
 		comment.access 'read write'
 		comment.type INTEGER
 		comment.count 1
@@ -283,7 +293,7 @@ state.Tosa {
 		name 'Phone Volume'
 		value 0
 	}
-	control.33 {
+	control.34 {
 		comment.access 'read write'
 		comment.type INTEGER
 		comment.count 2
@@ -293,7 +303,7 @@ state.Tosa {
 		value.0 23
 		value.1 23
 	}
-	control.34 {
+	control.35 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -301,7 +311,7 @@ state.Tosa {
 		name 'Capture 20dB Boost Switch'
 		value true
 	}
-	control.35 {
+	control.36 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -309,7 +319,7 @@ state.Tosa {
 		name 'Capture to Phone 20dB Boost Switch'
 		value true
 	}
-	control.36 {
+	control.37 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -317,7 +327,7 @@ state.Tosa {
 		name '3D Upper Cut-off Switch'
 		value false
 	}
-	control.37 {
+	control.38 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -325,7 +335,7 @@ state.Tosa {
 		name '3D Lower Cut-off Switch'
 		value false
 	}
-	control.38 {
+	control.39 {
 		comment.access 'read write'
 		comment.type INTEGER
 		comment.count 1
@@ -334,7 +344,7 @@ state.Tosa {
 		name '3D Playback Volume'
 		value 0
 	}
-	control.39 {
+	control.40 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -344,7 +354,7 @@ state.Tosa {
 		name 'Bass Control'
 		value 'Adaptive Boost'
 	}
-	control.40 {
+	control.41 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -352,7 +362,7 @@ state.Tosa {
 		name 'Bass Cut-off Switch'
 		value true
 	}
-	control.41 {
+	control.42 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -360,7 +370,7 @@ state.Tosa {
 		name 'Tone Cut-off Switch'
 		value false
 	}
-	control.42 {
+	control.43 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -368,7 +378,7 @@ state.Tosa {
 		name 'Playback Attenuate (-6dB) Switch'
 		value false
 	}
-	control.43 {
+	control.44 {
 		comment.access 'read write'
 		comment.type INTEGER
 		comment.count 1
@@ -377,7 +387,7 @@ state.Tosa {
 		name 'Bass Volume'
 		value 8
 	}
-	control.44 {
+	control.45 {
 		comment.access 'read write'
 		comment.type INTEGER
 		comment.count 1
@@ -386,7 +396,7 @@ state.Tosa {
 		name 'Treble Volume'
 		value 5
 	}
-	control.45 {
+	control.46 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -394,7 +404,7 @@ state.Tosa {
 		name 'Capture ADC Switch'
 		value false
 	}
-	control.46 {
+	control.47 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 2
@@ -405,17 +415,17 @@ state.Tosa {
 		value.0 '+0.75dB Steps'
 		value.1 '+0.75dB Steps'
 	}
-	control.47 {
+	control.48 {
 		comment.access 'read write'
 		comment.type INTEGER
 		comment.count 2
 		comment.range '0 - 63'
 		iface MIXER
 		name 'Capture Volume'
-		value.0 63
-		value.1 63
+		value.0 0
+		value.1 0
 	}
-	control.48 {
+	control.49 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -423,7 +433,7 @@ state.Tosa {
 		name 'Capture ZC Switch'
 		value false
 	}
-	control.49 {
+	control.50 {
 		comment.access 'read write'
 		comment.type INTEGER
 		comment.count 1
@@ -432,7 +442,7 @@ state.Tosa {
 		name 'Mic 1 Volume'
 		value 23
 	}
-	control.50 {
+	control.51 {
 		comment.access 'read write'
 		comment.type INTEGER
 		comment.count 1
@@ -441,7 +451,7 @@ state.Tosa {
 		name 'Mic 2 Volume'
 		value 23
 	}
-	control.51 {
+	control.52 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -449,7 +459,7 @@ state.Tosa {
 		name 'Mic 20dB Boost Switch'
 		value false
 	}
-	control.52 {
+	control.53 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -457,7 +467,7 @@ state.Tosa {
 		name 'Speaker Mixer PCBeep Bypass Swi'
 		value false
 	}
-	control.53 {
+	control.54 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -465,7 +475,7 @@ state.Tosa {
 		name 'Speaker Mixer Aux Playback Swit'
 		value false
 	}
-	control.54 {
+	control.55 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -473,7 +483,7 @@ state.Tosa {
 		name 'Speaker Mixer Phone Bypass Swit'
 		value false
 	}
-	control.55 {
+	control.56 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -481,7 +491,7 @@ state.Tosa {
 		name 'Speaker Mixer Line Bypass Switc'
 		value false
 	}
-	control.56 {
+	control.57 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -489,7 +499,7 @@ state.Tosa {
 		name 'Speaker Mixer PCM Playback Swit'
 		value true
 	}
-	control.57 {
+	control.58 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -497,7 +507,7 @@ state.Tosa {
 		name 'Phone Mixer PCBeep Bypass Switc'
 		value false
 	}
-	control.58 {
+	control.59 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -505,7 +515,7 @@ state.Tosa {
 		name 'Phone Mixer Aux Playback Switch'
 		value false
 	}
-	control.59 {
+	control.60 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -513,7 +523,7 @@ state.Tosa {
 		name 'Phone Mixer Line Bypass Switch'
 		value false
 	}
-	control.60 {
+	control.61 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -521,7 +531,7 @@ state.Tosa {
 		name 'Phone Mixer PCM Playback Switch'
 		value false
 	}
-	control.61 {
+	control.62 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -529,7 +539,7 @@ state.Tosa {
 		name 'Phone Mixer Mic 1 Sidetone Swit'
 		value false
 	}
-	control.62 {
+	control.63 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -537,55 +547,103 @@ state.Tosa {
 		name 'Phone Mixer Mic 2 Sidetone Swit'
 		value false
 	}
-	control.63 {
+	control.64 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
 		iface MIXER
-		name 'HP Mixer PCBeep Bypass Switch'
+		name 'Right HP Mixer PCBeep Bypass Sw'
 		value false
 	}
-	control.64 {
+	control.65 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
 		iface MIXER
-		name 'HP Mixer Aux Playback Switch'
+		name 'Right HP Mixer Aux Playback Swi'
 		value false
 	}
-	control.65 {
+	control.66 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
 		iface MIXER
-		name 'HP Mixer Phone Bypass Switch'
+		name 'Right HP Mixer Phone Bypass Swi'
 		value false
 	}
-	control.66 {
+	control.67 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
 		iface MIXER
-		name 'HP Mixer Line Bypass Switch'
+		name 'Right HP Mixer Line Bypass Swit'
 		value false
 	}
-	control.67 {
+	control.68 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
 		iface MIXER
-		name 'HP Mixer PCM Playback Switch'
+		name 'Right HP Mixer PCM Playback Swi'
 		value true
 	}
-	control.68 {
+	control.69 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
 		iface MIXER
-		name 'HP Mixer Mic Sidetone Switch'
+		name 'Right HP Mixer Mic Sidetone Swi'
 		value false
 	}
-	control.69 {
+	control.70 {
+		comment.access 'read write'
+		comment.type BOOLEAN
+		comment.count 1
+		iface MIXER
+		name 'Left HP Mixer PCBeep Bypass Swi'
+		value false
+	}
+	control.71 {
+		comment.access 'read write'
+		comment.type BOOLEAN
+		comment.count 1
+		iface MIXER
+		name 'Left HP Mixer Aux Playback Swit'
+		value false
+	}
+	control.72 {
+		comment.access 'read write'
+		comment.type BOOLEAN
+		comment.count 1
+		iface MIXER
+		name 'Left HP Mixer Phone Bypass Swit'
+		value false
+	}
+	control.73 {
+		comment.access 'read write'
+		comment.type BOOLEAN
+		comment.count 1
+		iface MIXER
+		name 'Left HP Mixer Line Bypass Switc'
+		value false
+	}
+	control.74 {
+		comment.access 'read write'
+		comment.type BOOLEAN
+		comment.count 1
+		iface MIXER
+		name 'Left HP Mixer PCM Playback Swit'
+		value true
+	}
+	control.75 {
+		comment.access 'read write'
+		comment.type BOOLEAN
+		comment.count 1
+		iface MIXER
+		name 'Left HP Mixer Mic Sidetone Swit'
+		value false
+	}
+	control.76 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -595,7 +653,7 @@ state.Tosa {
 		name 'Differential Source'
 		value Mic
 	}
-	control.70 {
+	control.77 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -607,7 +665,7 @@ state.Tosa {
 		name 'Mic Select Source'
 		value Differential
 	}
-	control.71 {
+	control.78 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -623,7 +681,7 @@ state.Tosa {
 		name 'Right Capture Select'
 		value Mic
 	}
-	control.72 {
+	control.79 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -639,7 +697,7 @@ state.Tosa {
 		name 'Left Capture Select'
 		value Mic
 	}
-	control.73 {
+	control.80 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -651,7 +709,7 @@ state.Tosa {
 		name 'Capture Phone Mux'
 		value Mute
 	}
-	control.74 {
+	control.81 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -659,9 +717,9 @@ state.Tosa {
 		comment.item.1 'Headphone Mix'
 		iface MIXER
 		name 'Speaker Mux'
-		value 'Headphone Mix'
+		value 'Speaker Mix'
 	}
-	control.75 {
+	control.82 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -673,7 +731,7 @@ state.Tosa {
 		name 'Out3 Mux'
 		value Left
 	}
-	control.76 {
+	control.83 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -685,7 +743,7 @@ state.Tosa {
 		name 'ALC Sidetone Mux'
 		value Stereo
 	}
-	control.77 {
+	control.84 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -696,17 +754,16 @@ state.Tosa {
 		comment.item.4 Off
 		iface MIXER
 		name 'Jack Function'
-		value Headphone
+		value Off
 	}
-	control.78 {
+	control.85 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
-		comment.item.0 Auto
-		comment.item.1 On
-		comment.item.2 Off
+		comment.item.0 On
+		comment.item.1 Off
 		iface MIXER
 		name 'Speaker Function'
-		value Auto
+		value On
 	}
 }
diff --git a/packages/zaurusd/files/alsa-6000x-default.state.patch b/packages/zaurusd/files/alsa-6000x-default.state.patch
index e019f3a117..857b8c8b62 100644
--- a/packages/zaurusd/files/alsa-6000x-default.state.patch
+++ b/packages/zaurusd/files/alsa-6000x-default.state.patch
@@ -1,5 +1,5 @@
---- zaurusd/config/alsa/6000x-default.state.old	2007-12-22 04:31:38.000000000 -0600
-+++ zaurusd/config/alsa/6000x-default.state	2007-12-26 00:06:02.000000000 -0600
+--- zaurusd/config/alsa/6000x-default.state.old	2008-03-21 02:21:47.000000000 -0500
++++ zaurusd/config/alsa/6000x-default.state	2008-03-30 07:48:06.000000000 -0500
 @@ -37,13 +37,23 @@ state.Tosa {
  	}
  	control.5 {
@@ -701,9 +701,12 @@
  		comment.access 'read write'
  		comment.type ENUMERATED
  		comment.count 1
-@@ -661,7 +719,7 @@ state.Tosa {
+@@ -659,9 +717,9 @@ state.Tosa {
+ 		comment.item.1 'Headphone Mix'
+ 		iface MIXER
  		name 'Speaker Mux'
- 		value 'Headphone Mix'
+-		value 'Headphone Mix'
++		value 'Speaker Mix'
  	}
 -	control.75 {
 +	control.82 {
@@ -728,9 +731,12 @@
  		comment.access 'read write'
  		comment.type ENUMERATED
  		comment.count 1
-@@ -698,15 +756,14 @@ state.Tosa {
+@@ -696,17 +754,16 @@ state.Tosa {
+ 		comment.item.4 Off
+ 		iface MIXER
  		name 'Jack Function'
- 		value Headphone
+-		value Headphone
++		value Off
  	}
 -	control.78 {
 +	control.85 {
-- 
cgit v1.2.3


From f3074ef2d1ee7a22df71d34913d96f1d894bbfc3 Mon Sep 17 00:00:00 2001
From: Junqian Gordon Xu <xjqian@gmail.com>
Date: Sun, 30 Mar 2008 13:12:17 +0000
Subject: gnuplot: fix configure * remove unnecessary depends (wxwidgets, etc)
 and configure option * fix SRC_DATE in 4.3.0+cvs * bump default to 4.2.3

---
 packages/gnuplot/gnuplot.inc      |  8 +++-----
 packages/gnuplot/gnuplot_4.0.0.bb |  2 +-
 packages/gnuplot/gnuplot_4.2.2.bb | 10 ----------
 packages/gnuplot/gnuplot_4.2.3.bb | 10 ++++++++++
 packages/gnuplot/gnuplot_cvs.bb   |  2 ++
 packages/gnuplot/qtplot_0.2.bb    | 12 ++++++------
 6 files changed, 22 insertions(+), 22 deletions(-)
 delete mode 100644 packages/gnuplot/gnuplot_4.2.2.bb
 create mode 100644 packages/gnuplot/gnuplot_4.2.3.bb

(limited to 'packages')

diff --git a/packages/gnuplot/gnuplot.inc b/packages/gnuplot/gnuplot.inc
index 9f1eebf003..bf442527af 100644
--- a/packages/gnuplot/gnuplot.inc
+++ b/packages/gnuplot/gnuplot.inc
@@ -4,18 +4,16 @@ HOMEPAGE = "http://www.gnuplot.info/"
 SECTION = "console/scientific"
 LICENSE = "BSD-4"
 PRIORITY = "optional"
-DEPENDS = "pango cairo virtual/libx11 libpng gd readline"
+DEPENDS = "virtual/libx11 readline"
 
 inherit autotools
 
 acpaths = ""
 
 EXTRA_OECONF = "--with-readline=${STAGING_LIBDIR}/.. \
-		--without-plot \
-		--with-png=${STAGING_LIBDIR}/.. \
-		--with-gd=${STAGING_LIBDIR}/.. \
 		--without-lisp-files \
-		--without-tutorial"
+		--without-tutorial \
+                --disable-wxwidgets"
 
 do_compile_prepend() {
 	install -m 0644 ${WORKDIR}/qtplot-0.2/qtopia.trm ${S}/term/
diff --git a/packages/gnuplot/gnuplot_4.0.0.bb b/packages/gnuplot/gnuplot_4.0.0.bb
index 6e1be52173..abf519ae6e 100644
--- a/packages/gnuplot/gnuplot_4.0.0.bb
+++ b/packages/gnuplot/gnuplot_4.0.0.bb
@@ -1,6 +1,6 @@
 require gnuplot.inc
 
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "ftp://ftp.gnuplot.info/pub/gnuplot/gnuplot-${PV}.tar.gz \
 	   file://subdirs.patch;patch=1 \
diff --git a/packages/gnuplot/gnuplot_4.2.2.bb b/packages/gnuplot/gnuplot_4.2.2.bb
deleted file mode 100644
index 478f6e2b0f..0000000000
--- a/packages/gnuplot/gnuplot_4.2.2.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require gnuplot.inc
-
-PR = "r0"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/gnuplot/${PN}-${PV}.tar.gz \
-           http://www.mneuroth.de/privat/zaurus/qtplot-0.2.tar.gz \
-	   file://subdirs.patch;patch=1 \
-           file://term.patch;patch=1 \
-	   file://gnuplot.desktop \
-	   file://gnuplot.png"
diff --git a/packages/gnuplot/gnuplot_4.2.3.bb b/packages/gnuplot/gnuplot_4.2.3.bb
new file mode 100644
index 0000000000..478f6e2b0f
--- /dev/null
+++ b/packages/gnuplot/gnuplot_4.2.3.bb
@@ -0,0 +1,10 @@
+require gnuplot.inc
+
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/gnuplot/${PN}-${PV}.tar.gz \
+           http://www.mneuroth.de/privat/zaurus/qtplot-0.2.tar.gz \
+	   file://subdirs.patch;patch=1 \
+           file://term.patch;patch=1 \
+	   file://gnuplot.desktop \
+	   file://gnuplot.png"
diff --git a/packages/gnuplot/gnuplot_cvs.bb b/packages/gnuplot/gnuplot_cvs.bb
index d63d31a492..ff3e9b3810 100644
--- a/packages/gnuplot/gnuplot_cvs.bb
+++ b/packages/gnuplot/gnuplot_cvs.bb
@@ -3,6 +3,8 @@ require gnuplot.inc
 PV = "4.3.0+cvs${SRCDATE}"
 PR = "r0"
 
+DEFAULT_PREFERENCE = "-1"
+
 SRC_URI = "cvs://anonymous@gnuplot.cvs.sourceforge.net/cvsroot/${PN};module=${PN} \
            http://www.mneuroth.de/privat/zaurus/qtplot-0.2.tar.gz \
            file://subdirs.patch;patch=1 \
diff --git a/packages/gnuplot/qtplot_0.2.bb b/packages/gnuplot/qtplot_0.2.bb
index 80b3e4a603..cc57260f49 100644
--- a/packages/gnuplot/qtplot_0.2.bb
+++ b/packages/gnuplot/qtplot_0.2.bb
@@ -1,14 +1,14 @@
 DESCRIPTION = "QT Gnuplot is a front end for Gnuplot. Install Opie-Embedded \
 console to enable the Launch Gnuplot menu option."
+HOMEPAGE = "http://www.mneuroth.de/privat/zaurus/gnuplot.html"
 SECTION = "opie/applications"
-PRIORITY   = "optional"
-LICENSE    = "GPL"
-PRIORITY   = "optional"
+PRIORITY = "optional"
+LICENSE = "GPL"
+DEPENDS = "gnuplot"
+RDEPDENDS_${PN} = "gnuplot"
 
-DEPENDS    = "gnuplot"
-RDEPDENDS  = "gnuplot"
+PR = "r1"
 
-HOMEPAGE = "http://www.mneuroth.de/privat/zaurus/gnuplot.html"
 SRC_URI  = "http://www.mneuroth.de/privat/zaurus/qtplot-${PV}.tar.gz"
 
 APPTYPE    = "binary"
-- 
cgit v1.2.3


From 93f365c0c3fa4a4b1ca945c63fff8534b1c9508c Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@rpsys.net>
Date: Sun, 30 Mar 2008 22:20:05 +0000
Subject: zaurus-updater: Teach do_deploy about packaged staging

---
 packages/zaurus-updater/zaurus-updater.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'packages')

diff --git a/packages/zaurus-updater/zaurus-updater.bb b/packages/zaurus-updater/zaurus-updater.bb
index 052560dcc9..56f067cbf7 100644
--- a/packages/zaurus-updater/zaurus-updater.bb
+++ b/packages/zaurus-updater/zaurus-updater.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Encrypted shellscript for the Zaurus ROM update"
 DEPENDS = "encdec-updater-native"
 LICENSE = "zaurus-updater"
-PR = "r20"
+PR = "r21"
 
 PACKAGES = ""
 PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -22,10 +22,12 @@ do_compile() {
 do_deploy() {
 	install -d ${DEPLOY_DIR_IMAGE}
 	install -m 0755 updater.sh ${DEPLOY_DIR_IMAGE}/updater.sh.${MACHINE}
+        package_stagefile_shell ${DEPLOY_DIR_IMAGE}/updater.sh.${MACHINE}
 
 	case ${MACHINE} in
 		spitz )
 			install -m 0755 gnu-tar ${DEPLOY_DIR_IMAGE}/gnu-tar
+		        package_stagefile_shell ${DEPLOY_DIR_IMAGE}/gnu-tar
 			;;
         	*)
 			;;
-- 
cgit v1.2.3


From 71e8456ea2160f4874b31f49999dc4befda80a16 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Mon, 31 Mar 2008 08:29:57 +0000
Subject: abiword: add 2.6.0, latest stable

---
 packages/abiword/abiword_2.6.0.bb | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 packages/abiword/abiword_2.6.0.bb

(limited to 'packages')

diff --git a/packages/abiword/abiword_2.6.0.bb b/packages/abiword/abiword_2.6.0.bb
new file mode 100644
index 0000000000..e2db4a09cb
--- /dev/null
+++ b/packages/abiword/abiword_2.6.0.bb
@@ -0,0 +1,3 @@
+require abiword-2.5.inc
+
+RCONFLICTS = "abiword-embedded"
-- 
cgit v1.2.3


From 0771406832d8d0951c50dd9a07aa05ef4bd05965 Mon Sep 17 00:00:00 2001
From: Jeremy Laine <jeremy.laine@m4x.org>
Date: Mon, 31 Mar 2008 08:32:59 +0000
Subject: =?UTF-8?q?kernel.bbclass,linux.inc:=20cleanup=20definition=20of?=
 =?UTF-8?q?=20${KERNEL=5FIMAGE=5FBASE=5FNAME}=20*=20drop=20${DATETIME}=20f?=
 =?UTF-8?q?rom=20${KERNEL=5FIMAGE=5FBASE=5FNAME}=20in=20kernel.bbclass,=20?=
 =?UTF-8?q?see:=20=20=20http://lists.linuxtogo.org/pipermail/openembedded-?=
 =?UTF-8?q?devel/2008-March/005017.html=20*=20make=20${KERNEL=5FIMAGE=5FBA?=
 =?UTF-8?q?SE=5FNAME}=20and=20${KERNEL=5FIMAGE=5FSYMLINK=5FNAME}=20=3F=3D,?=
 =?UTF-8?q?=20see:=20=20=20http://lists.linuxtogo.org/pipermail/openembedd?=
 =?UTF-8?q?ed-devel/2008-March/005016.html=20*=20remove=20${KERNEL=5FIMAGE?=
 =?UTF-8?q?=5FBASE=5FNAME}=20and=20${KERNEL=5FIMAGE=5FSYMLINK=5FNAME}=20fr?=
 =?UTF-8?q?om=20linux.inc=20*=20use=20${KERNEL=5FIMAGE=5FBASE=5FNAME}?=
 =?UTF-8?q?=C2=A0for=20uImage=20deploy?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/linux/linux.inc | 2 --
 1 file changed, 2 deletions(-)

(limited to 'packages')

diff --git a/packages/linux/linux.inc b/packages/linux/linux.inc
index ad7071c405..f5049b1d26 100644
--- a/packages/linux/linux.inc
+++ b/packages/linux/linux.inc
@@ -106,5 +106,3 @@ do_compile_append() {
     fi
 }
 
-KERNEL_IMAGE_BASE_NAME = "${KERNEL_IMAGETYPE}-${PV}-${PR}-${MACHINE}"
-KERNEL_IMAGE_SYMLINK_NAME = "${KERNEL_IMAGETYPE}-${MACHINE}"
-- 
cgit v1.2.3


From b120059dccc4285757586f0969955b4c298daefd Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Mon, 31 Mar 2008 08:42:50 +0000
Subject: abiword-plugins 2.5.x: unbreak configure by fixing DESCRIPTION

---
 packages/abiword/abiword-plugins_2.5.1.bb | 2 +-
 packages/abiword/abiword-plugins_2.5.2.bb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'packages')

diff --git a/packages/abiword/abiword-plugins_2.5.1.bb b/packages/abiword/abiword-plugins_2.5.1.bb
index ec11982ad7..eb626aba91 100644
--- a/packages/abiword/abiword-plugins_2.5.1.bb
+++ b/packages/abiword/abiword-plugins_2.5.1.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "AbiWord is a free word processing program similar to Microsoft(r) Word""
+DESCRIPTION = "AbiWord is a free word processing program similar to Microsoft(r) Word"
 HOMEPAGE = "http://www.abiword.org"
 SECTION = "x11/office"
 LICENSE = "GPLv2"
diff --git a/packages/abiword/abiword-plugins_2.5.2.bb b/packages/abiword/abiword-plugins_2.5.2.bb
index d750bf539d..89a0527401 100644
--- a/packages/abiword/abiword-plugins_2.5.2.bb
+++ b/packages/abiword/abiword-plugins_2.5.2.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "AbiWord is a free word processing program similar to Microsoft(r) Word""
+DESCRIPTION = "AbiWord is a free word processing program similar to Microsoft(r) Word"
 HOMEPAGE = "http://www.abiword.org"
 SECTION = "x11/office"
 LICENSE = "GPLv2"
-- 
cgit v1.2.3


From fea72465d5902d262c8771dded37f106b63993e3 Mon Sep 17 00:00:00 2001
From: Jeremy Laine <jeremy.laine@m4x.org>
Date: Mon, 31 Mar 2008 09:26:15 +0000
Subject: linux.inc: move binary devicetree generation to linux.inc

---
 packages/linux/linux-rt_2.6.24.bb         | 17 -----------------
 packages/linux/linux.inc                  | 20 ++++++++++++++++++++
 packages/linux/linux_2.6.23+2.6.24-rc5.bb | 12 +-----------
 packages/linux/linux_2.6.23.bb            | 17 -----------------
 packages/linux/linux_2.6.24.bb            | 15 ---------------
 5 files changed, 21 insertions(+), 60 deletions(-)

(limited to 'packages')

diff --git a/packages/linux/linux-rt_2.6.24.bb b/packages/linux/linux-rt_2.6.24.bb
index 8081f44e93..bddb16fdf0 100644
--- a/packages/linux/linux-rt_2.6.24.bb
+++ b/packages/linux/linux-rt_2.6.24.bb
@@ -4,8 +4,6 @@ require linux.inc
 DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_mpc8313e-rdb = "1"
 
-DEPENDS_append_mpc8313e-rdb = " dtc-native"
-
 PR = "r3"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.3.tar.bz2 \
@@ -24,18 +22,3 @@ SRC_URI_append_mpc8313e-rdb = "\
 #	file://mpc831x-nand.patch;patch=1 \
 #	file://mpc8313e-rdb-rtc.patch;patch=1 "
 
-DEVICETREE_mpc8313e-rdb = "arch/${ARCH}/boot/dts/mpc8313erdb.dts"
-DEVICETREE_FLAGS_mpc8313e-rdb = "-R 8 -S 0x3000"
-
-do_devicetree_image() {
-        if test -n "${DEVICETREE}" ; then
-            dtc -I dts -O dtb ${DEVICETREE_FLAGS} -o ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.dtb ${DEVICETREE}
-
-            cd ${DEPLOY_DIR_IMAGE}
-            rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.dtb
-            ln -sf ${KERNEL_IMAGE_BASE_NAME}.dtb ${KERNEL_IMAGE_SYMLINK_NAME}.dtb
-        fi
-}
-
-addtask devicetree_image after do_deploy before do_package
-
diff --git a/packages/linux/linux.inc b/packages/linux/linux.inc
index f5049b1d26..1f6eeb5538 100644
--- a/packages/linux/linux.inc
+++ b/packages/linux/linux.inc
@@ -18,6 +18,15 @@ CMDLINE_at91sam9263ek = "mem=64M console=ttyS0,115200 root=/dev/mmcblk0p1 rootfs
 CMDLINE_DEBUG ?= '${@base_conditional("DISTRO_TYPE", "release", "quiet", "debug",d)}'
 CMDLINE_append = " ${CMDLINE_DEBUG} "
 
+# Support for binary device tree generation
+
+KERNEL_DEVICETREE_mpc8313e-rdb = "arch/${ARCH}/boot/dts/mpc8313erdb.dts"
+KERNEL_DEVICETREE_FLAGS_mpc8313e-rdb = "-R 8 -S 0x3000"
+KERNEL_DEVICETREE_mpc8323e-rdb = "arch/${ARCH}/boot/dts/mpc832x_rdb.dts"
+
+DEPENDS_append_mpc8313e-rdb = " dtc-native"
+DEPENDS_append_mpc8323e-rdb = " dtc-native"
+
 do_configure_prepend() {
         echo "" > ${S}/.config
 
@@ -106,3 +115,14 @@ do_compile_append() {
     fi
 }
 
+do_devicetree_image() {
+        if test -n "${KERNEL_DEVICETREE}" ; then
+            dtc -I dts -O dtb ${KERNEL_DEVICETREE_FLAGS} -o ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.dtb ${KERNEL_DEVICETREE}
+
+            cd ${DEPLOY_DIR_IMAGE}
+            rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.dtb
+            ln -sf ${KERNEL_IMAGE_BASE_NAME}.dtb ${KERNEL_IMAGE_SYMLINK_NAME}.dtb
+        fi
+}
+
+addtask devicetree_image after do_deploy before do_package
diff --git a/packages/linux/linux_2.6.23+2.6.24-rc5.bb b/packages/linux/linux_2.6.23+2.6.24-rc5.bb
index 20ee7d0508..648fe6b756 100644
--- a/packages/linux/linux_2.6.23+2.6.24-rc5.bb
+++ b/packages/linux/linux_2.6.23+2.6.24-rc5.bb
@@ -64,15 +64,5 @@ python do_compulab_image() {
 	    os.symlink(img_file, link_file)
 }
 
-do_devicetree_image() {
-        if test -n "${DEVICETREE}" ; then
-            dtc -I dts -O dtb -o ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.dtb ${DEVICETREE}
-
-            cd ${DEPLOY_DIR_IMAGE}
-            rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.dtb
-            ln -sf ${KERNEL_IMAGE_BASE_NAME}.dtb ${KERNEL_IMAGE_SYMLINK_NAME}.dtb
-        fi
-}
-
 addtask compulab_image after do_deploy before do_package
-addtask devicetree_image after do_deploy before do_package
+
diff --git a/packages/linux/linux_2.6.23.bb b/packages/linux/linux_2.6.23.bb
index d3989a42ef..76ebbbe917 100644
--- a/packages/linux/linux_2.6.23.bb
+++ b/packages/linux/linux_2.6.23.bb
@@ -6,9 +6,6 @@ DEFAULT_PREFERENCE_mpc8313e-rdb = "1"
 DEFAULT_PREFERENCE_mpc8323e-rdb = "1"
 DEFAULT_PREFERENCE_avr32 = "1"
 
-DEPENDS_append_mpc8313e-rdb = " dtc-native"
-DEPENDS_append_mpc8323e-rdb = " dtc-native"
-
 PR = "r12"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.23.tar.bz2 \
@@ -52,10 +49,6 @@ SRC_URI_append_mpc8323e-rdb = "\
 
 CMDLINE_cm-x270 = "console=${CMX270_CONSOLE_SERIAL_PORT},38400 monitor=8 bpp=16 mem=64M mtdparts=physmap-flash.0:256k(boot)ro,0x180000(kernel),-(root);cm-x270-nand:64m(app),-(data) rdinit=/sbin/init root=mtd3 rootfstype=jffs2"
 
-DEVICETREE_mpc8313e-rdb = "arch/${ARCH}/boot/dts/mpc8313erdb.dts"
-DEVICETREE_mpc8323e-rdb = "arch/${ARCH}/boot/dts/mpc832x_rdb.dts"
-DEVICETREE_FLAGS_mpc8313e-rdb = "-R 8 -S 0x3000"
-
 FILES_kernel-image_cm-x270 = ""
 
 python do_compulab_image() {
@@ -93,16 +86,6 @@ python do_compulab_image() {
 	    os.symlink(img_file, link_file)
 }
 
-do_devicetree_image() {
-        if test -n "${DEVICETREE}" ; then
-            dtc -I dts -O dtb ${DEVICETREE_FLAGS} -o ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.dtb ${DEVICETREE}
-
-            cd ${DEPLOY_DIR_IMAGE}
-            rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.dtb
-            ln -sf ${KERNEL_IMAGE_BASE_NAME}.dtb ${KERNEL_IMAGE_SYMLINK_NAME}.dtb
-        fi
-}
 
 addtask compulab_image after do_deploy before do_package
-addtask devicetree_image after do_deploy before do_package
 
diff --git a/packages/linux/linux_2.6.24.bb b/packages/linux/linux_2.6.24.bb
index c0751634a5..fa255403e9 100644
--- a/packages/linux/linux_2.6.24.bb
+++ b/packages/linux/linux_2.6.24.bb
@@ -10,8 +10,6 @@ DEFAULT_PREFERENCE_atngw100 = "1"
 DEFAULT_PREFERENCE_at32stk1000 = "1"
 DEFAULT_PREFERENCE_ts72xx = "1"
 
-DEPENDS_append_mpc8313e-rdb = " dtc-native"
-
 PR = "r11"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2 \
@@ -84,8 +82,6 @@ CMDLINE_cm-x270 = "console=${CMX270_CONSOLE_SERIAL_PORT},38400 monitor=1 mem=64M
 
 FILES_kernel-image_gesbc-9302 = ""
 
-DEVICETREE_mpc8313e-rdb = "arch/${ARCH}/boot/dts/mpc8313erdb.dts"
-DEVICETREE_FLAGS_mpc8313e-rdb = "-R 8 -S 0x3000"
 python do_compulab_image() {
 	import os
 	import os.path
@@ -122,16 +118,5 @@ python do_compulab_image() {
 }
 
 
-do_devicetree_image() {
-        if test -n "${DEVICETREE}" ; then
-            dtc -I dts -O dtb ${DEVICETREE_FLAGS} -o ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.dtb ${DEVICETREE}
-
-            cd ${DEPLOY_DIR_IMAGE}
-            rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.dtb
-            ln -sf ${KERNEL_IMAGE_BASE_NAME}.dtb ${KERNEL_IMAGE_SYMLINK_NAME}.dtb
-        fi
-}
-
 addtask compulab_image after do_deploy before do_package
-addtask devicetree_image after do_deploy before do_package
 
-- 
cgit v1.2.3


From 15b87148d7d597c9fd213f95471b5c6ffb293d38 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Mon, 31 Mar 2008 09:47:16 +0000
Subject: abiword-plugins: add latest stable, 2.6.0 and patch it to use CXX for
 LD

---
 packages/abiword/abiword-plugins_2.6.0.bb          | 44 ++++++++++++++++++++++
 .../abiword/files/abiword-cxx-for-ld-fix.patch     | 12 ++++++
 2 files changed, 56 insertions(+)
 create mode 100644 packages/abiword/abiword-plugins_2.6.0.bb
 create mode 100644 packages/abiword/files/abiword-cxx-for-ld-fix.patch

(limited to 'packages')

diff --git a/packages/abiword/abiword-plugins_2.6.0.bb b/packages/abiword/abiword-plugins_2.6.0.bb
new file mode 100644
index 0000000000..f6cdcc56b0
--- /dev/null
+++ b/packages/abiword/abiword-plugins_2.6.0.bb
@@ -0,0 +1,44 @@
+DESCRIPTION = "AbiWord is a free word processing program similar to Microsoft(r) Word"
+HOMEPAGE = "http://www.abiword.org"
+SECTION = "x11/office"
+LICENSE = "GPLv2"
+DEPENDS = "boost loudmouth libwpd librsvg goffice poppler libglade"
+RDEPENDS = "abiword"
+
+SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-plugins-${PV}.tar.gz \
+           http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz \
+           file://abiword-cxx-for-ld-fix.patch;patch=1 \
+	   "
+
+DEFAULT_PREFERENCE = "2"
+
+inherit autotools
+
+PARALLEL_MAKE=""
+
+# Ugly hack to find libstdc++
+export LD="${CXX}"
+
+EXTRA_OECONF = " --without-libwmf \
+                 --without-inter7eps \
+		 --with-abiword=${WORKDIR}/abiword-${PV} \
+		 --with-boost=${STAGING_DIR_HOST} \ 
+		 --with-boost-thread=boost_thread-mt \
+               "
+
+PACKAGES_DYNAMIC = "abiword-plugin-*"
+
+python populate_packages_prepend () {
+	abiword_libdir    = bb.data.expand('${libdir}/abiword-2.6/plugins', d)
+	do_split_packages(d, abiword_libdir, '^libAbi(.*)\.so$', 'abiword-plugin-%s', 'Abiword plugin for %s', extra_depends='')
+        do_split_packages(d, abiword_libdir, '^libAbi(.*)\.la$', 'abiword-plugin-%s-dev', 'Abiword plugin for %s', extra_depends='')
+}
+
+
+PACKAGES =+ "abiword-plugin-collab-glade"
+
+FILES_abiword-plugin-collab-glade += "${datadir}"
+RDEPENDS_abiword-plugin-collab-glade = "abiword-plugin-collab"
+
+FILES_${PN}-dbg += "${libdir}/abiword-2.6/plugins/.debug"
+
diff --git a/packages/abiword/files/abiword-cxx-for-ld-fix.patch b/packages/abiword/files/abiword-cxx-for-ld-fix.patch
new file mode 100644
index 0000000000..e49b1e92e5
--- /dev/null
+++ b/packages/abiword/files/abiword-cxx-for-ld-fix.patch
@@ -0,0 +1,12 @@
+libstc++ isn't in staging anymore, so we must use g++ for linking
+
+--- /tmp/configure.ac	2008-03-31 11:39:13.130631737 +0200
++++ abiword-plugins-2.6.0/configure.ac	2008-03-31 11:39:22.754586487 +0200
+@@ -14,6 +14,7 @@
+ AC_PROG_INSTALL
+ AC_PROG_LN_S
+ AC_PROG_MAKE_SET
++AC_LANG_CPLUSPLUS
+ 
+ AM_INIT_AUTOMAKE
+ 
-- 
cgit v1.2.3


From 80b1d5fe7b58c66f8a1b05edd2967cadfd9a1984 Mon Sep 17 00:00:00 2001
From: Jeremy Laine <jeremy.laine@m4x.org>
Date: Mon, 31 Mar 2008 11:54:48 +0000
Subject: linux.inc: add dtc-native to DEPENDS if KERNEL_DEVICETREE is defined

---
 packages/linux/linux.inc | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'packages')

diff --git a/packages/linux/linux.inc b/packages/linux/linux.inc
index 1f6eeb5538..2757ad520d 100644
--- a/packages/linux/linux.inc
+++ b/packages/linux/linux.inc
@@ -24,8 +24,16 @@ KERNEL_DEVICETREE_mpc8313e-rdb = "arch/${ARCH}/boot/dts/mpc8313erdb.dts"
 KERNEL_DEVICETREE_FLAGS_mpc8313e-rdb = "-R 8 -S 0x3000"
 KERNEL_DEVICETREE_mpc8323e-rdb = "arch/${ARCH}/boot/dts/mpc832x_rdb.dts"
 
-DEPENDS_append_mpc8313e-rdb = " dtc-native"
-DEPENDS_append_mpc8323e-rdb = " dtc-native"
+python __anonymous () {
+
+    import bb
+    
+    devicetree = bb.data.getVar('KERNEL_DEVICETREE', d, 1) or ''
+    if devicetree:
+    	depends = bb.data.getVar("DEPENDS", d, 1)
+    	depends = "%s dtc-native" % depends
+    	bb.data.setVar("DEPENDS", depends, d)
+}
 
 do_configure_prepend() {
         echo "" > ${S}/.config
-- 
cgit v1.2.3


From f9302761ebe835b0059b73e104169837b31f5c14 Mon Sep 17 00:00:00 2001
From: Jeremy Laine <jeremy.laine@m4x.org>
Date: Mon, 31 Mar 2008 14:41:29 +0000
Subject: hostap-daemon: replace version 0.6.0 by 0.6.3

---
 packages/hostap/hostap-daemon-0.6.0/.mtn2git_empty |  0
 packages/hostap/hostap-daemon-0.6.0/init           | 37 --------------------
 .../hostap/hostap-daemon-0.6.0/makefile-cross.diff | 25 --------------
 packages/hostap/hostap-daemon-0.6.3/.mtn2git_empty |  0
 packages/hostap/hostap-daemon-0.6.3/init           | 37 ++++++++++++++++++++
 .../hostap/hostap-daemon-0.6.3/makefile-cross.diff | 25 ++++++++++++++
 packages/hostap/hostap-daemon_0.6.0.bb             | 40 ----------------------
 packages/hostap/hostap-daemon_0.6.3.bb             | 40 ++++++++++++++++++++++
 8 files changed, 102 insertions(+), 102 deletions(-)
 delete mode 100644 packages/hostap/hostap-daemon-0.6.0/.mtn2git_empty
 delete mode 100644 packages/hostap/hostap-daemon-0.6.0/init
 delete mode 100644 packages/hostap/hostap-daemon-0.6.0/makefile-cross.diff
 create mode 100644 packages/hostap/hostap-daemon-0.6.3/.mtn2git_empty
 create mode 100644 packages/hostap/hostap-daemon-0.6.3/init
 create mode 100644 packages/hostap/hostap-daemon-0.6.3/makefile-cross.diff
 delete mode 100644 packages/hostap/hostap-daemon_0.6.0.bb
 create mode 100644 packages/hostap/hostap-daemon_0.6.3.bb

(limited to 'packages')

diff --git a/packages/hostap/hostap-daemon-0.6.0/.mtn2git_empty b/packages/hostap/hostap-daemon-0.6.0/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/hostap/hostap-daemon-0.6.0/init b/packages/hostap/hostap-daemon-0.6.0/init
deleted file mode 100644
index 79f74b681e..0000000000
--- a/packages/hostap/hostap-daemon-0.6.0/init
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-DAEMON=/usr/sbin/hostapd
-NAME=hostapd
-DESC="HOSTAP Daemon"
-ARGS="/etc/hostapd.conf -B"
-
-test -f $DAEMON || exit 0
-
-set -e
-
-case "$1" in
-    start)
-	echo -n "Starting $DESC: "
-	start-stop-daemon -S -x $DAEMON -- $ARGS
-	echo "$NAME."
-	;;
-    stop)
-	echo -n "Stopping $DESC: "
-	start-stop-daemon -K -x $DAEMON
-	echo "$NAME."
-	;;
-    restart)
-	$0 stop
-	$0 start
-	;;
-    reload)
-	echo -n "Reloading $DESC: "
-	killall -HUP $(basename ${DAEMON})
-	echo "$NAME."
-	;;
-    *)
-	echo "Usage: $0 {start|stop|restart|reload}"
-	exit 1
-	;;
-esac
-
-exit 0
diff --git a/packages/hostap/hostap-daemon-0.6.0/makefile-cross.diff b/packages/hostap/hostap-daemon-0.6.0/makefile-cross.diff
deleted file mode 100644
index 9534199e78..0000000000
--- a/packages/hostap/hostap-daemon-0.6.0/makefile-cross.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -urN hostapd.orig/Makefile hostapd/Makefile
---- hostapd.orig/Makefile	2007-05-28 19:26:55.000000000 +0200
-+++ hostapd/Makefile	2007-11-22 16:28:44.000000000 +0100
-@@ -6,6 +6,8 @@
- CFLAGS = -MMD -O2 -Wall -g
- endif
- 
-+TARGET_PREFIX ?= /usr/local/bin/
-+
- # define HOSTAPD_DUMP_STATE to include SIGUSR1 handler for dumping state to
- # a file (undefine it, if you want to save in binary size)
- CFLAGS += -DHOSTAPD_DUMP_STATE
-@@ -361,10 +363,10 @@
- 	fi
- 
- install: all
--	for i in $(ALL); do cp $$i /usr/local/bin/$$i; done
-+	for i in $(ALL); do cp $$i $(TARGET_PREFIX)/$$i; done
- 
- hostapd: $(OBJS)
--	$(CC) -o hostapd $(OBJS) $(LIBS)
-+	$(CC) $(LDFLAGS) -o hostapd $(OBJS) $(LIBS)
- 
- OBJS_c = hostapd_cli.o ../src/common/wpa_ctrl.o ../src/utils/os_$(CONFIG_OS).o
- hostapd_cli: $(OBJS_c)
diff --git a/packages/hostap/hostap-daemon-0.6.3/.mtn2git_empty b/packages/hostap/hostap-daemon-0.6.3/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/hostap/hostap-daemon-0.6.3/init b/packages/hostap/hostap-daemon-0.6.3/init
new file mode 100644
index 0000000000..79f74b681e
--- /dev/null
+++ b/packages/hostap/hostap-daemon-0.6.3/init
@@ -0,0 +1,37 @@
+#!/bin/sh
+DAEMON=/usr/sbin/hostapd
+NAME=hostapd
+DESC="HOSTAP Daemon"
+ARGS="/etc/hostapd.conf -B"
+
+test -f $DAEMON || exit 0
+
+set -e
+
+case "$1" in
+    start)
+	echo -n "Starting $DESC: "
+	start-stop-daemon -S -x $DAEMON -- $ARGS
+	echo "$NAME."
+	;;
+    stop)
+	echo -n "Stopping $DESC: "
+	start-stop-daemon -K -x $DAEMON
+	echo "$NAME."
+	;;
+    restart)
+	$0 stop
+	$0 start
+	;;
+    reload)
+	echo -n "Reloading $DESC: "
+	killall -HUP $(basename ${DAEMON})
+	echo "$NAME."
+	;;
+    *)
+	echo "Usage: $0 {start|stop|restart|reload}"
+	exit 1
+	;;
+esac
+
+exit 0
diff --git a/packages/hostap/hostap-daemon-0.6.3/makefile-cross.diff b/packages/hostap/hostap-daemon-0.6.3/makefile-cross.diff
new file mode 100644
index 0000000000..9534199e78
--- /dev/null
+++ b/packages/hostap/hostap-daemon-0.6.3/makefile-cross.diff
@@ -0,0 +1,25 @@
+diff -urN hostapd.orig/Makefile hostapd/Makefile
+--- hostapd.orig/Makefile	2007-05-28 19:26:55.000000000 +0200
++++ hostapd/Makefile	2007-11-22 16:28:44.000000000 +0100
+@@ -6,6 +6,8 @@
+ CFLAGS = -MMD -O2 -Wall -g
+ endif
+ 
++TARGET_PREFIX ?= /usr/local/bin/
++
+ # define HOSTAPD_DUMP_STATE to include SIGUSR1 handler for dumping state to
+ # a file (undefine it, if you want to save in binary size)
+ CFLAGS += -DHOSTAPD_DUMP_STATE
+@@ -361,10 +363,10 @@
+ 	fi
+ 
+ install: all
+-	for i in $(ALL); do cp $$i /usr/local/bin/$$i; done
++	for i in $(ALL); do cp $$i $(TARGET_PREFIX)/$$i; done
+ 
+ hostapd: $(OBJS)
+-	$(CC) -o hostapd $(OBJS) $(LIBS)
++	$(CC) $(LDFLAGS) -o hostapd $(OBJS) $(LIBS)
+ 
+ OBJS_c = hostapd_cli.o ../src/common/wpa_ctrl.o ../src/utils/os_$(CONFIG_OS).o
+ hostapd_cli: $(OBJS_c)
diff --git a/packages/hostap/hostap-daemon_0.6.0.bb b/packages/hostap/hostap-daemon_0.6.0.bb
deleted file mode 100644
index 37b710db19..0000000000
--- a/packages/hostap/hostap-daemon_0.6.0.bb
+++ /dev/null
@@ -1,40 +0,0 @@
-DESCRIPTION = "User space daemon for extended IEEE 802.11 management"
-HOMEPAGE = "http://hostap.epitest.fi"
-SECTION = "kernel/userland"
-PRIORITY = "optional"
-LICENSE = "GPL"
-DEPENDS = "openssl ${@base_contains("COMBINED_FEATURES", "pci", "madwifi-ng", "",d)}"
-
-DEFAULT_PREFERENCE = "-1"
-
-SRC_URI = "http://hostap.epitest.fi/releases/hostapd-${PV}.tar.gz \
-	file://makefile-cross.diff;patch=1 \
-	file://defconfig \
-	file://init"
-
-S = "${WORKDIR}/hostapd-${PV}/hostapd"
-
-export HAS_PCI = "${@base_contains('COMBINED_FEATURES', 'pci', 1, 0,d)}"
-
-inherit update-rc.d
-INITSCRIPT_NAME=hostapd
-
-do_configure() {
-	install -m 0644 ${WORKDIR}/defconfig ${S}/.config
-	if [ "x$HAS_PCI" == "x1" ] ; then
-		echo "CONFIG_DRIVER_MADWIFI=y" >> .config
-		echo "CFLAGS += -I${STAGING_INCDIR}/madwifi-ng" >> .config
-	fi
-}
-
-do_compile() {
-	CFLAGS='${CFLAGS}' CC='${CC}' make
-}
-
-do_install() {
-	install -d ${D}${sbindir} ${D}${sysconfdir}/init.d
-	make TARGET_PREFIX=${D}${sbindir} install
-	install -m 0644 hostapd.conf ${D}${sysconfdir}
-	install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/hostapd
-}
-
diff --git a/packages/hostap/hostap-daemon_0.6.3.bb b/packages/hostap/hostap-daemon_0.6.3.bb
new file mode 100644
index 0000000000..37b710db19
--- /dev/null
+++ b/packages/hostap/hostap-daemon_0.6.3.bb
@@ -0,0 +1,40 @@
+DESCRIPTION = "User space daemon for extended IEEE 802.11 management"
+HOMEPAGE = "http://hostap.epitest.fi"
+SECTION = "kernel/userland"
+PRIORITY = "optional"
+LICENSE = "GPL"
+DEPENDS = "openssl ${@base_contains("COMBINED_FEATURES", "pci", "madwifi-ng", "",d)}"
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "http://hostap.epitest.fi/releases/hostapd-${PV}.tar.gz \
+	file://makefile-cross.diff;patch=1 \
+	file://def