[SCM] mjpegtools/master: make the use of v4l optional

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Sep 2 09:48:15 UTC 2012


The following commit has been merged in the master branch:
commit 150b5e74529796dffa81760751e41fa948c934fc
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Sep 2 10:44:21 2012 +0200

    make the use of v4l optional
    
    v4l is deprecated in favor of v4l2 and has already been dropped e.g. in
    Ubuntu.

diff --git a/debian/patches/12_make_v4l_optional.patch b/debian/patches/12_make_v4l_optional.patch
new file mode 100644
index 0000000..58b9c2b
--- /dev/null
+++ b/debian/patches/12_make_v4l_optional.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -157,7 +157,7 @@ case $host in
+                   [have_video4linux=true
+                    AC_DEFINE(HAVE_V4L, 1,
+ 		             [Building for Linux - using the video4linux API])],
+-                  [AC_MSG_ERROR([videodev.h not found - please install the linux kernel headers])])
++                  [AC_MSG_WARN([videodev.h not found - please install the linux kernel headers])])
+    ;;
+ esac
+ AM_CONDITIONAL(HAVE_V4L, test x$have_video4linux = xtrue)
diff --git a/debian/patches/series b/debian/patches/series
index 4867918..19d5901 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@
 09_script_path.patch
 10_usr_local.patch
 11_fix_ftbfs_gcc4.7.patch
+12_make_v4l_optional.patch

-- 
mjpegtools packaging



More information about the pkg-multimedia-commits mailing list