[oe-commits] org.oe.dev merge of '3e94a66ec6e7fc142c7d737c555c1f7330a6b02a'

[jeremy_laine commit]

merge of '3e94a66ec6e7fc142c7d737c555c1f7330a6b02a'
     and '8c692ec4078a7d2e345213289da925bfca3cac63'

Author: jeremy_laine at openembedded.org
Branch: org.openembedded.dev
Revision: 20415869e4deffc3f561d06a10ea4e95d8d13db7
ViewMTN: http://monotone.openembedded.org/revision/info/20415869e4deffc3f561d06a10ea4e95d8d13db7
Files:
1
conf/distro/angstrom-2007.1.conf
conf/distro/angstrom-2008.1.conf
packages/sofia-sip/sofia-sip.inc
packages/sofia-sip/sofia-sip_1.11.7.bb
packages/sofia-sip/sofia-sip_1.12.7.bb
Diffs:

#
# mt diff -r3e94a66ec6e7fc142c7d737c555c1f7330a6b02a -r20415869e4deffc3f561d06a10ea4e95d8d13db7
#
# 
# 
# patch "conf/distro/angstrom-2007.1.conf"
#  from [0333915fd642b2db9af96929a6b9fd60df4292bc]
#    to [0556daa097782b542ec3ef3bc2bc525d58b78091]
# 
# patch "conf/distro/angstrom-2008.1.conf"
#  from [1ea5dcfd838edd17ffbc00d7af4de7866da4c071]
#    to [2de9c3aa70e1a4887beb6ecfaa3bcc8727c3e126]
# 
============================================================
--- conf/distro/angstrom-2007.1.conf	0333915fd642b2db9af96929a6b9fd60df4292bc
+++ conf/distro/angstrom-2007.1.conf	0556daa097782b542ec3ef3bc2bc525d58b78091
@@ -148,6 +148,7 @@ require conf/distro/include/preferred-e-
 
 
 # Virtuals:
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross"
 PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial"
 PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross"
 PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross"
@@ -177,6 +178,7 @@ PREFERRED_PROVIDER_virtual/xserver      
 PREFERRED_PROVIDER_virtual/xserver      ?= "xserver-kdrive"
 
 # Others:
+PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers"
 PREFERRED_PROVIDER_dbus-glib             = "dbus-glib"
 PREFERRED_PROVIDER_esound 		?= "pulseaudio"
 PREFERRED_PROVIDER_gconf                ?= "gconf-dbus"
============================================================
--- conf/distro/angstrom-2008.1.conf	1ea5dcfd838edd17ffbc00d7af4de7866da4c071
+++ conf/distro/angstrom-2008.1.conf	2de9c3aa70e1a4887beb6ecfaa3bcc8727c3e126
@@ -103,6 +103,7 @@ require conf/distro/include/preferred-xo
 
 
 # Virtuals:
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross"
 PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial"
 PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross"
 PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross"
@@ -132,6 +133,7 @@ PREFERRED_PROVIDER_virtual/xserver      
 PREFERRED_PROVIDER_virtual/xserver      ?= "xserver-kdrive"
 
 # Others:
+PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers"
 PREFERRED_PROVIDER_dbus-glib             = "dbus-glib"
 PREFERRED_PROVIDER_esound 		?= "pulseaudio"
 PREFERRED_PROVIDER_gconf                ?= "gconf-dbus"


#
# mt diff -r8c692ec4078a7d2e345213289da925bfca3cac63 -r20415869e4deffc3f561d06a10ea4e95d8d13db7
#
# 
# 
# add_file "packages/sofia-sip/sofia-sip.inc"
#  content [c24ba4a0c665800fdcb52e018dbb56fe3bcae31d]
# 
# patch "packages/sofia-sip/sofia-sip_1.11.7.bb"
#  from [83b18f606b66c599ad5d66057b22875655622b58]
#    to [0c00d5fa650a8d1942355f3e313bfb2330037e3f]
# 
# patch "packages/sofia-sip/sofia-sip_1.12.7.bb"
#  from [bb742997aa1803f55576e4c877140c8956ea13ce]
#    to [6c87f9c6b4b19efc4d6126360c6bcd851eac9dd6]
# 
============================================================
--- packages/sofia-sip/sofia-sip.inc	c24ba4a0c665800fdcb52e018dbb56fe3bcae31d
+++ packages/sofia-sip/sofia-sip.inc	c24ba4a0c665800fdcb52e018dbb56fe3bcae31d
@@ -0,0 +1,21 @@
+DESCRIPTION = "Sofia-SIP is an open-source SIP User-Agent library, compliant with the IETF RFC3261 specification."
+HOMEPAGE = "http://sofia-sip.sourceforge.net/"
+LICENSE = "LGPL"
+DEPENDS = "glib-2.0 openssl"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}.tar.gz"
+
+inherit autotools pkgconfig
+
+PACKAGES += " ${PN}-bin ${PN}-glib"
+
+FILES_${PN}-bin = "${bindir}"
+FILES_${PN} = "${libdir}/libsofia-sip-ua.so.*"
+FILES_${PN}-dev += "${datadir}/sofia-sip/*.awk"
+FILES_${PN}-glib = "${libdir}/libsofia-sip-ua-glib.so.*" 
+
+LEAD_SONAME = "libsofia-sip-ua.so"
+
+do_stage () {
+	autotools_stage_all
+}
============================================================
--- packages/sofia-sip/sofia-sip_1.11.7.bb	83b18f606b66c599ad5d66057b22875655622b58
+++ packages/sofia-sip/sofia-sip_1.11.7.bb	0c00d5fa650a8d1942355f3e313bfb2330037e3f
@@ -1,13 +1,3 @@
-DESCRIPTION = "Sofia-SIP is an open-source SIP User-Agent library, compliant with the IETF RFC3261 specification."
-HOMEPAGE = "http://sofia-sip.sourceforge.net/"
-LICENSE = "LGPL"
-DEPENDS = "glib-2.0 openssl"
-PR = "r1"
+require sofia-sip.inc
 
+PR = "r2"
-SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}.tar.gz"
-
-inherit autotools pkgconfig
-
-do_stage () {
-	autotools_stage_all
-}
============================================================
--- packages/sofia-sip/sofia-sip_1.12.7.bb	bb742997aa1803f55576e4c877140c8956ea13ce
+++ packages/sofia-sip/sofia-sip_1.12.7.bb	6c87f9c6b4b19efc4d6126360c6bcd851eac9dd6
@@ -1,12 +1,3 @@
-DESCRIPTION = "Sofia-SIP is an open-source SIP User-Agent library, compliant with the IETF RFC3261 specification."
-HOMEPAGE = "http://sofia-sip.sourceforge.net/"
-LICENSE = "LGPL"
-DEPENDS = "glib-2.0 openssl"
+require sofia-sip.inc
 
+PR = "r1"
-SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}.tar.gz"
-
-inherit autotools pkgconfig
-
-do_stage () {
-	autotools_stage_all
-}