Hello community, here is the log from the commit of package linphone for openSUSE:Factory checked in at 2012-10-24 07:13:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/linphone (Old) and /work/SRC/openSUSE:Factory/.linphone.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "linphone", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/linphone/linphone.changes 2012-05-31 17:06:55.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.linphone.new/linphone.changes 2012-10-24 07:13:19.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Oct 12 12:04:14 UTC 2012 - [email protected] + +- added video support (disabled by default), to enable need to rebuild "with video" +- modify patch linphone-v4l (ffmpeg API changed) +- added linphone-ffmpeg.patch (ffmpeg API changed) +------------------------------------------------------------------- New: ---- linphone-ffmpeg.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linphone.spec ++++++ --- /var/tmp/diff_new_pack.hvacCZ/_old 2012-10-24 07:13:21.000000000 +0200 +++ /var/tmp/diff_new_pack.hvacCZ/_new 2012-10-24 07:13:21.000000000 +0200 @@ -18,7 +18,7 @@ Name: linphone Version: 3.5.2 -Release: 0 +Release: 39.23 Summary: Web Phone License: GPL-2.0+ Group: Productivity/Networking/Other @@ -27,6 +27,7 @@ Source1: %{name}-manual.tar.bz2 #FIX-FOR-UPSTREAM port linux/videodev.h to libv4l-videodev.h Patch1: linphone-v4l.patch +Patch2: linphone-ffmpeg.patch BuildRequires: gcc-c++ %if 0%{?suse_version} >= 1130 BuildRequires: pkgconfig(gnutls) @@ -58,6 +59,12 @@ BuildRequires: translation-update-upstream BuildRequires: update-desktop-files BuildRequires: pkgconfig(libglade-2.0) +# Video support - disabled by default due to patent issues +%bcond_with video +%if %{with video} +BuildRequires: libffmpeg-devel +BuildRequires: libXv-devel +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build #NoSource: 0 @@ -79,6 +86,10 @@ Requires: libosip2-devel Requires: speex-devel Requires: pkgconfig(glib-2.0) +%if %{with video} +Requires: libffmpeg-devel +Requires: libXv-devel +%endif %description devel Linphone is a Web phone with a GNOME interface. It lets you make @@ -92,6 +103,7 @@ %setup -q %if 0%{?suse_version} >= 1210 %patch1 -p1 +%patch2 -p1 %endif translation-update-upstream find -name "CVS" -type d -exec rm -Rfv "{}" "+" @@ -114,8 +126,10 @@ --disable-rpath \ --disable-silent-rules \ --disable-static \ - --disable-video \ --disable-strict \ +%if !%{with video} + --disable-video \ +%endif --enable-portaudio # future use, now in d:l:c # --enable-external-ortp ++++++ linphone-ffmpeg.patch ++++++ diff -urN linphone-3.5.2.orig/mediastreamer2/src/h264dec.c linphone-3.5.2/mediastreamer2/src/h264dec.c --- linphone-3.5.2.orig/mediastreamer2/src/h264dec.c 2012-02-22 18:54:58.000000000 +0700 +++ linphone-3.5.2/mediastreamer2/src/h264dec.c 2012-10-11 09:29:58.229247989 +0700 @@ -44,7 +44,6 @@ static void ffmpeg_init(){ static bool_t done=FALSE; if (!done){ - avcodec_init(); avcodec_register_all(); done=TRUE; } diff -urN linphone-3.5.2.orig/mediastreamer2/src/videoenc.c linphone-3.5.2/mediastreamer2/src/videoenc.c --- linphone-3.5.2.orig/mediastreamer2/src/videoenc.c 2012-02-22 18:54:58.000000000 +0700 +++ linphone-3.5.2/mediastreamer2/src/videoenc.c 2012-10-11 09:36:46.770805574 +0700 @@ -37,6 +37,13 @@ #define RATE_CONTROL_MARGIN 15000 /*bits/second*/ +#ifndef CODEC_FLAG_H263P_UMV +#define CODEC_FLAG_H263P_UMV 0x02000000 +#endif +#ifndef CODEC_FLAG_H263P_SLICE_STRUCT +#define CODEC_FLAG_H263P_SLICE_STRUCT 0x10000000 +#endif + static bool_t avcodec_initialized=FALSE; #ifdef ENABLE_LOG_FFMPEG @@ -53,7 +60,6 @@ void ms_ffmpeg_check_init(){ if(!avcodec_initialized){ - avcodec_init(); avcodec_register_all(); avcodec_initialized=TRUE; #ifdef ENABLE_LOG_FFMPEG @@ -372,7 +378,7 @@ // assume video size is CIF or QCIF if (context->width == 352 && context->height == 288) header->b_wptr[1] = 0x60; else header->b_wptr[1] = 0x40; - if (context->coded_frame->pict_type != FF_I_TYPE) header->b_wptr[1] |= 0x10; + if (context->coded_frame->pict_type != AV_PICTURE_TYPE_I) header->b_wptr[1] |= 0x10; header->b_wptr += 4; header->b_cont = *packet; *packet = header; @@ -779,7 +785,7 @@ s->req_vfu=TRUE; } if (s->req_vfu){ - pict.pict_type=FF_I_TYPE; + pict.pict_type=AV_PICTURE_TYPE_I; s->req_vfu=FALSE; } comp_buf->b_rptr=comp_buf->b_wptr=comp_buf->b_datap->db_base; @@ -799,7 +805,7 @@ if (s->framenum==1){ video_starter_first_frame (&s->starter,f->ticker->time); } - if (c->coded_frame->pict_type==FF_I_TYPE){ + if (c->coded_frame->pict_type==AV_PICTURE_TYPE_I){ ms_message("Emitting I-frame"); } comp_buf->b_wptr+=error; ++++++ linphone-v4l.patch ++++++ --- /var/tmp/diff_new_pack.hvacCZ/_old 2012-10-24 07:13:21.000000000 +0200 +++ /var/tmp/diff_new_pack.hvacCZ/_new 2012-10-24 07:13:21.000000000 +0200 @@ -1,6 +1,6 @@ diff -urN linphone-3.5.2.orig/mediastreamer2/configure.ac linphone-3.5.2/mediastreamer2/configure.ac ---- linphone-3.5.2.orig/mediastreamer2/configure.ac 2012-05-16 14:53:10.347774888 +0800 -+++ linphone-3.5.2/mediastreamer2/configure.ac 2012-05-16 15:01:19.443660348 +0800 +--- linphone-3.5.2.orig/mediastreamer2/configure.ac 2012-10-11 09:22:13.545254214 +0700 ++++ linphone-3.5.2/mediastreamer2/configure.ac 2012-10-11 09:23:08.812253473 +0700 @@ -625,8 +625,8 @@ AC_SUBST(PACKAGE_DATA_DIR) @@ -13,8 +13,8 @@ else found_v4l1=no diff -urN linphone-3.5.2.orig/mediastreamer2/src/msv4l.c linphone-3.5.2/mediastreamer2/src/msv4l.c ---- linphone-3.5.2.orig/mediastreamer2/src/msv4l.c 2012-05-16 14:53:10.350774850 +0800 -+++ linphone-3.5.2/mediastreamer2/src/msv4l.c 2012-05-16 15:02:29.402785738 +0800 +--- linphone-3.5.2.orig/mediastreamer2/src/msv4l.c 2012-10-11 09:22:13.540254214 +0700 ++++ linphone-3.5.2/mediastreamer2/src/msv4l.c 2012-10-11 09:24:25.505252447 +0700 @@ -30,7 +30,7 @@ #include <string.h> #include <sys/mman.h> @@ -24,3 +24,13 @@ #ifdef HAVE_LINUX_VIDEODEV2_H #include <linux/videodev2.h> #endif +@@ -48,6 +48,9 @@ + /* Set enable workaround for bugs, bitfield */ + #define VIDIOCQCSCOMPATIBLE _IOWR('v',QC_IOCTLBASE+10,int) + ++#ifndef BASE_VIDIOCPRIVATE ++#define BASE_VIDIOCPRIVATE 192 ++#endif + #ifndef VIDIOSFPS + #define VIDIOSFPS _IOW('v',BASE_VIDIOCPRIVATE+20, int) + #endif -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
