OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 25-Mar-2008 22:04:31
Branch: HEAD Handle: 2008032521043001
Modified files:
openpkg-src/asterisk asterisk.patch asterisk.spec
Log:
add initial cut for a MeetMe addition to pass an audio file containing
the user name (conference introduction)
Summary:
Revision Changes Path
1.39 +48 -1 openpkg-src/asterisk/asterisk.patch
1.70 +1 -1 openpkg-src/asterisk/asterisk.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.patch
============================================================================
$ cvs diff -u -r1.38 -r1.39 asterisk.patch
--- openpkg-src/asterisk/asterisk.patch 24 Mar 2008 20:11:27 -0000
1.38
+++ openpkg-src/asterisk/asterisk.patch 25 Mar 2008 21:04:30 -0000
1.39
@@ -78,7 +78,7 @@
+
+#include "asterisk.h"
+
-+ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.38 $")
++ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.39 $")
+
+#include <stdio.h>
+#include <asterisk/file.h>
@@ -382,3 +382,50 @@
</member>
<member name="EXTRA-SOUNDS-EN-GSM" displayname="English, GSM
format" >
</member>
+Index: apps/app_meetme.c
+--- apps/app_meetme.c.orig 2008-03-18 16:58:50 +0100
++++ apps/app_meetme.c 2008-03-25 21:41:52 +0100
+@@ -159,6 +159,7 @@
+ CONFFLAG_KICK_CONTINUE = (1 << 28),
+ CONFFLAG_DURATION_STOP = (1 << 29),
+ CONFFLAG_DURATION_LIMIT = (1 << 30),
++ CONFFLAG_USERNAME = (1 << 31),
+ };
+
+ enum {
+@@ -168,6 +169,7 @@
+ OPT_ARG_DURATION_LIMIT = 3,
+ OPT_ARG_MOH_CLASS = 4,
+ OPT_ARG_ARRAY_SIZE = 5,
++ OPT_ARG_USERNAME = 6,
+ };
+
+ AST_APP_OPTIONS(meetme_opts, BEGIN_OPTIONS
+@@ -199,6 +201,7 @@
+ AST_APP_OPTION('1', CONFFLAG_NOONLYPERSON ),
+ AST_APP_OPTION_ARG('S', CONFFLAG_DURATION_STOP, OPT_ARG_DURATION_STOP),
+ AST_APP_OPTION_ARG('L', CONFFLAG_DURATION_LIMIT,
OPT_ARG_DURATION_LIMIT),
++ AST_APP_OPTION_ARG('n', CONFFLAG_USERNAME, OPT_ARG_USERNAME),
+ END_OPTIONS );
+
+ static const char *app = "MeetMe";
+@@ -1695,6 +1698,11 @@
+ ast_mutex_unlock(&conf->playlock);
+
+ if (!(confflags & CONFFLAG_QUIET) && ((confflags & CONFFLAG_INTROUSER)
|| (confflags & CONFFLAG_INTROUSERNOREVIEW))) {
++ if ( (confflags & CONFFLAG_USERNAME)
++ && !ast_strlen_zero(optargs[OPT_ARG_USERNAME])
++ && ast_fileexists(optargs[OPT_ARG_USERNAME], NULL, NULL))
++ snprintf(user->namerecloc, sizeof(user->namerecloc), "%s",
optargs[OPT_ARG_USERNAME]);
++ else {
+ snprintf(user->namerecloc, sizeof(user->namerecloc),
+ "%s/meetme/meetme-username-%s-%d",
ast_config_AST_SPOOL_DIR,
+ conf->confno, user->user_no);
+@@ -1704,6 +1712,7 @@
+ res = ast_record_review(chan, "vm-rec-name",
user->namerecloc, 10, "sln", &duration, NULL);
+ if (res == -1)
+ goto outrun;
++ }
+ }
+
+ ast_mutex_lock(&conf->playlock);
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.spec
============================================================================
$ cvs diff -u -r1.69 -r1.70 asterisk.spec
--- openpkg-src/asterisk/asterisk.spec 24 Mar 2008 20:11:27 -0000
1.69
+++ openpkg-src/asterisk/asterisk.spec 25 Mar 2008 21:04:31 -0000
1.70
@@ -40,7 +40,7 @@
Group: VoIP
License: GPL
Version: %{V_opkg}
-Release: 20080324
+Release: 20080325
# package options
%option with_zaptel no
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
