[Pkg-voip-commits] r7777 - in /qutecom/trunk/debian: changelog patches/generic/track-sipaccount-init.patch patches/head/fix-build-newer-ffmpeg.patch patches/series rules

cavedon-guest at alioth.debian.org cavedon-guest at alioth.debian.org
Wed Nov 11 09:20:37 UTC 2009 

Author: cavedon-guest
Date: Wed Nov 11 09:20:36 2009
New Revision: 7777

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7777
Log:
* Add generic/track-sipaccount-init.patch for preventing segfault when
  another qutecom is running. Closes: #550947
* Add head/fix-build-newer-ffmpeg.patch to avoid FTBFS with the newer ffmpeg
  libraries.
* Add correct support for "noopt" in DEB_BUILD_OPTIONS.

Added:
    qutecom/trunk/debian/patches/generic/track-sipaccount-init.patch
    qutecom/trunk/debian/patches/head/fix-build-newer-ffmpeg.patch
Modified:
    qutecom/trunk/debian/changelog
    qutecom/trunk/debian/patches/series
    qutecom/trunk/debian/rules

Modified: qutecom/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/changelog?rev=7777&op=diff
==============================================================================
--- qutecom/trunk/debian/changelog (original)
+++ qutecom/trunk/debian/changelog Wed Nov 11 09:20:36 2009
@@ -4,8 +4,13 @@
   * Raise depend on cmake to version 2.6 (needed for handling libqt-dbus).
   * Make Vcs-Browser point to the same location as Vcs-Svn.
   * Add wenogophone transitional package. Closes: #550147.
-
- -- Ludovico Cavedon <ludovico.cavedon at gmail.com>  Wed, 14 Oct 2009 20:53:18 -0700
+  * Add generic/track-sipaccount-init.patch for preventing segfault when
+    another qutecom is running. Closes: #550947
+  * Add head/fix-build-newer-ffmpeg.patch to avoid FTBFS with the newer ffmpeg
+    libraries.
+  * Add correct support for "noopt" in DEB_BUILD_OPTIONS.
+
+ -- Ludovico Cavedon <ludovico.cavedon at gmail.com>  Wed, 11 Nov 2009 01:21:14 -0800
 
 qutecom (2.2~rc3.hg396~dfsg1-2) unstable; urgency=low
 

