[Pkg-voip-commits] r6584 - in /qutecom/trunk/debian: ./ patches/ patches/debian/ patches/generic/ patches/head/

cavedon-guest at alioth.debian.org cavedon-guest at alioth.debian.org
Fri Dec 26 17:04:19 UTC 2008 

Author: cavedon-guest
Date: Fri Dec 26 17:04:19 2008
New Revision: 6584

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=6584
Log:
qutecom:
* New upstream version.
* Remove all head and generic patches (applied upstream).
* Added patches:
  - generic/cmake-install-missing-endif.patch: fix syntax error in build
    makefiles.
  - generic/imwrapper-safe-reinit.patch: prevent race condition in libpurple
    re-initialization.
  - generic/ffmpeg-api-52.patch: fix compilation with new ffmpeg API.
  - head/cmake-swscale.patch: fix typo in build scripts
* Drop build dependency on libavformat-dev (no need for it, use newer
  lib swscale instead) and add debian/cmake-noavformat.patch in order not to
  look for that library during configuration.

Added:
    qutecom/trunk/debian/patches/debian/cmake-noavformat.patch
    qutecom/trunk/debian/patches/generic/cmake-install-missing-endif.patch
    qutecom/trunk/debian/patches/generic/ffmpeg-api-52.patch
    qutecom/trunk/debian/patches/generic/imwrapper-safe-reinit.patch
    qutecom/trunk/debian/patches/head/cmake-swscale.patch
Removed:
    qutecom/trunk/debian/patches/debian/cmake-svnrelease-from-debian-changelog.patch
    qutecom/trunk/debian/patches/generic/cmake-repo-revision-quotes.patch
    qutecom/trunk/debian/patches/generic/desktop-file-update.patch
    qutecom/trunk/debian/patches/generic/getcurrentdatetime.patch
    qutecom/trunk/debian/patches/generic/googlebreakpad-64bit.patch
    qutecom/trunk/debian/patches/generic/install-qutecom.patch
    qutecom/trunk/debian/patches/generic/libpurple_HAVE_GETADDRINFO.patch
    qutecom/trunk/debian/patches/head/video-fix-crash.video
Modified:
    qutecom/trunk/debian/changelog
    qutecom/trunk/debian/control
    qutecom/trunk/debian/patches/debian/cmake-force-fpic.patch
    qutecom/trunk/debian/patches/debian/remove-extra-copying-file.patch
    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=6584&op=diff
==============================================================================
--- qutecom/trunk/debian/changelog (original)
+++ qutecom/trunk/debian/changelog Fri Dec 26 17:04:19 2008
@@ -1,3 +1,20 @@
+qutecom (2.2~rc3.dfsg0-1) UNRELEASED; urgency=low
+
+  * New upstream version.
+  * Remove all head and generic patches (applied upstream).
+  * Added patches:
+    - generic/cmake-install-missing-endif.patch: fix syntax error in build
+      makefiles.
+    - generic/imwrapper-safe-reinit.patch: prevent race condition in libpurple
+      re-initialization.
+    - generic/ffmpeg-api-52.patch: fix compilation with new ffmpeg API.
+    - head/cmake-swscale.patch: fix typo in build scripts
+  * Drop build dependency on libavformat-dev (no need for it, use newer
+    lib swscale instead) and add debian/cmake-noavformat.patch in order not to
+    look for that library during configuration.
+
+ -- Ludovico Cavedon <ludovico.cavedon at gmail.com>  Fri, 26 Dec 2008 18:01:08 +0100
+
 qutecom (2.2~rc2.dfsg0-1) experimental; urgency=low
 
   [ Ludovico Cavedon ]

Modified: qutecom/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/control?rev=6584&op=diff
==============================================================================
--- qutecom/trunk/debian/control (original)
+++ qutecom/trunk/debian/control Fri Dec 26 17:04:19 2008
@@ -6,7 +6,6 @@
 Build-Depends: cdbs (>= 0.4.27), bzip2, debhelper (>= 4.1.0), quilt,
  patchutils (>= 0.2.25), cmake (>= 2.4.4), libqt4-dev (>= 4.1.4),
  libglib2.0-dev (>= 2.10.3), libavcodec-dev (>= 0.cvs20060823-3.1),
