Merge bk://openembedded@openembedded.bkbits.net/packages

into stealth.(none):/home/pb/oe/oe-packages

2004/08/31 20:11:42+01:00 (none)!pb
try to disable gtk-doc building

BKrev: 4134cd7cIj0aMcKZyWrvikPFf4XjUw

diff --git a/linphone/files/disable-gtk-doc.patch b/linphone/files/disable-gtk-doc.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/linphone/linphone-hh_0.12.2.hh1.oe b/linphone/linphone-hh_0.12.2.hh1.oe
index 788322d..7f9f7f1 100644 (file)
--- a/linphone/linphone-hh_0.12.2.hh1.oe
+++ b/linphone/linphone-hh_0.12.2.hh1.oe
@@ -1,10 +1,11 @@
-PR = "r1"
+PR = "r2"
 
 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://gpe-cross-lossage.patch;patch=1 \
+       file://disable-gtk-doc.patch;patch=1"
 
 S = "${WORKDIR}/linphone-${PV}"
 
@@ -12,7 +13,7 @@ FILES_${PN} += "${datadir}/linphonec"
 
 inherit autotools
 
-EXTRA_OECONF = "--disable-gnome_ui"
+EXTRA_OECONF = "--disable-gnome_ui --disable-gtk-doc"
 
 do_configure() {
        # ffmpeg is in AC_SUBDIRS, but doesn't actually use autoconf.

diff --git a/linphone/linphone_0.12.2.oe b/linphone/linphone_0.12.2.oe
index ea4d41d..b476ec1 100644 (file)
--- a/linphone/linphone_0.12.2.oe
+++ b/linphone/linphone_0.12.2.oe
@@ -1,12 +1,15 @@
-PR = "r1"
+PR = "r2"
 
 DESCRIPTION = "SIP-based IP phone (GPE edition)"
 DEPENDS = "libosip gtk+ libogg libgnomeui"
 SRC_URI = "http://simon.morlat.free.fr/download/0.12.2/source/linphone-${PV}.tar.gz \
-       file://osip-lossage.patch;patch=1"
+       file://osip-lossage.patch;patch=1 \
+       file://disable-gtk-doc.patch;patch=1"
 
 FILES_${PN} += "${datadir}/linphonec"
 
+EXTRA_OECONF = "--disable-gtk-doc"
+
 inherit autotools
 
 do_configure() {