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: 08-Mar-2008 23:17:59
Branch: HEAD Handle: 2008030822175500
Modified files:
openpkg-src/asterisk16 asterisk16.patch asterisk16.spec
Log:
add more functionality
Summary:
Revision Changes Path
1.2 +15 -0 openpkg-src/asterisk16/asterisk16.patch
1.2 +40 -6 openpkg-src/asterisk16/asterisk16.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk16/asterisk16.patch
============================================================================
$ cvs diff -u -r1.1 -r1.2 asterisk16.patch
--- openpkg-src/asterisk16/asterisk16.patch 8 Mar 2008 21:37:18 -0000
1.1
+++ openpkg-src/asterisk16/asterisk16.patch 8 Mar 2008 22:17:55 -0000
1.2
@@ -135,3 +135,18 @@
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" \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk16/asterisk16.spec
============================================================================
$ cvs diff -u -r1.1 -r1.2 asterisk16.spec
--- openpkg-src/asterisk16/asterisk16.spec 8 Mar 2008 21:37:18 -0000
1.1
+++ openpkg-src/asterisk16/asterisk16.spec 8 Mar 2008 22:17:55 -0000
1.2
@@ -48,6 +48,8 @@
%option with_zaptel no
%option with_capi no
%option with_mp3 no
+%option with_avcodec no
+%option with_ldap no
# list of sources
Source0:
http://downloads.digium.com/pub/asterisk/releases/asterisk-%{V_asterisk}.tar.gz
@@ -66,13 +68,21 @@
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20040130, bison, gcc, make, grep
PreReq: OpenPKG, openpkg >= 20040130
-BuildPreReq: zlib, curl, openssl, ncurses, speex, vorbis-libs, imap, popt,
sqlite
-PreReq: zlib, curl, openssl, ncurses, speex, vorbis-libs, imap, popt,
sqlite
+BuildPreReq: zlib, curl, openssl, ncurses, speex, vorbis-libs, imap, popt,
sqlite, iksemel, lua
+PreReq: zlib, curl, openssl, ncurses, speex, vorbis-libs, imap, popt,
sqlite, iksemel, lua
BuildPreReq: perl, perl-openpkg
PreReq: perl
%if "%{with_mp3}" == "yes"
PreReq: mpg123
%endif
+%if "%{with_avcodec}" == "yes"
+BuildPreReq: ffmpeg
+PreReq: ffmpeg
+%endif
+%if "%{with_ldap}" == "yes"
+BuildPreReq: openldap
+PreReq: openldap
+%endif
AutoReq: no
AutoReqProv: no
Provides: asterisk = %{version}-%{release}
@@ -180,11 +190,23 @@
res/res_musiconhold.c apps/app_mp3.c
# build program
+ %{l_shtool} subst \
+ -e 's;-llua5.1;-llua;' \
+ -e 's;lua5.1/lua.h;lua/lua.h;' \
+ -e 's;ffmpeg/avcodec.h;libavcodec/avcodec.h;' \
+ configure
+ libs="-logg -lm"
+%if "%{with_avcodec}" == "yes"
+ libs="$libs -lavcodec -lavutil"
+%endif
+%if "%{with_ldap}" == "yes"
+ libs="$libs -lldap -llber -lssl -lcrypto"
+%endif
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
- CPPFLAGS="%{l_cppflags ncurses .}" \
+ CPPFLAGS="%{l_cppflags ncurses lua .}" \
LDFLAGS="%{l_ldflags}" \
- LIBS="-logg" \
+ LIBS="$libs" \
./configure \
--prefix=%{l_prefix} \
--mandir=%{l_prefix}/man \
@@ -200,11 +222,23 @@
--with-z=%{l_prefix} \
--with-ogg=%{l_prefix} \
--with-vorbis=%{l_prefix} \
-%if "%{with_zaptel}" == "yes
+ --with-iksemel=%{l_prefix} \
+ --with-lua=%{l_prefix} \
+%if "%{with_zaptel}" == "yes"
--with-zaptel=$zaptel_prefix \
%else
--without-zaptel \
%endif
+%if "%{with_avcodec}" == "yes"
+ --with-avcodec=%{l_prefix} \
+%else
+ --without-avcodec \
+%endif
+%if "%{with_ldap}" == "yes"
+ --with-ldap=%{l_prefix} \
+%else
+ --without-ldap \
+%endif
--without-imap \
--without-netsnmp \
--without-isdnnet \
@@ -230,7 +264,7 @@
--without-gtk \
--without-gtk2
%{l_make} %{l_mflags} \
- CC="%{l_cc} %{l_cflags -O} -I. -I./include -I../include
-I../../include %{l_cppflags ncurses .}"
+ CC="%{l_cc} %{l_cflags -O} -I. -I./include -I../include
-I../../include %{l_cppflags ncurses lua .}"
# build addon modules
( cd appconference-*
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
