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

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

2005/01/05 20:34:43+00:00 nexus.co.uk!pb
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into stealth.nexus.co.uk:/home/pb/oe/oe

2005/01/05 20:34:07+00:00 nexus.co.uk!pb
update gsoko to 0.4.2-gpe6

2005/01/05 21:23:38+01:00 (none)!koen
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into lieve.(none):/data/build/oe/clean-tree/openembedded

2005/01/05 21:23:17+01:00 (none)!koen
familiar-0.8.1.conf:
  update familiar-0.8.1.conf

2005/01/05 20:20:07+00:00 nexus.co.uk!pb
upgrade libgpewidget to 0.97

2005/01/05 20:14:45+00:00 nexus.co.uk!pb
apply patch to fix linphone segfault on startup

BKrev: 41dc50aa1g6ozARYXlvOEduQIpqxnQ

diff --git a/conf/distro/familiar-0.8.1.conf b/conf/distro/familiar-0.8.1.conf
index 99f06b1..c0798bd 100644 (file)
--- a/conf/distro/familiar-0.8.1.conf
+++ b/conf/distro/familiar-0.8.1.conf
@@ -48,7 +48,7 @@ PREFERRED_VERSION_matchbox-wm = "0.9"
 PREFERRED_VERSION_matchbox-panel = "0.9"
 PREFERRED_VERSION_matchbox-applet-inputmanager = "0.6"
 PREFERRED_VERSION_gtk+ = "2.6.0"
-PREFERRED_VERSION_libgpewidget = "0.96"
+PREFERRED_VERSION_libgpewidget = "0.97"
 PREFERRED_VERSION_libgpepimc = "0.4"
 PREFERRED_VERSION_libgpevtype = "0.5"
 PREFERRED_VERSION_libschedule = "0.13"

diff --git a/packages/gsoko/gsoko-0.4.2-gpe6/fix_makefiles.patch b/packages/gsoko/gsoko-0.4.2-gpe6/fix_makefiles.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/gsoko/gsoko_0.4.2-gpe6.bb b/packages/gsoko/gsoko_0.4.2-gpe6.bb
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/libgpewidget/libgpewidget_0.97.bb b/packages/libgpewidget/libgpewidget_0.97.bb
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/linphone/linphone-hh-0.12.2.hh1/segfault.patch b/packages/linphone/linphone-hh-0.12.2.hh1/segfault.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/linphone/linphone-hh_0.12.2.hh1.bb b/packages/linphone/linphone-hh_0.12.2.hh1.bb
index e69de29..82c6aab 100644 (file)
--- a/packages/linphone/linphone-hh_0.12.2.hh1.bb
+++ b/packages/linphone/linphone-hh_0.12.2.hh1.bb
@@ -0,0 +1,35 @@
+LICENSE = GPL
+SECTION = "x11/utils"
+PR = "r3"
+
+DESCRIPTION = "SIP-based IP phone (GPE edition)"
+DEPENDS = "libosip gtk+ libogg alsa-lib"
+SRC_URI = "http://handhelds.org/pub/linux/packages/linphone/linphone-${PV}.tar.gz \
+       file://osipua-ipv6-lossage.patch;patch=1 \
+       file://gpe-cross-lossage.patch;patch=1 \
+       file://disable-gtk-doc.patch;patch=1 \
+       file://segfault.patch;patch=1"
+
+S = "${WORKDIR}/linphone-${PV}"
+
+FILES_${PN} += "${datadir}/linphonec"
+
+inherit autotools
+
+EXTRA_OECONF = "--disable-gnome_ui --disable-gtk-doc"
+
+do_configure() {
+       # ffmpeg is in AC_SUBDIRS, but doesn't actually use autoconf.
+       # Autoreconf will try to recurse into there and blow up.
+       for dir in . speex oRTP osipua; do
+               ( cd $dir; libtoolize --force; aclocal; automake; autoconf )
+       done
+
+       oe_runconf
+}
+
+do_install_append() {
+       mv ${D}${datadir}/gnome/apps/Internet ${D}${datadir}/applications
+       rm -f ${D}${datadir}/sounds/linphone/hello*.wav
+       rm -f ${D}${datadir}/sounds/linphone/rings/oldphone.wav
+}