Added: qutecom/trunk/debian/patches/generic/track-sipaccount-init.patch
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/patches/generic/track-sipaccount-init.patch?rev=7777&op=file
==============================================================================
--- qutecom/trunk/debian/patches/generic/track-sipaccount-init.patch (added)
+++ qutecom/trunk/debian/patches/generic/track-sipaccount-init.patch Wed Nov 11 09:20:36 2009
@@ -1,0 +1,55 @@
+Description: avoid calls to NetworkObserver in ~SipAccount() when SipAccount has not been initialzed
+Author: Ludovico cavedon <ludovico.cavedon at gmail.com>
+Bug-Debian: http://bugs.debian.org/550947
+Forwarded: http://trac.qutecom.com/ticket/165
+
+# HG changeset patch
+# User Ludovico cavedon <ludovico.cavedon at gmail.com>
+# Date 1257899623 28800
+# Node ID 2d714ab6a3f456f919add1d7d9b8913deaec3303
+# Parent  32faa7d90a062c1a37d319f7f8f585054a371364
+avoid calls to NetworkObserver in ~SipAccount() when SipAccount has not been initialzed
+
+diff -r 32faa7d90a06 -r 2d714ab6a3f4 wengophone/src/model/account/SipAccount.cpp
+--- a/wengophone/src/model/account/SipAccount.cpp	Sun Sep 27 16:24:36 2009 +0200
++++ b/wengophone/src/model/account/SipAccount.cpp	Tue Nov 10 16:33:43 2009 -0800
+@@ -48,6 +48,7 @@
+ 	_visibleName = "";
+ 	_voicemail = "123";
+ 	_enablePIM = true;
++	_initCalled = false;
+ 	_initSuccessful = false;
+ 
+ 	_discoveringNetwork = false;
+@@ -104,6 +105,10 @@
+ 
+ SipAccount::~SipAccount() {
+ 	Mutex::ScopedLock lock(_mutex);
++	
++	if(!_initCalled) {
++		return;
++	}
+ 
+ 	NetworkObserver::getInstance().connectionIsDownEvent -=
+ 		boost::bind(&SipAccount::connectionIsDownEventHandler, this, _1);
+@@ -184,6 +189,7 @@
+ void SipAccount::init() {
+ 	Mutex::ScopedLock lock(_mutex);
+ 
++	_initCalled = true;
+ 	_initSuccessful = false;
+ 
+ 	if (NetworkObserver::getInstance().isConnected()) {
+diff -r 32faa7d90a06 -r 2d714ab6a3f4 wengophone/src/model/account/SipAccount.h
+--- a/wengophone/src/model/account/SipAccount.h	Sun Sep 27 16:24:36 2009 +0200
++++ b/wengophone/src/model/account/SipAccount.h	Tue Nov 10 16:33:43 2009 -0800
+@@ -561,6 +561,9 @@
+ 
+ 	Timer _initTimer;
+ 
++	/** True if _init() has been called. */
++	bool _initCalled;
++
+ 	/** True if initialization has been successul. */
+ 	bool _initSuccessful;
+ 

Added: qutecom/trunk/debian/patches/head/fix-build-newer-ffmpeg.patch
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/patches/head/fix-build-newer-ffmpeg.patch?rev=7777&op=file
==============================================================================
--- qutecom/trunk/debian/patches/head/fix-build-newer-ffmpeg.patch (added)
+++ qutecom/trunk/debian/patches/head/fix-build-newer-ffmpeg.patch Wed Nov 11 09:20:36 2009
@@ -1,0 +1,71 @@
+Description: fix compilation error with latest ffmpeg libraries
+Origin: upstream, http://trac.qutecom.com/attachment/ticket/99/mac_ffmpeg.diff
+Bug: http://trac.qutecom.com/ticket/99
+
+diff -r b9d37dbd4b26 libs/pixertool/src/ffmpeg/ffmpeg-pixertool.c
+--- a/libs/pixertool/src/ffmpeg/ffmpeg-pixertool.c	Mon May 25 11:54:53 2009 +0200
++++ b/libs/pixertool/src/ffmpeg/ffmpeg-pixertool.c	Mon May 25 12:10:12 2009 +0200
+@@ -53,7 +53,7 @@
+ 	case PIX_FMT_RGB565:
+ 		palette = PIX_OSI_RGB565;
+ 		break;
+-	case PIX_FMT_RGBA32:
++	case PIX_FMT_RGBA:
+ 		palette = PIX_OSI_RGBA32;
+ 		break;
+ 	case PIX_FMT_YUV420P:
+@@ -62,7 +62,7 @@
+ 	case PIX_FMT_YUV422P:
+ 		palette = PIX_OSI_YUV422P;
+ 		break;
+-	case PIX_FMT_YUV422:
++	case PIX_FMT_YUYV422:
+ 		palette = PIX_OSI_YUY2;
+ 		break;
+ 	case PIX_FMT_YUV444P:
+@@ -98,7 +98,7 @@
+ 	case PIX_OSI_ARGB32:
+ 	case PIX_OSI_RGB32:
+ 	case PIX_OSI_RGBA32:
+-		palette = PIX_FMT_RGBA32;
++		palette = PIX_FMT_RGBA;
+ 		break;
+ 	case PIX_OSI_YUV420P:
+ 		palette = PIX_FMT_YUV420P;
+@@ -112,7 +112,7 @@
+ 	case PIX_OSI_YUV422:
+ 	case PIX_OSI_YUYV:
+ 	case PIX_OSI_YUY2:
+-		palette = PIX_FMT_YUV422;
++		palette = PIX_FMT_YUYV422;
+ 		break;
+ /* DOES not compile on MacOS X with current version of fink/ffmpeg (11/9/2006)
+ 	case PIX_OSI_UYVY:
+diff -r b9d37dbd4b26 libs/pixertool/src/pixertool.cpp
+--- a/libs/pixertool/src/pixertool.cpp	Mon May 25 11:54:53 2009 +0200
++++ b/libs/pixertool/src/pixertool.cpp	Mon May 25 12:10:12 2009 +0200
+@@ -79,11 +79,11 @@
+ }
+ 
+ unsigned pix_size(pixosi pix, unsigned width, unsigned height) {
+-	return avpicture_get_size(pix_ffmpeg_from_pix_osi(pix), width, height);
++	return avpicture_get_size((PixelFormat)pix_ffmpeg_from_pix_osi(pix), width, height);
+ }
+ 
+ const char *pix_get_fmt_name(int pixfmt) {
+-  return avcodec_get_pix_fmt_name(pixfmt);
++  return avcodec_get_pix_fmt_name((PixelFormat)pixfmt);
+ }
+ 
+ pixerrorcode pix_convert(int flags, piximage * img_dst, piximage * img_src) {
+@@ -112,8 +112,8 @@
+ 
+ 	//int len_target = pix_size(img_dst->palette, img_src->width, img_src->height);
+ 
+-	enum PixelFormat pix_fmt_source = pix_ffmpeg_from_pix_osi(img_src->palette);
+-	enum PixelFormat pix_fmt_target = pix_ffmpeg_from_pix_osi(img_dst->palette);
++	enum PixelFormat pix_fmt_source = (PixelFormat)pix_ffmpeg_from_pix_osi(img_src->palette);
++	enum PixelFormat  pix_fmt_target = (PixelFormat)pix_ffmpeg_from_pix_osi(img_dst->palette);
+ 
+ 	AVPicture avp_source, avp_target;
+ 	avpicture_fill(&avp_source,  buf_source, pix_fmt_source, img_src->width, img_src->height);

Modified: qutecom/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/patches/series?rev=7777&op=diff
==============================================================================
--- qutecom/trunk/debian/patches/series (original)
+++ qutecom/trunk/debian/patches/series Wed Nov 11 09:20:36 2009
@@ -1,5 +1,7 @@
+head/fix-build-newer-ffmpeg.patch
 #generic/curl-openssl-mt-fix.patch
 generic/google-breakpad-gcc44.patch
+generic/track-sipaccount-init.patch
 debian/cmake-noavformat.patch
 debian/remove-extra-copying-file.patch
 debian/cmake-force-fpic.patch

Modified: qutecom/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/rules?rev=7777&op=diff
==============================================================================
--- qutecom/trunk/debian/rules (original)
+++ qutecom/trunk/debian/rules Wed Nov 11 09:20:36 2009
@@ -9,8 +9,13 @@
 
 DEB_INSTALL_DOCS_qutecom := $(CURDIR)/wengophone/AUTHORS
 
+ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
+	DEB_CMAKE_EXTRA_FLAGS += -DCMAKE_BUILD_TYPE=Debug
+else
+	DEB_CMAKE_EXTRA_FLAGS += -DCMAKE_BUILD_TYPE=RelWithDebInfo
+endif
+
 DEB_CMAKE_EXTRA_FLAGS := -DQT_UIC_EXECUTABLE=/usr/bin/uic-qt4 \
-	-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 	-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON \
 	-DCMAKE_INSTALL_RPATH=/usr/lib/qutecom \
 	-DCMAKE_SKIP_RPATH=FALSE \

More information about the Pkg-voip-commits mailing list