[amsn] use V4L2, V4L1 headers are non-existing anymore on F16 it seems

[Sander Hoentjen]

commit 26f9b06b51c319110d1f675ec82aa476f3ef1792
Author: Sander Hoentjen <sander at hoentjen.eu>
Date:   Tue Jun 21 12:01:44 2011 +0200

    use V4L2, V4L1 headers are non-existing anymore on F16 it seems

 amsn-0.98.4-useV4L2.patch |   84 +++++++++++++++++++++++++++++++++++++++++++++
 amsn.spec                 |    7 +++-
 2 files changed, 90 insertions(+), 1 deletions(-)
---
diff --git a/amsn-0.98.4-useV4L2.patch b/amsn-0.98.4-useV4L2.patch
new file mode 100644
index 0000000..7a55fe4
--- /dev/null
+++ b/amsn-0.98.4-useV4L2.patch
@@ -0,0 +1,84 @@
+--- amsn/configure.ac	2011/04/08 17:08:27	12314
++++ amsn/configure.ac	2011/04/12 00:20:59	12315
+@@ -489,6 +489,11 @@
+       libv4l2 >= 0.5.0,
+       HAVE_LIBV4L=yes,HAVE_LIBV4L=no)
+   fi
++  AC_CHECK_HEADERS(linux/videodev.h,HAVE_LIBV4L=yes,HAVE_LIBV4L=no)
++  AC_CHECK_HEADERS(linux/videodev2.h,HAVE_LIBV4L2=yes,HAVE_LIBV4L2=no)
++  if test x"$v4l2" = x"yes" ; then
++    HAVE_LIBV4L=yes
++  fi
+   AC_SUBST(HAVE_LIBV4L)
+ 
+   AC_ARG_ENABLE([upnp],
+--- amsn/utils/linux/capture/capture.h	2011/04/08 17:08:27	12314
++++ amsn/utils/linux/capture/capture.h	2011/04/12 00:20:59	12315
+@@ -30,11 +30,13 @@
+ 
+ #include "config.h"
+ 
++/*
+ #ifdef HAVE_SYS_VIDEODEV2_H
+ #   include <sys/videodev2.h>
+ #else
+ #   include <linux/videodev.h>
+ #endif
++*/
+ 
+ #include "grab-ng.h"
+ 
+--- amsn/configure	2010/06/17 00:31:07	12053
++++ amsn/configure	2011/04/12 00:43:13	12317
+@@ -597,6 +605,7 @@
+ HAVE_GUPNP
+ GUPNP_LIBS
+ GUPNP_CFLAGS
++HAVE_LIBV4L2
+ HAVE_LIBV4L
+ LIBV4L_LIBS
+ LIBV4L_CFLAGS
+@@ -5688,6 +5697,35 @@
+ 	HAVE_LIBV4L=yes
+ fi
+   fi
++  for ac_header in linux/videodev.h
++do :
++  ac_fn_c_check_header_mongrel "$LINENO" "linux/videodev.h" "ac_cv_header_linux_videodev_h" "$ac_includes_default"
++if test "x$ac_cv_header_linux_videodev_h" = xyes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_LINUX_VIDEODEV_H 1
++_ACEOF
++ HAVE_LIBV4L=yes
++else
++  HAVE_LIBV4L=no
++fi
++
++done
++
++  for ac_header in linux/videodev2.h
++do :
++  ac_fn_c_check_header_mongrel "$LINENO" "linux/videodev2.h" "ac_cv_header_linux_videodev2_h" "$ac_includes_default"
++if test "x$ac_cv_header_linux_videodev2_h" = xyes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_LINUX_VIDEODEV2_H 1
++_ACEOF
++ HAVE_LIBV4L2=yes
++else
++  HAVE_LIBV4L2=no
++fi
++
++done
++
++
+ 
+ 
+   # Check whether --enable-upnp was given.
+@@ -7058,6 +7124,7 @@
+     STATIC       : $STATIC
+     FARSIGHT     : $HAVE_FARSIGHT
+     LIBV4L       : $HAVE_LIBV4L
++    LIBV4L2      : $HAVE_LIBV4L2
+     GUPNP-IGD    : $HAVE_GUPNP
+ 
+ EOF
diff --git a/amsn.spec b/amsn.spec
index dd61a5d..0f4f3ee 100644
--- a/amsn.spec
+++ b/amsn.spec
@@ -3,7 +3,7 @@
 
 Name:           amsn
 Version:        0.98.4
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        MSN Messenger clone for Linux, Mac and Windows
 
 Group:          Applications/Internet
@@ -11,6 +11,7 @@ License:        GPLv2
 URL:            http://www.amsn-project.net/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}-src.tar.bz2
 Patch0:		amsn-0.98.1-usesnack.patch
+Patch1:		amsn-0.98.4-useV4L2.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils, tk-devel, which, libpng-devel, libjpeg-devel
@@ -41,6 +42,7 @@ snapshots with your webcam to use as your display picture.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 rm -r utils/BWidget-1.9.0
 rm -r skins/default/winicons
@@ -133,6 +135,9 @@ fi
 
 
 %changelog
+* Mon Jun 20 2011 Sander Hoentjen <sander at hoentjen.eu> 0.98.4-4
+- use V4L2 (backport http://amsn.svn.sourceforge.net/viewvc/amsn?view=revision&revision=12315)
+
 * Fri Jun 17 2011 Peter Robinson <pbrobinson at gmail.com> 0.98.4-3
 - rebuild for new gupnp/gssdp