[SCM] lives/master: Remove 03-v4l1-videodev.patch as it is no longer needed.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Mon Jun 20 10:02:58 UTC 2011


The following commit has been merged in the master branch:
commit 06640edba370068ad75f1947ef1a65ef3f20af4c
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Jun 20 11:55:22 2011 +0200

    Remove 03-v4l1-videodev.patch as it is no longer needed.

diff --git a/debian/patches/03-v4l1-videodev.patch b/debian/patches/03-v4l1-videodev.patch
deleted file mode 100644
index c05d2b7..0000000
--- a/debian/patches/03-v4l1-videodev.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-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 76ecd7a..28e26b8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 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