[Pkg-voip-commits] r4428 - in /wengophone/trunk/debian: ./ backports/ patches/ patches/generic/ patches/head/
cavedon-guest at alioth.debian.org
cavedon-guest at alioth.debian.org
Fri Sep 7 22:10:49 UTC 2007
Author: cavedon-guest
Date: Fri Sep 7 22:10:48 2007
New Revision: 4428
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=4428
Log:
* New upstream release
* Removed merged patches
* Re-enable video support
* Added patch generic/phapi-fix-crash-missing-codec.patch to avoid crash if
video codec is not available in ffmpeg
Added:
wengophone/trunk/debian/patches/generic/phapi-fix-crash-missing-codec.patch
Removed:
wengophone/trunk/debian/patches/generic/exosip-fix-empty-notify.patch
wengophone/trunk/debian/patches/generic/phapi-fix-empty-ctype-dos.patch
wengophone/trunk/debian/patches/generic/portaudio-avoid-unnecessary-inclusion.patch
wengophone/trunk/debian/patches/head/phapi-disable-iLBC-codec.patch
Modified:
wengophone/trunk/debian/backports/etch
wengophone/trunk/debian/backports/feisty
wengophone/trunk/debian/changelog
wengophone/trunk/debian/patches/generic/cmake-fix-ENABLE_CRASHREPORT.patch
wengophone/trunk/debian/patches/generic/curl-openssl-mt-fix.patch
wengophone/trunk/debian/patches/generic/qobjectthreadsafe-fix-qt42.patch
wengophone/trunk/debian/patches/series
wengophone/trunk/debian/rules
Modified: wengophone/trunk/debian/backports/etch
URL: http://svn.debian.org/wsvn/pkg-voip/wengophone/trunk/debian/backports/etch?rev=4428&op=diff
==============================================================================
--- wengophone/trunk/debian/backports/etch (original)
+++ wengophone/trunk/debian/backports/etch Fri Sep 7 22:10:48 2007
@@ -7,6 +7,6 @@
sed -i -e 's#\(libboost-[-a-z]*-dev *( *>= *\)1.34[^)]*)#\11.33)#g' debian/control
sed -i -e 's#libcurl4-openssl-dev[^)]*)#g++-3.4#g' debian/control
sed -i -e 's#-DCURL_INTERNAL=OFF#-DCURL_INTERNAL=ON#' debian/rules
-sed -i -e 's#-DPHAPI_VIDEO_SUPPORT=OFF#-DPHAPI_VIDEO_SUPPORT=ON \\\n\t-DCMAKE_C_COMPILER=$(shell which gcc-3.4) \\\n\t-DCMAKE_CXX_COMPILER=$(shell which g++-3.4)#' debian/rules
+sed -i -e 's#-DPHAPI_VIDEO_SUPPORT=ON#-DPHAPI_VIDEO_SUPPORT=ON \\\n\t-DCMAKE_C_COMPILER=$(shell which gcc-3.4) \\\n\t-DCMAKE_CXX_COMPILER=$(shell which g++-3.4)#' debian/rules
exit 0
Modified: wengophone/trunk/debian/backports/feisty
URL: http://svn.debian.org/wsvn/pkg-voip/wengophone/trunk/debian/backports/feisty?rev=4428&op=diff
==============================================================================
--- wengophone/trunk/debian/backports/feisty (original)
+++ wengophone/trunk/debian/backports/feisty Fri Sep 7 22:10:48 2007
@@ -7,6 +7,6 @@
sed -i -e 's#\(libboost-[-a-z]*-dev *( *>= *\)1.34[^)]*)#\11.33)#g' debian/control
sed -i -e 's#libcurl4-openssl-dev[^)]*)#g++-3.4#g' debian/control
sed -i -e 's#-DCURL_INTERNAL=OFF#-DCURL_INTERNAL=ON#' debian/rules
-sed -i -e 's#-DPHAPI_VIDEO_SUPPORT=OFF#-DPHAPI_VIDEO_SUPPORT=ON \\\n\t-DCMAKE_C_COMPILER=$(shell which gcc-3.4) \\\n\t-DCMAKE_CXX_COMPILER=$(shell which g++-3.4)#' debian/rules
+sed -i -e 's#-DPHAPI_VIDEO_SUPPORT=ON#-DPHAPI_VIDEO_SUPPORT=ON \\\n\t-DCMAKE_C_COMPILER=$(shell which gcc-3.4) \\\n\t-DCMAKE_CXX_COMPILER=$(shell which g++-3.4)#' debian/rules
exit 0
Modified: wengophone/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/wengophone/trunk/debian/changelog?rev=4428&op=diff
==============================================================================
--- wengophone/trunk/debian/changelog (original)
+++ wengophone/trunk/debian/changelog Fri Sep 7 22:10:48 2007
@@ -1,8 +1,21 @@
-wengophone (2.1.1.dfsg0-5) UNRELEASED; urgency=low
-
- * NOT RELEASED YET
-
- -- Marco Nenciarini <mnencia at debian.org> Mon, 03 Sep 2007 16:10:38 +0200
+wengophone (2.1.2.dfsg0-0) UNRELEASED; urgency=low
+
+ * New upstream release
+ * Removed patches (merged upstream):
+ - head/phapi-disable-iLBC-codec.patch
+ - generic/exosip-fix-empty-notify.patch
+ - generic/portaudio-avoid-unnecessary-inclusion.patch
+ - generic/phapi-fix-empty-ctype-dos.patch
+ * Refreshed patches:
+ - generic/qobjectthreadsafe-fix-qt42.patch (partially merged upstream)
+ - generic/cmake-fix-ENABLE_CRASHREPORT.patch
+ - generic/curl-openssl-mt-fix.patch
+ - generic/qobjectthreadsafe-fix-qt42.patch
+ * Re-enable video support
+ * Added patch generic/phapi-fix-crash-missing-codec.patch to avoid crash if
+ video codec is not available in ffmpeg
+
+ -- Ludovico Cavedon <cavedon at sssup.it> Fri, 07 Sep 2007 22:01:42 +0000
wengophone (2.1.1.dfsg0-4) unstable; urgency=low
Modified: wengophone/trunk/debian/patches/generic/cmake-fix-ENABLE_CRASHREPORT.patch
URL: http://svn.debian.org/wsvn/pkg-voip/wengophone/trunk/debian/patches/generic/cmake-fix-ENABLE_CRASHREPORT.patch?rev=4428&op=diff
==============================================================================
--- wengophone/trunk/debian/patches/generic/cmake-fix-ENABLE_CRASHREPORT.patch (original)
+++ wengophone/trunk/debian/patches/generic/cmake-fix-ENABLE_CRASHREPORT.patch Fri Sep 7 22:10:48 2007
@@ -1,7 +1,8 @@
-diff -urNad wengophone-2.1.1~/libs/3rdparty/CMakeLists.txt wengophone-2.1.1/libs/3rdparty/CMakeLists.txt
---- wengophone-2.1.1~/libs/3rdparty/CMakeLists.txt 2007-07-05 00:51:07.000000000 +0200
-+++ wengophone-2.1.1/libs/3rdparty/CMakeLists.txt 2007-07-05 00:51:45.000000000 +0200
-@@ -57,11 +57,11 @@
+Index: wengophone-2.1.2.dfsg0/libs/3rdparty/CMakeLists.txt
+===================================================================
+--- wengophone-2.1.2.dfsg0.orig/libs/3rdparty/CMakeLists.txt 2007-07-19 15:05:30.000000000 +0000
++++ wengophone-2.1.2.dfsg0/libs/3rdparty/CMakeLists.txt 2007-09-07 21:36:28.000000000 +0000
+@@ -57,8 +57,8 @@
#iaxclient
)
@@ -12,12 +13,10 @@
)
-endif (LINUX)
+endif (LINUX AND ENABLE_CRASHREPORT)
-
- if (NOT APPLE)
- subdirs(
-diff -urNad wengophone-2.1.1~/libs/owutil/CMakeLists.txt wengophone-2.1.1/libs/owutil/CMakeLists.txt
---- wengophone-2.1.1~/libs/owutil/CMakeLists.txt 2007-07-05 00:51:05.000000000 +0200
-+++ wengophone-2.1.1/libs/owutil/CMakeLists.txt 2007-07-05 00:51:45.000000000 +0200
+Index: wengophone-2.1.2.dfsg0/libs/owutil/CMakeLists.txt
+===================================================================
+--- wengophone-2.1.2.dfsg0.orig/libs/owutil/CMakeLists.txt 2007-04-02 16:41:31.000000000 +0000
++++ wengophone-2.1.2.dfsg0/libs/owutil/CMakeLists.txt 2007-09-07 21:34:49.000000000 +0000
@@ -32,9 +32,11 @@
http
)
@@ -35,9 +34,10 @@
+ endif (WIN32 OR LINUX)
+endif (ENABLE_CRASHREPORT)
-diff -urNad wengophone-2.1.1~/wengophone/src/presentation/qt/CMakeLists.txt wengophone-2.1.1/wengophone/src/presentation/qt/CMakeLists.txt
---- wengophone-2.1.1~/wengophone/src/presentation/qt/CMakeLists.txt 2007-07-05 00:51:05.000000000 +0200
-+++ wengophone-2.1.1/wengophone/src/presentation/qt/CMakeLists.txt 2007-07-05 00:51:45.000000000 +0200
+Index: wengophone-2.1.2.dfsg0/wengophone/src/presentation/qt/CMakeLists.txt
+===================================================================
+--- wengophone-2.1.2.dfsg0.orig/wengophone/src/presentation/qt/CMakeLists.txt 2007-07-20 13:37:37.000000000 +0000
++++ wengophone-2.1.2.dfsg0/wengophone/src/presentation/qt/CMakeLists.txt 2007-09-07 21:34:49.000000000 +0000
@@ -23,11 +23,13 @@
owsoftupdater
)
Modified: wengophone/trunk/debian/patches/generic/curl-openssl-mt-fix.patch
URL: http://svn.debian.org/wsvn/pkg-voip/wengophone/trunk/debian/patches/generic/curl-openssl-mt-fix.patch?rev=4428&op=diff
==============================================================================
--- wengophone/trunk/debian/patches/generic/curl-openssl-mt-fix.patch (original)
+++ wengophone/trunk/debian/patches/generic/curl-openssl-mt-fix.patch Fri Sep 7 22:10:48 2007
@@ -1,7 +1,7 @@
-Index: wengophone-2.1.1.dfsg0/libs/owutil/http/CMakeLists.txt
+Index: wengophone-2.1.2.dfsg0/libs/owutil/http/CMakeLists.txt
===================================================================
---- wengophone-2.1.1.dfsg0.orig/libs/owutil/http/CMakeLists.txt 2007-03-01 14:37:00.000000000 +0000
-+++ wengophone-2.1.1.dfsg0/libs/owutil/http/CMakeLists.txt 2007-08-24 11:43:23.000000000 +0000
+--- wengophone-2.1.2.dfsg0.orig/libs/owutil/http/CMakeLists.txt 2007-03-01 14:37:00.000000000 +0000
++++ wengophone-2.1.2.dfsg0/libs/owutil/http/CMakeLists.txt 2007-09-07 21:37:11.000000000 +0000
@@ -7,6 +7,7 @@
ow_use_private_libraries(
@@ -18,10 +18,10 @@
src/curl/CurlHttpRequest.cpp
#src/null/NullHttpRequest.cpp
#src/qt/QtHttpRequest.cpp
-Index: wengophone-2.1.1.dfsg0/libs/owutil/http/HttpRequest.h
+Index: wengophone-2.1.2.dfsg0/libs/owutil/http/HttpRequest.h
===================================================================
---- wengophone-2.1.1.dfsg0.orig/libs/owutil/http/HttpRequest.h 2007-01-31 17:57:31.000000000 +0000
-+++ wengophone-2.1.1.dfsg0/libs/owutil/http/HttpRequest.h 2007-08-24 11:43:23.000000000 +0000
+--- wengophone-2.1.2.dfsg0.orig/libs/owutil/http/HttpRequest.h 2007-01-31 17:57:31.000000000 +0000
++++ wengophone-2.1.2.dfsg0/libs/owutil/http/HttpRequest.h 2007-09-07 21:37:11.000000000 +0000
@@ -156,6 +156,8 @@
OWHTTP_API void abort();
@@ -31,10 +31,10 @@
private:
//Inherited from Thread
-Index: wengophone-2.1.1.dfsg0/libs/owutil/http/src/HttpRequest.cpp
+Index: wengophone-2.1.2.dfsg0/libs/owutil/http/src/HttpRequest.cpp
===================================================================
---- wengophone-2.1.1.dfsg0.orig/libs/owutil/http/src/HttpRequest.cpp 2007-01-31 17:57:31.000000000 +0000
-+++ wengophone-2.1.1.dfsg0/libs/owutil/http/src/HttpRequest.cpp 2007-08-24 11:43:23.000000000 +0000
+--- wengophone-2.1.2.dfsg0.orig/libs/owutil/http/src/HttpRequest.cpp 2007-01-31 17:57:31.000000000 +0000
++++ wengophone-2.1.2.dfsg0/libs/owutil/http/src/HttpRequest.cpp 2007-09-07 21:37:11.000000000 +0000
@@ -156,6 +156,10 @@
void HttpRequest::run() {
}
@@ -46,10 +46,10 @@
void HttpRequest::answerReceivedEventHandler(IHttpRequest * sender, int requestId, const std::string & answer, Error error) {
//sender = _httpRequestPrivate
//sender now is HttpRequest that will delete _httpRequestPrivate
-Index: wengophone-2.1.1.dfsg0/libs/owutil/http/src/HttpRequestFactory.cpp
+Index: wengophone-2.1.2.dfsg0/libs/owutil/http/src/HttpRequestFactory.cpp
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ wengophone-2.1.1.dfsg0/libs/owutil/http/src/HttpRequestFactory.cpp 2007-08-24 11:43:23.000000000 +0000
++++ wengophone-2.1.2.dfsg0/libs/owutil/http/src/HttpRequestFactory.cpp 2007-09-07 21:37:11.000000000 +0000
@@ -0,0 +1,15 @@
+#include "HttpRequestFactory.h"
+
@@ -66,10 +66,10 @@
+ http_tunnel_init_ssl();
+}
+
-Index: wengophone-2.1.1.dfsg0/libs/owutil/http/src/HttpRequestFactory.h
+Index: wengophone-2.1.2.dfsg0/libs/owutil/http/src/HttpRequestFactory.h
===================================================================
---- wengophone-2.1.1.dfsg0.orig/libs/owutil/http/src/HttpRequestFactory.h 2007-03-01 12:17:48.000000000 +0000
-+++ wengophone-2.1.1.dfsg0/libs/owutil/http/src/HttpRequestFactory.h 2007-08-24 11:43:59.000000000 +0000
+--- wengophone-2.1.2.dfsg0.orig/libs/owutil/http/src/HttpRequestFactory.h 2007-03-01 12:17:48.000000000 +0000
++++ wengophone-2.1.2.dfsg0/libs/owutil/http/src/HttpRequestFactory.h 2007-09-07 21:37:11.000000000 +0000
@@ -36,6 +36,8 @@
class HttpRequestFactory : NonCopyable {
public:
@@ -79,10 +79,10 @@
static IHttpRequest * create() {
//new QtHttpRequest();
//new NullHttpRequest();
-Index: wengophone-2.1.1.dfsg0/libs/owutil/http/src/curl/CurlHttpRequest.cpp
+Index: wengophone-2.1.2.dfsg0/libs/owutil/http/src/curl/CurlHttpRequest.cpp
===================================================================
---- wengophone-2.1.1.dfsg0.orig/libs/owutil/http/src/curl/CurlHttpRequest.cpp 2007-03-19 17:31:18.000000000 +0000
-+++ wengophone-2.1.1.dfsg0/libs/owutil/http/src/curl/CurlHttpRequest.cpp 2007-08-24 11:43:23.000000000 +0000
+--- wengophone-2.1.2.dfsg0.orig/libs/owutil/http/src/curl/CurlHttpRequest.cpp 2007-03-19 17:31:18.000000000 +0000
++++ wengophone-2.1.2.dfsg0/libs/owutil/http/src/curl/CurlHttpRequest.cpp 2007-09-07 21:37:11.000000000 +0000
@@ -205,7 +205,7 @@
//curl_easy_setopt(_curl, CURLOPT_WRITEHEADER, this);
curl_easy_setopt(_curl, CURLOPT_WRITEDATA, this);
@@ -92,10 +92,10 @@
curl_easy_setopt(_curl, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0);
//Maximum time in seconds that you allow the libcurl transfer operation to take
-Index: wengophone-2.1.1.dfsg0/wengophone/src/model/WengoPhone.cpp
+Index: wengophone-2.1.2.dfsg0/wengophone/src/model/WengoPhone.cpp
===================================================================
---- wengophone-2.1.1.dfsg0.orig/wengophone/src/model/WengoPhone.cpp 2007-06-20 08:44:26.000000000 +0000
-+++ wengophone-2.1.1.dfsg0/wengophone/src/model/WengoPhone.cpp 2007-08-24 11:43:23.000000000 +0000
+--- wengophone-2.1.2.dfsg0.orig/wengophone/src/model/WengoPhone.cpp 2007-06-20 08:44:26.000000000 +0000
++++ wengophone-2.1.2.dfsg0/wengophone/src/model/WengoPhone.cpp 2007-09-07 21:37:11.000000000 +0000
@@ -50,6 +50,7 @@
_enableSerialization = true;
_startupSettingListener = new StartupSettingListener();
@@ -104,10 +104,10 @@
//set HttpRequest User Agent
std::stringstream ss;
ss << WengoPhoneBuildId::getSoftphoneName();
-Index: wengophone-2.1.1.dfsg0/wifo/httptunnel/httptunnel.c
+Index: wengophone-2.1.2.dfsg0/wifo/httptunnel/httptunnel.c
===================================================================
---- wengophone-2.1.1.dfsg0.orig/wifo/httptunnel/httptunnel.c 2007-04-20 14:29:17.000000000 +0000
-+++ wengophone-2.1.1.dfsg0/wifo/httptunnel/httptunnel.c 2007-08-24 11:43:23.000000000 +0000
+--- wengophone-2.1.2.dfsg0.orig/wifo/httptunnel/httptunnel.c 2007-04-20 14:29:17.000000000 +0000
++++ wengophone-2.1.2.dfsg0/wifo/httptunnel/httptunnel.c 2007-09-07 21:37:11.000000000 +0000
@@ -93,7 +93,7 @@
int UseProxy = 0;
@@ -117,10 +117,10 @@
int sslIsInit = 0;
#ifdef HT_USE_SSL
-Index: wengophone-2.1.1.dfsg0/wifo/httptunnel/httptunnel.h
+Index: wengophone-2.1.2.dfsg0/wifo/httptunnel/httptunnel.h
===================================================================
---- wengophone-2.1.1.dfsg0.orig/wifo/httptunnel/httptunnel.h 2007-01-26 13:40:41.000000000 +0000
-+++ wengophone-2.1.1.dfsg0/wifo/httptunnel/httptunnel.h 2007-08-24 11:43:23.000000000 +0000
+--- wengophone-2.1.2.dfsg0.orig/wifo/httptunnel/httptunnel.h 2007-01-26 13:40:41.000000000 +0000
++++ wengophone-2.1.2.dfsg0/wifo/httptunnel/httptunnel.h 2007-09-07 21:37:11.000000000 +0000
@@ -88,6 +88,7 @@
int http_tunnel_close(void *h_tunnel);
void http_tunnel_init_host(const char *hostname, int port, int ssl);
@@ -129,22 +129,22 @@
void http_tunnel_clean_up();
#ifdef __cplusplus
}
-Index: wengophone-2.1.1.dfsg0/CMakeLists.txt
+Index: wengophone-2.1.2.dfsg0/CMakeLists.txt
===================================================================
---- wengophone-2.1.1.dfsg0.orig/CMakeLists.txt 2007-06-21 13:59:17.000000000 +0000
-+++ wengophone-2.1.1.dfsg0/CMakeLists.txt 2007-08-24 11:43:23.000000000 +0000
-@@ -26,6 +26,7 @@
+--- wengophone-2.1.2.dfsg0.orig/CMakeLists.txt 2007-08-22 11:44:50.000000000 +0000
++++ wengophone-2.1.2.dfsg0/CMakeLists.txt 2007-09-07 21:38:13.000000000 +0000
+@@ -40,6 +40,7 @@
+ endif(LINUX AND OWSOUND_PORTAUDIO_SUPPORT)
+
subdirs(
- libs/3rdparty
-
-+ wifo/httptunnel # Needed by owhttp
++ wifo/httptunnel # Needed by owhttp
libs/owutil
libs/wenbox
libs/qtutil
-Index: wengophone-2.1.1.dfsg0/wifo/CMakeLists.txt
+Index: wengophone-2.1.2.dfsg0/wifo/CMakeLists.txt
===================================================================
---- wengophone-2.1.1.dfsg0.orig/wifo/CMakeLists.txt 2007-04-24 10:01:04.000000000 +0000
-+++ wengophone-2.1.1.dfsg0/wifo/CMakeLists.txt 2007-08-24 11:43:23.000000000 +0000
+--- wengophone-2.1.2.dfsg0.orig/wifo/CMakeLists.txt 2007-04-24 10:01:04.000000000 +0000
++++ wengophone-2.1.2.dfsg0/wifo/CMakeLists.txt 2007-09-07 21:37:11.000000000 +0000
@@ -35,7 +35,7 @@
endif (PHAPI_CODEC_ILBC_SUPPORT)
Added: wengophone/trunk/debian/patches/generic/phapi-fix-crash-missing-codec.patch
URL: http://svn.debian.org/wsvn/pkg-voip/wengophone/trunk/debian/patches/generic/phapi-fix-crash-missing-codec.patch?rev=4428&op=file
==============================================================================
--- wengophone/trunk/debian/patches/generic/phapi-fix-crash-missing-codec.patch (added)
+++ wengophone/trunk/debian/patches/generic/phapi-fix-crash-missing-codec.patch Fri Sep 7 22:10:48 2007
@@ -1,0 +1,181 @@
+Index: wengophone-2.1.2.dfsg0/wifo/phapi/phcodec-h263.c
+===================================================================
+--- wengophone-2.1.2.dfsg0.orig/wifo/phapi/phcodec-h263.c 2007-09-07 21:58:54.000000000 +0000
++++ wengophone-2.1.2.dfsg0/wifo/phapi/phcodec-h263.c 2007-09-07 21:59:00.000000000 +0000
+@@ -68,7 +68,12 @@
+ h263t->max_frame_len = MAX_ENC_BUFFER_SIZE;
+ h263t->data_enc = (uint8_t *) av_malloc (h263t->max_frame_len);
+
+- phcodec_avcodec_encoder_init(&h263t->encoder_ctx, &h263t->meta, s);
++ if(phcodec_avcodec_encoder_init(&h263t->encoder_ctx, &h263t->meta, s) < 0)
++ {
++ av_free(h263t->data_enc);
++ free(h263t);
++ return 0;
++ }
+
+ h263t->encoder_ctx.context->flags |= CODEC_FLAG_QP_RD;
+ h263t->encoder_ctx.context->flags |= CODEC_FLAG_H263P_SLICE_STRUCT;
+@@ -103,7 +108,11 @@
+
+ h263t = (ph_h263_decoder_ctx_t *) calloc(sizeof(ph_h263_decoder_ctx_t), 1);
+ _h263_meta_init(&h263t->meta, s);
+- phcodec_avcodec_decoder_init(&h263t->decoder_ctx, &h263t->meta);
++ if(phcodec_avcodec_decoder_init(&h263t->decoder_ctx, &h263t->meta) < 0)
++ {
++ free(h263t);
++ return 0;
++ }
+ h263t->max_frame_len = MAX_DEC_BUFFER_SIZE;
+ h263t->data_dec = (uint8_t *) av_malloc (h263t->max_frame_len+FF_INPUT_BUFFER_PADDING_SIZE);
+ memset(h263t->data_dec + h263t->max_frame_len, 0, FF_INPUT_BUFFER_PADDING_SIZE);
+Index: wengophone-2.1.2.dfsg0/wifo/phapi/phcodec-h263flv1.c
+===================================================================
+--- wengophone-2.1.2.dfsg0.orig/wifo/phapi/phcodec-h263flv1.c 2007-09-07 21:58:54.000000000 +0000
++++ wengophone-2.1.2.dfsg0/wifo/phapi/phcodec-h263flv1.c 2007-09-07 21:59:00.000000000 +0000
+@@ -68,7 +68,12 @@
+ h263t->max_frame_len = MAX_ENC_BUFFER_SIZE;
+ h263t->data_enc = (uint8_t *) av_malloc (h263t->max_frame_len);
+
+- phcodec_avcodec_encoder_init(&h263t->encoder_ctx, &h263t->meta, s);
++ if(phcodec_avcodec_encoder_init(&h263t->encoder_ctx, &h263t->meta, s) < 0)
++ {
++ av_free(h263t->data_enc);
++ free(h263t);
++ return 0;
++ }
+
+ h263t->encoder_ctx.context->flags |= CODEC_FLAG_QP_RD;
+ h263t->encoder_ctx.context->flags |= CODEC_FLAG_H263P_SLICE_STRUCT;
+@@ -103,7 +108,11 @@
+
+ h263t = (ph_h263_decoder_ctx_t *) calloc(sizeof(ph_h263_decoder_ctx_t), 1);
+ _h263flv1_meta_init(&h263t->meta, s);
+- phcodec_avcodec_decoder_init(&h263t->decoder_ctx, &h263t->meta);
++ if(phcodec_avcodec_decoder_init(&h263t->decoder_ctx, &h263t->meta) < 0)
++ {
++ free(h263t);
++ return 0;
++ }
+ h263t->max_frame_len = MAX_DEC_BUFFER_SIZE;
+ h263t->data_dec = (uint8_t *) av_malloc (h263t->max_frame_len+FF_INPUT_BUFFER_PADDING_SIZE);
+ memset(h263t->data_dec + h263t->max_frame_len, 0, FF_INPUT_BUFFER_PADDING_SIZE);
+Index: wengophone-2.1.2.dfsg0/wifo/phapi/phcodec-h263plus.c
+===================================================================
+--- wengophone-2.1.2.dfsg0.orig/wifo/phapi/phcodec-h263plus.c 2007-09-07 21:58:54.000000000 +0000
++++ wengophone-2.1.2.dfsg0/wifo/phapi/phcodec-h263plus.c 2007-09-07 21:59:00.000000000 +0000
+@@ -61,7 +61,12 @@
+ h263t->max_frame_len = MAX_ENC_BUFFER_SIZE;
+ h263t->data_enc = (uint8_t *) av_malloc (h263t->max_frame_len);
+
+- phcodec_avcodec_encoder_init(&h263t->encoder_ctx, &h263t->meta, s);
++ if(phcodec_avcodec_encoder_init(&h263t->encoder_ctx, &h263t->meta, s) < 0)
++ {
++ av_free(h263t->data_enc);
++ free(h263t);
++ return 0;
++ }
+
+ h263t->encoder_ctx.context->flags |= CODEC_FLAG_QP_RD;
+ h263t->encoder_ctx.context->flags |= CODEC_FLAG_H263P_SLICE_STRUCT;
+@@ -96,7 +101,11 @@
+
+ h263t = (ph_h263_decoder_ctx_t *) calloc(sizeof(ph_h263_decoder_ctx_t), 1);
+ _h263p_meta_init(&h263t->meta, s);
+- phcodec_avcodec_decoder_init(&h263t->decoder_ctx, &h263t->meta);
++ if(phcodec_avcodec_decoder_init(&h263t->decoder_ctx, &h263t->meta) < 0)
++ {
++ free(h263t);
++ return 0;
++ }
+ h263t->max_frame_len = MAX_DEC_BUFFER_SIZE;
+ h263t->data_dec = (uint8_t *) av_malloc (h263t->max_frame_len+FF_INPUT_BUFFER_PADDING_SIZE);
+ memset(h263t->data_dec + h263t->max_frame_len, 0, FF_INPUT_BUFFER_PADDING_SIZE);
+Index: wengophone-2.1.2.dfsg0/wifo/phapi/phcodec-h264.c
+===================================================================
+--- wengophone-2.1.2.dfsg0.orig/wifo/phapi/phcodec-h264.c 2007-09-07 21:58:54.000000000 +0000
++++ wengophone-2.1.2.dfsg0/wifo/phapi/phcodec-h264.c 2007-09-07 21:59:00.000000000 +0000
+@@ -70,7 +70,12 @@
+ h264t->max_frame_len = 8096;
+ h264t->data_enc = (uint8_t *) av_malloc (h264t->max_frame_len);
+
+- phcodec_avcodec_encoder_init(&h264t->encoder_ctx, &h264t->meta, s);
++ if(phcodec_avcodec_encoder_init(&h264t->encoder_ctx, &h264t->meta, s) < 0)
++ {
++ av_free(h264t->data_enc);
++ free(h264t);
++ return 0;
++ }
+
+ if (avcodec_open(h264t->encoder_ctx.context,
+ h264t->encoder_ctx.encoder) < 0)
+@@ -90,7 +95,11 @@
+ h264t->data_dec = (uint8_t *) av_malloc (100000);
+ h264t->buf_index = 0;
+ h264t->max_frame_len = 8096;
+- phcodec_avcodec_decoder_init(&h264t->decoder_ctx, &h264t->meta);
++ if(phcodec_avcodec_decoder_init(&h264t->decoder_ctx, &h264t->meta) < 0)
++ {
++ free(h264t);
++ return 0;
++ }
+
+ return h264t;
+ }
+Index: wengophone-2.1.2.dfsg0/wifo/phapi/phcodec-mpeg4.c
+===================================================================
+--- wengophone-2.1.2.dfsg0.orig/wifo/phapi/phcodec-mpeg4.c 2007-09-07 21:58:54.000000000 +0000
++++ wengophone-2.1.2.dfsg0/wifo/phapi/phcodec-mpeg4.c 2007-09-07 21:59:00.000000000 +0000
+@@ -73,7 +73,12 @@
+ mpeg4t->max_frame_len = 8096;
+ mpeg4t->data_enc = (uint8_t *) av_malloc (mpeg4t->max_frame_len);
+
+- phcodec_avcodec_encoder_init(&mpeg4t->encoder_ctx, &mpeg4t->meta, s);
++ if(phcodec_avcodec_encoder_init(&mpeg4t->encoder_ctx, &mpeg4t->meta, s) < 0)
++ {
++ av_free(mpeg4t->data_enc);
++ free(mpeg4t);
++ return 0;
++ }
+
+ mpeg4t->encoder_ctx.context->flags |= CODEC_FLAG_QP_RD;
+ //mpeg4t->encoder_ctx.context->flags |= CODEC_FLAG_H263P_UMV;
+@@ -106,7 +111,11 @@
+
+ mpeg4t = (ph_mpeg4_decoder_ctx_t *) calloc(sizeof(ph_mpeg4_decoder_ctx_t), 1);
+ _mpeg4_meta_init(&mpeg4t->meta, s);
+- phcodec_avcodec_decoder_init(&mpeg4t->decoder_ctx, &mpeg4t->meta);
++ if(phcodec_avcodec_decoder_init(&mpeg4t->decoder_ctx, &mpeg4t->meta) < 0)
++ {
++ free(mpeg4t);
++ return 0;
++ }
+ mpeg4t->data_dec = (uint8_t *) av_malloc (100000);
+ mpeg4t->buf_index = 0;
+ mpeg4t->max_frame_len = 8096;
+Index: wengophone-2.1.2.dfsg0/wifo/phapi/phmedia-video.c
+===================================================================
+--- wengophone-2.1.2.dfsg0.orig/wifo/phapi/phmedia-video.c 2007-09-07 21:58:54.000000000 +0000
++++ wengophone-2.1.2.dfsg0/wifo/phapi/phmedia-video.c 2007-09-07 21:59:00.000000000 +0000
+@@ -489,11 +489,21 @@
+ if (codec->encoder_init)
+ {
+ video_stream->ms.encoder_ctx = codec->encoder_init(video_stream);
++ if (!video_stream->ms.encoder_ctx) {
++ DBG_MEDIA_ENGINE_VIDEO("unable to initialize video encoder\n");
++ osip_free(video_stream);
++ return -1;
++ }
+ }
+
+ if (codec->decoder_init)
+ {
+ video_stream->ms.decoder_ctx = codec->decoder_init(video_stream);
++ if (!video_stream->ms.decoder_ctx) {
++ DBG_MEDIA_ENGINE_VIDEO("unable to initialize video decoder\n");
++ osip_free(video_stream);
++ return -1;
++ }
+ }
+
+ #ifdef PHAPI_VIDEO_LOCAL_HACK
Modified: wengophone/trunk/debian/patches/generic/qobjectthreadsafe-fix-qt42.patch
URL: http://svn.debian.org/wsvn/pkg-voip/wengophone/trunk/debian/patches/generic/qobjectthreadsafe-fix-qt42.patch?rev=4428&op=diff
==============================================================================
--- wengophone/trunk/debian/patches/generic/qobjectthreadsafe-fix-qt42.patch (original)
+++ wengophone/trunk/debian/patches/generic/qobjectthreadsafe-fix-qt42.patch Fri Sep 7 22:10:48 2007
@@ -1,28 +1,21 @@
-Index: wengophone-2.1.1.dfsg0/libs/qtutil/src/QObjectThreadSafe.cpp
+Index: wengophone-2.1.2.dfsg0/libs/qtutil/src/QObjectThreadSafe.cpp
===================================================================
---- wengophone-2.1.1.dfsg0.orig/libs/qtutil/src/QObjectThreadSafe.cpp 2006-08-11 22:15:03.000000000 +0000
-+++ wengophone-2.1.1.dfsg0/libs/qtutil/src/QObjectThreadSafe.cpp 2007-08-23 16:26:38.000000000 +0000
-@@ -20,11 +20,20 @@
- #include <qtutil/QObjectThreadSafe.h>
-
- #include <QtCore/QCoreApplication>
-+#include <QtCore/QThread>
+--- wengophone-2.1.2.dfsg0.orig/libs/qtutil/src/QObjectThreadSafe.cpp 2007-07-04 07:52:16.000000000 +0000
++++ wengophone-2.1.2.dfsg0/libs/qtutil/src/QObjectThreadSafe.cpp 2007-09-07 21:32:18.000000000 +0000
+@@ -23,7 +23,7 @@
+ #include <QtCore/QThread>
QObjectThreadSafe::QObjectThreadSafe(QObject * parent)
- : QObject(parent) {
--
++ : QObject(parent), _blockEvents(false) {
+ #if QT_VERSION >= 0x040200
+ // This is needed with Qt 4.2 and later. See Trac ticket #1322.
+ //
+@@ -34,7 +34,6 @@
+ moveToThread(QCoreApplication::instance()->thread());
+ }
+ #endif
- _blockEvents = false;
-+ : QObject(parent), _blockEvents(false) {
-+#if QT_VERSION >= 0x040200
-+ // This is needed with Qt 4.2 and later. See Trac ticket #1322.
-+ //
-+ // If an object has a parent, its thread must be the current one. See
-+ // http://doc.trolltech.com/4.3/qobject.html#moveToThread for more info.
-+ assert(!parent || parent->thread() == QThread::currentThread());
-+ if(!parent) {
-+ moveToThread(QCoreApplication::instance()->thread());
-+ }
-+#endif
}
QObjectThreadSafe::~QObjectThreadSafe() {
Modified: wengophone/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/wengophone/trunk/debian/patches/series?rev=4428&op=diff
==============================================================================
--- wengophone/trunk/debian/patches/series (original)
+++ wengophone/trunk/debian/patches/series Fri Sep 7 22:10:48 2007
@@ -1,15 +1,12 @@
-head/phapi-disable-iLBC-codec.patch
head/alsa-plughw-default.patch
generic/qobjectthreadsafe-fix-qt42.patch
generic/cmake-fix-ENABLE_CRASHREPORT.patch
generic/cmake-static-coredumper.patch
-generic/exosip-fix-empty-notify.patch
generic/memory-dump-fix-double-dump.patch
generic/memory-dump-tmp-path.patch
-generic/portaudio-avoid-unnecessary-inclusion.patch
generic/desktop-file-update.patch
-generic/phapi-fix-empty-ctype-dos.patch
generic/def-enable-video-fix.patch
+generic/phapi-fix-crash-missing-codec.patch
generic/curl-openssl-mt-fix.patch
debian/remove-extra-copying-file.patch
debian/cmake-no-rpath_to_link_path.patch
Modified: wengophone/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/wengophone/trunk/debian/rules?rev=4428&op=diff
==============================================================================
--- wengophone/trunk/debian/rules (original)
+++ wengophone/trunk/debian/rules Fri Sep 7 22:10:48 2007
@@ -18,7 +18,7 @@
-DSPEEX_INTERNAL=OFF \
-DSAMPLERATE_INTERNAL=OFF \
-DCURL_INTERNAL=OFF \
- -DPHAPI_VIDEO_SUPPORT=OFF
+ -DPHAPI_VIDEO_SUPPORT=ON
ifeq ($(DEB_HOST_ARCH), i386)
@@ -40,7 +40,7 @@
UPVERSION:=$(shell echo $(SRCVERSION) | sed -e 's/-svn.*$$//' -e 's/\.dfsg.*$$//')
SVNVERSION:=$(shell echo $(DEBVERSION) | grep svn | sed -e 's/^.*svn//' -e 's/-[0-9]*$$//')
-SVNREP:=https://dev.openwengo.com/svn/openwengo/wengophone-ng/tags/release/2.1/2007-06-21-wengophone-2.1.1
+SVNREP:=https://dev.openwengo.com/svn/openwengo/wengophone-ng/tags/release/2.1/2007-08-22-wengophone-2.1.2
print-version:
@@echo "Debian version: $(DEBVERSION)"
More information about the Pkg-voip-commits
mailing list