[Pkg-voip-commits] r9683 - in /asterisk/trunk/debian: changelog patches/ilbc_disable patches/series rules

[tzafrir at alioth.debian.org]

Author: tzafrir
Date: Mon May 14 15:17:28 2012
New Revision: 9683

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=9683
Log:
* Fully strip-out the ilbc code (Closes: #665938, #665937).
  - Patch ilbc_disable to fix the build.

Added:
    asterisk/trunk/debian/patches/ilbc_disable
Modified:
    asterisk/trunk/debian/changelog
    asterisk/trunk/debian/patches/series
    asterisk/trunk/debian/rules

Modified: asterisk/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/changelog?rev=9683&op=diff
==============================================================================
--- asterisk/trunk/debian/changelog (original)
+++ asterisk/trunk/debian/changelog Mon May 14 15:17:28 2012
@@ -1,11 +1,13 @@
-asterisk (1:1.8.12.0~rc3~dfsg-1) UNRELEASED; urgency=low
+asterisk (1:1.8.12.0~dfsg-1) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
   * New upstream release candidate.
     - Patch gmime2.6 removed: merged upstream.
   * Also pass LDFLAGS to menuselect (Closes: #664086 for real).
-
- -- Tzafrir Cohen <tzafrir at debian.org>  Wed, 02 May 2012 17:29:34 +0300
+  * Fully strip-out the ilbc code (Closes: #665938, #665937).
+    - Patch ilbc_disable to fix the build.
+
+ -- Tzafrir Cohen <tzafrir at debian.org>  Thu, 10 May 2012 18:46:52 +0300
 
 asterisk (1:1.8.11.1~dfsg-1) unstable; urgency=high
 

Added: asterisk/trunk/debian/patches/ilbc_disable
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/ilbc_disable?rev=9683&op=file
==============================================================================
--- asterisk/trunk/debian/patches/ilbc_disable (added)
+++ asterisk/trunk/debian/patches/ilbc_disable Mon May 14 15:17:28 2012
@@ -1,0 +1,32 @@
+Descirption: disable building codec_ilbc
+Author: Tzafrir Cohen <tzafrir at debian.org>
+Forwarded-Upstream: no
+Bug-Debian:
+
+As we have to strip the ilbc code from asterisk, we need to disable
+building codec_ilbc and cleaning the ilbc/ directory.
+
+Patch needs to be cleaned-up to be uploaded upstream.
+
+--- a/codecs/Makefile
++++ b/codecs/Makefile
+@@ -32,7 +32,9 @@ endif
+ clean::
+ 	$(MAKE) -C gsm clean
+ 	$(MAKE) -C lpc10 clean
++ifneq ($(wildcard ilbc/Makefile),)
+ 	$(MAKE) -C ilbc clean
++endif
+ 	rm -f g722/*.[oa]
+ 
+ gsm/lib/libgsm.a:
+--- a/codecs/codec_ilbc.c
++++ b/codecs/codec_ilbc.c
+@@ -26,6 +26,7 @@
+  */
+ 
+ /*** MODULEINFO
++	<defaultenabled>no</defaultenabled>
+ 	<support_level>core</support_level>
+  ***/
+ 

Modified: asterisk/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/series?rev=9683&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/series (original)
+++ asterisk/trunk/debian/patches/series Mon May 14 15:17:28 2012
@@ -24,3 +24,4 @@
 
 sparc32_disable
 menuselect_cflags
+ilbc_disable

Modified: asterisk/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/rules?rev=9683&op=diff
==============================================================================
--- asterisk/trunk/debian/rules (original)
+++ asterisk/trunk/debian/rules Mon May 14 15:17:28 2012
@@ -251,7 +251,7 @@
 	# in case the tarball is not clean:
 	@rm -rf $(TMP_TARBALL_TOP)/AST.txt
 	@rm -rf $(TMP_TARBALL_TOP)/AST.pdf
-	@rm -f $(TMP_TARBALL_TOP)/codecs/ilbc/rfc3951.txt
+	@rm -rf $(TMP_TARBALL_TOP)/codecs/ilbc
 	# While we're at it: remove some generated files that will become
 	# invalid:
 	@rm -rf $(TMP_TARBALL_TOP)/*/.makeopts