13 files changed, 54 insertions, 67 deletions
diff --git a/packages/gpephone/audioplayer_0.1.bb b/packages/gpephone/audioplayer_1.0.bb
index e79b294e81..e79b294e81 100644
--- a/packages/gpephone/audioplayer_0.1.bb
+++ b/packages/gpephone/audioplayer_1.0.bb
diff --git a/packages/gpephone/calendar_0.1.bb b/packages/gpephone/calendar_1.0.bb
index 9aed3e56d9..342f81eed4 100644
--- a/packages/gpephone/calendar_0.1.bb
+++ b/packages/gpephone/calendar_1.0.bb
@@ -6,7 +6,7 @@ PR          = "r0"
 
 DEPENDS = "gtk+ libgpewidget libgpephone libgemwidget dbus-glib libcalenabler libiac"
 
-GPE_TARBALL_SUFFIX= "bz2"
+GPE_TARBALL_SUFFIX= "gz"
 inherit gpephone autotools
 
 FILES_${PN} += "${datadir}/database ${datadir}/res"
diff --git a/packages/gpephone/gpe-applauncher_0.6.bb b/packages/gpephone/gpe-applauncher_0.7.bb
index 5fd81291f8..6b6d08d547 100644
--- a/packages/gpephone/gpe-applauncher_0.6.bb
+++ b/packages/gpephone/gpe-applauncher_0.7.bb
@@ -6,7 +6,7 @@ PR          = "r0"
 
 DEPENDS = "gtk+ libgpewidget libgpephone libgpelaunch dbus-glib libxsettings-client"
 
-GPE_TARBALL_SUFFIX= "bz2"
+GPE_TARBALL_SUFFIX= "gz"
 inherit gpephone autotools
 
 #EXTRA_OECONF = "--enable-gridlayout"
diff --git a/packages/gpephone/libcalenabler_0.1.bb b/packages/gpephone/libcalenabler_1.0.bb
index e5375a8f86..fc5367984f 100644
--- a/packages/gpephone/libcalenabler_0.1.bb
+++ b/packages/gpephone/libcalenabler_1.0.bb
@@ -5,9 +5,9 @@ PRIORITY    = "optional"
 DEPENDS     = "glib-2.0 e2fsprogs-libs sqlite3"
 PR          = "r1"
 
-GPE_TARBALL_SUFFIX = "bz2"
+GPE_TARBALL_SUFFIX = "gz"
 
-inherit gpe pkgconfig autotools
+inherit gpephone pkgconfig autotools
 
 LDFLAGS += " -L${STAGING_LIBDIR}"
 
diff --git a/packages/gpephone/libchenabler_0.1.bb b/packages/gpephone/libchenabler_0.1.bb
index 86a6397b07..dfc353964c 100644
--- a/packages/gpephone/libchenabler_0.1.bb
+++ b/packages/gpephone/libchenabler_0.1.bb
@@ -5,9 +5,9 @@ PRIORITY    = "optional"
 DEPENDS     = "glib-2.0 sqlite3 librecord"
 PR          = "r0"
 
-GPE_TARBALL_SUFFIX = "bz2"
+GPE_TARBALL_SUFFIX = "gz"
 
-inherit gpe pkgconfig autotools
+inherit gpephone pkgconfig autotools
 
 FILES_${PN} += " ${datadir}/vochistory"
 
diff --git a/packages/gpephone/libvocenabler_0.1.bb b/packages/gpephone/libvocenabler_0.1.bb
index 208b83f584..f0b86ee0e3 100644
--- a/packages/gpephone/libvocenabler_0.1.bb
+++ b/packages/gpephone/libvocenabler_0.1.bb
@@ -5,7 +5,7 @@ PRIORITY    = "optional"
 DEPENDS     = "glib-2.0 dbus-glib linphone"
 PR          = "r0"
 
-GPE_TARBALL_SUFFIX = "bz2"
+GPE_TARBALL_SUFFIX = "gz"
 
 inherit gpephone pkgconfig autotools
 
diff --git a/packages/gpephone/phoneserver_0.1.bb b/packages/gpephone/phoneserver_1.0.bb
index 85ccff0041..fdde9d73f9 100644
--- a/packages/gpephone/phoneserver_0.1.bb
+++ b/packages/gpephone/phoneserver_1.0.bb
@@ -6,6 +6,6 @@ PR          = "r0"
 
 DEPENDS = "dbus-glib glib-2.0  libmsgenabler libabenabler"
 
-GPE_TARBALL_SUFFIX= "gz"
+GPE_TARBALL_SUFFIX= "bz2"
 inherit gpephone autotools
  
