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: 09-Mar-2008 13:41:04
Branch: HEAD Handle: 2008030912410400
Modified files:
openpkg-src/asterisk asterisk.patch asterisk.spec
Log:
upgrade to beta 5 and the Asterisk 1.4 sounds, including the extra
sounds
Summary:
Revision Changes Path
1.25 +39 -28 openpkg-src/asterisk/asterisk.patch
1.37 +37 -33 openpkg-src/asterisk/asterisk.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.patch
============================================================================
$ cvs diff -u -r1.24 -r1.25 asterisk.patch
--- openpkg-src/asterisk/asterisk.patch 9 Mar 2008 09:11:32 -0000
1.24
+++ openpkg-src/asterisk/asterisk.patch 9 Mar 2008 12:41:04 -0000
1.25
@@ -1,6 +1,6 @@
Index: Makefile
---- Makefile.orig 2008-01-29 18:22:47 +0100
-+++ Makefile 2008-03-08 19:36:45 +0100
+--- Makefile.orig 2008-02-26 21:19:03 +0100
++++ Makefile 2008-03-09 13:27:48 +0100
@@ -245,12 +245,6 @@
ASTCFLAGS+=-fsigned-char
endif
@@ -16,7 +16,7 @@
endif
Index: appconference-2.0.1/Makefile
--- appconference-2.0.1/Makefile.orig 2008-02-26 17:05:57 +0100
-+++ appconference-2.0.1/Makefile 2008-03-08 21:10:48 +0100
++++ appconference-2.0.1/Makefile 2008-03-09 13:27:48 +0100
@@ -18,9 +18,9 @@
#
@@ -40,7 +40,7 @@
#CFLAGS += -O3 -march=pentium3 -msse -mfpmath=sse,387 -ffast-math
Index: appconference-2.0.1/app_conference.h
--- appconference-2.0.1/app_conference.h.orig 2008-02-26 17:05:57
+0100
-+++ appconference-2.0.1/app_conference.h 2008-03-08 19:36:45 +0100
++++ appconference-2.0.1/app_conference.h 2008-03-09 13:27:48 +0100
@@ -44,6 +44,7 @@
#include <pthread.h>
@@ -50,17 +50,32 @@
#include <asterisk/pbx.h>
#include <asterisk/module.h>
Index: asterisk-perl-0.10/Makefile.PL
---- asterisk-perl-0.10/Makefile.PL.orig 2008-03-08 19:41:19 +0100
-+++ asterisk-perl-0.10/Makefile.PL 2008-03-08 19:41:19 +0100
+--- asterisk-perl-0.10/Makefile.PL.orig 2003-06-13 07:52:12 +0200
++++ asterisk-perl-0.10/Makefile.PL 2008-03-09 13:27:48 +0100
@@ -14,3 +14,4 @@
},
);
+
+Index: channels/console_video.h
+--- channels/console_video.h.orig 2008-01-09 19:03:40 +0100
++++ channels/console_video.h 2008-03-09 13:27:48 +0100
+@@ -28,10 +28,7 @@
+ "console {device}"
+ #else
+
+-#include <ffmpeg/avcodec.h>
+-#ifndef OLD_FFMPEG
+-#include <ffmpeg/swscale.h> /* requires a recent ffmpeg */
+-#endif
++#include <libavcoded/avcodec.h>
+
+ #define CONSOLE_VIDEO_CMDS \
+ "console {videodevice|videocodec" \
Index: configure
---- configure.orig 2008-02-19 18:33:55 +0100
-+++ configure 2008-03-08 19:36:45 +0100
-@@ -4043,12 +4043,6 @@
+--- configure.orig 2008-02-23 00:56:55 +0100
++++ configure 2008-03-09 13:27:48 +0100
+@@ -4049,12 +4049,6 @@
# note- does not work on FreeBSD
case "${host_os}" in
@@ -75,7 +90,7 @@
if test ${sysconfdir} = '${prefix}/etc'; then
Index: iax-0.2.2/src/Makefile.in
--- iax-0.2.2/src/Makefile.in.orig 2001-11-13 18:45:14 +0100
-+++ iax-0.2.2/src/Makefile.in 2008-03-08 19:36:45 +0100
++++ iax-0.2.2/src/Makefile.in 2008-03-09 13:27:48 +0100
@@ -71,7 +71,7 @@
PACKAGE = @PACKAGE@
RANLIB = @RANLIB@
@@ -105,7 +120,7 @@
# Otherwise a system limit (for SysV at least) may be exceeded.
Index: iax-0.2.2/src/iax.c
--- iax-0.2.2/src/iax.c.orig 2001-11-07 00:10:41 +0100
-+++ iax-0.2.2/src/iax.c 2008-03-08 19:36:45 +0100
++++ iax-0.2.2/src/iax.c 2008-03-09 13:27:48 +0100
@@ -33,13 +33,11 @@
#include <sys/time.h>
#include <stdlib.h>
@@ -121,8 +136,8 @@
#include <netinet/in.h>
#include <arpa/inet.h>
Index: main/Makefile
---- main/Makefile.orig 2008-01-29 18:44:05 +0100
-+++ main/Makefile 2008-03-08 19:36:45 +0100
+--- main/Makefile.orig 2008-02-28 01:11:31 +0100
++++ main/Makefile 2008-03-09 13:27:48 +0100
@@ -82,10 +82,7 @@
endif
@@ -135,18 +150,14 @@
endif
ifneq ($(findstring $(OSARCH), mingw32 cygwin ),)
-Index: channels/console_video.h
---- channels/console_video.h.orig 2008-01-09 19:03:40 +0100
-+++ channels/console_video.h 2008-03-08 23:06:34 +0100
-@@ -28,10 +28,7 @@
- "console {device}"
- #else
-
--#include <ffmpeg/avcodec.h>
--#ifndef OLD_FFMPEG
--#include <ffmpeg/swscale.h> /* requires a recent ffmpeg */
--#endif
-+#include <libavcoded/avcodec.h>
-
- #define CONSOLE_VIDEO_CMDS \
- "console {videodevice|videocodec" \
+Index: menuselect-tree
+--- menuselect-tree.orig 2008-03-04 18:52:08 +0100
++++ menuselect-tree 2008-03-09 13:28:44 +0100
+@@ -668,6 +668,7 @@
+ <member name="EXTRA-SOUNDS-EN-ALAW" displayname="English, a-Law
format">
+ </member>
+ <member name="EXTRA-SOUNDS-EN-GSM" displayname="English, GSM
format" >
++ <defaultenabled>yes</defaultenabled>
+ </member>
+ <member name="EXTRA-SOUNDS-EN-G729" displayname="English, G.729
format">
+ </member>
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.spec
============================================================================
$ cvs diff -u -r1.36 -r1.37 asterisk.spec
--- openpkg-src/asterisk/asterisk.spec 9 Mar 2008 11:57:52 -0000
1.36
+++ openpkg-src/asterisk/asterisk.spec 9 Mar 2008 12:41:04 -0000
1.37
@@ -22,14 +22,15 @@
##
# package version
-%define V_opkg 1.6.0b4
-%define V_asterisk 1.6.0-beta4
-%define V_asterisk_addons 1.6.0-beta2
-%define V_asterisk_sounds 1.2.1
-%define V_asterisk_libiax 0.2.2
-%define V_app_conference 2.0.1
-%define V_asterisk_perl 0.10
-%define V_chan_capi 1_6_1
+%define V_opkg 1.6.0b5
+%define V_asterisk 1.6.0-beta5
+%define V_asterisk_addons 1.6.0-beta2
+%define V_asterisk_sounds_core 1.4.9
+%define V_asterisk_sounds_extra 1.4.7
+%define V_asterisk_libiax 0.2.2
+%define V_app_conference 2.0.1
+%define V_asterisk_perl 0.10
+%define V_chan_capi 1_6_1
# package information
Name: asterisk
@@ -54,13 +55,14 @@
# list of sources
Source0:
http://downloads.digium.com/pub/asterisk/releases/asterisk-%{V_asterisk}.tar.gz
Source1:
http://downloads.digium.com/pub/asterisk/releases/asterisk-addons-%{V_asterisk_addons}.tar.gz
-Source2:
http://downloads.digium.com/pub/asterisk/releases/asterisk-sounds-%{V_asterisk_sounds}.tar.gz
-Source3:
http://downloads.digium.com/pub/libiax/iax-%{V_asterisk_libiax}.tar.gz
-Source4:
http://switch.dl.sourceforge.net/appconference/appconference-%{V_app_conference}.tar.gz
-Source5:
http://asterisk.gnuinter.net/files/asterisk-perl-%{V_asterisk_perl}.tar.gz
-Source6:
http://www.turbocat.net/~hselasky/capi4pbx/releases/chan_capi_%{V_chan_capi}.tar.bz2
-Source7: asterisk.txt
-Source8: rc.asterisk
+Source2:
http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-en-gsm-%{V_asterisk_sounds_core}.tar.gz
+Source3:
http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-extra-sounds-en-gsm-%{V_asterisk_sounds_extra}.tar.gz
+Source4:
http://downloads.digium.com/pub/libiax/iax-%{V_asterisk_libiax}.tar.gz
+Source5:
http://switch.dl.sourceforge.net/appconference/appconference-%{V_app_conference}.tar.gz
+Source6:
http://asterisk.gnuinter.net/files/asterisk-perl-%{V_asterisk_perl}.tar.gz
+Source7:
http://www.turbocat.net/~hselasky/capi4pbx/releases/chan_capi_%{V_chan_capi}.tar.bz2
+Source8: asterisk.txt
+Source9: rc.asterisk
Patch0: asterisk.patch
# build information
@@ -115,10 +117,15 @@
url = http://downloads.digium.com/pub/asterisk/releases/
regex = asterisk-addons-(\d+\.\d+(\.\d+)+)\.tar\.gz
}
- prog asterisk16:sounds = {
- version = %{V_asterisk_sounds}
- url = http://downloads.digium.com/pub/asterisk/releases/
- regex = asterisk-sounds-(\d+\.\d+(\.\d+)+)\.tar\.gz
+ prog asterisk16:sounds_core = {
+ version = %{V_asterisk_sounds_core}
+ url =
http://downloads.digium.com/pub/telephony/sounds/releases/
+ regex = asterisk-core-sounds-en-gsm-(\d+\.\d+(\.\d+)+)\.tar\.gz
+ }
+ prog asterisk16:sounds_extra = {
+ version = %{V_asterisk_sounds_extra}
+ url =
http://downloads.digium.com/pub/telephony/sounds/releases/
+ regex = asterisk-extra-sounds-en-gsm-(\d+\.\d+(\.\d+)+)\.tar\.gz
}
prog asterisk16:libiax = {
version = %{V_asterisk_libiax}
@@ -139,12 +146,16 @@
%prep
%setup -q -n asterisk-%{V_asterisk}
%setup -q -n asterisk-%{V_asterisk} -D -T -a 1
- %setup -q -n asterisk-%{V_asterisk} -D -T -a 2
- %setup -q -n asterisk-%{V_asterisk} -D -T -a 3
%setup -q -n asterisk-%{V_asterisk} -D -T -a 4
%setup -q -n asterisk-%{V_asterisk} -D -T -a 5
%setup -q -n asterisk-%{V_asterisk} -D -T -a 6
+ %setup -q -n asterisk-%{V_asterisk} -D -T -a 7
%patch -p0
+ cp %{SOURCE2} %{SOURCE3} sounds/
+ %{l_shtool} subst \
+ -e 's;\(CORE_SOUNDS_VERSION\):=.*$;\1:=%{V_asterisk_sounds_core};' \
+ -e 's;\(EXTRA_SOUNDS_VERSION\):=.*$;\1:=%{V_asterisk_sounds_extra};'
\
+ sounds/Makefile
%build
# sanity check
@@ -299,18 +310,6 @@
DESTDIR=$RPM_BUILD_ROOT \
INSTALL_PREFIX=%{l_prefix}
- # install additional sounds
- ( cd asterisk-sounds-%{V_asterisk_sounds}
- %{l_make} %{l_mflags} install \
- DESTDIR=$RPM_BUILD_ROOT \
- ASTVARLIBDIR=%{l_prefix}/share/asterisk \
- INSTALL="%{l_shtool} install -c"
- ) || exit $?
-%if "%{with_mp3}" == "yes"
- %{l_shtool} install -c -m 644 %{l_value -s -a} \
- sounds/*.mp3 $RPM_BUILD_ROOT%{l_prefix}/share/asterisk/mohmp3/
-%endif
-
# install addon modules
( cd appconference-*
%{l_make} %{l_mflags} install \
@@ -345,6 +344,11 @@
rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man8/safe_asterisk.8 >/dev/null
2>&1 || true
rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/asterisk/firmware >/dev/null
2>&1 || true
rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/asterisk/images >/dev/null 2>&1
|| true
+ rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/asterisk/sounds/.asterisk*
>/dev/null 2>&1 || true
+ rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/asterisk/sounds/en/CREDIT*
>/dev/null 2>&1 || true
+ rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/asterisk/sounds/en/CHANGES*
>/dev/null 2>&1 || true
+ rmdir $RPM_BUILD_ROOT%{l_prefix}/share/asterisk/sounds/es >/dev/null
2>&1 || true
+ rmdir $RPM_BUILD_ROOT%{l_prefix}/share/asterisk/sounds/fr >/dev/null
2>&1 || true
# post-adjust installation
strip $RPM_BUILD_ROOT%{l_prefix}/sbin/* >/dev/null 2>&1 || true
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
