You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
210 lines
6.4 KiB
210 lines
6.4 KiB
Index: Makefile |
|
--- Makefile.orig 2008-02-26 21:19:03 +0100 |
|
+++ Makefile 2008-03-09 20:35:44 +0100 |
|
@@ -121,42 +121,20 @@ |
|
|
|
# Define standard directories for various platforms |
|
# These apply if they are not redefined in asterisk.conf |
|
-ifeq ($(OSARCH),SunOS) |
|
- ASTETCDIR=/var/etc/asterisk |
|
- ASTLIBDIR=/opt/asterisk/lib |
|
- ASTVARLIBDIR=/var/opt/asterisk |
|
- ASTDBDIR=$(ASTVARLIBDIR) |
|
- ASTKEYDIR=$(ASTVARLIBDIR) |
|
- ASTSPOOLDIR=/var/spool/asterisk |
|
- ASTLOGDIR=/var/log/asterisk |
|
- ASTHEADERDIR=/opt/asterisk/include |
|
- ASTBINDIR=/opt/asterisk/bin |
|
- ASTSBINDIR=/opt/asterisk/sbin |
|
- ASTVARRUNDIR=/var/run/asterisk |
|
- ASTMANDIR=/opt/asterisk/man |
|
-else |
|
ASTETCDIR=$(sysconfdir)/asterisk |
|
ASTLIBDIR=$(libdir)/asterisk |
|
ASTHEADERDIR=$(includedir)/asterisk |
|
ASTBINDIR=$(bindir) |
|
ASTSBINDIR=$(sbindir) |
|
- ASTSPOOLDIR=$(localstatedir)/spool/asterisk |
|
- ASTLOGDIR=$(localstatedir)/log/asterisk |
|
+ ASTSPOOLDIR=$(localstatedir)/spool |
|
+ ASTLOGDIR=$(localstatedir)/log |
|
ASTVARRUNDIR=$(localstatedir)/run |
|
ASTMANDIR=$(mandir) |
|
-ifneq ($(findstring BSD,$(OSARCH)),) |
|
ASTVARLIBDIR=$(prefix)/share/asterisk |
|
- ASTVARRUNDIR=$(localstatedir)/run/asterisk |
|
- ASTDBDIR=$(localstatedir)/db/asterisk |
|
-else |
|
- ASTVARLIBDIR=$(localstatedir)/lib/asterisk |
|
- ASTDBDIR=$(ASTVARLIBDIR) |
|
-endif |
|
+ ASTVARRUNDIR=$(localstatedir)/run |
|
+ ASTDBDIR=$(localstatedir)/db |
|
ASTKEYDIR=$(ASTVARLIBDIR) |
|
-endif |
|
-ifeq ($(ASTDATADIR),) |
|
ASTDATADIR:=$(ASTVARLIBDIR) |
|
-endif |
|
|
|
# Asterisk.conf is located in ASTETCDIR or by using the -C flag |
|
# when starting Asterisk |
|
@@ -245,12 +223,6 @@ |
|
ASTCFLAGS+=-fsigned-char |
|
endif |
|
|
|
-ifeq ($(OSARCH),FreeBSD) |
|
- # -V is understood by BSD Make, not by GNU make. |
|
- BSDVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk) |
|
- ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi) |
|
-endif |
|
- |
|
ifeq ($(OSARCH),NetBSD) |
|
ASTCFLAGS+=-pthread -I/usr/pkg/include |
|
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-09 20:33:38 +0100 |
|
@@ -18,9 +18,9 @@ |
|
# |
|
|
|
INSTALL_PREFIX := |
|
-INSTALL_MODULES_DIR := $(INSTALL_PREFIX)/usr/lib/asterisk/modules |
|
+INSTALL_MODULES_DIR := $(INSTALL_PREFIX)/lib/asterisk/modules |
|
|
|
-ASTERISK_INCLUDE_DIR ?= ../asterisk/include |
|
+ASTERISK_INCLUDE_DIR ?= ../include |
|
|
|
REVISION = $(shell svnversion -n .) |
|
|
|
@@ -48,7 +48,7 @@ |
|
INCLUDE = -I$(ASTERISK_INCLUDE_DIR) |
|
DEBUG := -g |
|
|
|
-CFLAGS = -pipe -Wall -Wmissing-prototypes -Wmissing-declarations -MD -MP $(DEBUG) |
|
+CFLAGS = -pipe -MD -MP $(DEBUG) |
|
CPPFLAGS = $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE -DREVISION=\"$(REVISION)\" |
|
#CFLAGS += -O2 |
|
#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-09 20:33:38 +0100 |
|
@@ -44,6 +44,7 @@ |
|
#include <pthread.h> |
|
|
|
/* asterisk includes */ |
|
+#include <asterisk.h> |
|
#include <asterisk/utils.h> |
|
#include <asterisk/pbx.h> |
|
#include <asterisk/module.h> |
|
Index: asterisk-perl-0.10/Makefile.PL |
|
--- asterisk-perl-0.10/Makefile.PL.orig 2003-06-13 07:52:12 +0200 |
|
+++ asterisk-perl-0.10/Makefile.PL 2008-03-09 20:33:38 +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 20:33:38 +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-23 00:56:55 +0100 |
|
+++ configure 2008-03-09 20:33:38 +0100 |
|
@@ -4049,12 +4049,6 @@ |
|
# note- does not work on FreeBSD |
|
|
|
case "${host_os}" in |
|
- freebsd*) |
|
- ac_default_prefix=/usr/local |
|
- CPPFLAGS=-I/usr/local/include |
|
- LDFLAGS=-L/usr/local/lib |
|
- ;; |
|
- |
|
*) |
|
ac_default_prefix=/usr |
|
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-09 20:33:38 +0100 |
|
@@ -71,7 +71,7 @@ |
|
PACKAGE = @PACKAGE@ |
|
RANLIB = @RANLIB@ |
|
VERSION = @VERSION@ |
|
-CFLAGS = -g -Wall -Wstrict-prototypes -I . -DDEBUG_SUPPORT -DDEBUG_DEFAULT $(UCFLAGS) |
|
+CFLAGS = -I . -DDEBUG_SUPPORT -DDEBUG_DEFAULT $(UCFLAGS) |
|
|
|
pkgdir = $(libdir) |
|
pkg_LTLIBRARIES = libiax.la |
|
@@ -304,12 +304,11 @@ |
|
|
|
|
|
install: |
|
- mkdir -p $(includedir)/iax |
|
- install -m 644 md5.h $(includedir)/iax |
|
- install -m 644 frame.h $(includedir)/iax |
|
- install -m 644 iax.h $(includedir)/iax |
|
- install -m 644 iax-client.h $(includedir)/iax |
|
- /sbin/ldconfig |
|
+ mkdir -p $(DESTDIR)$(includedir)/iax |
|
+ install -m 644 md5.h $(DESTDIR)$(includedir)/iax |
|
+ install -m 644 frame.h $(DESTDIR)$(includedir)/iax |
|
+ install -m 644 iax.h $(DESTDIR)$(includedir)/iax |
|
+ install -m 644 iax-client.h $(DESTDIR)$(includedir)/iax |
|
|
|
# Tell versions [3.59,3.63) of GNU make to not export all variables. |
|
# 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-09 20:33:38 +0100 |
|
@@ -33,13 +33,11 @@ |
|
#include <sys/time.h> |
|
#include <stdlib.h> |
|
#include <string.h> |
|
-#include <malloc.h> |
|
#include <stdarg.h> |
|
#include <stdio.h> |
|
#include <unistd.h> |
|
#include <fcntl.h> |
|
#include <errno.h> |
|
-#include <error.h> |
|
#include <sys/select.h> |
|
#include <netinet/in.h> |
|
#include <arpa/inet.h> |
|
Index: main/Makefile |
|
--- main/Makefile.orig 2008-02-28 01:11:31 +0100 |
|
+++ main/Makefile 2008-03-09 20:33:38 +0100 |
|
@@ -82,10 +82,7 @@ |
|
endif |
|
|
|
ifeq ($(OSARCH),FreeBSD) |
|
- # -V is understood by BSD Make, not by GNU make. |
|
- BSDVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk) |
|
- AST_LIBS+=$(shell if test $(BSDVERSION) -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi) |
|
- AST_LIBS+=-lcrypto |
|
+ AST_LIBS+=-lpthread -lcrypto |
|
endif |
|
|
|
ifneq ($(findstring $(OSARCH), mingw32 cygwin ),) |
|
Index: menuselect-tree |
|
--- menuselect-tree.orig 2008-03-04 18:52:08 +0100 |
|
+++ menuselect-tree 2008-03-09 20:33:38 +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>
|
|
|