[gentoo-commits] gentoo-x86 commit in net-im/psimedia/files: psimedia-1.0.3-linux-headers-2.6.38.patch

[Samuli Suominen (ssuominen)]

ssuominen    11/03/31 07:46:45

  Added:                psimedia-1.0.3-linux-headers-2.6.38.patch
  Log:
  Remove support for V4L v1 because linux-headers-2.6.38 stopped shipping linux/videodev.h.
  
  (Portage version: 2.2.0_alpha29/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  net-im/psimedia/files/psimedia-1.0.3-linux-headers-2.6.38.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/psimedia/files/psimedia-1.0.3-linux-headers-2.6.38.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/psimedia/files/psimedia-1.0.3-linux-headers-2.6.38.patch?rev=1.1&content-type=text/plain

Index: psimedia-1.0.3-linux-headers-2.6.38.patch
===================================================================
http://pkgs.fedoraproject.org/gitweb/?p=psimedia.git;a=blob_plain;f=psimedia-remove-v4l.patch;hb=HEAD

--- gstprovider/deviceenum/deviceenum_unix.cpp
+++ gstprovider/deviceenum/deviceenum_unix.cpp
@@ -35,7 +35,7 @@
 # include <sys/stat.h>
 # include <dirent.h>
 # include <sys/ioctl.h>
-# include <linux/videodev.h>
+# include <linux/videodev2.h>
 #endif
 
 namespace DeviceEnum {
@@ -478,72 +478,7 @@
 // v4l detection scheme adapted from PWLib (used by Ekiga/Gnomemeeting)
 static QList<Item> get_v4l_items()
 {
-#ifdef Q_OS_LINUX
-	QList<Item> out;
-
-	QList<V4LName> list = get_v4l_names("/sys/class/video4linux", true);
-	if(list.isEmpty())
-		list = get_v4l_names("/proc/video/dev", false);
-
-	// if we can't find anything, then do a raw scan for possibilities
-	if(list.isEmpty())
-	{
-		QStringList possible = scan_for_videodevs("/dev");
-		foreach(QString str, possible)
-		{
-			V4LName v;
-			v.dev = str;
-			list += v;
-		}
-	}
-
-	for(int n = 0; n < list.count(); ++n)
-	{
-		V4LName &v = list[n];
-
-		// if we already have a friendly name then we'll skip the confirm
-		//   in order to save resources.  the only real drawback here that
-		//   I can think of is if the device isn't a capture type.  but
-		//   what does it mean to have a V4L device that isn't capture??
-		if(v.friendlyName.isEmpty())
-		{
-			int fd = open(QFile::encodeName(v.dev).data(), O_RDONLY | O_NONBLOCK);
-			if(fd == -1)
-				continue;
-
-			// get video capabilities and close
-			struct video_capability caps;
-			memset(&caps, 0, sizeof(caps));
-			int ret = ioctl(fd, VIDIOCGCAP, &caps);
-			close(fd);
-			if(ret == -1)
-				continue;
-
-			if(!(caps.type & VID_TYPE_CAPTURE))
-				continue;
-
-			v.friendlyName = caps.name;
-		}
-
-		Item i;
-		i.type = Item::Video;
-		i.dir = Item::Input;
-		i.name = v.friendlyName;
-		i.driver = "v4l";
-		i.id = v.dev;
-
-		// HACK
-		if(v.friendlyName == "Labtec Webcam Notebook")
-			i.explicitCaptureSize = QSize(640, 480);
-
-		out += i;
-	}
-
-	return out;
-#else
-	// return empty list if non-linux
 	return QList<Item>();
-#endif
 }
 
 static QList<Item> get_v4l2_items()