- libavformat-dev (>= 0.cvs20060823-3.1),
  libswscale-dev (>= 0.cvs20060823-3.1), libgnutls-dev (>= 1.2.9),
  libboost-serialization-dev (>= 1.34.0), libboost-thread-dev (>= 1.34.0),
  libboost-regex-dev (>= 1.34.0), libboost-signals-dev (>= 1.34.0),

Modified: qutecom/trunk/debian/patches/debian/cmake-force-fpic.patch
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/patches/debian/cmake-force-fpic.patch?rev=6584&op=diff
==============================================================================
--- qutecom/trunk/debian/patches/debian/cmake-force-fpic.patch (original)
+++ qutecom/trunk/debian/patches/debian/cmake-force-fpic.patch Fri Dec 26 17:04:19 2008
@@ -1,7 +1,7 @@
-Index: wengophone-2.1.0~rc2-svn10386/owbuild/owbuild/OWDefaultCompilerFlags.cmake
+Index: qutecom-2.2~rc3.dfsg0/owbuild/owbuild/OWDefaultCompilerFlags.cmake
 ===================================================================
---- wengophone-2.1.0~rc2-svn10386.orig/owbuild/owbuild/OWDefaultCompilerFlags.cmake	2007-04-03 14:54:16.000000000 +0000
-+++ wengophone-2.1.0~rc2-svn10386/owbuild/owbuild/OWDefaultCompilerFlags.cmake	2007-04-03 14:54:34.000000000 +0000
+--- qutecom-2.2~rc3.dfsg0.orig/owbuild/owbuild/OWDefaultCompilerFlags.cmake	2008-12-18 14:22:36.000000000 +0100
++++ qutecom-2.2~rc3.dfsg0/owbuild/owbuild/OWDefaultCompilerFlags.cmake	2008-12-20 14:24:47.000000000 +0100
 @@ -15,12 +15,10 @@
  
  # With -fPIC

Added: qutecom/trunk/debian/patches/debian/cmake-noavformat.patch
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/patches/debian/cmake-noavformat.patch?rev=6584&op=file
==============================================================================
--- qutecom/trunk/debian/patches/debian/cmake-noavformat.patch (added)
+++ qutecom/trunk/debian/patches/debian/cmake-noavformat.patch Fri Dec 26 17:04:19 2008
@@ -1,0 +1,38 @@
+Index: qutecom-2.2~rc3.dfsg0/owbuild/FindFFMPEG.cmake
+===================================================================
+--- qutecom-2.2~rc3.dfsg0.orig/owbuild/FindFFMPEG.cmake	2008-12-26 15:06:57.000000000 +0000
++++ qutecom-2.2~rc3.dfsg0/owbuild/FindFFMPEG.cmake	2008-12-26 15:08:01.000000000 +0000
+@@ -23,7 +23,7 @@
+   if (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4)
+     include(UsePkgConfig)
+     pkgconfig(libavcodec _AVCODEC_INCLUDEDIR _AVCODEC_LIBDIR _AVCODEC_LDFLAGS _AVCODEC_CFLAGS)
+-    pkgconfig(libavformat _AVFORMAT_INCLUDEDIR _AVFORMAT_LIBDIR _AVFORMAT_LDFLAGS _AVFORMAT_CFLAGS)
++#    pkgconfig(libavformat _AVFORMAT_INCLUDEDIR _AVFORMAT_LIBDIR _AVFORMAT_LDFLAGS _AVFORMAT_CFLAGS)
+     pkgconfig(libavutil _AVUTIL_INCLUDEDIR _AVUTIL_LIBDIR _AVUTIL_LDFLAGS _AVUTIL_CFLAGS)
+ #    pkgconfig(libpostproc _POSTPROC_INCLUDEDIR _POSTPROC_LIBDIR _POSTPROC_LDFLAGS _POSTPROC_CFLAGS)
+     pkgconfig(libswscale _SWSCALE_INCLUDEDIR _SWSCALE_LIBDIR _SWSCALE_LDFLAGS _SWSCALE_CFLAGS)
+@@ -32,7 +32,7 @@
+     find_package(PkgConfig)
+     if (PKG_CONFIG_FOUND)
+       pkg_check_modules(_AVCODEC libavcodec)
+-      pkg_check_modules(_AVFORMAT libavformat)
++#      pkg_check_modules(_AVFORMAT libavformat)
+       pkg_check_modules(_AVUTIL libavutil)
+ #      pkg_check_modules(_POSTPROC libpostproc)
+       pkg_check_modules(_SWSCALE libswscale)
+@@ -80,6 +80,7 @@
+   )
+   mark_as_advanced(AVUTIL_INCLUDE_DIR)
+ 
++  if (FALSE) 
+   find_path(AVFORMAT_INCLUDE_DIR
+     NAMES
+       avformat.h
+@@ -95,6 +96,7 @@
+     NO_DEFAULT_PATH
+   )
+   mark_as_advanced(AVFORMAT_INCLUDE_DIR)
++  endif (FALSE)
+ 
+   if (FALSE) 
+   find_path(POSTPROC_INCLUDE_DIR

Modified: qutecom/trunk/debian/patches/debian/remove-extra-copying-file.patch
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/patches/debian/remove-extra-copying-file.patch?rev=6584&op=diff
==============================================================================
--- qutecom/trunk/debian/patches/debian/remove-extra-copying-file.patch (original)
+++ qutecom/trunk/debian/patches/debian/remove-extra-copying-file.patch Fri Dec 26 17:04:19 2008
@@ -1,8 +1,8 @@
-Index: qutecom-2.2~rc2.dfsg0/wengophone/src/presentation/qt/CMakeLists-install-linux.txt
+Index: qutecom-2.2~rc3.dfsg0/wengophone/src/presentation/qt/CMakeLists-install-linux.txt
 ===================================================================
---- qutecom-2.2~rc2.dfsg0.orig/wengophone/src/presentation/qt/CMakeLists-install-linux.txt	2008-12-11 18:46:59.000000000 -0800
-+++ qutecom-2.2~rc2.dfsg0/wengophone/src/presentation/qt/CMakeLists-install-linux.txt	2008-12-11 18:47:06.000000000 -0800
-@@ -62,7 +62,3 @@
+--- qutecom-2.2~rc3.dfsg0.orig/wengophone/src/presentation/qt/CMakeLists-install-linux.txt	2008-12-21 10:42:49.000000000 +0000
++++ qutecom-2.2~rc3.dfsg0/wengophone/src/presentation/qt/CMakeLists-install-linux.txt	2008-12-21 10:42:56.000000000 +0000
+@@ -80,7 +80,3 @@
  		RENAME qutecom.png)
  endforeach(size)
  

