[oe-commits] org.oe.dev merge of '0927821eeda6b9984fe915a180f51d49aba58e46'

rwhitby commit openembedded-commits at lists.openembedded.org
Thu Jun 21 17:27:32 UTC 2007


merge of '0927821eeda6b9984fe915a180f51d49aba58e46'
     and '8ee01e7aef977a6c51cf71b7d11f65f42e0dc413'

Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: 76f379743d0f947433f4b0c862f4b20a0d3d1867
ViewMTN: http://monotone.openembedded.org/revision.psp?id=76f379743d0f947433f4b0c862f4b20a0d3d1867
Files:
1
packages/prismstumbler/prismstumbler-0.7.3/fix-includes.patch
packages/openpbx/openpbx.org-1.2-rc3
packages/openpbx/openpbx.org-1.2_rc3
packages/openpbx/openpbx.org-perl.bb
packages/prismstumbler/prismstumbler-0.7.3/crosscompile.patch
packages/sox/sox/src-Makefile.am.patch
packages/sox/sox-native_13.0.0.bb
packages/sox/sox_13.0.0.bb
conf/distro/angstrom-2007.1.conf
packages/apt/apt_0.6.46.2.bb
packages/apt/files/apt.conf
packages/gnome/libgnomeui_2.16.1.bb
packages/monotone/monotone-6_0.33.bb
packages/mysql/mysql-native_4.1.18.bb
packages/openpbx/openpbx.org_1.2_rc3.bb
packages/prismstumbler/prismstumbler_0.7.3.bb
packages/sox/sox_12.17.5.bb
Diffs:

