[Pkg-voip-commits] r10205 - in /linphone/trunk/debian: changelog patches/kfreebsd.patch patches/series

[msp at alioth.debian.org]

Author: msp
Date: Sun May 26 00:55:06 2013
New Revision: 10205

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=10205
Log:
Fix "kFreeBSD support" patch from Christoph Egger (Closes: #688182)

Added:
    linphone/trunk/debian/patches/kfreebsd.patch
Modified:
    linphone/trunk/debian/changelog
    linphone/trunk/debian/patches/series

Modified: linphone/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/linphone/trunk/debian/changelog?rev=10205&op=diff
==============================================================================
--- linphone/trunk/debian/changelog (original)
+++ linphone/trunk/debian/changelog Sun May 26 00:55:06 2013
@@ -6,6 +6,7 @@
   * Fix " Media encryption" (Closes: #671815)
     - Include add-zrtp-to-ortp-dependencies.patch
   * Add Build-Depends: libglew-dev
+  * Fix "kFreeBSD support" patch from Christoph Egger (Closes: #688182)
 
  -- Mark Purcell <msp at debian.org>  Mon, 20 May 2013 22:02:18 +1000
 

Added: linphone/trunk/debian/patches/kfreebsd.patch
URL: http://svn.debian.org/wsvn/pkg-voip/linphone/trunk/debian/patches/kfreebsd.patch?rev=10205&op=file
==============================================================================
--- linphone/trunk/debian/patches/kfreebsd.patch (added)
+++ linphone/trunk/debian/patches/kfreebsd.patch Sun May 26 00:55:06 2013
@@ -1,0 +1,28 @@
+Description: Fix v4l support on kFreeBSD
+
+ This patch is enough to make linphone build on kfreebsd with video
+ enabled. The resulting linphone was successfully tested using
+ cuse4bsd and webcamd (pending upload).
+
+Author: Christoph Egger <christoph at debian.org>
+Bug-Debian: http://bugs.debian.org/688182
+Forwarded: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=688182#8
+
+
+--- linphone-3.5.2.orig/mediastreamer2/src/msv4l.c
++++ linphone-3.5.2/mediastreamer2/src/msv4l.c
+@@ -17,8 +17,6 @@ along with this program; if not, write t
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+ 
+-#ifdef __linux
+-
+ #include "mediastreamer-config.h"
+ 
+ #include <fcntl.h>
+@@ -1071,5 +1069,3 @@ static void v4l_detect(MSWebCamManager *
+ 	}
+ }
+ 
+-
+-#endif

Modified: linphone/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/linphone/trunk/debian/patches/series?rev=10205&op=diff
==============================================================================
--- linphone/trunk/debian/patches/series (original)
+++ linphone/trunk/debian/patches/series Sun May 26 00:55:06 2013
@@ -2,3 +2,4 @@
 spelling-error-in-binary.patch
 fix-readline-detection.patch
 add-zrtp-to-ortp-dependencies.patch
+kfreebsd.patch