diff --git a/packages/gpephone/sms_0.1.bb b/packages/gpephone/sms_1.0.bb
index 12cd8b4f6e..12cd8b4f6e 100644
--- a/packages/gpephone/sms_0.1.bb
+++ b/packages/gpephone/sms_1.0.bb
diff --git a/packages/gpephone/soundserver_0.1.bb b/packages/gpephone/soundserver_1.0.bb
index bf45c2ecc6..bf45c2ecc6 100644
--- a/packages/gpephone/soundserver_0.1.bb
+++ b/packages/gpephone/soundserver_1.0.bb
diff --git a/packages/gpephone/videoplayer_0.1.bb b/packages/gpephone/videoplayer_0.1.bb
index 49436eb293..0cff5c3c73 100644
--- a/packages/gpephone/videoplayer_0.1.bb
+++ b/packages/gpephone/videoplayer_0.1.bb
@@ -6,7 +6,7 @@ PR          = "r0"
 
 DEPENDS = "gtk+ libgpewidget libgpephone libgemwidget dbus-glib gst-plugins-base libiac"
 
-GPE_TARBALL_SUFFIX= "bz2"
+GPE_TARBALL_SUFFIX= "gz"
 inherit gpephone autotools
 
 FILES_${PN} += "${datadir}/database ${datadir}/res"
diff --git a/packages/gpephone/voicecall_0.4.bb b/packages/gpephone/voicecall_0.1.bb
index 2594991458..2594991458 100644
--- a/packages/gpephone/voicecall_0.4.bb
+++ b/packages/gpephone/voicecall_0.1.bb
diff --git a/packages/linphone/linphone_1.6.0.bb b/packages/linphone/linphone_1.6.0.bb
index f483368c79..9a5a02f2cd 100644
--- a/packages/linphone/linphone_1.6.0.bb
+++ b/packages/linphone/linphone_1.6.0.bb
@@ -1,50 +1,34 @@
 DESCRIPTION = "SIP-based IP phone (console edition)"
 HOMEPAGE = "http://www.linphone.org/?lang=us"
-LICENSE = "GPL-2"
 SECTION = "x11/utils"
-PROVIDES = "linphone linphonec liblinphone"
-DEPENDS = "intltool libosip2 speex libogg alsa-lib readline"
-# for GPE version perhaps use this:
-#DEPENDS = "intltool libosip2 speex libogg alsa-lib readline gtk+ libgnomeui"
-PR = "r0"
-
-SRC_URI = "http://download.savannah.nongnu.org/releases/linphone/1.6.x/sources/linphone-${PV}.tar.gz \
-           http://download.devbase.at/voip/linphone-1.6.0-pl0.patch;patch=1"
-
-S = "${WORKDIR}/linphone-${PV}"
+LICENSE = "GPL-2"
 
-PACKAGES += "linphonec linphone-rings liblinphone libquickstream libmediastreamer libortp"
+DEPENDS = "intltool libosip2 speex libogg alsa-lib readline"
+DEPENDS_${PN} = "liblinphone"
+DEPENDS_${PN}c = "liblinphone readline"
+DEPENDS_liblinphone = "libquickstream libmediastreamer libortp libosip2"
+DEPENDS_libquickstream = "speex libmediastreamer alsa-lib"
+DEPENDS_libmediastreamer = "speex libogg alsa-lib libortp"
 
-FILES_${PN} = "${bindir}/linphone ${datadir}/pixmaps ${datadir}/applications ${datadir}/gnome/apps"
-DEPENDS_${PN}  = "liblinphone"
 RDEPENDS_${PN} = "liblinphone"
-# for GPE version perhaps use these:
-#DEPENDS_${PN}  = "liblinphone gtk+ libgnomeui"
-#RDEPENDS_${PN} = "liblinphone gtk+ libgnomeui"
-
-FILES_${PN}c = "${bindir}/linphonec ${bindir}/sipomatic ${datadir}/sounds/linphone/ringback.wav"
-DEPENDS_${PN}c  = "liblinphone readline"
 RDEPENDS_${PN}c = "liblinphone readline"
-
-FILES_${PN}-rings = "${datadir}/sounds/linphone/rings"
-
-FILES_liblinphone = "${libdir}/liblinphone.so*"
-DEPENDS_liblinphone  = "libquickstream libmediastreamer libortp libosip2"
 RDEPENDS_liblinphone = "libquickstream libmediastreamer libortp libosip2"
-
-FILES_libquickstream = "${libdir}/libquickstream.so*"
-DEPENDS_libquickstream  = "speex libmediastreamer alsa-lib"
 RDEPENDS_libquickstream = "speex libmediastreamer libasound"
-
-FILES_libmediastreamer = "${libdir}/libmediastreamer.so*"
-DEPENDS_libmediastreamer  = "speex libogg alsa-lib libortp"
 RDEPENDS_libmediastreamer = "speex libogg libasound libortp"
 
-FILES_libortp = "${libdir}/libortp.so*"
+PROVIDES = "linphone linphonec liblinphone"
 
-FILES_${PN}-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/pkgconfig ${includedir}"
+PR = "r1"
+
+SRC_URI = "http://download.savannah.nongnu.org/releases/linphone/1.6.x/sources/linphone-${PV}.tar.gz \
+           http://download.devbase.at/voip/linphone-1.6.0-pl0.patch;patch=1"
+
+S = "${WORKDIR}/linphone-${PV}"
+
+inherit autotools pkgconfig
 