Added: qutecom/trunk/debian/patches/generic/cmake-install-missing-endif.patch
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/patches/generic/cmake-install-missing-endif.patch?rev=6584&op=file
==============================================================================
--- qutecom/trunk/debian/patches/generic/cmake-install-missing-endif.patch (added)
+++ qutecom/trunk/debian/patches/generic/cmake-install-missing-endif.patch Fri Dec 26 17:04:19 2008
@@ -1,0 +1,20 @@
+Index: qutecom-2.2~rc3.dfsg0/wengophone/src/presentation/qt/CMakeLists-install-linux.txt
+===================================================================
+--- qutecom-2.2~rc3.dfsg0.orig/wengophone/src/presentation/qt/CMakeLists-install-linux.txt	2008-12-21 10:42:16.000000000 +0000
++++ qutecom-2.2~rc3.dfsg0/wengophone/src/presentation/qt/CMakeLists-install-linux.txt	2008-12-21 10:42:49.000000000 +0000
+@@ -29,13 +29,14 @@
+ 	install(PROGRAMS
+ 		${TMP_BUILD_DIR}/phapi-plugins/libphamrplugin.so
+ 	)
++endif (PHAPI_CODEC_AMR_SUPPORT)
+ 
+ if (PHAPI_CODEC_ILBC_SUPPORT)
+ 	install(PROGRAMS
+ 		${TMP_BUILD_DIR}/phapi-plugins/philbcplugin.so
+ 	)
++endif (PHAPI_CODEC_ILBC_SUPPORT)
+ 	
+-endif (PHAPI_CODEC_AMR_SUPPORT)
+ 
+ if (ENABLE_CRASHREPORT)
+ 	install(PROGRAMS

Added: qutecom/trunk/debian/patches/generic/ffmpeg-api-52.patch
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/patches/generic/ffmpeg-api-52.patch?rev=6584&op=file
==============================================================================
--- qutecom/trunk/debian/patches/generic/ffmpeg-api-52.patch (added)
+++ qutecom/trunk/debian/patches/generic/ffmpeg-api-52.patch Fri Dec 26 17:04:19 2008
@@ -1,0 +1,14 @@
+Index: qutecom-2.2~rc3.dfsg0/wifo/phapi/phcodec-avcodec-wrapper.c
+===================================================================
+--- qutecom-2.2~rc3.dfsg0.orig/wifo/phapi/phcodec-avcodec-wrapper.c	2008-12-18 13:22:36.000000000 +0000
++++ qutecom-2.2~rc3.dfsg0/wifo/phapi/phcodec-avcodec-wrapper.c	2008-12-26 15:17:43.000000000 +0000
+@@ -123,7 +123,9 @@
+ 	encoder_t->context->dct_algo = FF_DCT_AUTO;
+ 	encoder_t->context->idct_algo = FF_IDCT_AUTO;
+ 	encoder_t->context->opaque = opaque;
++#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
+ 	encoder_t->context->rtp_mode = 1;
++#endif
+ 	encoder_t->context->rtp_payload_size = 1000;
+ 	encoder_t->context->rtp_callback = phcodec_avcodec_video_rtp_callback;
+ 

Added: qutecom/trunk/debian/patches/generic/imwrapper-safe-reinit.patch
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/patches/generic/imwrapper-safe-reinit.patch?rev=6584&op=file
==============================================================================
--- qutecom/trunk/debian/patches/generic/imwrapper-safe-reinit.patch (added)
+++ qutecom/trunk/debian/patches/generic/imwrapper-safe-reinit.patch Fri Dec 26 17:04:19 2008
@@ -1,0 +1,91 @@
+Index: qutecom-2.2~rc3.dfsg0/wengophone/src/model/profile/UserProfileHandler.cpp
+===================================================================
+--- qutecom-2.2~rc3.dfsg0.orig/wengophone/src/model/profile/UserProfileHandler.cpp	2008-12-18 13:22:36.000000000 +0000
++++ qutecom-2.2~rc3.dfsg0/wengophone/src/model/profile/UserProfileHandler.cpp	2008-12-22 20:04:42.000000000 +0000
+@@ -48,6 +48,9 @@
+ }
+ 
+ UserProfileHandler::~UserProfileHandler() {
++}
++
++void UserProfileHandler::uninit() {
+ 	OWSAFE_DELETE(_desiredUserProfile);
+ 
+ 	{
+Index: qutecom-2.2~rc3.dfsg0/wengophone/src/model/profile/UserProfileHandler.h
+===================================================================
+--- qutecom-2.2~rc3.dfsg0.orig/wengophone/src/model/profile/UserProfileHandler.h	2008-12-18 13:22:36.000000000 +0000
++++ qutecom-2.2~rc3.dfsg0/wengophone/src/model/profile/UserProfileHandler.h	2008-12-22 19:44:13.000000000 +0000
+@@ -175,6 +175,11 @@
+ 		_autoSave = enable;
+ 	}
+ 
++	/**
++	 * Destroy the UserProfile and uninitialize external libraries
++	 */
++	void uninit();
++
+ private:
+ 
+ 	/**
+Index: qutecom-2.2~rc3.dfsg0/libs/imwrapper/src/purple/PurpleIMFactory.cpp
+===================================================================
+--- qutecom-2.2~rc3.dfsg0.orig/libs/imwrapper/src/purple/PurpleIMFactory.cpp	2008-12-18 13:22:36.000000000 +0000
++++ qutecom-2.2~rc3.dfsg0/libs/imwrapper/src/purple/PurpleIMFactory.cpp	2008-12-22 19:44:13.000000000 +0000
+@@ -240,8 +240,6 @@
+ 	PurpleWrapperInit();
+ }
+ 
+-static gboolean quit_timeout = 0;
+-
+ void PurpleIMFactory::PurpleQuitCallback() {
+ 	LOG_DEBUG("");
+ 	// Don't stop gMainLoop here: this is called when the user logoff, but we
+@@ -249,29 +247,16 @@
+ 	// running.
+ }
+ 
+-static gboolean terminate_cb(gpointer data)
+-{
+-	purple_connections_set_ui_ops(&null_conn_wg_ops);
+-	purple_accounts_set_ui_ops(&null_acc_wg_ops);
+-	purple_blist_set_ui_ops(&null_blist_wg_ops);
+-
+-	purple_core_quit();
+-
+-	if (quit_timeout > 0)
+-	{
+-		purple_timeout_remove(quit_timeout);
+-		quit_timeout = 0;
+-	}
+-
+-	return TRUE;
+-}
+-
+ void PurpleIMFactory::terminate() {
+ 	if (AccountMngr) {
+ 		AccountMngr->reset();
+ 	}
+ 	
+-	quit_timeout = purple_timeout_add(0, (GSourceFunc) terminate_cb, NULL);
++	purple_connections_set_ui_ops(&null_conn_wg_ops);
++	purple_accounts_set_ui_ops(&null_acc_wg_ops);
++	purple_blist_set_ui_ops(&null_blist_wg_ops);
++
++	purple_core_quit();
+ }
+ 
+ IMConnect * PurpleIMFactory::createIMConnect(IMAccount &account) {
+Index: qutecom-2.2~rc3.dfsg0/wengophone/src/model/WengoPhone.cpp
+===================================================================
+--- qutecom-2.2~rc3.dfsg0.orig/wengophone/src/model/WengoPhone.cpp	2008-12-22 20:09:18.000000000 +0000
++++ qutecom-2.2~rc3.dfsg0/wengophone/src/model/WengoPhone.cpp	2008-12-22 20:10:07.000000000 +0000
+@@ -116,6 +116,8 @@
+ 	LOG_DEBUG("model thread is ready for events");
+ 
+ 	runEvents();
++
++	_userProfileHandler->uninit();
+ }
+ 
+ void WengoPhone::terminate() {

Added: qutecom/trunk/debian/patches/head/cmake-swscale.patch
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/patches/head/cmake-swscale.patch?rev=6584&op=file
==============================================================================
--- qutecom/trunk/debian/patches/head/cmake-swscale.patch (added)
+++ qutecom/trunk/debian/patches/head/cmake-swscale.patch Fri Dec 26 17:04:19 2008
@@ -1,0 +1,13 @@
+Index: qutecom-2.2~rc3.dfsg0/owbuild/FindFFMPEG.cmake
+===================================================================
+--- qutecom-2.2~rc3.dfsg0.orig/owbuild/FindFFMPEG.cmake	2008-12-26 14:58:56.000000000 +0000
++++ qutecom-2.2~rc3.dfsg0/owbuild/FindFFMPEG.cmake	2008-12-26 14:59:05.000000000 +0000
+@@ -117,7 +117,7 @@
+     NAMES
+       swscale.h
+     PATHS
+-      ${_SWCALE_INCLUDEDIR}
++      ${_SWSCALE_INCLUDEDIR}
+       /usr/include
+       /usr/local/include
+       /opt/local/include

Modified: qutecom/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/patches/series?rev=6584&op=diff
==============================================================================
--- qutecom/trunk/debian/patches/series (original)
+++ qutecom/trunk/debian/patches/series Fri Dec 26 17:04:19 2008
@@ -1,10 +1,8 @@
+head/cmake-swscale.patch
 #generic/curl-openssl-mt-fix.patch
-head/video-fix-crash.video
-generic/getcurrentdatetime.patch
-generic/googlebreakpad-64bit.patch
-generic/install-qutecom.patch
-generic/cmake-repo-revision-quotes.patch
-generic/desktop-file-update.patch
-generic/libpurple_HAVE_GETADDRINFO.patch
+generic/cmake-install-missing-endif.patch
+generic/imwrapper-safe-reinit.patch
+generic/ffmpeg-api-52.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=6584&op=diff
==============================================================================
--- qutecom/trunk/debian/rules (original)
+++ qutecom/trunk/debian/rules Fri Dec 26 17:04:19 2008
@@ -39,7 +39,7 @@
 UPVERSION:=$(shell echo $(SRCVERSION) | sed -e 's/-svn.*$$//' -e 's/\.dfsg.*$$//')
 
 HGBRANCH:=qutecom-2.2
-HGTAG:=QuteCom-2.2-RC2
+HGTAG:=QuteCom-2.2-RC3
 
 print-version:
 	@@echo "Debian version:          $(DEBVERSION)"

More information about the Pkg-voip-commits mailing list