Package: linphone
Version: 3.1.2-2
Severity: important
Tags: patch
User: debian-...@lists.debian.org
Usertags: kfreebsd

Hi,

the current version fails to build on GNU/kFreeBSD.

It needs changes to debian packaging and tweaks for sources.
Please find attached patch with them.

It would also be nice if you can ask upstream
to include source changes.

Thanks in advance

                        Petr
diff -u linphone-3.1.2/debian/control linphone-3.1.2/debian/control
--- linphone-3.1.2/debian/control
+++ linphone-3.1.2/debian/control
@@ -6,7 +6,8 @@
 Build-Depends: debhelper (>= 7), dpkg-dev (>= 1.13.19), cdbs, 
  autoconf, automake1.9, autotools-dev, libtool, pkg-config, intltool,
  libglib2.0-dev, libosip2-dev (>= 3.0.3-2), libexosip2-dev (>= 3.0.3-2),
- libasound2-dev, libspeex-dev (>= 1.1.12), libspeexdsp-dev, libsamplerate0-dev, libxml-parser-perl,
+ libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], 
+ libspeex-dev (>= 1.1.12), libspeexdsp-dev, libsamplerate0-dev, libxml-parser-perl,
  libgtk2.0-dev, libglade2-dev, libtheora-dev,
  dpatch, libavcodec-dev, libreadline5-dev, libsdl1.2-dev, libswscale-dev, doxygen
 Standards-Version: 3.8.1
@@ -66,7 +67,8 @@
 Architecture: any
 Provides: liblinphone2-dev
 Replaces: liblinphone2-dev
-Depends: ${misc:Depends}, liblinphone3 (=${binary:Version}), libmediastreamer-dev, libortp-dev, libosip2-dev (>= 2.2.0), libspeex-dev, libsamplerate0-dev, libasound2-dev
+Depends: ${misc:Depends}, liblinphone3 (=${binary:Version}), libmediastreamer-dev, libortp-dev, libosip2-dev (>= 2.2.0), 
+ libspeex-dev, libsamplerate0-dev, libasound2-dev [linux-any]
 Conflicts: liblinphone2-dev
 Description: linphone web phone's library (supporting the SIP protocol)
  Linphone is a is an audio and video internet phone using the SIP protocol. It 
@@ -93,7 +95,8 @@
 Architecture: any
 Provides: libmediastreamer0-dev
 Replaces: libmediastreamer0-dev
-Depends: ${misc:Depends}, libmediastreamer0 (=${binary:Version}), libasound2-dev, libortp-dev, libspeex-dev
+Depends: ${misc:Depends}, libmediastreamer0 (=${binary:Version}), 
+ libasound2-dev [linux-any], libortp-dev, libspeex-dev
 Conflicts: libmediastreamer0-dev
 Description: linphone web phone's media library
  Linphone is a is an audio and video internet phone using the SIP protocol. It 
only in patch2:
unchanged:
--- linphone-3.1.2.orig/mediastreamer2/src/Makefile.am
+++ linphone-3.1.2/mediastreamer2/src/Makefile.am
@@ -69,7 +69,9 @@
 
 if BUILD_MACOSX
 libmediastreamer_la_SOURCES+=msv4m.c
-else
+endif
+# for now reuse ALSA detection
+if BUILD_ALSA
 libmediastreamer_la_SOURCES+=msv4l.c msv4l2.c
 endif
 
only in patch2:
unchanged:
--- linphone-3.1.2.orig/mediastreamer2/src/Makefile.in
+++ linphone-3.1.2/mediastreamer2/src/Makefile.in
@@ -46,7 +46,8 @@
 @build_macsnd_t...@am__append_6 = macsnd.c
 @build_macaqsnd_t...@am__append_7 = aqsnd.c
 @BUILD_MACOSX_TRUE@@build_video_t...@am__append_8 = msv4m.c
-...@build_macosx_false@@build_video_t...@am__append_9 = msv4l.c msv4l2.c
+# for now reuse ALSA detection
+...@build_alsa_true@@build_video_t...@am__append_9 = msv4l.c msv4l2.c
 @build_video_t...@am__append_10 = videoenc.c videodec.c pixconv.c \
 @BUILD_VIDEO_TRUE@	sizeconv.c rfc2429.h nowebcam.c nowebcam.h \
 @BUILD_VIDEO_TRUE@	videoout.c msvideo.c rfc3984.c mire.c \
@@ -99,8 +100,7 @@
 @build_macsnd_t...@am__objects_6 = macsnd.lo
 @build_macaqsnd_t...@am__objects_7 = aqsnd.lo
 @BUILD_MACOSX_TRUE@@build_video_t...@am__objects_8 = msv4m.lo
-...@build_macosx_false@@build_video_t...@am__objects_9 = msv4l.lo \
-...@build_macosx_false@@BUILD_VIDEO_TRUE@	msv4l2.lo
+...@build_alsa_true@@build_video_t...@am__objects_9 = msv4l.lo msv4l2.lo
 @build_video_t...@am__objects_10 = videoenc.lo videodec.lo pixconv.lo \
 @BUILD_VIDEO_TRUE@	sizeconv.lo nowebcam.lo videoout.lo \
 @BUILD_VIDEO_TRUE@	msvideo.lo rfc3984.lo mire.lo videostream.lo
only in patch2:
unchanged:
--- linphone-3.1.2.orig/mediastreamer2/src/mssndcard.c
+++ linphone-3.1.2/mediastreamer2/src/mssndcard.c
@@ -215,11 +215,9 @@
 	ms_free(obj);
 }
 
-#ifdef __linux
 #ifndef __ALSA_ENABLED__
 MSSndCard * ms_alsa_card_new_custom(const char *pcmdev, const char *mixdev){
 	ms_warning("Alsa support not available in this build of mediastreamer2");
 	return NULL;
 }
 #endif
-#endif

Reply via email to