[Pkg-voip-commits] r2557 - in wengophone/trunk/debian: . patches
patches/debian patches/generic
Marco Nenciarini
mnencia at costa.debian.org
Thu Oct 12 17:51:00 UTC 2006
Author: mnencia
Date: 2006-10-12 17:51:00 +0000 (Thu, 12 Oct 2006)
New Revision: 2557
Added:
wengophone/trunk/debian/patches/generic/cmake-conditional-iLBC
Removed:
wengophone/trunk/debian/patches/generic/cmake-amrplugin-pic-code.patch
wengophone/trunk/debian/patches/generic/cmake-fix-static-phapi.patch
wengophone/trunk/debian/patches/generic/cmake-static-owcurl.patch
Modified:
wengophone/trunk/debian/changelog
wengophone/trunk/debian/get-orig-source.sh
wengophone/trunk/debian/patches/debian/disable-crashreport.patch
wengophone/trunk/debian/patches/series
wengophone/trunk/debian/rules
Log:
updated get-orig-source.sh to not checkout iLBC and portaudio
Refreshed debian/patches/debian/disable-crashreport.patch
New patch generic/cmake-conditional-iLB
Removed (merged upstream)
+ generic/cmake-fix-static-phapi.patch
+ generic/cmake-amrplugin-pic-code.patch
+ cmake-static-owcurl.patch
Added build flag -DWITH_ILBC=OFF
Modified: wengophone/trunk/debian/changelog
===================================================================
--- wengophone/trunk/debian/changelog 2006-10-12 13:16:03 UTC (rev 2556)
+++ wengophone/trunk/debian/changelog 2006-10-12 17:51:00 UTC (rev 2557)
@@ -1,3 +1,10 @@
+wengophone (2.0.0~rc4-svn8014-1) unstable; urgency=medium
+
+ * Removed iLBC codec from source. (Closes: #361327)
+ * Added patch cmake-conditional-iLBC.
+
+ -- Marco Nenciarini <mnencia at debian.org> Thu, 12 Oct 2006 14:45:46 +0200
+
wengophone (2.0.0~rc4-svn7960-3) unstable; urgency=low
* Updated patch stun-fix-non-i386 to fix even similar code in netlib
Modified: wengophone/trunk/debian/get-orig-source.sh
===================================================================
--- wengophone/trunk/debian/get-orig-source.sh 2006-10-12 13:16:03 UTC (rev 2556)
+++ wengophone/trunk/debian/get-orig-source.sh 2006-10-12 17:51:00 UTC (rev 2557)
@@ -75,6 +75,12 @@
rm -rf $destdir/libs/openssl/inc32
rm -rf $destdir/libs/openssl/out32
+# Remove portaudio
+rm -fr $destdir/libs/portaudio
+
+# Remove iLBC codec
+rm -rf $destdir/wifo/phapi/ilbc
+
# Make the sources archive
echo -n "Writing archive... "
tar cf $desttar $destdir
Modified: wengophone/trunk/debian/patches/debian/disable-crashreport.patch
===================================================================
--- wengophone/trunk/debian/patches/debian/disable-crashreport.patch 2006-10-12 13:16:03 UTC (rev 2556)
+++ wengophone/trunk/debian/patches/debian/disable-crashreport.patch 2006-10-12 17:51:00 UTC (rev 2557)
@@ -1,8 +1,8 @@
-Index: wengophone-2.0.0~rc4-svn7946/CMakeLists.txt
+Index: wengophone-2.0.0~rc4-svn8014/CMakeLists.txt
===================================================================
---- wengophone-2.0.0~rc4-svn7946.orig/CMakeLists.txt 2006-10-06 12:24:17.000000000 +0000
-+++ wengophone-2.0.0~rc4-svn7946/CMakeLists.txt 2006-10-06 12:24:25.000000000 +0000
-@@ -61,6 +61,6 @@
+--- wengophone-2.0.0~rc4-svn8014.orig/CMakeLists.txt 2006-10-09 00:59:06.000000000 +0000
++++ wengophone-2.0.0~rc4-svn8014/CMakeLists.txt 2006-10-12 16:17:04.000000000 +0000
+@@ -59,6 +59,6 @@
libs/sipwrapper/src/phapi
libs/imwrapper/src/multiim
wengophone
Deleted: wengophone/trunk/debian/patches/generic/cmake-amrplugin-pic-code.patch
===================================================================
--- wengophone/trunk/debian/patches/generic/cmake-amrplugin-pic-code.patch 2006-10-12 13:16:03 UTC (rev 2556)
+++ wengophone/trunk/debian/patches/generic/cmake-amrplugin-pic-code.patch 2006-10-12 17:51:00 UTC (rev 2557)
@@ -1,26 +0,0 @@
-Index: wengophone-2.0.0~rc4-svn7946/wifo/phapi/amrwb/CMakeLists.txt
-===================================================================
---- wengophone-2.0.0~rc4-svn7946.orig/wifo/phapi/amrwb/CMakeLists.txt 2006-10-06 14:51:47.000000000 +0000
-+++ wengophone-2.0.0~rc4-svn7946/wifo/phapi/amrwb/CMakeLists.txt 2006-10-06 14:51:21.000000000 +0000
-@@ -41,7 +41,7 @@
- ${AMRWB_INCLUDE_DIRS}
- )
-
--add_library(${AMRWB_LIBRARY} STATIC ${amrwb_SRCS})
-+add_library(${AMRWB_LIBRARY} SHARED ${amrwb_SRCS})
-
- target_link_libraries(${AMRWB_LINK_LIBRARIES})
-
-Index: wengophone-2.0.0~rc4-svn7946/wifo/phapi/amrnb/CMakeLists.txt
-===================================================================
---- wengophone-2.0.0~rc4-svn7946.orig/wifo/phapi/amrnb/CMakeLists.txt 2006-10-06 14:52:27.000000000 +0000
-+++ wengophone-2.0.0~rc4-svn7946/wifo/phapi/amrnb/CMakeLists.txt 2006-10-06 14:51:02.000000000 +0000
-@@ -28,7 +28,7 @@
- ${AMRNB_INCLUDE_DIRS}
- )
-
--add_library(${AMRNB_LIBRARY} STATIC ${amrnb_SRCS})
-+add_library(${AMRNB_LIBRARY} SHARED ${amrnb_SRCS})
-
- target_link_libraries(${AMRNB_LINK_LIBRARIES})
-
Added: wengophone/trunk/debian/patches/generic/cmake-conditional-iLBC
===================================================================
--- wengophone/trunk/debian/patches/generic/cmake-conditional-iLBC (rev 0)
+++ wengophone/trunk/debian/patches/generic/cmake-conditional-iLBC 2006-10-12 17:51:00 UTC (rev 2557)
@@ -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
Deleted: wengophone/trunk/debian/patches/generic/cmake-fix-static-phapi.patch
===================================================================
--- wengophone/trunk/debian/patches/generic/cmake-fix-static-phapi.patch 2006-10-12 13:16:03 UTC (rev 2556)
+++ wengophone/trunk/debian/patches/generic/cmake-fix-static-phapi.patch 2006-10-12 17:51:00 UTC (rev 2557)
@@ -1,27 +0,0 @@
-Index: wengophone-2.0.0~rc4-svn7946/wifo/phapi/CMakeLists.txt
-===================================================================
---- wengophone-2.0.0~rc4-svn7946.orig/wifo/phapi/CMakeLists.txt 2006-10-06 12:45:17.000000000 +0000
-+++ wengophone-2.0.0~rc4-svn7946/wifo/phapi/CMakeLists.txt 2006-10-06 12:50:15.000000000 +0000
-@@ -256,7 +256,7 @@
-
- if (UNIX AND NOT WIN32)
- if (APPLE)
-- set(WITH_PHAPI_SHARED OFF)
-+ set(WITH_SHARED_PHAPI OFF)
-
- set(phapi_SRCS
- ${phapi_SRCS}
-@@ -419,13 +419,6 @@
-
- install(
- TARGETS
-- ${PHAPI_LIBRARY}
-- DESTINATION
-- ${LIB_INSTALL_DIR}
--)
--
--install(
-- TARGETS
- phamrplugin
- phspeexplugin
- DESTINATION
Deleted: wengophone/trunk/debian/patches/generic/cmake-static-owcurl.patch
===================================================================
--- wengophone/trunk/debian/patches/generic/cmake-static-owcurl.patch 2006-10-12 13:16:03 UTC (rev 2556)
+++ wengophone/trunk/debian/patches/generic/cmake-static-owcurl.patch 2006-10-12 17:51:00 UTC (rev 2557)
@@ -1,39 +0,0 @@
-Index: wengophone-2.0.0~rc4-svn7946/libs/curl/CMakeLists.txt
-===================================================================
---- wengophone-2.0.0~rc4-svn7946.orig/libs/curl/CMakeLists.txt 2006-10-06 12:40:42.000000000 +0000
-+++ wengophone-2.0.0~rc4-svn7946/libs/curl/CMakeLists.txt 2006-10-06 12:56:55.000000000 +0000
-@@ -30,6 +30,8 @@
- -DUSE_OPENSSL
- )
-
-+option(WITH_SHARED_OWCURL "Build owcurl as shared library" ON)
-+
- if (APPLE)
- find_package(ZLIB REQUIRED)
-
-@@ -122,14 +124,16 @@
- ${OWCURL_DEFINITIONS}
- )
-
--add_library(${OWCURL_LIBRARY} SHARED ${owcurl_SRCS})
-+if (WITH_SHARED_OWCURL)
-+ add_library(${OWCURL_LIBRARY} SHARED ${owcurl_SRCS})
-+ install(
-+ TARGETS
-+ ${OWCURL_LIBRARY}
-+ DESTINATION
-+ ${LIB_INSTALL_DIR}
-+ )
-+else (WITH_SHARED_OWCURL)
-+ add_library(${OWCURL_LIBRARY} STATIC ${owcurl_SRCS})
-+endif (WITH_SHARED_OWCURL)
-
- target_link_libraries(${OWCURL_LINK_LIBRARIES})
--
--install(
-- TARGETS
-- ${OWCURL_LIBRARY}
-- DESTINATION
-- ${LIB_INSTALL_DIR}
--)
--
Modified: wengophone/trunk/debian/patches/series
===================================================================
--- wengophone/trunk/debian/patches/series 2006-10-12 13:16:03 UTC (rev 2556)
+++ wengophone/trunk/debian/patches/series 2006-10-12 17:51:00 UTC (rev 2557)
@@ -1,8 +1,6 @@
-generic/cmake-static-owcurl.patch
-generic/cmake-fix-static-phapi.patch
generic/cmake-fix-static-sfp-plugin.patch
-generic/cmake-amrplugin-pic-code.patch
generic/stun-fix-non-i386.patch
generic/fix-implicit-pointer-functions.patch
debian/disable-crashreport.patch
debian/cmake-svnrelease-from-debian-changelog.patch
+generic/cmake-conditional-iLBC
Modified: wengophone/trunk/debian/rules
===================================================================
--- wengophone/trunk/debian/rules 2006-10-12 13:16:03 UTC (rev 2556)
+++ wengophone/trunk/debian/rules 2006-10-12 17:51:00 UTC (rev 2557)
@@ -6,7 +6,8 @@
DEB_INSTALL_MANPAGES_wengophone := $(CURDIR)/debian/qtwengophone.1
DEB_CMAKE_EXTRA_FLAGS := -DWITH_BUILDID=ON -DWITH_SHARED_PHAPI=OFF \
- -DWITH_SHARED_OWCURL=OFF -DWITH_SHARED_SFP-PLUGIN=OFF
+ -DWITH_SHARED_OWCURL=OFF -DWITH_SHARED_SFP-PLUGIN=OFF \
+ -DWITH_ILBC=OFF
DEBVERSION:=$(shell head -n 1 debian/changelog | sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
UPVERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9]*$$//' -e 's/-svn.*$$//' -e 's/.dfsg$$//')
More information about the Pkg-voip-commits
mailing list