[SCM] lives/master: Rely on libv4l-dev to provide V4L1 support.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Thu Feb 24 14:02:58 UTC 2011


The following commit has been merged in the master branch:
commit b2544a29693fd3bcc084ff881deb960f9ba05290
Author: Alessio Treglia <alessio at debian.org>
Date:   Thu Feb 24 15:01:58 2011 +0100

    Rely on libv4l-dev to provide V4L1 support.

diff --git a/debian/patches/03-v4l1-videodev.patch b/debian/patches/03-v4l1-videodev.patch
new file mode 100644
index 0000000..c05d2b7
--- /dev/null
+++ b/debian/patches/03-v4l1-videodev.patch
@@ -0,0 +1,19 @@
+Description: V4L1 support will be dropped in the next future.
+ Rely on the headers provided by libv4l-dev.
+Author: Alessio Treglia <alessio at debian.org>
+Forwarded: no
+---
+ lives-plugins/plugins/playback/video/vloopback.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- lives-1.4.1.orig/lives-plugins/plugins/playback/video/vloopback.c
++++ lives-1.4.1/lives-plugins/plugins/playback/video/vloopback.c
+@@ -22,7 +22,7 @@ static int mypalette;
+ #include <fcntl.h>
+ #include <dirent.h>
+ #include <unistd.h>
+-#include <linux/videodev.h>
++#include <libv4l1-videodev.h>
+ #include <sys/ioctl.h>
+ 
+ static struct video_window x_vidwin;
diff --git a/debian/patches/series b/debian/patches/series
index 28e26b8..76ecd7a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 01-cdda2wav_to_icedax.patch
 02-drop_py3_multiencoder.patch
+03-v4l1-videodev.patch

-- 
lives packaging



More information about the pkg-multimedia-commits mailing list