[psimedia] update v4l1 patch

[nucleo]

commit a1f92df9cd90e5a06fbf523cad47bf8e1614ab44
Author: nucleo <nucleo at fedoraproject.org>
Date:   Thu Apr 21 01:35:58 2011 +0300

    update v4l1 patch

 psimedia-remove-v4l.patch |   32 ++++++++++++++++++++++++--------
 psimedia.spec             |    6 +++++-
 2 files changed, 29 insertions(+), 9 deletions(-)
---
diff --git a/psimedia-remove-v4l.patch b/psimedia-remove-v4l.patch
index b2f5510..8a70d00 100644
--- a/psimedia-remove-v4l.patch
+++ b/psimedia-remove-v4l.patch
@@ -1,5 +1,7 @@
---- psimedia-1.0.3/gstprovider/deviceenum/deviceenum_unix.cpp	2008-11-19 04:10:01.000000000 +0200
-+++ psimedia-1.0.3/gstprovider/deviceenum/deviceenum_unix.cpp	2011-02-09 19:48:51.000000000 +0200
+Index: psimedia/gstprovider/deviceenum/deviceenum_unix.cpp
+===================================================================
+--- psimedia/gstprovider/deviceenum/deviceenum_unix.cpp	(revision 808)
++++ psimedia/gstprovider/deviceenum/deviceenum_unix.cpp	(working copy)
 @@ -35,7 +35,7 @@
  # include <sys/stat.h>
  # include <dirent.h>
@@ -9,10 +11,13 @@
  #endif
  
  namespace DeviceEnum {
-@@ -478,72 +478,7 @@
- // v4l detection scheme adapted from PWLib (used by Ekiga/Gnomemeeting)
- static QList<Item> get_v4l_items()
- {
+@@ -475,77 +475,6 @@
+ 	return out;
+ }
+ 
+-// v4l detection scheme adapted from PWLib (used by Ekiga/Gnomemeeting)
+-static QList<Item> get_v4l_items()
+-{
 -#ifdef Q_OS_LINUX
 -	QList<Item> out;
 -
@@ -77,8 +82,19 @@
 -	return out;
 -#else
 -	// return empty list if non-linux
- 	return QList<Item>();
+-	return QList<Item>();
 -#endif
+-}
+-
+ static QList<Item> get_v4l2_items()
+ {
+ #ifdef Q_OS_LINUX
+@@ -636,8 +565,6 @@
+ 	QList<Item> out;
+ 	if(driver.isEmpty() || driver == "v4l2")
+ 		out += get_v4l2_items();
+-	if(driver.isEmpty() || driver == "v4l")
+-		out += get_v4l_items();
+ 	return out;
  }
  
- static QList<Item> get_v4l2_items()
diff --git a/psimedia.spec b/psimedia.spec
index 5ae90b8..db2a12a 100644
--- a/psimedia.spec
+++ b/psimedia.spec
@@ -1,6 +1,6 @@
 Name:           psimedia
 Version:        1.0.3
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Audio and video RTP services for Psi-like IM clients
 
 Group:          Applications/Multimedia
@@ -10,6 +10,7 @@ Source0:        http://delta.affinix.com/download/psimedia/%{name}-%{version}.ta
 Source1:        psimedia.desktop
 # Using %{_libdir}/psi/plugins directory for psimedia demo
 Patch0:         psimedia-demo.patch
+# http://code.google.com/p/psi-dev/source/browse/trunk/patches/psimedia/0040-psimedia-2.6.38-compilation-fix.diff
 Patch1:         psimedia-remove-v4l.patch
 Requires:       psi >= 0.13
 
@@ -62,6 +63,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/psi/plugins/libgstprovider.so
 
 %changelog
+* Thu Apr 21 2011 Alexey Kurov <nucleo at fedoraproject.org> - 1.0.3-7
+- update v4l1 patch
+
 * Wed Feb 09 2011 Alexey Kurov <nucleo at fedoraproject.org> - 1.0.3-6
 - removed v4l