[Pkg-voip-commits] r6889 - in /qutecom/trunk/debian: changelog compat control get-orig-source.sh patches/generic/pixelfromat.patch patches/series rules

cavedon-guest at alioth.debian.org cavedon-guest at alioth.debian.org
Fri Mar 20 06:06:59 UTC 2009 

Author: cavedon-guest
Date: Fri Mar 20 06:06:58 2009
New Revision: 6889

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=6889
Log:
* Use system libpurple.
* Updating Standards-Version to 3.8.1.
* Add patch generic/pixelformat.patch: compilation fix, required by newer
  ffmpeg libs.
* Update debhelper compatibility to 7.

Added:
    qutecom/trunk/debian/patches/generic/pixelfromat.patch
Modified:
    qutecom/trunk/debian/changelog
    qutecom/trunk/debian/compat
    qutecom/trunk/debian/control
    qutecom/trunk/debian/get-orig-source.sh
    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=6889&op=diff
==============================================================================
--- qutecom/trunk/debian/changelog (original)
+++ qutecom/trunk/debian/changelog Fri Mar 20 06:06:58 2009
@@ -1,10 +1,15 @@
-qutecom (2.2~rc3.dfsg1-5) UNRELEASED; urgency=low
+qutecom (2.2~rc3.dfsg2-1) UNRELEASED; urgency=low
 
   * Use newer Boost libraries.
   * Update README.Debian about video support. 
   * Add generic/boost_1_37.patch for correct detection of boost libraries.
-
- -- Ludovico Cavedon <ludovico.cavedon at gmail.com>  Mon, 16 Feb 2009 14:16:17 -0800
+  * Use system libpurple.
+  * Updating Standards-Version to 3.8.1.
+  * Add patch generic/pixelformat.patch: compilation fix, required by newer
+    ffmpeg libs.
+  * Update debhelper compatibility to 7.
+
+ -- Ludovico Cavedon <ludovico.cavedon at gmail.com>  Thu, 19 Mar 2009 21:17:09 -0700
 
 qutecom (2.2~rc3.dfsg1-4) experimental; urgency=low
 

Modified: qutecom/trunk/debian/compat
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/compat?rev=6889&op=diff
==============================================================================
--- qutecom/trunk/debian/compat (original)
+++ qutecom/trunk/debian/compat Fri Mar 20 06:06:58 2009
@@ -1,1 +1,1 @@
-4
+7

Modified: qutecom/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/control?rev=6889&op=diff
==============================================================================
--- qutecom/trunk/debian/control (original)
+++ qutecom/trunk/debian/control Fri Mar 20 06:06:58 2009
@@ -9,13 +9,13 @@
  libswscale-dev (>= 0.cvs20060823-3.1), libgnutls-dev (>= 1.2.9),
  libboost-serialization1.37-dev, libboost-thread1.37-dev,
  libboost-regex1.37-dev, libboost-signals1.37-dev,
- libboost-program-options1.37-dev, uuid-dev,
+ libboost-program-options1.37-dev, uuid-dev, libpurple-dev (>= 2.5.5),
  libasound2-dev (>= 1.0.11), libspeex-dev (>= 1.1.12), libssl-dev (>= 0.9.8a),
  libxml2-dev (>= 2.6.24), libsamplerate0-dev (>= 0.1.2),
  libsndfile1-dev (>= 1.0.12), libcurl4-openssl-dev (>= 7.16.1),
- dpkg-dev (>= 1.13.19), libx11-dev, python-dev
+ dpkg-dev (>= 1.13.19), libx11-dev, python-dev, debhelper (>= 7)
 Build-Conflicts: qt3-dev-tools
-Standards-Version: 3.8.0
+Standards-Version: 3.8.1
 Homepage: http://www.qutecom.org/
 Vcs-Svn: svn://svn.debian.org/pkg-voip/qutecom/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/qutecom/?op=log
@@ -50,6 +50,7 @@
 
 Package: qutecom-dbg
 Architecture: any
