- fix WITH_ILBC

Reported by:	Guido Falsi <mad@madpilot.net>
This commit is contained in:
Florian Smeets 2011-07-21 23:01:21 +00:00
parent 5b40c41ee6
commit 40fb8a4368
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=278140
4 changed files with 8 additions and 42 deletions

View file

@ -283,7 +283,7 @@ post-patch:
${REINPLACE_CMD} -e 's|/var/lib|${PREFIX}/share|g' ${WRKSRC}/configs/musiconhold.conf.sample
post-configure:
.if defined(WITH_MYSQL) || defined(WITH_NEWG711)
.if defined(WITH_MYSQL) || defined(WITH_NEWG711) || defined(WITH_ILBC)
@cd ${WRKSRC} && make menuselect.makeopts
.if defined(WITH_MYSQL)
@cd ${WRKSRC} && ./menuselect/menuselect --enable res_config_mysql menuselect.makeopts
@ -293,6 +293,9 @@ post-configure:
.if defined(WITH_NEWG711)
@cd ${WRKSRC} && ./menuselect/menuselect --enable G711_NEW_ALGORITHM menuselect.makeopts
.endif
.if defined(WITH_ILBC)
@cd ${WRKSRC} && ./menuselect/menuselect --enable codec_ilbc menuselect.makeopts
.endif
.endif
post-install:

View file

@ -1,16 +1,6 @@
$FreeBSD$
--- menuselect-tree
+++ menuselect-tree
@@ -269,7 +269,6 @@
<depend>gsm</depend>
</member>
<member name="codec_ilbc" displayname="iLBC Coder/Decoder" remove_on_change="codecs/codec_ilbc.o codecs/codec_ilbc.so">
- <defaultenabled>no</defaultenabled>
</member>
<member name="codec_lpc10" displayname="LPC10 2.4kbps Coder/Decoder" remove_on_change="codecs/codec_lpc10.o codecs/codec_lpc10.so">
</member>
diff -druN codecs/ilbc.orig/FrameClassify.c codecs/ilbc/FrameClassify.c
--- codecs/ilbc.orig/FrameClassify.c 1969-12-31 16:00:00.000000000 -0800
+++ codecs/ilbc/FrameClassify.c 2006-02-14 11:14:15.000000000 -0800
@ -7587,13 +7577,3 @@ diff -druN codecs/ilbc.orig/syntFilter.h codecs/ilbc/syntFilter.h
+#endif
+
+
--- codecs/.moduleinfo 2008/08/20 23:00:58 1.1
+++ codecs/.moduleinfo 2008/08/20 23:01:12
@@ -11,7 +11,6 @@
<depend>gsm</depend>
</member>
<member name="codec_ilbc" displayname="iLBC Coder/Decoder" remove_on_change="codecs/codec_ilbc.o codecs/codec_ilbc.so">
- <defaultenabled>no</defaultenabled>
</member>
<member name="codec_lpc10" displayname="LPC10 2.4kbps Coder/Decoder" remove_on_change="codecs/codec_lpc10.o codecs/codec_lpc10.so">
</member>

View file

@ -283,7 +283,7 @@ post-patch:
${REINPLACE_CMD} -e 's|/var/lib|${PREFIX}/share|g' ${WRKSRC}/configs/musiconhold.conf.sample
post-configure:
.if defined(WITH_MYSQL) || defined(WITH_NEWG711)
.if defined(WITH_MYSQL) || defined(WITH_NEWG711) || defined(WITH_ILBC)
@cd ${WRKSRC} && make menuselect.makeopts
.if defined(WITH_MYSQL)
@cd ${WRKSRC} && ./menuselect/menuselect --enable res_config_mysql menuselect.makeopts
@ -293,6 +293,9 @@ post-configure:
.if defined(WITH_NEWG711)
@cd ${WRKSRC} && ./menuselect/menuselect --enable G711_NEW_ALGORITHM menuselect.makeopts
.endif
.if defined(WITH_ILBC)
@cd ${WRKSRC} && ./menuselect/menuselect --enable codec_ilbc menuselect.makeopts
.endif
.endif
post-install:

View file

@ -1,16 +1,6 @@
$FreeBSD$
--- menuselect-tree
+++ menuselect-tree
@@ -269,7 +269,6 @@
<depend>gsm</depend>
</member>
<member name="codec_ilbc" displayname="iLBC Coder/Decoder" remove_on_change="codecs/codec_ilbc.o codecs/codec_ilbc.so">
- <defaultenabled>no</defaultenabled>
</member>
<member name="codec_lpc10" displayname="LPC10 2.4kbps Coder/Decoder" remove_on_change="codecs/codec_lpc10.o codecs/codec_lpc10.so">
</member>
diff -druN codecs/ilbc.orig/FrameClassify.c codecs/ilbc/FrameClassify.c
--- codecs/ilbc.orig/FrameClassify.c 1969-12-31 16:00:00.000000000 -0800
+++ codecs/ilbc/FrameClassify.c 2006-02-14 11:14:15.000000000 -0800
@ -7587,13 +7577,3 @@ diff -druN codecs/ilbc.orig/syntFilter.h codecs/ilbc/syntFilter.h
+#endif
+
+
--- codecs/.moduleinfo 2008/08/20 23:00:58 1.1
+++ codecs/.moduleinfo 2008/08/20 23:01:12
@@ -11,7 +11,6 @@
<depend>gsm</depend>
</member>
<member name="codec_ilbc" displayname="iLBC Coder/Decoder" remove_on_change="codecs/codec_ilbc.o codecs/codec_ilbc.so">
- <defaultenabled>no</defaultenabled>
</member>
<member name="codec_lpc10" displayname="LPC10 2.4kbps Coder/Decoder" remove_on_change="codecs/codec_lpc10.o codecs/codec_lpc10.so">
</member>