packages: asterisk/asterisk.spec, asterisk/lpc10-system.patch (NEW) - build...
glen
glen at pld-linux.org
Thu Dec 31 13:27:16 CET 2009
Author: glen Date: Thu Dec 31 12:27:16 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- build with system lpc10
- sandsp dep updated
- patches renum
---- Files affected:
packages/asterisk:
asterisk.spec (1.154 -> 1.155) , lpc10-system.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/asterisk/asterisk.spec
diff -u packages/asterisk/asterisk.spec:1.154 packages/asterisk/asterisk.spec:1.155
--- packages/asterisk/asterisk.spec:1.154 Thu Dec 31 00:38:58 2009
+++ packages/asterisk/asterisk.spec Thu Dec 31 13:27:11 2009
@@ -1,7 +1,7 @@
# $Revision$, $Date$
# TODO:
# - cgi-bin package - separate, because of suid-root
-# - use shared versions of lpc10, gsm,...
+# - use shared versions of LIBILBC:=ilbc/libilbc.a
# - CFLAGS passing
# - fix bluetooth patch
# - ~/.asterisk_history gets encoded with \xxx on exit, each time yet again
@@ -18,9 +18,17 @@
# *** WARNING: identical binaries are copied, not linked:
# /usr/lib64/asterisk/modules/app_directory_plain.so
# and /usr/lib64/asterisk/modules/app_directory_imap.so
-# - lua not detected
# - ncurses dep gone for good (replaced by libedit)?
-# - make as-needed compatible, or why chan_h323 gets built w/o libs initially?
+# - missing/failed features:
+# $ grep =0 build_tools/menuselect-deps
+# H323=0
+# HOARD=0
+# NBS=0
+# OSPTK=0
+# RESAMPLE=0
+# SS7=0
+# VPBAPI=0
+# WINARCH=0
#
# Conditional build:
%bcond_with rxfax # without rx (also tx:-D) fax
@@ -33,7 +41,7 @@
%bcond_without verbose # verbose build
%define spandsp_version 0.0.2pre26
-%define rel 0.34
+%define rel 0.37
Summary: Asterisk PBX
Summary(pl.UTF-8): Centralka (PBX) Asterisk
Name: asterisk
@@ -62,12 +70,13 @@
Patch9: pld-banner.patch
# http://soft-switch.org/downloads/spandsp/spandsp-%{spandsp_version}/asterisk-1.2.x/apps_Makefile.patch
Patch10: %{name}-txfax-Makefile.patch
-Patch12: %{name}-chan_bluetooth.patch
-Patch13: %{name}-zhone.patch
+Patch11: %{name}-chan_bluetooth.patch
+Patch12: %{name}-zhone.patch
# http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff
-Patch14: %{name}-bristuff.patch
-Patch15: %{name}-bristuff-build.patch
-Patch16: %{name}-bristuff-libpri.patch
+Patch13: %{name}-bristuff.patch
+Patch14: %{name}-bristuff-build.patch
+Patch15: %{name}-bristuff-libpri.patch
+Patch16: lpc10-system.patch
URL: http://www.asterisk.org/
BuildRequires: OSPToolkit
BuildRequires: SDL_image-devel
@@ -88,8 +97,10 @@
BuildRequires: jack-audio-connection-kit-devel
BuildRequires: libcap-devel
BuildRequires: libedit-devel
+BuildRequires: libgsm-devel
BuildRequires: libogg-devel
BuildRequires: libvorbis-devel
+BuildRequires: lpc10-devel
BuildRequires: lua51-devel
BuildRequires: mISDNuser-devel
BuildRequires: mxml-devel
@@ -110,8 +121,7 @@
BuildRequires: radiusclient-ng-devel
BuildRequires: rpmbuild(macros) >= 1.268
BuildRequires: sed >= 4.0
-BuildRequires: spandsp-devel
-%{?with_rxfax:BuildRequires: spandsp-devel >= %{spandsp_version}}
+BuildRequires: spandsp-devel >= 0.0.5
BuildRequires: speex-devel
BuildRequires: sqlite-devel
BuildRequires: sqlite3-devel
@@ -245,10 +255,10 @@
Requires: %{name} = %{version}-%{release}
%description h323
-This channel driver (chan_h323) provides support for the H.323 protocol for
-Asterisk. This is an implementation originally contributed by NuFone and
-nowdays maintained and distributed by Digium, Inc. Hence, it is considered the
-official H.323 chanel driver.
+This channel driver (chan_h323) provides support for the H.323
+protocol for Asterisk. This is an implementation originally
+contributed by NuFone and nowdays maintained and distributed by
+Digium, Inc. Hence, it is considered the official H.323 chanel driver.
%package ices
Summary: Stream audio from Asterisk to an IceCast server
@@ -465,33 +475,30 @@
%patch7 -p0
%patch8 -p1
%patch9 -p1
-
%if %{with zhone}
sed -i -e 's|.*#define.*ZHONE_HACK.*|#define ZHONE_HACK 1|g' channels/chan_zap.c
%endif
-
%if %{with rxfax}
cd apps
%patch10 -p0
cp %{SOURCE10} .
cp %{SOURCE11} .
%endif
-
-%{?with_bluetooth:%patch12 -p1}
-%{?with_zhonehack:%patch13 -p1}
-
+%{?with_bluetooth:%patch11 -p1}
+%{?with_zhonehack:%patch12 -p1}
%if %{with bristuff}
+%patch13 -p1
%patch14 -p1
%patch15 -p1
-%patch16 -p1
%endif
+%patch16 -p1
# Fixup makefile so sound archives aren't downloaded/installed
%{__sed} -i -e 's/^all:.*$/all:/' sounds/Makefile
%{__sed} -i -e 's/^install:.*$/install:/' sounds/Makefile
-# avoid using it
-rm -rf imap menuselect/mxml main/editline
+# avoid using these
+rm -rf imap menuselect/mxml main/editline codecs/gsm codecs/lpc10
%build
rm -f pbx/.depend
@@ -521,6 +528,7 @@
%{?with_bristuff:--with-gsmat=%{_prefix}} \
--with-imap=system \
--with-gsm=/usr \
+ --with-lpc10=/usr \
--with-libedit=yes
# safe checks
@@ -1187,6 +1195,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.155 2009/12/31 12:27:11 glen
+- build with system lpc10
+- sandsp dep updated
+- patches renum
+
Revision 1.154 2009/12/30 23:38:58 glen
- nuke editline copy
- make menuselect only needed for building
================================================================
Index: packages/asterisk/lpc10-system.patch
diff -u /dev/null packages/asterisk/lpc10-system.patch:1.1
--- /dev/null Thu Dec 31 13:27:16 2009
+++ packages/asterisk/lpc10-system.patch Thu Dec 31 13:27:11 2009
@@ -0,0 +1,130 @@
+--- asterisk-1.6.1.12/codecs/codec_lpc10.c 2009-12-31 13:37:17.453275676 +0200
++++ asterisk-1.6.1.12/codecs/codec_lpc10.c 2009-12-31 13:18:26.630953709 +0200
+@@ -26,6 +26,9 @@
+ *
+ * \ingroup codecs
+ */
++/*** MODULEINFO
++ <depend>lpc10</depend>
++ ***/
+
+ #include "asterisk.h"
+
+@@ -33,7 +36,7 @@
+ #include "asterisk/module.h"
+ #include "asterisk/utils.h"
+
+-#include "lpc10/lpc10.h"
++#include <lpc10.h>
+
+ /* Sample frame data */
+ #include "slin_lpc10_ex.h"
+--- asterisk-1.6.1.12/build_tools/menuselect-deps.in~ 2009-12-31 13:39:17.000000000 +0200
++++ asterisk-1.6.1.12/build_tools/menuselect-deps.in 2009-12-31 14:19:55.440132344 +0200
+@@ -5,6 +5,7 @@
+ FREETDS=@PBX_FREETDS@
+ GMIME=@PBX_GMIME@
+ GNU_LD=@GNU_LD@
++LPC10=@PBX_LPC10@
+ GSM=@PBX_GSM@
+ GTK2=@PBX_GTK2@
+ GTK=@PBX_GTK@
+--- asterisk-1.6.1.12/codecs/Makefile~ 2009-07-21 16:48:38.000000000 +0300
++++ asterisk-1.6.1.12/codecs/Makefile 2009-12-31 13:11:04.977664417 +0200
+@@ -42,7 +42,9 @@
+ $(LIBLPC10):
+ @$(MAKE) -C lpc10 all
+
++ifneq ($(LPC10_INTERNAL),no)
+ $(if $(filter codec_lpc10,$(EMBEDDED_MODS)),modules.link,codec_lpc10.so): $(LIBLPC10)
++endif
+
+ $(LIBILBC):
+ @$(MAKE) -C ilbc all _ASTCFLAGS="$(filter-out -Wmissing-prototypes -Wmissing-declarations -Wshadow,$(_ASTCFLAGS)) $(AST_NO_STRICT_OVERFLOW)"
+--- asterisk-1.6.1.12/makeopts.in~ 2009-12-31 11:15:37.000000000 +0200
++++ asterisk-1.6.1.12/makeopts.in 2009-12-31 13:02:52.623760100 +0200
+@@ -96,6 +96,10 @@
+ GSM_INCLUDE=@GSM_INCLUDE@
+ GSM_LIB=@GSM_LIB@
+
++LPC10_INTERNAL=@LPC10_INTERNAL@
++LPC10_INCLUDE=@LPC10_INCLUDE@
++LPC10_LIB=@LPC10_LIB@
++
+ GTK_INCLUDE=@GTK_INCLUDE@
+ GTK_LIB=@GTK_LIB@
+
+--- asterisk-1.6.1.12/configure.ac~ 2009-12-31 11:15:37.000000000 +0200
++++ asterisk-1.6.1.12/configure.ac 2009-12-31 13:09:33.900041134 +0200
+@@ -237,6 +237,7 @@
+ AST_EXT_LIB_SETUP([DAHDI], [DAHDI], [dahdi])
+ AST_EXT_LIB_SETUP([FFMPEG], [Ffmpeg and avcodec library], [avcodec])
+ AST_EXT_LIB_SETUP([GSM], [External GSM library], [gsm], [, use 'internal' GSM otherwise])
++AST_EXT_LIB_SETUP([LPC10], [External lpc10 library], [lpc10], [, use 'internal' lpc10 otherwise])
+ AST_EXT_LIB_SETUP([GTK], [gtk libraries], [gtk])
+ AST_EXT_LIB_SETUP([GTK2], [gtk2 libraries], [gtk2])
+ AST_EXT_LIB_SETUP([GMIME], [GMime library], [gmime])
+@@ -712,6 +713,63 @@
+ fi
+ fi
+
++LPC10_INTERNAL="yes"
++AC_SUBST(LPC10_INTERNAL)
++LPC10_SYSTEM="yes"
++if test "${USE_LPC10}" != "no"; then
++ if test "${LPC10_DIR}" = "internal"; then
++ LPC10_SYSTEM="no"
++ elif test "${LPC10_DIR}" != ""; then
++ LPC10_INTERNAL="no"
++ fi
++ if test "${LPC10_SYSTEM}" = "yes"; then
++ lpc10libdir=""
++ if test "x${LPC10_DIR}" != "x"; then
++ if test -d ${LPC10_DIR}/lib; then
++ lpc10libdir="-L${LPC10_DIR}/lib"
++ else
++ lpc10libdir="-L${LPC10_DIR}"
++ fi
++ fi
++ AC_CHECK_LIB([lpc10], [lpc10_encode], AC_DEFINE_UNQUOTED([HAVE_LPC10], 1,
++ [Define to indicate the GSM library]), [], ${gsmlibdir})
++ if test "${ac_cv_lib_lpc10_lpc10_encode}" = "yes"; then
++ if test "x${LPC10_DIR}" != "x" ; then
++ AC_CHECK_HEADER([${LPC10_DIR}/include/lpc10.h], [LPC10_HEADER_FOUND=1], [LPC10_HEADER_FOUND=0])
++ else
++ AC_CHECK_HEADER([lpc10.h], [LPC10_HEADER_FOUND=1], [LPC10_HEADER_FOUND=0])
++ fi
++ if test "${LPC10_HEADER_FOUND}" = "0" ; then
++ if test "x${LPC10_MANDATORY}" = "xyes" ; then
++ AC_MSG_NOTICE([***])
++ AC_MSG_NOTICE([*** It appears that you do not have the lpc10 development package installed.])
++ AC_MSG_NOTICE([*** Please install it to include ${LPC10_DESCRIP} support, or re-run configure])
++ AC_MSG_NOTICE([*** without explicitly specifying --with-${LPC10_OPTION}])
++ exit 1
++ fi
++ fi
++ LPC10_OK=0
++ if test "${LPC10_HEADER_FOUND}" = "1" ; then
++ AC_DEFINE_UNQUOTED([HAVE_LPC10_HEADER], 1, [Define to indicate that lpc10.h has no prefix for its location])
++ LPC10_OK=1
++ fi
++ if test "${LPC10_OK}" = "1" ; then
++ LPC10_LIB="-llpc10"
++ if test "x${LPC10_DIR}" != "x"; then
++ LPC10_LIB="${lpc10libdir} ${LPC10_LIB}"
++ LPC10_INCLUDE="-I${LPC10_DIR}/include"
++ fi
++ PBX_LPC10=1
++ LPC10_INTERNAL="no"
++ fi
++ fi
++ fi
++ if test "${LPC10_INTERNAL}" = "yes"; then
++ PBX_LPC10=1
++ AC_DEFINE_UNQUOTED([HAVE_LPC10_HEADER], 1, [Define to indicate that lpc10.h has no prefix for its location])
++ fi
++fi
++
+ AST_EXT_LIB_CHECK([ICONV], [iconv], [iconv_open], [iconv.h])
+ # Some versions of Linux package iconv in glibc
+ AST_EXT_LIB_CHECK([ICONV], [c], [iconv_close], [iconv.h])
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/asterisk/asterisk.spec?r1=1.154&r2=1.155&f=u
More information about the pld-cvs-commit
mailing list