[oe-commits] org.oe.dev merge of '54570a87efd5af4300ec960e3afaff8b0a1d4b19'

[oe commit]

merge of '54570a87efd5af4300ec960e3afaff8b0a1d4b19'
     and '6058c179a37fa5f2a0c6e782d10d5e66c4b1f035'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 24843f0cf6621b20c46776755c335f6914a91aea
ViewMTN: http://monotone.openembedded.org/revision/info/24843f0cf6621b20c46776755c335f6914a91aea
Files:
1
packages/dtc/dtc-native_1.0.0.bb
packages/spandsp/spandsp_0.0.2+0.0.3pre27.bb
packages/spandsp/spandsp_0.0.3+0.0.4pre16.bb
packages/spandsp/spandsp_0.0.4-pre16.bb
packages/speex/speex_1.1.12+1.2beta1.bb
packages/speex/speex_1.2-beta3.bb
packages/spandsp/spandsp.inc
packages/spandsp/spandsp_0.0.3.bb
Diffs:

#
# mt diff -r54570a87efd5af4300ec960e3afaff8b0a1d4b19 -r24843f0cf6621b20c46776755c335f6914a91aea
#
#
#
# patch "packages/dtc/dtc-native_1.0.0.bb"
#  from [a6cfb4d12568399421737e9db3bec79674a9c14a]
#    to [fc6937168b72b10220652c50a46b2c017e2ad219]
#
============================================================
--- packages/dtc/dtc-native_1.0.0.bb	a6cfb4d12568399421737e9db3bec79674a9c14a
+++ packages/dtc/dtc-native_1.0.0.bb	fc6937168b72b10220652c50a46b2c017e2ad219
@@ -2,12 +2,13 @@ LICENSE = "GPL"
 SECTION = "bootloader"
 PRIORITY = "optional"
 LICENSE = "GPL"
+PR = "r1"
 
 DEFAULT_PREFERENCE = "1"
 
-SRC_URI = "http://www.jdl.com/pub/software/dtc-${PV}.tgz"
+SRC_URI = "http://www.jdl.com/software/dtc-v${PV}.tgz"
 
-S = "${WORKDIR}/dtc"
+S = "${WORKDIR}/dtc-v${PV}"
 
 inherit autotools native
 


#
# mt diff -r6058c179a37fa5f2a0c6e782d10d5e66c4b1f035 -r24843f0cf6621b20c46776755c335f6914a91aea
#
#
#
# delete "packages/spandsp/spandsp_0.0.2+0.0.3pre27.bb"
# 
# rename "packages/spandsp/spandsp_0.0.3+0.0.4pre16.bb"
#     to "packages/spandsp/spandsp_0.0.4-pre16.bb"
# 
# rename "packages/speex/speex_1.1.12+1.2beta1.bb"
#     to "packages/speex/speex_1.2-beta3.bb"
# 
# add_file "packages/spandsp/spandsp.inc"
#  content [7a5c5ca2cf5ff4a844e530c565b7d883200eba67]
# 
# patch "packages/spandsp/spandsp_0.0.3.bb"
#  from [eabce9404047737c74f5e7710878f500f27fc5b3]
#    to [3299ad935f81769ffe792924086078142e52f310]
# 
# patch "packages/spandsp/spandsp_0.0.4-pre16.bb"
#  from [cbf596364dc7d8cbafb87b41aa8550243180eef5]
#    to [c407c189154e9ff32b8c3ce3c0f698ea193fc8b2]
# 
# patch "packages/speex/speex_1.2-beta3.bb"
#  from [f4e404c373cafd1d01bf094caec29533e4be9d2c]
#    to [0b3702f32d103a331bd8a2c594cacf37253f220f]
#
============================================================
--- packages/spandsp/spandsp.inc	7a5c5ca2cf5ff4a844e530c565b7d883200eba67
+++ packages/spandsp/spandsp.inc	7a5c5ca2cf5ff4a844e530c565b7d883200eba67
@@ -0,0 +1,13 @@
+DESCRIPTION = "A library of many DSP functions for telephony."
+HOMEPAGE = "http://www.soft-switch.org"
+SECTION = "voip"
+LICENSE = "GPL"
+DEPENDS = "tiff libxml2"
+
+inherit autotools
+
+do_stage () {
+    autotools_stage_all
+}
+
+PARALLEL_MAKE = ""
============================================================
--- packages/spandsp/spandsp_0.0.3.bb	eabce9404047737c74f5e7710878f500f27fc5b3
+++ packages/spandsp/spandsp_0.0.3.bb	3299ad935f81769ffe792924086078142e52f310
@@ -1,21 +1,10 @@
-DESCRIPTION = "A library of many DSP functions for telephony."
-HOMEPAGE = "http://www.soft-switch.org"
-SECTION = "voip"
-LICENSE = "GPL"
-DEPENDS = "tiff libxml2"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://www.soft-switch.org/downloads/spandsp/spandsp-${PV}.tgz"
 
