[Pkg-voip-commits] r1583 - in opal: branches/sarge/debian/patches trunk/debian/patches

[Kilian Krause]

Author: kilian
Date: 2006-04-16 11:27:15 +0000 (Sun, 16 Apr 2006)
New Revision: 1583

Modified:
   opal/branches/sarge/debian/patches/remove_ilbc.dpatch
   opal/trunk/debian/patches/remove_ilbc.dpatch
Log:
update patch according to hint from Julien BLACHE.


Modified: opal/branches/sarge/debian/patches/remove_ilbc.dpatch
===================================================================
--- opal/branches/sarge/debian/patches/remove_ilbc.dpatch	2006-04-15 22:28:25 UTC (rev 1582)
+++ opal/branches/sarge/debian/patches/remove_ilbc.dpatch	2006-04-16 11:27:15 UTC (rev 1583)
@@ -74,3 +74,28 @@
  VIC_DIR = $(OPAL_SRCDIR)/codec/vic
  
  SOURCES += $(OPAL_SRCDIR)/codec/h261codec.c \
+diff -ru orig/opal_v2_2_1/include/codec/allcodecs.h opal_v2_2_1/include/codec/allcodecs.h
+--- orig/opal_v2_2_1/include/codec/allcodecs.h  2006-01-01 20:19:32.000000000 +0100
++++ opal_v2_2_1/include/codec/allcodecs.h       2006-04-16 12:55:03.501545261 +0200
+@@ -81,9 +81,6 @@
+ #include <codec/speexcodec.h>
+ OPAL_REGISTER_SPEEX();
+ 
+-#include <codec/ilbccodec.h>
+-OPAL_REGISTER_iLBC();
+-
+ #include <codec/vidcodec.h>
+ OPAL_REGISTER_UNCOMPRESSED_VIDEO();
+ 
+Only in orig/opal_v2_2_1/include/codec: ilbccodec.h
+diff -ru orig/opal_v2_2_1/include/h323/h323.h opal_v2_2_1/include/h323/h323.h
+--- orig/opal_v2_2_1/include/h323/h323.h        2004-03-11 07:54:26.000000000 +0100
++++ opal_v2_2_1/include/h323/h323.h     2006-04-16 13:16:28.106553131 +0200
+@@ -485,7 +485,6 @@
+ #ifndef NO_SPEEX
+ #include <codec/speexcodec.h>
+ #endif
+-#include <codec/ilbccodec.h>
+ #endif // NO_H323_AUDIO_CODECS
+ 
+ #ifndef NO_OPAL_VIDEO

Modified: opal/trunk/debian/patches/remove_ilbc.dpatch
===================================================================
--- opal/trunk/debian/patches/remove_ilbc.dpatch	2006-04-15 22:28:25 UTC (rev 1582)
+++ opal/trunk/debian/patches/remove_ilbc.dpatch	2006-04-16 11:27:15 UTC (rev 1583)
@@ -74,3 +74,28 @@
  VIC_DIR = $(OPAL_SRCDIR)/codec/vic
  
  SOURCES += $(OPAL_SRCDIR)/codec/h261codec.c \
+diff -ru orig/opal_v2_2_1/include/codec/allcodecs.h opal_v2_2_1/include/codec/allcodecs.h
+--- orig/opal_v2_2_1/include/codec/allcodecs.h  2006-01-01 20:19:32.000000000 +0100
++++ opal_v2_2_1/include/codec/allcodecs.h       2006-04-16 12:55:03.501545261 +0200
+@@ -81,9 +81,6 @@
+ #include <codec/speexcodec.h>
+ OPAL_REGISTER_SPEEX();
+ 
+-#include <codec/ilbccodec.h>
+-OPAL_REGISTER_iLBC();
+-
+ #include <codec/vidcodec.h>
+ OPAL_REGISTER_UNCOMPRESSED_VIDEO();
+ 
+Only in orig/opal_v2_2_1/include/codec: ilbccodec.h
+diff -ru orig/opal_v2_2_1/include/h323/h323.h opal_v2_2_1/include/h323/h323.h
+--- orig/opal_v2_2_1/include/h323/h323.h        2004-03-11 07:54:26.000000000 +0100
++++ opal_v2_2_1/include/h323/h323.h     2006-04-16 13:16:28.106553131 +0200
+@@ -485,7 +485,6 @@
+ #ifndef NO_SPEEX
+ #include <codec/speexcodec.h>
+ #endif
+-#include <codec/ilbccodec.h>
+ #endif // NO_H323_AUDIO_CODECS
+ 
+ #ifndef NO_OPAL_VIDEO