- update to pjsip/pjsua 2.9
- stop using CC -lstdc++ to link, use CXX instead
This commit is contained in:
parent
9fe9ac81b6
commit
03aaa26071
@ -1,13 +1,12 @@
|
||||
# $OpenBSD: Makefile,v 1.47 2019/07/12 20:49:55 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.48 2020/01/10 13:37:46 sthen Exp $
|
||||
|
||||
COMMENT-main= multimedia communication library (SIP, RTP, ICE, etc)
|
||||
COMMENT-pjsua= lightweight sip client
|
||||
|
||||
V= 2.8
|
||||
V= 2.9
|
||||
DISTNAME= pjproject-$V
|
||||
PKGNAME-main= pjsip-$V
|
||||
PKGNAME-pjsua= pjsua-$V
|
||||
REVISION-pjsua= 0
|
||||
EXTRACT_SUFX= .tar.bz2
|
||||
|
||||
LIBVER= 0.0
|
||||
@ -45,7 +44,7 @@ WANTLIB-pjsua += pjsip-ua pjsua pthread resample
|
||||
|
||||
WANTLIB-main = ${WANTLIB} ${COMPILER_LIBCXX}
|
||||
|
||||
COMPILER = base-clang ports-gcc base-gcc
|
||||
COMPILER = base-clang ports-gcc
|
||||
|
||||
MULTI_PACKAGES= -main -pjsua
|
||||
|
||||
@ -65,6 +64,7 @@ CONFIGURE_STYLE= autoconf no-autoheader
|
||||
AUTOCONF_VERSION= 2.69
|
||||
CONFIGURE_ARGS= --enable-shared \
|
||||
--disable-libwebrtc \
|
||||
--disable-openh264 \
|
||||
--disable-oss \
|
||||
--disable-video \
|
||||
--with-external-gsm \
|
||||
@ -72,7 +72,8 @@ CONFIGURE_ARGS= --enable-shared \
|
||||
--with-external-speex \
|
||||
--with-external-srtp
|
||||
CFLAGS+= -DNDEBUG -DPJ_HAS_IPV6=1 -I${LOCALBASE}/include
|
||||
CONFIGURE_ENV= CFLAGS="${CFLAGS}" \
|
||||
CONFIGURE_ENV= LD="${CXX}" \
|
||||
CFLAGS="${CFLAGS}" \
|
||||
LDFLAGS="-L${LOCALBASE}/lib"
|
||||
CONFIGURE_ENV+= ac_cv_header_uuid_uuid_h=no \
|
||||
ac_cv_lib_uuid_uuid_generate=no
|
||||
|
@ -1,2 +1,2 @@
|
||||
SHA256 (pjproject-2.8.tar.bz2) = UD0L1/nxPcFJKsm3G3YbEImFH7tgi5oTmW7cPEIAb3k=
|
||||
SIZE (pjproject-2.8.tar.bz2) = 4976501
|
||||
SHA256 (pjproject-2.9.tar.bz2) = 0YXveFXI7AcZHd6S9Utlp6S3pve/jEb3rzXO6x2ipjY=
|
||||
SIZE (pjproject-2.9.tar.bz2) = 5009546
|
||||
|
13
telephony/pjsua/patches/patch-build_mak_in
Normal file
13
telephony/pjsua/patches/patch-build_mak_in
Normal file
@ -0,0 +1,13 @@
|
||||
$OpenBSD: patch-build_mak_in,v 1.4 2020/01/10 13:37:47 sthen Exp $
|
||||
|
||||
Index: build.mak.in
|
||||
--- build.mak.in.orig
|
||||
+++ build.mak.in
|
||||
@@ -292,7 +292,6 @@ export APP_LDLIBS := $(PJSUA_LIB_LDLIB) \
|
||||
$(PJLIB_LDLIB) \
|
||||
@LIBS@
|
||||
export APP_LDXXLIBS := $(PJSUA2_LIB_LDLIB) \
|
||||
- -lstdc++ \
|
||||
$(APP_LDLIBS)
|
||||
|
||||
# Here are the variabels to use if application is using the library
|
15
telephony/pjsua/patches/patch-pjsip_build_Makefile
Normal file
15
telephony/pjsua/patches/patch-pjsip_build_Makefile
Normal file
@ -0,0 +1,15 @@
|
||||
$OpenBSD: patch-pjsip_build_Makefile,v 1.1 2020/01/10 13:37:47 sthen Exp $
|
||||
|
||||
Index: pjsip/build/Makefile
|
||||
--- pjsip/build/Makefile.orig
|
||||
+++ pjsip/build/Makefile
|
||||
@@ -152,8 +152,7 @@ export PJSUA2_LIB_LDFLAGS += $(PJSUA_LIB_LDLIB) \
|
||||
$(PJNATH_LDLIB) \
|
||||
$(PJLIB_UTIL_LDLIB) \
|
||||
$(PJLIB_LDLIB) \
|
||||
- $(_LDFLAGS) \
|
||||
- -lstdc++
|
||||
+ $(_LDFLAGS)
|
||||
|
||||
|
||||
###############################################################################
|
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST-main,v 1.2 2019/02/15 22:31:09 sthen Exp $
|
||||
@comment $OpenBSD: PLIST-main,v 1.3 2020/01/10 13:37:47 sthen Exp $
|
||||
include/pj/
|
||||
include/pj++/
|
||||
include/pj++/file.hpp
|
||||
@ -225,6 +225,7 @@ include/pjmedia/transport_udp.h
|
||||
include/pjmedia/types.h
|
||||
include/pjmedia/vid_codec.h
|
||||
include/pjmedia/vid_codec_util.h
|
||||
include/pjmedia/vid_conf.h
|
||||
include/pjmedia/vid_port.h
|
||||
include/pjmedia/vid_stream.h
|
||||
include/pjmedia/vid_tee.h
|
||||
|
Loading…
Reference in New Issue
Block a user