[Pkg-voip-commits] r2558 - in wengophone/trunk/debian/patches: . generic

Marco Nenciarini mnencia at costa.debian.org
Thu Oct 12 18:28:49 UTC 2006 

Author: mnencia
Date: 2006-10-12 18:28:47 +0000 (Thu, 12 Oct 2006)
New Revision: 2558

Added:
   wengophone/trunk/debian/patches/generic/cmake-conditional-iLBC.patch
Removed:
   wengophone/trunk/debian/patches/generic/cmake-conditional-iLBC
Modified:
   wengophone/trunk/debian/patches/series
Log:
Correct typo


Deleted: wengophone/trunk/debian/patches/generic/cmake-conditional-iLBC
===================================================================
--- wengophone/trunk/debian/patches/generic/cmake-conditional-iLBC	2006-10-12 17:51:00 UTC (rev 2557)
+++ wengophone/trunk/debian/patches/generic/cmake-conditional-iLBC	2006-10-12 18:28:47 UTC (rev 2558)
@@ -1,107 +0,0 @@
-Index: wengophone-2.0.0~rc4-svn8014/wifo/CMakeLists.txt
-===================================================================
---- wengophone-2.0.0~rc4-svn8014.orig/wifo/CMakeLists.txt	2006-10-09 00:59:06.000000000 +0000
-+++ wengophone-2.0.0~rc4-svn8014/wifo/CMakeLists.txt	2006-10-12 16:18:54.000000000 +0000
-@@ -19,6 +19,8 @@
-   )
- endif (MSVC)
- 
-+option(WITH_ILBC "Build phapi with iLBC codec" ON)
-+
- subdirs(
-   libosip2
-   eXosip
-@@ -30,7 +32,15 @@
-   phapi/amrwb
-   phapi/fidlib
-   phapi/gsm
--  phapi/ilbc
-+)
-+
-+if(WITH_ILBC)
-+  subdirs(
-+    phapi/ilbc
-+  )
-+endif (WITH_ILBC)
-+
-+subdirs(
-   phapi/speex
-   phapi/speexec
-   phapi/stun
-Index: wengophone-2.0.0~rc4-svn8014/wifo/phapi/CMakeLists.txt
-===================================================================
---- wengophone-2.0.0~rc4-svn8014.orig/wifo/phapi/CMakeLists.txt	2006-10-10 14:25:12.000000000 +0000
-+++ wengophone-2.0.0~rc4-svn8014/wifo/phapi/CMakeLists.txt	2006-10-12 17:05:04.000000000 +0000
-@@ -7,7 +7,6 @@
-   ${OSIP2_INCLUDE_DIRS}
-   ${EXOSIP_INCLUDE_DIRS}
-   ${ORTP_INCLUDE_DIRS}
--  ${ILBC_INCLUDE_DIRS}
-   ${STUN_INCLUDE_DIRS}
-   ${GSM_INCLUDE_DIRS}
-   ${OWUTIL_INCLUDE_DIRS}
-@@ -32,7 +31,6 @@
-   ${OSIP2_LIBRARY}
-   ${EXOSIP_LIBRARY}
-   ${ORTP_LIBRARY}
--  ${ILBC_LIBRARY}
-   ${STUN_LIBRARY}
-   ${GSM_LIBRARY}
-   ${PHAPI-UTIL_LIBRARY}
-@@ -54,7 +52,6 @@
-   -DUSE_WAVEIN_CBK=1
-   -DPSEUDO_AEC=0
-   -DNO_ECHO__SUPPRESSOR=1
--  -DENABLE_ILBC=1
-   -DOSIP_MT=1
-   -DENABLE_TRACE=0
-   -DPH_VIDEO_USELOCK=1
-@@ -68,6 +65,21 @@
-   add_definitions(-DSUBVERSION_REVISION="${SVN_REVISION}")
- endif (WITH_BUILDID)
- 
-+if (WITH_ILBC)
-+  set(PHAPI_INCLUDE_DIRS
-+    ${PHAPI_INCLUDE_DIRS}
-+    ${ILBC_INCLUDE_DIRS}
-+  )
-+  set(PHAPI_LINK_LIBRARIES
-+    ${PHAPI_LINK_LIBRARY}
-+    ${ILBC_LIBRARY}
-+  )
-+  set(PHAPI_DEFINITIONS
-+    ${PHAPI_DEFINITIONS}
-+    -DENABLE_ILBC=1
-+  )
-+endif (WITH_ILBC)
-+
- # PH_FORCE_16KHZ : activate FORCED 16 KHZ SAMPLING
- # SUBVERSION_REVISION : grab the svn revision number
- # WENGOPHONE_UA : set the wengophone user agent. It should
-Index: wengophone-2.0.0~rc4-svn8014/wifo/phapi/phcodec.c
-===================================================================
---- wengophone-2.0.0~rc4-svn8014.orig/wifo/phapi/phcodec.c	2006-10-12 16:57:30.000000000 +0000
-+++ wengophone-2.0.0~rc4-svn8014/wifo/phapi/phcodec.c	2006-10-12 17:05:40.000000000 +0000
-@@ -16,9 +16,12 @@
- #include "rtpport.h" // only for GMutex <- phmedia.h <- phcodec-h263.h
- #include "phcodec.h"
- 
-+#ifdef ENABLE_ILBC
- #include "ilbc/iLBC_define.h"
- #include "ilbc/iLBC_encode.h"
- #include "ilbc/iLBC_decode.h"
-+#endif
-+
- //#define FIXED_AMR 1
- 
- void ph_media_plugin_codec_init(const char *dirpath);
-@@ -44,9 +47,6 @@
- #include "gsm/gsm.h"
- #include "gsm/private.h"
- #endif
--#ifndef NO_ILBC
--#define ENABLE_ILBC 1
--#endif
- 
- #if defined(WIN32) && !defined(__GNUC__)
- # define inline _inline

Copied: wengophone/trunk/debian/patches/generic/cmake-conditional-iLBC.patch (from rev 2557, wengophone/trunk/debian/patches/generic/cmake-conditional-iLBC)
===================================================================
--- wengophone/trunk/debian/patches/generic/cmake-conditional-iLBC.patch	                        (rev 0)
+++ wengophone/trunk/debian/patches/generic/cmake-conditional-iLBC.patch	2006-10-12 18:28:47 UTC (rev 2558)
@@ -0,0 +1,107 @@
+Index: wengophone-2.0.0~rc4-svn8014/wifo/CMakeLists.txt
+===================================================================
+--- wengophone-2.0.0~rc4-svn8014.orig/wifo/CMakeLists.txt	2006-10-09 00:59:06.000000000 +0000
++++ wengophone-2.0.0~rc4-svn8014/wifo/CMakeLists.txt	2006-10-12 16:18:54.000000000 +0000
+@@ -19,6 +19,8 @@
+   )
+ endif (MSVC)
+ 
++option(WITH_ILBC "Build phapi with iLBC codec" ON)
++
+ subdirs(
+   libosip2
+   eXosip
+@@ -30,7 +32,15 @@
+   phapi/amrwb
+   phapi/fidlib
+   phapi/gsm
+-  phapi/ilbc
++)
++
++if(WITH_ILBC)
++  subdirs(
++    phapi/ilbc
++  )
++endif (WITH_ILBC)
++
++subdirs(
+   phapi/speex
+   phapi/speexec
+   phapi/stun
+Index: wengophone-2.0.0~rc4-svn8014/wifo/phapi/CMakeLists.txt
+===================================================================
+--- wengophone-2.0.0~rc4-svn8014.orig/wifo/phapi/CMakeLists.txt	2006-10-10 14:25:12.000000000 +0000
++++ wengophone-2.0.0~rc4-svn8014/wifo/phapi/CMakeLists.txt	2006-10-12 17:05:04.000000000 +0000
+@@ -7,7 +7,6 @@
+   ${OSIP2_INCLUDE_DIRS}
+   ${EXOSIP_INCLUDE_DIRS}
+   ${ORTP_INCLUDE_DIRS}
+-  ${ILBC_INCLUDE_DIRS}
+   ${STUN_INCLUDE_DIRS}
+   ${GSM_INCLUDE_DIRS}
+   ${OWUTIL_INCLUDE_DIRS}
+@@ -32,7 +31,6 @@
+   ${OSIP2_LIBRARY}
+   ${EXOSIP_LIBRARY}
+   ${ORTP_LIBRARY}
+-  ${ILBC_LIBRARY}
+   ${STUN_LIBRARY}
+   ${GSM_LIBRARY}
+   ${PHAPI-UTIL_LIBRARY}
+@@ -54,7 +52,6 @@
+   -DUSE_WAVEIN_CBK=1
+   -DPSEUDO_AEC=0
+   -DNO_ECHO__SUPPRESSOR=1
+-  -DENABLE_ILBC=1
+   -DOSIP_MT=1
+   -DENABLE_TRACE=0
+   -DPH_VIDEO_USELOCK=1
+@@ -68,6 +65,21 @@
+   add_definitions(-DSUBVERSION_REVISION="${SVN_REVISION}")
+ endif (WITH_BUILDID)
+ 
++if (WITH_ILBC)
++  set(PHAPI_INCLUDE_DIRS
++    ${PHAPI_INCLUDE_DIRS}
++    ${ILBC_INCLUDE_DIRS}
++  )
++  set(PHAPI_LINK_LIBRARIES
++    ${PHAPI_LINK_LIBRARY}
++    ${ILBC_LIBRARY}
++  )
++  set(PHAPI_DEFINITIONS
++    ${PHAPI_DEFINITIONS}
++    -DENABLE_ILBC=1
++  )
++endif (WITH_ILBC)
++
+ # PH_FORCE_16KHZ : activate FORCED 16 KHZ SAMPLING
+ # SUBVERSION_REVISION : grab the svn revision number
+ # WENGOPHONE_UA : set the wengophone user agent. It should
+Index: wengophone-2.0.0~rc4-svn8014/wifo/phapi/phcodec.c
+===================================================================
+--- wengophone-2.0.0~rc4-svn8014.orig/wifo/phapi/phcodec.c	2006-10-12 16:57:30.000000000 +0000
++++ wengophone-2.0.0~rc4-svn8014/wifo/phapi/phcodec.c	2006-10-12 17:05:40.000000000 +0000
+@@ -16,9 +16,12 @@
+ #include "rtpport.h" // only for GMutex <- phmedia.h <- phcodec-h263.h
+ #include "phcodec.h"
+ 
++#ifdef ENABLE_ILBC
+ #include "ilbc/iLBC_define.h"
+ #include "ilbc/iLBC_encode.h"
+ #include "ilbc/iLBC_decode.h"
++#endif
++
+ //#define FIXED_AMR 1
+ 
+ void ph_media_plugin_codec_init(const char *dirpath);
+@@ -44,9 +47,6 @@
+ #include "gsm/gsm.h"
+ #include "gsm/private.h"
+ #endif
+-#ifndef NO_ILBC
+-#define ENABLE_ILBC 1
+-#endif
+ 
+ #if defined(WIN32) && !defined(__GNUC__)
+ # define inline _inline

Modified: wengophone/trunk/debian/patches/series
===================================================================
--- wengophone/trunk/debian/patches/series	2006-10-12 17:51:00 UTC (rev 2557)
+++ wengophone/trunk/debian/patches/series	2006-10-12 18:28:47 UTC (rev 2558)
@@ -3,4 +3,4 @@
 generic/fix-implicit-pointer-functions.patch
 debian/disable-crashreport.patch
 debian/cmake-svnrelease-from-debian-changelog.patch
-generic/cmake-conditional-iLBC
+generic/cmake-conditional-iLBC.patch

More information about the Pkg-voip-commits mailing list