-inherit autotools
+#ugly, ugly hack to get around some pkgconfig versioning problems, hopefully the nslu2 people will come up with a proper solution
+export PKG_CONFIG=/usr/bin/pkg-config
 
 EXTRA_OECONF = "--disable-gtk-doc \
                 --without-ffmpeg --disable-video --without-sdl \
@@ -54,30 +38,33 @@ EXTRA_OECONF = "--disable-gtk-doc \
                 --with-speex=${STAGING_DIR}/${HOST_SYS} \
                 --disable-truespeech --disable-manual \
                 --disable-gnome_ui"
-# for GPE version probably remove the last line above
 
-#export SPEEX_CFLAGS=-I${STAGING_INCDIR}
-#export SPEEX_LIBS="-L${STAGING_LIBDIR} -lspeex"
-export PKG_CONFIG=/usr/bin/pkg-config
+PARALLEL_MAKE = ""
 
-do_install_append() {
-#	rm -f ${D}${datadir}/sounds/linphone/rings/oldphone.wav
+do_stage () {
+        install -d ${STAGING_DATADIR}/aclocal
+        oe_libinstall -a -so liblinphone ${STAGING_LIBDIR}
+        install -d ${STAGING_INCDIR}/linphone
+        install -m 0644 ${S}/coreapi/linphonecore.h ${STAGING_INCDIR}/linphone
+        install -m 0644 ${S}/coreapi/lpconfig.h ${STAGING_INCDIR}/linphone
+        oe_libinstall -a -so libmediastreamer ${STAGING_LIBDIR}
+        oe_libinstall -a -so libquickstream ${STAGING_LIBDIR}
+        install -d ${STAGING_INCDIR}/mediastreamer2
+        install -m 0644 ${S}/mediastreamer2/include/mediastreamer2/*.h ${STAGING_INCDIR}/mediastreamer2
+        install -d ${STAGING_INCDIR}/ortp
+        oe_libinstall -a -so libortp ${STAGING_LIBDIR}/
+        install -m 0644 ${S}/oRTP/include/ortp/*.h ${STAGING_INCDIR}/ortp/
+        autotools_stage_all
 }
 
-do_stage () {
-	install -d ${STAGING_DATADIR}/aclocal
+PACKAGES += "linphonec linphone-rings liblinphone libquickstream libmediastreamer libortp"
+
+FILES_${PN} = "${bindir}/linphone ${datadir}/pixmaps ${datadir}/applications ${datadir}/gnome/apps"
+FILES_${PN}c = "${bindir}/linphonec ${bindir}/sipomatic ${datadir}/sounds/linphone/ringback.wav"
+FILES_${PN}-rings = "${datadir}/sounds/linphone/rings"
+FILES_liblinphone = "${libdir}/liblinphone.so*"
+FILES_libquickstream = "${libdir}/libquickstream.so*"
+FILES_libmediastreamer = "${libdir}/libmediastreamer.so*"
+FILES_libortp = "${libdir}/libortp.so*"
+FILES_${PN}-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/pkgconfig ${includedir}"
 
-	oe_libinstall -a -so liblinphone ${STAGING_LIBDIR}
-	install -d ${STAGING_INCDIR}/linphone
-	install -m 0644 ${S}/coreapi/linphonecore.h ${STAGING_INCDIR}/linphone
-	install -m 0644 ${S}/coreapi/lpconfig.h ${STAGING_INCDIR}/linphone
-        
-	oe_libinstall -a -so libmediastreamer ${STAGING_LIBDIR}
-	oe_libinstall -a -so libquickstream ${STAGING_LIBDIR}
-	install -d ${STAGING_INCDIR}/mediastreamer2
-	install -m 0644 ${S}/mediastreamer2/include/mediastreamer2/*.h ${STAGING_INCDIR}/mediastreamer2
-        
-	install -d ${STAGING_INCDIR}/ortp
-	oe_libinstall -a -so libortp ${STAGING_LIBDIR}/
-	install -m 0644 ${S}/oRTP/include/ortp/*.h ${STAGING_INCDIR}/ortp/
-}
diff --git a/packages/linux/linux-rp_2.6.20.bb b/packages/linux/linux-rp_2.6.20.bb
index f0f62c36b2..6cd46f9561 100644
--- a/packages/linux/linux-rp_2.6.20.bb
+++ b/packages/linux/linux-rp_2.6.20.bb
@@ -1,6 +1,6 @@
 require linux-rp.inc
 
-PR = "r1"
+PR = "r2"
 
 # Handy URLs
 # git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046
@@ -14,7 +14,7 @@ PR = "r1"
 # Patches submitted upstream are towards top of this list 
 # Hacks should clearly named and at the bottom
 SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.20.tar.bz2 \
-           http://opensource.wolfsonmicro.com/~lg/asoc/asoc-v0.13.patch;patch=1;status=merged \
+           http://opensource.wolfsonmicro.com/~lg/asoc/asoc-v0.13.3.patch;patch=1;status=merged \
            ${RPSRC}/hx2750_base-r28.patch;patch=1 \
            ${RPSRC}/hx2750_bl-r8.patch;patch=1 \
            ${RPSRC}/hx2750_pcmcia-r2.patch;patch=1 \