cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Major update to opal-3.6.6.

Browse Source
This commit is contained in:
ajacoutot 2010-03-23 21:13:37 +00:00
parent be119c989e
commit 986b2502e0
15 changed files with 241 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
net/opal/Makefile
View File

@ -1,13 +1,19 @@
# $OpenBSD: Makefile,v 1.7 2009/05/28 10:00:44 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.8 2010/03/23 21:13:37 ajacoutot Exp $
SHARED_ONLY= Yes
COMMENT= Open Phone Abstraction Library
DISTNAME= opal-2.2.11
PKGNAME= ${DISTNAME}p4
SHARED_LIBS= opal 0.0 # .2.2.11
CATEGORIES= net devel
V= 3.6.6
DISTNAME= opal-${V}
SUBST_VARS+= V
SHARED_LIBS= opal 1.0 # .2.2.11
EXTRACT_SUFX= .tar.bz2
CATEGORIES= net devel telephony
HOMEPAGE= http://www.opalvoip.org/
@ -19,31 +25,55 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ${HOMEPAGE}/admin/downloads/latest/sources/sources/
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=opalvoip/}
WANTLIB= SDL crypto expat lber ldap ldap_r sasl2 ssl
WANTLIB += SDL c crypto expat lber ldap ldap_r m ogg sasl2
WANTLIB += ssl
LIB_DEPENDS= speex.>=7,speexdsp::audio/speex \
pt.>=2::devel/pwlib
theora::multimedia/libtheora \
gsm::audio/gsm \
pt.>=3::devel/ptlib
ALL_TARGET= optshared
ALL_TARGET= opt
OPAL_FILE= libopal.so
MAKE_ENV= CC=${CC} CPLUS=${CXX} BUILDSELF="1"
MAKE_ENV= CC=${CC} CPLUS=${CXX} VERBOSE=1
MAKE_FLAGS= OPAL_FILE=${OPAL_FILE} \
LIB_SONAME=${OPAL_FILE}.${LIBopal_VERSION} \
LIBNAME_PAT=${OPAL_FILE}.${LIBopal_VERSION}
RELEASE_LIB_FILENAME_SHARED_PAT=${OPAL_FILE}.${LIBopal_VERSION}
USE_GMAKE= Yes
NO_REGRESS= Yes
MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/plugins
CONFIGURE_STYLE=gnu
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --disable-localspeex
CONFIGURE_ARGS= --disable-localspeex \
--disable-localgsm \
--enable-plugins
pre-configure:
@perl -pi -e 's,!!PREFIX!!,${PREFIX},g' \
${WRKSRC}/opal_inc.mak.in
# XXX
# ekiga:/usr/local/lib/opal-3.6.6/lid/vpb_lid_pwplugin.so:
# undefined symbol '_Z18vpb_set_event_maskit'
# <...>
CONFIGURE_ARGS+= --disable-vpb
# XXX our FFmpeg is too old
CONFIGURE_ARGS+= --disable-h264
#BUILD_DEPENDS= ${RUN_DEPENDS}
#RUN_DEPENDS= ::graphics/ffmpeg # dlopen(3) libavcodec.so
#LIB_DEPENDS+= x264::multimedia/x264
#LDFLAGS+= -pthread
.ifndef DEBUG
CONFIGURE_ENV+= DEBUG_BUILD="no"
.endif
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/opal
${INSTALL_DATA} ${WRKSRC}/opal_inc.mak ${PREFIX}/share/opal
${INSTALL_DATA} ${WRKSRC}/version.h ${PREFIX}/share/opal
.include <bsd.port.mk>

10
net/opal/distinfo
View File

@ -1,5 +1,5 @@
MD5 (opal-2.2.11.tar.gz) = 60qcDJ6pPslch2qurfg5Ng==
RMD160 (opal-2.2.11.tar.gz) = fvLVBcxS7KkTbKEKhlx7fzqNwrU=
SHA1 (opal-2.2.11.tar.gz) = +GOKfc6OnDKr2MacabotYd/KBfA=
SHA256 (opal-2.2.11.tar.gz) = CZDq05co8joc45mX9BqEhMWYCczsDncLm8T3lahaKcQ=
SIZE (opal-2.2.11.tar.gz) = 4165191
MD5 (opal-3.6.6.tar.bz2) = Q7NjyGB4Dn8aA2HP7o+fSg==
RMD160 (opal-3.6.6.tar.bz2) = tjlwn34ozmB0eL3cQdFx4OVL7p8=
SHA1 (opal-3.6.6.tar.bz2) = vV45B/r5bbiEpk2s3tsiWayjDNM=
SHA256 (opal-3.6.6.tar.bz2) = YMnXVwO+3+ynFAy3ayP65xec4fhufosAJrctZqzXXII=
SIZE (opal-3.6.6.tar.bz2) = 7062422

