The attatched patch makes the package build but i'm not sure if it's
correct (and I don't have things set up to test it). it contains two
dpatches, a minor fix to debian/rules to fix a ftbfs if built twice in a
row issue that I ran into while investigating and a tightening of
build-depends in debian/control.
fix_ffmpeg_includes.dpatch is trivial/obvious stuff
dont_set_rtp_mode.dpatch i'm not so sure about. Other projects that use
ffmpeg seem to have simply removed the line that sets this but i'm not
sure what if any impract this has.
diff -urN linphone-2.1.1/debian/control linphone-2.1.1.new/debian/control
--- linphone-2.1.1/debian/control 2009-03-06 19:09:29.000000000 +0000
+++ linphone-2.1.1.new/debian/control 2009-03-06 18:59:48.000000000 +0000
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian VoIP Team <[email protected]>
Uploaders: Samuel Mimram <[email protected]>, Kilian Krause <[email protected]>, Faidon Liambotis <[email protected]>
-Build-Depends: debhelper (>= 4.0.0), dpkg-dev (>= 1.13.19), autoconf, automake1.9, autotools-dev, libtool, pkg-config, libglib2.0-dev, libosip2-dev (>= 3.0.3-2), libexosip2-dev (>= 3.0.3-2), libasound2-dev, libjack0.100.0-dev, libspeex-dev (>= 1.1.12), libspeexdsp-dev, libsamplerate0-dev, libxml-parser-perl, gtk-doc-tools, docbook-utils, libgnomeui-dev, libgnome2-dev, gnome-applets, libpanel-applet2-dev, dpatch, libavcodec-dev, libvorbis-dev, libreadline5-dev, libsdl1.2-dev, libartsc0-dev, libswscale-dev, doxygen
+Build-Depends: debhelper (>= 4.0.0), dpkg-dev (>= 1.13.19), autoconf, automake1.9, autotools-dev, libtool, pkg-config, libglib2.0-dev, libosip2-dev (>= 3.0.3-2), libexosip2-dev (>= 3.0.3-2), libasound2-dev, libjack0.100.0-dev, libspeex-dev (>= 1.1.12), libspeexdsp-dev, libsamplerate0-dev, libxml-parser-perl, gtk-doc-tools, docbook-utils, libgnomeui-dev, libgnome2-dev, gnome-applets, libpanel-applet2-dev, dpatch, libavcodec-dev (>=3:0.svn20090204-3 ), libvorbis-dev, libreadline5-dev, libsdl1.2-dev, libartsc0-dev, libswscale-dev (>= 3:0.svn20090204-3), doxygen
Standards-Version: 3.7.3
Homepage: http://www.linphone.org/
Vcs-Svn: svn://svn.debian.org/pkg-voip/linphone/trunk/
diff -urN linphone-2.1.1/debian/patches/00list linphone-2.1.1.new/debian/patches/00list
--- linphone-2.1.1/debian/patches/00list 2009-03-06 19:09:29.000000000 +0000
+++ linphone-2.1.1.new/debian/patches/00list 2009-03-06 19:02:09.000000000 +0000
@@ -1,2 +1,4 @@
hide_manual_menu
fix_desktop_section
+fix_ffmpeg_includes
+dont_set_rtp_mode
diff -urN linphone-2.1.1/debian/patches/dont_set_rtp_mode.dpatch linphone-2.1.1.new/debian/patches/dont_set_rtp_mode.dpatch
--- linphone-2.1.1/debian/patches/dont_set_rtp_mode.dpatch 1970-01-01 00:00:00.000000000 +0000
+++ linphone-2.1.1.new/debian/patches/dont_set_rtp_mode.dpatch 2009-03-06 19:07:27.000000000 +0000
@@ -0,0 +1,22 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## dont_set_rtp_mode.dpatch by peter green <[email protected]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: don't set rtp_mode since it no longer seems to exist, this seems to be
+## DP: what others who have run into the error with other packages but i'm not
+## DP: sure it is correct
+
+...@dpatch@
+
+diff -ur linphone-2.1.1/mediastreamer2/src/videoenc.c linphone-2.1.1.new/mediastreamer2/src/videoenc.c
+--- linphone-2.1.1/mediastreamer2/src/videoenc.c 2008-01-24 09:08:46.000000000 +0000
++++ linphone-2.1.1.new/mediastreamer2/src/videoenc.c 2009-03-06 18:29:34.000000000 +0000
+@@ -235,7 +235,7 @@
+ AVCodecContext *c=&s->av_context;
+ /* we don't use the rtp_callback but use rtp_mode that forces ffmpeg to insert
+ Start Codes as much as possible in the bitstream */
+- c->rtp_mode = 1;
++ //c->rtp_mode = 1;
+ c->rtp_payload_size = s->mtu/2;
+ if (s->profile==0){
+ s->codec=CODEC_ID_H263;
diff -urN linphone-2.1.1/debian/patches/fix_ffmpeg_includes.dpatch linphone-2.1.1.new/debian/patches/fix_ffmpeg_includes.dpatch
--- linphone-2.1.1/debian/patches/fix_ffmpeg_includes.dpatch 1970-01-01 00:00:00.000000000 +0000
+++ linphone-2.1.1.new/debian/patches/fix_ffmpeg_includes.dpatch 2009-03-06 19:06:47.000000000 +0000
@@ -0,0 +1,92 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix_ffmpeg_includes by peter green <[email protected]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: fix ffmpeg include locations
+
+...@dpatch@
+
+diff -ur linphone-2.1.1/mediastreamer2/src/nowebcam.c linphone-2.1.1.new/mediastreamer2/src/nowebcam.c
+--- linphone-2.1.1/mediastreamer2/src/nowebcam.c 2007-12-14 13:37:56.000000000 +0000
++++ linphone-2.1.1.new/mediastreamer2/src/nowebcam.c 2009-03-06 18:43:01.000000000 +0000
+@@ -1,8 +1,8 @@
+ #include "mediastreamer2/mscommon.h"
+ #include "mediastreamer2/msvideo.h"
+
+-#include <ffmpeg/avcodec.h>
+-#include <ffmpeg/swscale.h>
++#include <libavcodec/avcodec.h>
++#include <libswscale/swscale.h>
+
+
+ #ifdef HAVE_CONFIG_H
+diff -ur linphone-2.1.1/mediastreamer2/src/pixconv.c linphone-2.1.1.new/mediastreamer2/src/pixconv.c
+--- linphone-2.1.1/mediastreamer2/src/pixconv.c 2007-11-16 14:29:43.000000000 +0000
++++ linphone-2.1.1.new/mediastreamer2/src/pixconv.c 2009-03-06 18:31:05.000000000 +0000
+@@ -20,8 +20,8 @@
+ #include "mediastreamer2/msfilter.h"
+ #include "mediastreamer2/msvideo.h"
+
+-#include <ffmpeg/avcodec.h>
+-#include <ffmpeg/swscale.h>
++#include <libavcodec/avcodec.h>
++#include <libswscale/swscale.h>
+
+ extern void ms_ffmpeg_check_init();
+
+diff -ur linphone-2.1.1/mediastreamer2/src/sizeconv.c linphone-2.1.1.new/mediastreamer2/src/sizeconv.c
+--- linphone-2.1.1/mediastreamer2/src/sizeconv.c 2008-01-13 20:56:56.000000000 +0000
++++ linphone-2.1.1.new/mediastreamer2/src/sizeconv.c 2009-03-06 18:36:55.000000000 +0000
+@@ -21,8 +21,8 @@
+ #include "mediastreamer2/msticker.h"
+ #include "mediastreamer2/msvideo.h"
+
+-#include <ffmpeg/avcodec.h>
+-#include <ffmpeg/swscale.h>
++#include <libavcodec/avcodec.h>
++#include <libswscale/swscale.h>
+
+ typedef struct SizeConvState{
+ MSVideoSize target_vsize;
+diff -ur linphone-2.1.1/mediastreamer2/src/videodec.c linphone-2.1.1.new/mediastreamer2/src/videodec.c
+--- linphone-2.1.1/mediastreamer2/src/videodec.c 2007-11-15 13:51:32.000000000 +0000
++++ linphone-2.1.1.new/mediastreamer2/src/videodec.c 2009-03-06 18:30:27.000000000 +0000
+@@ -17,8 +17,8 @@
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+-#include <ffmpeg/avcodec.h>
+-#include <ffmpeg/swscale.h>
++#include <libavcodec/avcodec.h>
++#include <libswscale/swscale.h>
+
+ #include "mediastreamer2/msfilter.h"
+ #include "mediastreamer2/msvideo.h"
+diff -ur linphone-2.1.1/mediastreamer2/src/videoenc.c linphone-2.1.1.new/mediastreamer2/src/videoenc.c
+--- linphone-2.1.1/mediastreamer2/src/videoenc.c 2008-01-24 09:08:46.000000000 +0000
++++ linphone-2.1.1.new/mediastreamer2/src/videoenc.c 2009-03-06 18:29:34.000000000 +0000
+@@ -17,7 +17,7 @@
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+-#include <ffmpeg/avcodec.h>
++#include <libavcodec/avcodec.h>
+ #include "mediastreamer2/msfilter.h"
+ #include "mediastreamer2/msvideo.h"
+ #include "mediastreamer2/msticker.h"
+diff -ur linphone-2.1.1/mediastreamer2/src/videoout.c linphone-2.1.1.new/mediastreamer2/src/videoout.c
+--- linphone-2.1.1/mediastreamer2/src/videoout.c 2008-01-25 14:41:12.000000000 +0000
++++ linphone-2.1.1.new/mediastreamer2/src/videoout.c 2009-03-06 18:48:56.000000000 +0000
+@@ -21,9 +21,9 @@
+ #include "mediastreamer2/msvideo.h"
+ #include "mediastreamer2/msvideoout.h"
+
+-#include <ffmpeg/avcodec.h>
+-#include <ffmpeg/swscale.h>
+-#include <ffmpeg/avutil.h>
++#include <libavcodec/avcodec.h>
++#include <libswscale/swscale.h>
++#include <libavutil/avutil.h>
+
+ static int video_out_handle_resize(MSFilter *f, void *arg);
+
diff -urN linphone-2.1.1/debian/rules linphone-2.1.1.new/debian/rules
--- linphone-2.1.1/debian/rules 2009-03-06 19:09:29.000000000 +0000
+++ linphone-2.1.1.new/debian/rules 2009-03-06 18:59:44.000000000 +0000
@@ -87,6 +87,7 @@
rm -f po/.intltool-merge-cache po/Makefile.in po/Makefile po/POTFILES po/*.gmo
rm -rf share/C/manual share/fr/manual share/it/manual share/ja/manual
rm -rf support/.deps support/Makefile
+ rm -rf oRTP/doc
dh_clean