#
# mt diff -r0927821eeda6b9984fe915a180f51d49aba58e46 -r76f379743d0f947433f4b0c862f4b20a0d3d1867
#
# 
# 
# delete "packages/prismstumbler/prismstumbler-0.7.3/fix-includes.patch"
# 
# rename "packages/openpbx/openpbx.org-1.2-rc3"
#     to "packages/openpbx/openpbx.org-1.2_rc3"
# 
# add_file "packages/openpbx/openpbx.org-perl.bb"
#  content [fc9d6bb9b361043d8bc9be5c55c87fc3e9b77645]
# 
# add_file "packages/prismstumbler/prismstumbler-0.7.3/crosscompile.patch"
#  content [c65f1d520b5f8457a0318aa5fa0d16af86b4d538]
# 
# add_file "packages/sox/sox/src-Makefile.am.patch"
#  content [ce8ee77815553712182c6362f6e17352c3f15071]
# 
# add_file "packages/sox/sox-native_13.0.0.bb"
#  content [e68db293ebf4ade3f81ddca28a1397483e646eab]
# 
# add_file "packages/sox/sox_13.0.0.bb"
#  content [a2d29830aa38c8fc2399ca00e324d266d6bf8de6]
# 
# patch "conf/distro/angstrom-2007.1.conf"
#  from [5ff83666db4369ce96ec6c7931097d69c47379d4]
#    to [0a417743ac330663af1be775a9b9e53e1b04f11f]
# 
# patch "packages/apt/apt_0.6.46.2.bb"
#  from [ef36cfeb12b1c71655baec7da011e9a3354a12a6]
#    to [385fd9a20abac5dfb1c4419a595bb5eedb71885b]
# 
# patch "packages/apt/files/apt.conf"
#  from [7b2848cac0bb01a55a7135209cfd9cb9d669e16d]
#    to [a11cde2c27f3b4a221c40eeca244e9a87cdf1a09]
# 
# patch "packages/gnome/libgnomeui_2.16.1.bb"
#  from [41eb452224a16a5480303cbb7d86f8ffeb65c470]
#    to [20d8baaa7c7d1e7f2b9e84f91f368017d511202f]
# 
# patch "packages/monotone/monotone-6_0.33.bb"
#  from [1c6b9d90f86a0d276bd0f786c27f9a327f36430b]
#    to [372aa01bb7dbef8fd9422679ddd0048f51ef4444]
# 
# patch "packages/mysql/mysql-native_4.1.18.bb"
#  from [aa241f58f1cce068226bd64bd4b393e0818b05d0]
#    to [11fb90393df3a09f2561c4afe2b0c17269a03446]
# 
# patch "packages/openpbx/openpbx.org_1.2_rc3.bb"
#  from [49a30ccb91b4a3db1f750c2efa7e2295dcdf7cca]
#    to [6479fb49390c52f1cab5317ed4dcb63e683786a3]
# 
# patch "packages/prismstumbler/prismstumbler_0.7.3.bb"
#  from [25674e65f52983cf371dfc5d01cf7e3e0d4ff73c]
#    to [7efb7211b2f807c58bcc736154c961d9b73f0790]
# 
# patch "packages/sox/sox_12.17.5.bb"
#  from [8e81ca99053d7707cebe1ac32ef662150b892edd]
#    to [ca76efb1938959ac15494b731c07b963dd43645e]
# 
============================================================
--- packages/openpbx/openpbx.org-perl.bb	fc9d6bb9b361043d8bc9be5c55c87fc3e9b77645
+++ packages/openpbx/openpbx.org-perl.bb	fc9d6bb9b361043d8bc9be5c55c87fc3e9b77645
@@ -0,0 +1,24 @@
+DESCRIPTION = "Openpbx::OGI Perl Gateway Interface Module"
+HOMEPAGE = "http://www.openpbx.org"
+SECTION = "libs"
+LICENSE = "GPL"
+DEPENDS = "install-native"
+RDEPENDS = "perl openpbx.org-ogi"
+PR = "r0"
+
+OPBXV = "openpbx.org-1.2_rc3"
+
+SRC_URI = "http://www.openpbx.org/releases/${OPBXV}.tar.gz"
+
+S = "${WORKDIR}/${OPBXV}/contrib/ogi-perl/openpbx-perl-${PV}"
+
+inherit cpan
+
+do_install_append () {
+  install -d ${D}${datadir}/openpbx.org/ogi/perl
+  install ${S}/examples/* ${D}${datadir}/openpbx.org/ogi/perl
+}
+
+PACKAGES =+ "${PN}-examples"
+
+FILES_${PN}-examples = "${datadir}/openpbx.org/ogi/perl"
============================================================
--- packages/prismstumbler/prismstumbler-0.7.3/crosscompile.patch	c65f1d520b5f8457a0318aa5fa0d16af86b4d538
+++ packages/prismstumbler/prismstumbler-0.7.3/crosscompile.patch	c65f1d520b5f8457a0318aa5fa0d16af86b4d538
@@ -0,0 +1,166 @@
+Index: prismstumbler-0.7.3/src/gpsd/Makefile.in
+===================================================================
+--- prismstumbler-0.7.3.orig/src/gpsd/Makefile.in
++++ prismstumbler-0.7.3/src/gpsd/Makefile.in
+@@ -128,8 +128,8 @@ xgpsspeed: $(XGPSOBJS)
+ 	$(LINK.c) -o $@ $(XGPSOBJS) -L. -lgpsd $(LIBXAW) $(ALL_X_LIBS) $(LIBS)
+ 
+ libgpsd.a:  $(LIB_OBJECTS)
+-	ar -r libgpsd.a $(LIB_OBJECTS)
+-	ranlib libgpsd.a
++	$(AR) -r libgpsd.a $(LIB_OBJECTS)
++	$(RANLIB) libgpsd.a
+ 
+ clean:
+ 	rm -f *.o *.a gpsd gps *~ config.status
+Index: prismstumbler-0.7.3/src/gpsd/Makefile
+===================================================================
+--- prismstumbler-0.7.3.orig/src/gpsd/Makefile
++++ prismstumbler-0.7.3/src/gpsd/Makefile
+@@ -1,4 +1,3 @@
+-# Generated automatically from Makefile.in by configure.
+ # Makefile.in
+ # $Modified: Thu Jan 22 11:55:32 1998 by brook $
+ 
+@@ -7,10 +6,10 @@
+ 
+ # What we use to compile C files.
+ # CC = cc
+-CC = gcc
++CC = ccache arm-angstrom-linux-gnueabi-gcc -march=armv5te -mtune=xscale
+ 
+ # The flags we use to compile C files.
+-CFLAGS = -g -O2
++CFLAGS = -I/home/papercrane/oe/angstrom.build/tmp/work/armv5te-angstrom-linux-gnueabi/prismstumbler-0.7.3-r5/prismstumbler-0.7.3/include -D_GNU_SOURCE -isystem/home/papercrane/oe/angstrom.build/tmp/staging/arm-angstrom-linux-gnueabi/include -fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os
+ 
+ 
+ ## The C preprocessor.
+@@ -19,7 +18,7 @@ CFLAGS = -g -O2
+ CPP = @CPP_TRADITIONAL@
+ 
+ # Flags passed to the C preprocessor.  ()
+-CPPFLAGS = 
++CPPFLAGS = -isystem/home/papercrane/oe/angstrom.build/tmp/staging/arm-angstrom-linux-gnueabi/include
+ 
+ # Definitions to be passed to the C preprocessor.  (-DHAVE_CONFIG_H)
+ DEFS = -DHAVE_CONFIG_H
+@@ -28,10 +27,10 @@ DEFS = -DHAVE_CONFIG_H
+ ## The Linker.
+ 
+ # Flags passed to the linker.  (-g -O)
+-LDFLAGS = 
++LDFLAGS = -L/home/papercrane/oe/angstrom.build/tmp/staging/arm-angstrom-linux-gnueabi/lib -Wl,-rpath-link,/home/papercrane/oe/angstrom.build/tmp/staging/arm-angstrom-linux-gnueabi/lib -Wl,-O1
+ 
+ # Use this for building statically linked executables with GCC.
+-# LDFLAGS = -static 
++# LDFLAGS = -static -L/home/papercrane/oe/angstrom.build/tmp/staging/arm-angstrom-linux-gnueabi/lib -Wl,-rpath-link,/home/papercrane/oe/angstrom.build/tmp/staging/arm-angstrom-linux-gnueabi/lib -Wl,-O1
+ 
+ 
+ ## Local libraries
+@@ -52,7 +51,7 @@ NETLIBS = $(LIBNSL) $(LIBSOCKET)
+ ## X Libraries
+ 
+ # Special flags for linking with X.  (-L/usr/X11R5/lib)
+-X_LDFLAGS =  -L/usr/X11R6/lib
++X_LDFLAGS = -L/usr/lib  -L/home/papercrane/oe/angstrom.build/tmp/staging/arm-angstrom-linux-gnueabi/lib
+ 
+ # Motif library.  (-lXm)
+ LIBXM = 
+@@ -62,10 +61,10 @@ LIBXM = 
+ # LIBXM = -Wl,-Bstatic  -Wl,-Bdynamic
+ 
+ # X extension library; needed for Athena and Motif >= 2.0.  (-lXext)
+-LIBXEXT = -lXext
++LIBXEXT = 
+ 
+ # Xpm library; needed for DDD and sometimes for Motif >= 2.0.  (-lXpm)
+-LIBXPM = -lXpm
++LIBXPM = 
+ 
+ # Xp library; sometimes needed for Motif >= 2.1.  (-lXp)
+ LIBXP = 
+@@ -74,13 +73,13 @@ LIBXP = 
+ LIBGEN = 
+ 
+ # X toolkit library.  (-lXt)
+-LIBXT = -lXt
++LIBXT = 
+ 
+ # Xaw library.  (-lXaw)
+-LIBXAW = -lXaw
++LIBXAW = 
+ 
+ # X library.  (-lSM -lICE -lX11 -lnsl -lsocket)
+-LIBX11 =  -lSM -lICE -lX11 
++LIBX11 =  -lSM -lICE  
+ 
+ # All libraries shown above
+ ALL_X_LIBS = $(X_LDFLAGS) $(LIBXM) $(LIBXP) $(LIBXPM) $(LIBXEXT) \
+@@ -94,7 +93,7 @@ COMPILE_AND_LINK.c = \
+     $(CC) $(CPPFLAGS) $(DEFS) $(CFLAGS) $(LDFLAGS)
+ 
+ ## Where to look for X include files.  (-I/usr/X11R5/include)
+-X_INCLUDE =  -I/usr/X11R6/include
++X_INCLUDE = -I/usr/include  -I/home/papercrane/oe/angstrom.build/tmp/staging/arm-angstrom-linux-gnueabi/include/X11
+ 
+ ## Where to look for include files.
+ INCLUDE = -I. $(X_INCLUDE)
+@@ -129,8 +128,8 @@ xgpsspeed: $(XGPSOBJS)
+ 	$(LINK.c) -o $@ $(XGPSOBJS) -L. -lgpsd $(LIBXAW) $(ALL_X_LIBS) $(LIBS)
+ 
+ libgpsd.a:  $(LIB_OBJECTS)
+-	ar -r libgpsd.a $(LIB_OBJECTS)
+-	ranlib libgpsd.a
++	$(AR) -r libgpsd.a $(LIB_OBJECTS)
++	$(RANLIB) libgpsd.a
+ 
+ clean:
+ 	rm -f *.o *.a gpsd gps *~ config.status
+Index: prismstumbler-0.7.3/src/gpsd/Makefile.arm
+===================================================================
+--- prismstumbler-0.7.3.orig/src/gpsd/Makefile.arm
++++ prismstumbler-0.7.3/src/gpsd/Makefile.arm
+@@ -94,7 +94,7 @@ COMPILE_AND_LINK.c = \
+     $(CC) $(CPPFLAGS) $(DEFS) $(CFLAGS) $(LDFLAGS)
+ 
+ ## Where to look for X include files.  (-I/usr/X11R5/include)
+-X_INCLUDE =  -I/skiff/local/arm-linux/include/X11
++X_INCLUDE = @X_CFLAGS@
+ 
+ ## Where to look for include files.
+ INCLUDE = -I. $(X_INCLUDE)
+@@ -129,8 +129,8 @@ xgpsspeed: $(XGPSOBJS)
+ 	$(LINK.c) -o $@ $(XGPSOBJS) -L. -lgpsd $(LIBXAW) $(ALL_X_LIBS) $(LIBS)
+ 
+ libgpsd.a:  $(LIB_OBJECTS)
+-	ar -r libgpsd.a $(LIB_OBJECTS)
+-	ranlib libgpsd.a
++	$(AR) -r libgpsd.a $(LIB_OBJECTS)
++	$(RANLIB) libgpsd.a
+ 
+ clean:
+ 	rm -f *.o *.a gpsd gps *~ config.status
+Index: prismstumbler-0.7.3/src/gpsd/Makefile.i386
+===================================================================
+--- prismstumbler-0.7.3.orig/src/gpsd/Makefile.i386
++++ prismstumbler-0.7.3/src/gpsd/Makefile.i386
+@@ -94,7 +94,7 @@ COMPILE_AND_LINK.c = \
+     $(CC) $(CPPFLAGS) $(DEFS) $(CFLAGS) $(LDFLAGS)
+ 
+ ## Where to look for X include files.  (-I/usr/X11R5/include)
+-X_INCLUDE =  -I/usr/X11R6/include
++X_INCLUDE = @X_CFLAGS@
+ 
+ ## Where to look for include files.
+ INCLUDE = -I. $(X_INCLUDE)
+@@ -129,8 +129,8 @@ xgpsspeed: $(XGPSOBJS)
+ 	$(LINK.c) -o $@ $(XGPSOBJS) -L. -lgpsd $(LIBXAW) $(ALL_X_LIBS) $(LIBS)
+ 
+ libgpsd.a:  $(LIB_OBJECTS)
+-	ar -r libgpsd.a $(LIB_OBJECTS)
+-	ranlib libgpsd.a
++	$(AR) -r libgpsd.a $(LIB_OBJECTS)
++	$(RANLIB) libgpsd.a
+ 
+ clean:
+ 	rm -f *.o *.a gpsd gps *~ config.status
============================================================
--- packages/sox/sox/src-Makefile.am.patch	ce8ee77815553712182c6362f6e17352c3f15071
+++ packages/sox/sox/src-Makefile.am.patch	ce8ee77815553712182c6362f6e17352c3f15071
@@ -0,0 +1,11 @@
+--- sox-13.0.0.old/src/Makefile.am	2007-03-18 22:19:52.296535098 -0400
++++ sox-13.0.0/src/Makefile.am	2007-03-18 22:21:48.968947731 -0400
+@@ -42,7 +42,7 @@
+ 	$(MAKE) -C libgsm
+ 
+ play rec: sox$(EXEEXT)
+-	./sox --help > /dev/null
++#	./sox --help > /dev/null
+ 	test -f .libs/lt-sox && ( $(RM) $@ && $(LN_S) .libs/lt-sox $@ ) || $(LN_S) sox$(EXEEXT) $@
+ 
+ install-exec-hook:
============================================================
--- packages/sox/sox-native_13.0.0.bb	e68db293ebf4ade3f81ddca28a1397483e646eab
+++ packages/sox/sox-native_13.0.0.bb	e68db293ebf4ade3f81ddca28a1397483e646eab
@@ -0,0 +1,19 @@
+include sox_${PV}.bb
+
+S = "${WORKDIR}/sox-${PV}"
+
+inherit native
+
+do_patch() {
+        true
+}
+
+do_stage() {
+	make bindir="${STAGING_BINDIR}" libdir="${STAGING_LIBDIR}" mandir="${STAGING_DIR}/${HOST_SYS}/man" includedir="${STAGING_INCDIR}" install
+	rm ${STAGING_BINDIR}/rec
+	ln -s ${STAGING_BINDIR}/play ${STAGING_BINDIR}/rec
+}
+
+do_install() {
+        true
+}
============================================================
--- packages/sox/sox_13.0.0.bb	a2d29830aa38c8fc2399ca00e324d266d6bf8de6
+++ packages/sox/sox_13.0.0.bb	a2d29830aa38c8fc2399ca00e324d266d6bf8de6
@@ -0,0 +1,18 @@
+DESCRIPTION="SoX is the Swiss Army knife of sound processing tools. \
+It converts audio files among various standard audio file formats \
+and can apply different effects and filters to the audio data." 
+HOMEPAGE = "http://sox.sourceforge.net"
+SECTION = "audio"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/sox/sox-${PV}.tar.gz \
+         file://src-Makefile.am.patch;patch=1"
+
+inherit autotools
+
+do_install() {
+	make bindir="${D}${bindir}" libdir="${D}${libdir}" mandir="${D}/${mandir}" includedir="${D}${includedir}" install
+	rm ${D}${bindir}/rec
+	ln -s /usr/bin/play ${D}${bindir}/rec
+}
============================================================
--- conf/distro/angstrom-2007.1.conf	5ff83666db4369ce96ec6c7931097d69c47379d4
+++ conf/distro/angstrom-2007.1.conf	0a417743ac330663af1be775a9b9e53e1b04f11f
@@ -123,7 +123,7 @@ PREFERRED_VERSION_xserver-kdrive = "X11R
 require conf/distro/include/preferred-xorg-versions-X11R7.1.inc
 
 PREFERRED_VERSION_xserver-kdrive = "X11R7.1-1.1.0"
-PREFERRED_VERSION_gtk+ = "2.10.9"
+PREFERRED_VERSION_gtk+ = "2.10.10"
 
 #zap extra stuff taking place in $MACHINE.conf 
 GPE_EXTRA_INSTALL = ""
============================================================
--- packages/apt/apt_0.6.46.2.bb	ef36cfeb12b1c71655baec7da011e9a3354a12a6
+++ packages/apt/apt_0.6.46.2.bb	385fd9a20abac5dfb1c4419a595bb5eedb71885b
@@ -1,7 +1,6 @@ require apt.inc
 require apt.inc
 
-SRC_URI += "file://autofoo.patch;patch=1 \
-            file://nodoc.patch;patch=1"
+SRC_URI += "file://nodoc.patch;patch=1"
 
 require apt-package.inc
 
============================================================
--- packages/apt/files/apt.conf	7b2848cac0bb01a55a7135209cfd9cb9d669e16d
+++ packages/apt/files/apt.conf	a11cde2c27f3b4a221c40eeca244e9a87cdf1a09
@@ -21,6 +21,10 @@ Dir "${STAGING_DIR}/"
       apt-get "apt-get";
       apt-cache "apt-cache";
    };
+   Etc "etc/apt/"
+   {
+      Preferences "preferences";
+   };
 };
 
 APT
============================================================
--- packages/gnome/libgnomeui_2.16.1.bb	41eb452224a16a5480303cbb7d86f8ffeb65c470
+++ packages/gnome/libgnomeui_2.16.1.bb	20d8baaa7c7d1e7f2b9e84f91f368017d511202f
@@ -1,9 +1,11 @@ DESCRIPTION = "GNOME User Interface Libr
 LICENSE = "GPL"
 SECTION = "x11/gnome/libs"
 PR = "r0"
 DEPENDS = "libgnome libgnomecanvas libbonoboui gnome-keyring"
 DESCRIPTION = "GNOME User Interface Library"
 
+DEFAULT_PREFERENCE = "-1"
+
 FILES_${PN} += "${libdir}/gtk-2.0/*/filesystems/lib*.so \
 	${libdir}/libglade/*/lib*.so"
 
============================================================
--- packages/monotone/monotone-6_0.33.bb	1c6b9d90f86a0d276bd0f786c27f9a327f36430b
+++ packages/monotone/monotone-6_0.33.bb	372aa01bb7dbef8fd9422679ddd0048f51ef4444
@@ -25,7 +25,7 @@ ARM_INSTRUCTION_SET = "arm"
 #FIXME: remove the following
 ARM_INSTRUCTION_SET = "arm"
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://monotone.ca/downloads/${PV}/monotone-${PV}.tar.gz \
            file://txt2c-cross-post-0.22.patch;patch=1 \
@@ -42,7 +42,7 @@ do_install_append() {
         install -d ${D}${tsd}
         install -c -m 755 testsuite ${D}${tsd}/testsuite
         cp -pPR tests ${D}${tsd}/tests
-	rm ${D}/home/monotone/monotone-6/tests/tests/diff_a_binary_file/binary
+	rm ${D}/home/monotone/monotone-6/tests/diff_a_binary_file/binary
 }
 
 PACKAGES = "${PN} ${PN}-doc ${PN}-testsuite"
============================================================
--- packages/mysql/mysql-native_4.1.18.bb	aa241f58f1cce068226bd64bd4b393e0818b05d0
+++ packages/mysql/mysql-native_4.1.18.bb	11fb90393df3a09f2561c4afe2b0c17269a03446
@@ -1,6 +1,7 @@ inherit native
 SECTION = "console/network"
 require mysql_${PV}.bb
 inherit native
+PR="r3"
 
 RDEPENDS_${PN} = ""
 
@@ -9,7 +10,7 @@ EXTRA_OECONF = " --with-embedded-server 
 EXTRA_OEMAKE = ""
 EXTRA_OECONF = " --with-embedded-server "
 
-do_stage() {
+do_stage_append() {
 	install -m 0755 sql/gen_lex_hash ${STAGING_BINDIR}/
 }
 
============================================================
--- packages/openpbx/openpbx.org_1.2_rc3.bb	49a30ccb91b4a3db1f750c2efa7e2295dcdf7cca
+++ packages/openpbx/openpbx.org_1.2_rc3.bb	6479fb49390c52f1cab5317ed4dcb63e683786a3
@@ -1,16 +1,18 @@ LICENSE = "GPL"
 DESCRIPTION = "A flexible VOIP soft switch/PBX."
 HOMEPAGE = "http://www.openpbx.org"
 #RDEPENDS = "ssmtp"
 SECTION = "voip"
 LICENSE = "GPL"
-DEPENDS = "openssl zlib tiff libcap spandsp speex readline js"
+DEPENDS = "openssl zlib tiff libcap spandsp speex readline js \
+           sox-native findutils-native"
 DEPENDS_${PN}-ldap = "openldap"
 RRECOMMENDS = "logrotate"
-RRECOMMENDS_${PN}-ogi = "perl perl-module-strict"
+RRECOMMENDS_${PN}-ogi = "perl perl-module-strict openpbx.org-perl"
 PV = "1.2_rc3"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://www.openpbx.org/releases/${P}.tar.gz \
+           svn://svn.openpbx.org/openpbx-sounds/trunk/sounds/en_US;module=MelanieTaylor;proto=svn \
            file://bootstrap.patch;patch=1 \
            file://openssl.m4.patch;patch=1 \
            file://logrotate \
@@ -45,17 +47,34 @@ do_install_append() {
     install -c -D -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/openpbx
     install -c -D -m 644 ${WORKDIR}/logrotate ${D}${sysconfdir}/logrotate.d/openpbx
     install -c -D -m 644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/openpbx
+    # And now for sounds...
+    for file in `find ${WORKDIR}/MelanieTaylor -name \*.wav`; do
+        echo $file
+        sox -V $file -t raw -s -r 8000 -c 1 -w `echo $file|sed -e s/\.wav$/.sln/` resample -ql;
+        sox -V $file -t raw -U -r 8000 -c 1 -b `echo $file|sed -e s/\.wav$/.ulaw/` resample -ql;
+        sox -V $file -t raw -A -r 8000 -c 1 -b `echo $file|sed -e s/\.wav$/.alaw/` resample -ql;
+        sox -V $file -t gsm -r 8000 -c 1 -b `echo $file|sed -e s/\.wav$/.gsm/` resample -ql;
+        relfile=`echo $file|sed %s
>>> DIFF TRUNCATED @ 16K


#
# mt diff -r8ee01e7aef977a6c51cf71b7d11f65f42e0dc413 -r76f379743d0f947433f4b0c862f4b20a0d3d1867
#
# 
# no changes
# 






More information about the Openembedded-commits mailing list