-inherit autotools
-
-PARALLEL_MAKE = ""
-
 # *cough*
 do_configure_append() {
         rm config.log
 }
 
+require spandsp.inc
-do_stage () { 
-    autotools_stage_all 
-}
============================================================
--- packages/spandsp/spandsp_0.0.3+0.0.4pre16.bb	cbf596364dc7d8cbafb87b41aa8550243180eef5
+++ packages/spandsp/spandsp_0.0.4-pre16.bb	c407c189154e9ff32b8c3ce3c0f698ea193fc8b2
@@ -1,24 +1,14 @@
-DESCRIPTION = "A library of many DSP functions for telephony."
-HOMEPAGE = "http://www.soft-switch.org"
-DEPENDS = "tiff libxml2"
-SECTION = "voip"
-LICENSE = "GPL"
+PR = "r1"
 
-PR = "r0"
+SRC_URI = "http://www.soft-switch.org/downloads/spandsp/${PN}-0.0.4pre16.tgz"
 
-SRC_URI = "http://www.soft-switch.org/downloads/spandsp/spandsp-0.0.4pre16.tgz"
-
 S = "${WORKDIR}/spandsp-0.0.4"
 
-inherit autotools pkgconfig
-
-PARALLEL_MAKE = ""
-
 # *cough*
 do_configure_append() {
-	rm config.log
+      rm config.log
 }
 
+require spandsp.inc
+
+DEFAULT_PREFERENCE = "-16"
-do_stage () { 
-    autotools_stage_all 
-}
============================================================
--- packages/speex/speex_1.1.12+1.2beta1.bb	f4e404c373cafd1d01bf094caec29533e4be9d2c
+++ packages/speex/speex_1.2-beta3.bb	0b3702f32d103a331bd8a2c594cacf37253f220f
@@ -3,26 +3,31 @@ DEPENDS = "libogg"
 LICENSE = "BSD"
 HOMEPAGE = "http://www.speex.org"
 DEPENDS = "libogg"
-PR = "r2"
+PR = "r0"
 
-SRC_URI = "http://downloads.us.xiph.org/releases/speex/speex-1.2beta1.tar.gz"
-S = "${WORKDIR}/${PN}-1.2beta1"
+SRC_URI = "http://downloads.us.xiph.org/releases/speex/speex-1.2beta3.tar.gz"
+S = "${WORKDIR}/${PN}-1.2beta3"
 
 PARALLEL_MAKE = ""
 
 inherit autotools pkgconfig
 
+LEAD_SONAME = "libspeex.so"
+
 # Some interesting options are:
 #
 #	--enable-arm4-asm
 #	--enable-arm5e-asm
+#       --enable-blackfin-asm
 #	--enable-fixed-point
+#       --disable-float-api --disable-vbr (must disable-vbr if disable-float-api)
 #
 
-EXTRA_OECONF_append_openmn = " --enable-arm5e-asm --enable-fixed-point"
-EXTRA_OECONF_append_amsdelta = " --enable-arm4-asm --enable-fixed-point"
-EXTRA_OECONF_append_arm = " --enable-fixed-point "
-EXTRA_OECONF_append_dht-walnut = " --enable-fixed-point "
+EXTRA_OECONF_append_openmn = " --enable-arm5e-asm --enable-fixed-point --disable-float-api --disable-vbr "
+EXTRA_OECONF_append_amsdelta = " --enable-arm4-asm --enable-fixed-point --disable-float-api --diable-vbr "
+EXTRA_OECONF_append_bfin = " --enable-blackfin-asm --enable-fixed-point --disable-float-api --diable-vbr "
+EXTRA_OECONF_append_arm = " --enable-fixed-point --disable-float-api --disable-vbr "
+EXTRA_OECONF_append_dht-walnut = " --enable-fixed-point --disable-float-api --disable-vbr "
 
 do_configure_append() {
 	sed -i s/"^OGG_CFLAGS.*$"/"OGG_CFLAGS = "/g Makefile */Makefile */*/Makefile