[SCM] mjpegtools/master: remove patches that no longer apply with new upstream version

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 5696fe358d7bade15226b1b4e598b2c15f8a00d4
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Sep 2 14:54:58 2012 +0200

    remove patches that no longer apply with new upstream version

diff --git a/debian/patches/05_ignore_videodev.h_error.patch b/debian/patches/05_ignore_videodev.h_error.patch
deleted file mode 100644
index c56b590..0000000
--- a/debian/patches/05_ignore_videodev.h_error.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: mjpegtools/configure
-===================================================================
---- mjpegtools.orig/configure	2011-05-01 11:44:40.229150265 +0700
-+++ mjpegtools/configure	2011-05-01 11:44:45.819150262 +0700
-@@ -16340,8 +16340,6 @@
- 
- $as_echo "#define HAVE_V4L 1" >>confdefs.h
- 
--else
--  as_fn_error "videodev.h not found - please install the linux kernel headers" "$LINENO" 5
- fi
- 
- 
diff --git a/debian/patches/12_make_v4l_optional.patch b/debian/patches/12_make_v4l_optional.patch
deleted file mode 100644
index 58b9c2b..0000000
--- a/debian/patches/12_make_v4l_optional.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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 7a84457..f1cd89d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,14 +1,12 @@
 01_debian-directory.patch
 03_disable_optimization.patch
 04_manpage-syntax.patch
-05_ignore_videodev.h_error.patch
 06_link_pthread.patch
 07_yuvdenoise_disable_sse2.patch
 08_use_bash.patch
 09_script_path.patch
 10_usr_local.patch
 11_fix_ftbfs_gcc4.7.patch
-12_make_v4l_optional.patch
 13_fix_lav2yuv_linking.diff
 14_fix_mplex_linking.diff
 15_fix_qttoy4m_linking.diff

-- 
mjpegtools packaging