diff --git a/net/opal/Makefile b/net/opal/Makefile --- a/net/opal/Makefile +++ b/net/opal/Makefile @@ -21,17 +21,16 @@ CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -OPTIONS_DEFINE= JAVA CELT ILBC GSM SPEEX THEORA FFMPEG X264 SIP H323 IAX \ +OPTIONS_DEFINE= JAVA ILBC GSM SPEEX THEORA FFMPEG X264 SIP H323 IAX \ H224 H281 FAX MSRP SIPIM RTPTEXT H450 H460 H501 LID UVIDEO \ AEC DEBUG RUBY # MSRP = plist extra line vpd? # RTPTEXT disable == build fail, so make it default? -OPTIONS_DEFAULT=CELT GSM SPEEX FFMPEG X264 SIP H224 H281 FAX MSRP SIPIM \ +OPTIONS_DEFAULT=GSM SPEEX FFMPEG X264 SIP H224 H281 FAX MSRP SIPIM \ RTPTEXT LID AEC DEBUG_DESC= Install debug library JAVA_DESC= Java JNI support RUBY_DESC= Ruby support -CELT_DESC= Celt codec from ports ILBC_DESC= iLBC codec from ports GSM_DESC= GSM 06.10 codec from ports SPEEX_DESC= SPEEX codec from ports @@ -76,7 +75,7 @@ PLIST_SUB+= DEBUG="@comment " .endif -CONFIGURE_ARGS+= --disable-zrtp +CONFIGURE_ARGS+= --disable-celt --disable-zrtp .if ${PORT_OPTIONS:MGSM} LIB_DEPENDS+= libgsm.so:audio/gsm @@ -102,15 +101,6 @@ CONFIGURE_ARGS+= --disable-ruby .endif -.if ${PORT_OPTIONS:MCELT} -LIB_DEPENDS+= libcelt0.so:audio/celt -CONFIGURE_ARGS+= --enable-celt -PLIST_SUB+= CELT="" -.else -CONFIGURE_ARGS+= --disable-celt -PLIST_SUB+= CELT="@comment " -.endif - .if ${PORT_OPTIONS:MILBC} LIB_DEPENDS+= libilbc.so:net/ilbc .else diff --git a/net/opal/pkg-plist b/net/opal/pkg-plist --- a/net/opal/pkg-plist +++ b/net/opal/pkg-plist @@ -141,7 +141,6 @@ %%DEBUG%%lib/libopal_d.so.%%PVERSION_MAJOR%% %%DEBUG%%lib/libopal_d.so.%%PVERSION_MINOR%% %%DEBUG%%lib/libopal_d.so.%%VERSION%% -%%CELT%%lib/opal-%%VERSION%%/codecs/audio/celt_ptplugin.so lib/opal-%%VERSION%%/codecs/audio/g7221_ptplugin.so lib/opal-%%VERSION%%/codecs/audio/g7222_ptplugin.so lib/opal-%%VERSION%%/codecs/audio/g722_ptplugin.so