[Pkg-voip-commits] [pjproject] 04/05: fix_no_video.patch: fix default build

[tzafrir at debian.org]

This is an automated email from the git hooks/post-receive script.

tzafrir pushed a commit to branch master
in repository pjproject.

commit 40244d57a27b4d8e009e370fc60aa708017c4d29
Author: Tzafrir Cohen <tzafrir at debian.org>
Date:   Mon Jan 13 21:22:30 2014 +0200

    fix_no_video.patch: fix default build
---
 debian/patches/fix_no_video.patch | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/debian/patches/fix_no_video.patch b/debian/patches/fix_no_video.patch
new file mode 100644
index 0000000..ba1577b
--- /dev/null
+++ b/debian/patches/fix_no_video.patch
@@ -0,0 +1,28 @@
+Description: some places failed to detect we build with no video
+Author: Tzafrir Cohen <tzafrir at debian.org>
+
+--- a/pjmedia/src/pjmedia-videodev/sdl_dev.c
++++ b/pjmedia/src/pjmedia-videodev/sdl_dev.c
+@@ -21,6 +21,9 @@
+ #include <pj/log.h>
+ #include <pj/os.h>
+ 
++#if (! defined(PJMEDIA_HAS_VIDEO)) || (PJMEDIA_HAS_VIDEO == 0)
++#   undef PJMEDIA_VIDEO_DEV_HAS_SDL
++#endif
+ #if defined(PJMEDIA_VIDEO_DEV_HAS_SDL) && PJMEDIA_VIDEO_DEV_HAS_SDL != 0
+ #include <SDL.h>
+ #include <SDL_syswm.h>
+--- a/pjmedia/src/pjmedia-videodev/v4l2_dev.c
++++ b/pjmedia/src/pjmedia-videodev/v4l2_dev.c
+@@ -25,6 +25,10 @@
+ #include <pj/os.h>
+ #include <pj/rand.h>
+ 
++#if (! defined(PJMEDIA_HAS_VIDEO)) || (PJMEDIA_HAS_VIDEO == 0)
++#   undef PJMEDIA_VIDEO_DEV_HAS_V4L2
++#endif
++#
+ #if PJMEDIA_VIDEO_DEV_HAS_V4L2
+ 
+ #include <linux/videodev2.h>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/pjproject.git