+Section: debug
 Priority: extra
 Depends: qutecom (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Description: SIP-based software telephone with video and chat features (debug files)

Modified: qutecom/trunk/debian/get-orig-source.sh
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/get-orig-source.sh?rev=6889&op=diff
==============================================================================
--- qutecom/trunk/debian/get-orig-source.sh (original)
+++ qutecom/trunk/debian/get-orig-source.sh Fri Mar 20 06:06:58 2009
@@ -106,7 +106,7 @@
 purge_3rdparty $destdir/libs/3rdparty/gaim
 
 # Remove libpurple code
-#purge_3rdparty $destdir/libs/3rdparty/libpurple
+purge_3rdparty $destdir/libs/3rdparty/libpurple
 
 # Remove coredumper code
 purge_3rdparty $destdir/libs/3rdparty/coredumper

Added: qutecom/trunk/debian/patches/generic/pixelfromat.patch
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/patches/generic/pixelfromat.patch?rev=6889&op=file
==============================================================================
--- qutecom/trunk/debian/patches/generic/pixelfromat.patch (added)
+++ qutecom/trunk/debian/patches/generic/pixelfromat.patch Fri Mar 20 06:06:58 2009
@@ -1,0 +1,54 @@
+Fix type of pix_fmt_target, required by newer ffmpeg libs
+
+Index: qutecom-2.2~rc3.dfsg2/libs/pixertool/src/pixertool.cpp
+===================================================================
+--- qutecom-2.2~rc3.dfsg2.orig/libs/pixertool/src/pixertool.cpp	2009-03-20 03:46:59.000000000 +0000
++++ qutecom-2.2~rc3.dfsg2/libs/pixertool/src/pixertool.cpp	2009-03-20 03:55:57.000000000 +0000
+@@ -112,8 +112,8 @@
+ 
+ 	//int len_target = pix_size(img_dst->palette, img_src->width, img_src->height);
+ 
+-	int pix_fmt_source = pix_ffmpeg_from_pix_osi(img_src->palette);
+-	int pix_fmt_target = pix_ffmpeg_from_pix_osi(img_dst->palette);
++	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);
+ 
+ 	AVPicture avp_source, avp_target;
+ 	avpicture_fill(&avp_source,  buf_source, pix_fmt_source, img_src->width, img_src->height);
+Index: qutecom-2.2~rc3.dfsg2/libs/pixertool/src/ffmpeg/ffmpeg-pixertool.c
+===================================================================
+--- qutecom-2.2~rc3.dfsg2.orig/libs/pixertool/src/ffmpeg/ffmpeg-pixertool.c	2009-03-20 03:46:59.000000000 +0000
++++ qutecom-2.2~rc3.dfsg2/libs/pixertool/src/ffmpeg/ffmpeg-pixertool.c	2009-03-20 03:56:32.000000000 +0000
+@@ -79,8 +79,8 @@
+ 	return palette;
+ }
+ 
+-int pix_ffmpeg_from_pix_osi(pixosi pix) {
+-	int palette;
++enum PixelFormat pix_ffmpeg_from_pix_osi(pixosi pix) {
++	enum PixelFormat palette;
+ 
+ 	switch(pix) {
+ 	case PIX_OSI_BGR24:
+Index: qutecom-2.2~rc3.dfsg2/libs/pixertool/include/pixertool/ffmpeg-pixertool.h
+===================================================================
+--- qutecom-2.2~rc3.dfsg2.orig/libs/pixertool/include/pixertool/ffmpeg-pixertool.h	2009-03-20 03:46:59.000000000 +0000
++++ qutecom-2.2~rc3.dfsg2/libs/pixertool/include/pixertool/ffmpeg-pixertool.h	2009-03-20 03:49:40.000000000 +0000
+@@ -35,6 +35,8 @@
+ }
+ #endif
+ 
++#include <avutil.h>
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+@@ -59,7 +61,7 @@
+  * @param pix palette identifier to convert
+  * @return equivalent ffmpeg identifier
+  */
+-PIXERTOOL_API int pix_ffmpeg_from_pix_osi(pixosi pix);
++PIXERTOOL_API enum PixelFormat pix_ffmpeg_from_pix_osi(pixosi pix);
+ 
+ /**
+  * Fills an AVPicture with a piximage.

Modified: qutecom/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/patches/series?rev=6889&op=diff
==============================================================================
--- qutecom/trunk/debian/patches/series (original)
+++ qutecom/trunk/debian/patches/series Fri Mar 20 06:06:58 2009
@@ -5,6 +5,7 @@
 generic/ffmpeg-api-52.patch
 generic/wengophone-thread-destruction.patch
 generic/boost_1_37.patch
+generic/pixelfromat.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=6889&op=diff
==============================================================================
--- qutecom/trunk/debian/rules (original)
+++ qutecom/trunk/debian/rules Fri Mar 20 06:06:58 2009
@@ -5,7 +5,7 @@
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 DEB_DESTDIR=$(CURDIR)/debian/qutecom
-DEB_DH_STRIP_ARGS := --dbg-package=qutecom
+DEB_DH_STRIP_ARGS := --dbg-package=qutecom-dbg
 
 DEB_INSTALL_DOCS_qutecom := $(CURDIR)/wengophone/AUTHORS
 
@@ -19,6 +19,7 @@
 	-DSPEEX_INTERNAL=OFF \
 	-DSAMPLERATE_INTERNAL=OFF \
 	-DCURL_INTERNAL=OFF \
+	-DLIBPURPLE_INTERNAL=OFF \
 	-DPHAPI_VIDEO_SUPPORT=ON \
 	-DHAVE_SWSCALE=1

More information about the Pkg-voip-commits mailing list