37
net/opal/patches/patch-Makefile_in
View File

@ -1,37 +0,0 @@
$OpenBSD: patch-Makefile_in,v 1.2 2008/05/22 19:30:41 ajacoutot Exp $
--- Makefile.in.orig Sat Apr 22 16:06:54 2006
+++ Makefile.in Thu May 22 20:21:08 2008
@@ -534,7 +534,7 @@ SOURCES += $(OPAL_SRCDIR)/codec/speexcodec.cxx
ifdef OPAL_SYSTEM_SPEEX
-ENDLDLIBS := -lspeex $(ENDLDLIBS)
+ENDLDLIBS := -lspeex -lspeexdsp $(ENDLDLIBS)
else
@@ -762,9 +762,6 @@ ifeq ($(P_SHAREDLIB),1)
endif
$(LIBDIR)/$(OPAL_FILE): $(LIBDIR)/$(LIBNAME_PAT)
- cd $(LIBDIR) ; rm -f $(OPAL_FILE) ; ln -sf $(LIBNAME_PAT) $(OPAL_FILE)
- cd $(LIBDIR) ; rm -f $(LIBNAME_MAJ) ; ln -sf $(LIBNAME_PAT) $(LIBNAME_MAJ)
- cd $(LIBDIR) ; rm -f $(LIBNAME_MIN) ; ln -sf $(LIBNAME_PAT) $(LIBNAME_MIN)
$(LIBDIR)/$(LIBNAME_PAT): $(STATIC_LIB_FILE)
@echo EXTLIBS = $(EXTLIBS)
@@ -881,14 +878,6 @@ install:
do mkdir -p $$dir ; chmod 755 $$dir ; \
done)
$(INSTALL) -m 755 lib/$(LIBNAME_PAT) $(DESTDIR)@LIBDIR@
- ln -snf $(LIBNAME_PAT) \
- $(DESTDIR)@LIBDIR@/$(OPAL_FILE).$(MAJOR_VERSION).$(MINOR_VERSION)
- ln -snf $(LIBNAME_PAT) \
- $(DESTDIR)@LIBDIR@/$(OPAL_FILE).$(MAJOR_VERSION)
- ln -snf $(LIBNAME_PAT) \
- $(DESTDIR)@LIBDIR@/$(OPAL_FILE)
- ln -snf $(LIBNAME_PAT) \
- $(DESTDIR)@LIBDIR@/libopal.so
( for fn in include/asn/*.h ; do \
$(INSTALL) -m 644 $$fn $(DESTDIR)$(PREFIX)/include/opal/asn ; \
done)

23
net/opal/patches/patch-configure Normal file
View File

@ -0,0 +1,23 @@
$OpenBSD: patch-configure,v 1.1 2010/03/23 21:13:37 ajacoutot Exp $
--- configure.orig Sun Jul 5 08:13:12 2009
+++ configure Tue Jul 7 09:52:53 2009
@@ -4336,7 +4336,7 @@ fi
WFLAGS=
if test "x$ac_cv_c_compiler_gnu" = xyes; then
if test ${GXX_MAJOR} -lt 4 ; then
- WFLAGS="-Wall -Wextra -Wstrict-aliasing=2 -Wfloat-equal -Wno-comment -Wno-unused"
+ WFLAGS="-Wall -Wfloat-equal -Wno-comment -Wno-unused"
else
WFLAGS="-Wall -Wextra -Winit-self -Wstrict-aliasing=2 -Wfloat-equal -Wno-comment -Wno-missing-field-initializers -Wno-unused"
@@ -5081,6 +5081,10 @@ fi
solaris*)
opal_release_flags="-O3 -DSOLARIS"
opal_debug_flags="-g -D_DEBUG -DSOLARIS"
+ ;;
+ openbsd*)
+ opal_release_flags=""
+ opal_debug_flags="-g3 -ggdb -O0 -D_DEBUG"
;;
*)
opal_release_flags="-Os"

24
net/opal/patches/patch-opal_inc_mak_in
View File

@ -1,24 +0,0 @@
$OpenBSD: patch-opal_inc_mak_in,v 1.1.1.1 2008/04/29 07:01:18 ajacoutot Exp $
--- opal_inc.mak.in.orig Tue Jan 31 09:10:37 2006
+++ opal_inc.mak.in Mon Apr 28 14:13:50 2008
@@ -67,7 +67,11 @@ HAS_IXJ=@HAS_IXJ@
HAS_SANGOMA=@HAS_SANGOMA@
+ifdef BUILDSELF
OPALDIR=@OPALDIR@
+else
+OPALDIR=!!PREFIX!!/lib
+endif
PWLIBDIR=@PWLIBDIR@
LIBDIRS += $(OPALDIR)
@@ -103,7 +107,7 @@ OPAL_SUFFIX = $(OBJ_SUFFIX)
endif
-OPAL_BASE = opal_$(PLATFORM_TYPE)_$(OPAL_SUFFIX)
+OPAL_BASE = opal
OPAL_FILE = lib$(OPAL_BASE)$(LIB_TYPE).$(LIB_SUFFIX)
LDFLAGS += -L$(OPAL_LIBDIR)

12
net/opal/patches/patch-plugins_audio_GSM0610_Makefile_in Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-plugins_audio_GSM0610_Makefile_in,v 1.1 2010/03/23 21:13:37 ajacoutot Exp $
--- plugins/audio/GSM0610/Makefile.in.orig Wed Sep 23 00:23:13 2009
+++ plugins/audio/GSM0610/Makefile.in Wed Sep 23 00:24:07 2009
@@ -163,7 +163,7 @@ ifeq (solaris,$(findstring solaris,$(target_os)))
$(Q_LD)$(CC) $(LDSO) $@ -o $@ $^ $(EXTRALIBS)
else
- $(Q_LD)$(CC) $(LDSO) -o $@ $^ $(EXTRALIBS)
+ $(Q_LD)$(CC) $(LDSO) -o $@ $(LDFLAGS) $^ $(EXTRALIBS)
endif

14
net/opal/patches/patch-plugins_configure Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-plugins_configure,v 1.1 2010/03/23 21:13:37 ajacoutot Exp $
--- plugins/configure.orig Tue Sep 22 02:57:56 2009
+++ plugins/configure Wed Sep 23 00:24:27 2009
@@ -2195,6 +2195,10 @@ fi
opal_release_flags="-O3 -DSOLARIS"
opal_debug_flags="-g -D_DEBUG -DSOLARIS"
;;
+ openbsd*)
+ opal_release_flags=""
+ opal_debug_flags="-g3 -ggdb -O0 -D_DEBUG"
+ ;;
*)
opal_release_flags="-Os"
opal_debug_flags="-g3 -ggdb -O0 -D_DEBUG"

11
net/opal/patches/patch-plugins_plugin-config_h_in Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-plugins_plugin-config_h_in,v 1.1 2010/03/23 21:13:37 ajacoutot Exp $
--- plugins/plugin-config.h.in.orig Thu Jun 4 20:53:52 2009
+++ plugins/plugin-config.h.in Thu Jun 4 20:54:42 2009
@@ -178,5 +178,6 @@
#undef vfork
/* define if posix_memalign is available */
+#ifndef __OpenBSD__
#undef HAVE_POSIX_MEMALIGN
-
+#endif

11
net/opal/patches/patch-plugins_video_H_261-vic_vic_config_h Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-plugins_video_H_261-vic_vic_config_h,v 1.1 2010/03/23 21:13:37 ajacoutot Exp $
--- plugins/video/H.261-vic/vic/config.h.orig Mon Nov 3 18:04:53 2008
+++ plugins/video/H.261-vic/vic/config.h Mon Nov 3 18:05:07 2008
@@ -71,6 +71,7 @@ typedef unsigned char BYTE;
typedef unsigned long u_long;
#ifndef _WIN32
+#include <sys/types.h>
#include <netinet/in.h>
#endif

24
net/opal/patches/patch-plugins_video_H_263-1998_h263-1998_cxx Normal file
View File

@ -0,0 +1,24 @@
$OpenBSD: patch-plugins_video_H_263-1998_h263-1998_cxx,v 1.1 2010/03/23 21:13:37 ajacoutot Exp $
XXX FFmpeg is too old:
struct AVCodecContext has no member named error_recognition
--- plugins/video/H.263-1998/h263-1998.cxx.orig Sun Jul 5 08:12:58 2009
+++ plugins/video/H.263-1998/h263-1998.cxx Tue Jul 7 11:15:47 2009
@@ -59,6 +59,7 @@
#include "dyna.h"
#include "mpi.h"
+#include <cstdio>
#include <stdio.h>
#include "tracer.h"
@@ -278,7 +279,7 @@ bool H263_Base_EncoderContext::Open(CodecID codecId)
_context->flags |= CODEC_FLAG_PASS1;
_context->error_concealment = 3;
- _context->error_recognition = 5;
+// _context->error_recognition = 5;
// debugging flags
if (Trace::CanTraceUserPlane(4)) {

11
net/opal/patches/patch-plugins_video_H_264_h264pipe_unix_cxx Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-plugins_video_H_264_h264pipe_unix_cxx,v 1.1 2010/03/23 21:13:37 ajacoutot Exp $
--- plugins/video/H.264/h264pipe_unix.cxx.orig Fri Nov 14 04:05:39 2008
+++ plugins/video/H.264/h264pipe_unix.cxx Fri Nov 14 04:06:11 2008
@@ -32,6 +32,7 @@
#include "rtpframe.h"
#include "h264pipe_unix.h"
#include <string.h>
+#include <unistd.h>
#define HAVE_MKFIFO 1
#define GPL_PROCESS_FILENAME "h264_video_pwplugin_helper"

11
net/opal/patches/patch-plugins_video_H_264_shared_h264frame_h Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-plugins_video_H_264_shared_h264frame_h,v 1.1 2010/03/23 21:13:37 ajacoutot Exp $
--- plugins/video/H.264/shared/h264frame.h.orig Tue Jul 7 11:16:56 2009
+++ plugins/video/H.264/shared/h264frame.h Tue Jul 7 11:17:41 2009
@@ -118,6 +118,7 @@ const static struct h264_resolution {
#ifndef LICENCE_MPL
extern "C"
{
+#include <inttypes.h>
#ifdef _MSC_VER
#include "x264/x264.h"
#else

12
net/opal/patches/patch-plugins_video_THEORA_Makefile_in Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-plugins_video_THEORA_Makefile_in,v 1.1 2010/03/23 21:13:37 ajacoutot Exp $
--- plugins/video/THEORA/Makefile.in.orig Mon Nov 3 18:23:44 2008
+++ plugins/video/THEORA/Makefile.in Mon Nov 3 18:24:02 2008
@@ -34,7 +34,7 @@ COMMONDIR=../common
PLUGINDIR=../..
CC =@CC@
-CFLAGS =@CFLAGS@
+CFLAGS =@CFLAGS@ @THEORA_CFLAGS@
CXX =@CXX@
LDSO =@LDSO@
PLUGINEXT =@PLUGINEXT@

17
net/opal/patches/patch-src_codec_gsm_src_code_c
View File

@ -1,17 +0,0 @@
$OpenBSD: patch-src_codec_gsm_src_code_c,v 1.1 2009/02/18 11:56:25 jasper Exp $
Fix 64-bit issues.
--- src/codec/gsm/src/code.c.orig Wed Feb 18 12:32:11 2009
+++ src/codec/gsm/src/code.c Wed Feb 18 12:43:53 2009
@@ -17,6 +17,10 @@
extern char * memcpy P((char *, char *, int));
#endif
+#ifdef HAS_STRING_H
+#include <string.h>
+#endif
+
#include "private.h"
#include "gsm.h"
#include "proto.h"

81
net/opal/pkg/PLIST
View File

@ -1,9 +1,10 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2008/04/29 07:01:18 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.2 2010/03/23 21:13:37 ajacoutot Exp $
include/opal/
include/opal/asn/
include/opal/asn/gcc.h
include/opal/asn/h225.h
include/opal/asn/h235.h
include/opal/asn/h235_srtp.h
include/opal/asn/h245.h
include/opal/asn/h248.h
include/opal/asn/h4501.h
@ -22,21 +23,16 @@ include/opal/asn/mcs.h
include/opal/asn/t38.h
include/opal/asn/x880.h
include/opal/codec/
include/opal/codec/allcodecs.h
include/opal/codec/echocancel.h
include/opal/codec/g711a1_plc.h
include/opal/codec/g711codec.h
include/opal/codec/g726codec.h
include/opal/codec/g729codec.h
include/opal/codec/gsmcodec.h
include/opal/codec/h261codec.h
include/opal/codec/h263codec.h
include/opal/codec/ilbccodec.h
include/opal/codec/lpc10codec.h
include/opal/codec/mscodecs.h
include/opal/codec/opalplugin.h
include/opal/codec/opalpluginmgr.h
include/opal/codec/opalwavfile.h
include/opal/codec/ratectl.h
include/opal/codec/rfc2833.h
include/opal/codec/rfc4175.h
include/opal/codec/silencedetect.h
include/opal/codec/speexcodec.h
include/opal/codec/vidcodec.h
include/opal/h323/
include/opal/h323/channels.h
@ -59,54 +55,77 @@ include/opal/h323/peclient.h
include/opal/h323/q931.h
include/opal/h323/svcctrl.h
include/opal/h323/transaddr.h
include/opal/h460/
include/opal/h460/h460.h
include/opal/h460/h4601.h
include/opal/h460/h46018.h
include/opal/h460/h46019.h
include/opal/h460/h4609.h
include/opal/h460/h460p.h
include/opal/h460/h460pres.h
include/opal/h460/h460tm.h
include/opal/iax2/
include/opal/iax2/callprocessor.h
include/opal/iax2/causecode.h
include/opal/iax2/frame.h
include/opal/iax2/iax2.h
include/opal/iax2/iax2con.h
include/opal/iax2/iax2ep.h
include/opal/iax2/iax2jitter.h
include/opal/iax2/iax2medstrm.h
include/opal/iax2/iedata.h
include/opal/iax2/ies.h
include/opal/iax2/overview.h
include/opal/iax2/processor.h
include/opal/iax2/receiver.h
include/opal/iax2/regprocessor.h
include/opal/iax2/remote.h
include/opal/iax2/safestrings.h
include/opal/iax2/sound.h
include/opal/iax2/specialprocessor.h
include/opal/iax2/transmit.h
include/opal/iax2/version.h
include/opal/im/
include/opal/im/im.h
include/opal/im/msrp.h
include/opal/im/rfc4103.h
include/opal/im/sipim.h
include/opal/im/t140.h
include/opal/lids/
include/opal/lids/QTIoctl.h
include/opal/lids/alllids.h
include/opal/lids/ixjDefs.h
include/opal/lids/ixjidb.h
include/opal/lids/ixjlid.h
include/opal/lids/lid.h
include/opal/lids/lidep.h
include/opal/lids/sangomalid.h
include/opal/lids/vblasterlid.h
include/opal/lids/vpbapi.h
include/opal/lids/vpblid.h
include/opal/lids/lidplugin.h
include/opal/lids/lidpluginmgr.h
include/opal/opal/
include/opal/opal.h
include/opal/opal/audiorecord.h
include/opal/opal/buildopts.h
include/opal/opal/call.h
include/opal/opal/connection.h
include/opal/opal/endpoint.h
include/opal/opal/guid.h
include/opal/opal/ivr.h
include/opal/opal/localep.h
include/opal/opal/manager.h
include/opal/opal/mediacmd.h
include/opal/opal/mediafmt.h
include/opal/opal/mediastrm.h
include/opal/opal/mediatype.h
include/opal/opal/opalmixer.h
include/opal/opal/opalvxml.h
include/opal/opal/patch.h
include/opal/opal/pcss.h
include/opal/opal/rtpconn.h
include/opal/opal/rtpep.h
include/opal/opal/transcoders.h
include/opal/opal/transports.h
include/opal/rtp/
include/opal/rtp/jitter.h
include/opal/rtp/rtp.h
include/opal/rtp/srtp.h
include/opal/rtp/zrtpudp.h
include/opal/sip/
include/opal/sip/handlers.h
include/opal/sip/sdp.h
include/opal/sip/sip.h
include/opal/sip/sipcon.h
@ -118,7 +137,29 @@ include/opal/t120/t120proto.h
include/opal/t120/x224.h
include/opal/t38/
include/opal/t38/h323t38.h
include/opal/t38/sipt38.h
include/opal/t38/t38proto.h
include/opal/zrtp/
include/opal/zrtp/opalzrtp.h
include/opal/zrtp/zrtpeventproc.h
lib/libopal.so
@lib lib/libopal.so.${LIBopal_VERSION}
lib/libopal_s.a
lib/opal-${V}/
lib/opal-${V}/codecs/
lib/opal-${V}/codecs/audio/
lib/opal-${V}/codecs/audio/g722_audio_pwplugin.so
lib/opal-${V}/codecs/audio/g726_audio_pwplugin.so
lib/opal-${V}/codecs/audio/gsm0610_audio_pwplugin.so
lib/opal-${V}/codecs/audio/gsmamrcodec_pwplugin.so
lib/opal-${V}/codecs/audio/ilbc_audio_pwplugin.so
lib/opal-${V}/codecs/audio/ima_adpcm_audio_pwplugin.so
lib/opal-${V}/codecs/audio/lpc10_audio_pwplugin.so
lib/opal-${V}/codecs/audio/speex_audio_pwplugin.so
lib/opal-${V}/codecs/video/
lib/opal-${V}/codecs/video/h261-vic_video_pwplugin.so
lib/opal-${V}/codecs/video/theora_video_pwplugin.so
lib/pkgconfig/opal.pc
share/opal/
share/opal/opal_inc.mak
share/opal/version.h