4 files changed, 296 insertions, 22 deletions

diff --git a/net/kdenetwork4/distinfo b/net/kdenetwork4/distinfo
index c476c5354e96..7524a4da64fa 100644
--- a/net/kdenetwork4/distinfo
+++ b/net/kdenetwork4/distinfo
@@ -1,3 +1,2 @@
-MD5 (KDE/kdenetwork-4.5.2.tar.bz2) = 5fa30d2c8bf911dd24e277b001f015e9
-SHA256 (KDE/kdenetwork-4.5.2.tar.bz2) = ea5c9fab6aa2823da3228bb87d9aa0e3642b1f1243d604c9ed67915191fba94c
-SIZE (KDE/kdenetwork-4.5.2.tar.bz2) = 8161881
+SHA256 (KDE/kdenetwork-4.5.3.tar.bz2) = e5866aa5bb0fb734f830d0a70a25949f8e3c9ed7753492f68ee82cb46a0a2e66
+SIZE (KDE/kdenetwork-4.5.3.tar.bz2) = 8151284
diff --git a/net/kdenetwork4/files/patch-kopete__libkopete__avdevice__videodevice.cpp b/net/kdenetwork4/files/patch-kopete__libkopete__avdevice__videodevice.cpp
new file mode 100644
index 000000000000..136a0f6e64fc
--- /dev/null
+++ b/net/kdenetwork4/files/patch-kopete__libkopete__avdevice__videodevice.cpp
@@ -0,0 +1,245 @@
+--- ./kopete/libkopete/avdevice/videodevice.cpp.orig	2010-10-01 01:22:38.000000000 +0400
++++ ./kopete/libkopete/avdevice/videodevice.cpp	2010-10-31 23:13:07.584295519 +0300
+@@ -57,7 +57,7 @@
+  */
+ void VideoDevice::setupControls()
+ {
+-#if defined(__linux__) && defined(ENABLE_AV)
++#if (defined(__linux__) || defined(__FreeBSD__)) && defined(ENABLE_AV)
+ 	bool driver_vflip = false;
+ 	bool driver_hflip = false;
+ #endif
+@@ -68,7 +68,7 @@
+ 
+ 	switch(m_driver)
+ 	{
+-#if defined(__linux__) && defined(ENABLE_AV)
++#if (defined(__linux__) || defined(__FreeBSD__)) && defined(ENABLE_AV)
+ #ifdef V4L2_CAP_VIDEO_CAPTURE
+ 		case VIDEODEV_DRIVER_V4L2:
+ 			struct v4l2_queryctrl qctrl;
+@@ -146,7 +146,7 @@
+ 			break;
+ 	}
+ 	
+-#if defined(__linux__) && defined(ENABLE_AV)
++#if (defined(__linux__) || defined(__FreeBSD__)) && defined(ENABLE_AV)
+ 	// Software controls:
+ 	BooleanVideoControl boolCtrl;
+ 	boolCtrl.value_default = 0;
+@@ -171,7 +171,7 @@
+ #endif
+ }
+ 
+-#if defined(__linux__) && defined(ENABLE_AV)
++#if (defined(__linux__) || defined(__FreeBSD__)) && defined(ENABLE_AV)
+ #ifdef V4L2_CAP_VIDEO_CAPTURE
+ /*!
+     \fn bool VideoDevice::getMenuCtrlOptions(quint32 id, quint32 maxindex, QStringList * options)
+@@ -379,7 +379,7 @@
+ 		m_videostream=false;
+ 
+ 		m_driver=VIDEODEV_DRIVER_NONE;
+-#if defined(__linux__) && defined(ENABLE_AV)
++#if (defined(__linux__) || defined(__FreeBSD__)) && defined(ENABLE_AV)
+ #ifdef V4L2_CAP_VIDEO_CAPTURE
+ 
+ 		CLEAR(V4L2_capabilities);
+@@ -649,7 +649,7 @@
+ 	m_io_method = IO_METHOD_NONE;
+ 	switch(m_driver)
+ 	{
+-#if defined(__linux__) && defined(ENABLE_AV)
++#if (defined(__linux__) || defined(__FreeBSD__)) && defined(ENABLE_AV)
+ #ifdef V4L2_CAP_VIDEO_CAPTURE
+ 		case VIDEODEV_DRIVER_V4L2:
+ 			if(V4L2_capabilities.capabilities & V4L2_CAP_READWRITE)
+@@ -695,7 +695,7 @@
+ 	}
+ 
+ // Select video input, video standard and tune here.
+-#if defined(__linux__) && defined(ENABLE_AV)
++#if (defined(__linux__) || defined(__FreeBSD__)) && defined(ENABLE_AV)
+ #ifdef V4L2_CAP_VIDEO_CAPTURE
+ 	struct v4l2_cropcap cropcap;
+ 	struct v4l2_crop crop;
+@@ -826,7 +826,7 @@
+ // Change resolution for the video device
+ 		switch(m_driver)
+ 		{
+-#if defined(__linux__) && defined(ENABLE_AV)
++#if (defined(__linux__) || defined(__FreeBSD__)) && defined(ENABLE_AV)
+ #ifdef V4L2_CAP_VIDEO_CAPTURE
+ 			case VIDEODEV_DRIVER_V4L2:
+ //				CLEAR (fmt);
+@@ -932,7 +932,7 @@
+ // Change the pixel format for the video device
+ 	switch(m_driver)
+ 	{
+-#if defined(__linux__) && defined(ENABLE_AV)
++#if (defined(__linux__) || defined(__FreeBSD__)) && defined(ENABLE_AV)
+ #ifdef V4L2_CAP_VIDEO_CAPTURE
+ 		case VIDEODEV_DRIVER_V4L2:
+ //			CLEAR (fmt);
+@@ -1025,7 +1025,7 @@
+ 	{
+ 		switch (m_driver)
+ 		{
+-#if defined(__linux__) && defined(ENABLE_AV)
++#if (defined(__linux__) || defined(__FreeBSD__)) && defined(ENABLE_AV)
+ #ifdef V4L2_CAP_VIDEO_CAPTURE
+ 			case VIDEODEV_DRIVER_V4L2:
+ 				if (-1 == ioctl (descriptor, VIDIOC_S_INPUT, &newinput))
+@@ -1076,7 +1076,7 @@
+ 			case IO_METHOD_READ: // Nothing to do
+ 				break;
+ 			case IO_METHOD_MMAP:
+-#if defined(__linux__) && defined(ENABLE_AV)
++#if (defined(__linux__) || defined(__FreeBSD__)) && defined(ENABLE_AV)
+ #ifdef V4L2_CAP_VIDEO_CAPTURE
+ 				{
+ 					unsigned int loop;
+@@ -1098,7 +1098,7 @@
+ #endif
+ 				break;
+ 			case IO_METHOD_USERPTR:
+-#if defined(__linux__) && defined(ENABLE_AV)
++#if (defined(__linux__) || defined(__FreeBSD__)) && defined(ENABLE_AV)
+ #ifdef V4L2_CAP_VIDEO_CAPTURE
+ 				{
+ 					unsigned int loop;
+@@ -1136,7 +1136,7 @@
+     /// @todo implement me
+ 	ssize_t bytesread;
+ 
+-#if defined(__linux__) && defined(ENABLE_AV)
++#if (defined(__linux__) || defined(__FreeBSD__)) && defined(ENABLE_AV)
+ #ifdef V4L2_CAP_VIDEO_CAPTURE
+ 	struct v4l2_buffer v4l2buffer;
+ #endif
+@@ -1175,7 +1175,7 @@
+ 				}
+ 				break;
+ 			case IO_METHOD_MMAP:
+-#if defined(__linux__) && defined(ENABLE_AV)
++#if (defined(__linux__) || defined(__FreeBSD__)) && defined(ENABLE_AV)
+ #ifdef V4L2_CAP_VIDEO_CAPTURE
+ 				CLEAR (v4l2buffer);
+ 				v4l2buffer.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+@@ -1211,7 +1211,7 @@
+ #endif
+ 				break;
+ 			case IO_METHOD_USERPTR:
+-#if defined(__linux__) && defined(ENABLE_AV)
++#if (defined(__linux__) || defined(__FreeBSD__)) && defined(ENABLE_AV)
+ #ifdef V4L2_CAP_VIDEO_CAPTURE
+ 				{
+ 					unsigned int i;
+@@ -1724,7 +1724,7 @@
+ 	if (!isOpen())
+ 		return EXIT_FAILURE;
+ 
+-#if defined(__linux__) && defined(ENABLE_AV)
++#if (defined(__linux__) || defined(__FreeBSD__)) && defined(ENABLE_AV)
+ 	if (ctrl_id == IMGCTRL_ID_SOFT_AUTOBRIGHTNESSCONTRASTCORR)
+ 	{
+ 		if (m_current_input < m_input.size() )
+@@ -1773,7 +1773,7 @@
+ 
+ 	switch(m_driver)
+ 	{
+-#if defined(__linux__) && defined(ENABLE_AV)
++#if (defined(__linux__) || defined(__FreeBSD__)) && defined(ENABLE_AV)
+ #ifdef V4L2_CAP_VIDEO_CAPTURE
+ 		case VIDEODEV_DRIVER_V4L2:
+ 			{
+@@ -1864,7 +1864,7 @@
+ 	if (!isOpen())
+ 		return EXIT_FAILURE;
+ 
+-#if defined(__linux__) && defined(ENABLE_AV)
++#if (defined(__linux__) || defined(__FreeBSD__)) && defined(ENABLE_AV)
+ 	if (ctrl_id == IMGCTRL_ID_SOFT_AUTOBRIGHTNESSCONTRASTCORR)
+ 	{
+ 		if (m_current_input < m_input.size() )
+@@ -1909,7 +1909,7 @@
+ 
+ 	switch(m_driver)
+ 	{
+-#if defined(__linux__) && defined(ENABLE_AV)
++#if (defined(__linux__) || defined(__FreeBSD__)) && defined(ENABLE_AV)
+ #ifdef V4L2_CAP_VIDEO_CAPTURE
+ 		case VIDEODEV_DRIVER_V4L2:
+ 			{
+@@ -2012,7 +2012,7 @@
+ {
+ 	switch(m_driver)
+ 	{
+-#if defined(__linux__) && defined(ENABLE_AV)
++#if (defined(__linux__) || defined(__FreeBSD__)) && defined(ENABLE_AV)
+ #ifdef V4L2_CAP_VIDEO_CAPTURE
+ 		case VIDEODEV_DRIVER_V4L2:
+ 			switch(palette)
+@@ -2092,7 +2092,7 @@
+ {
+ 	switch(m_driver)
+ 	{
+-#if defined(__linux__) && defined(ENABLE_AV)
++#if (defined(__linux__) || defined(__FreeBSD__)) && defined(ENABLE_AV)
+ #ifdef V4L2_CAP_VIDEO_CAPTURE
+ 		case VIDEODEV_DRIVER_V4L2:
+ 			switch(pixelformat)
+@@ -2298,7 +2298,7 @@
+ 	returnvalue = "None";
+ 	switch(m_driver)
+ 	{
+-#if defined(__linux__) && defined(ENABLE_AV)
++#if (defined(__linux__) || defined(__FreeBSD__)) && defined(ENABLE_AV)
+ #ifdef V4L2_CAP_VIDEO_CAPTURE
+ 		case VIDEODEV_DRIVER_V4L2:
+ 			switch(pixelformat)
+@@ -2378,7 +2378,7 @@
+ 			int err = 0;
+ 	switch(m_driver)
+ 	{
+-#if defined(__linux__) && defined(ENABLE_AV)
++#if (defined(__linux__) || defined(__FreeBSD__)) && defined(ENABLE_AV)
+ #ifdef V4L2_CAP_VIDEO_CAPTURE
+ 		case VIDEODEV_DRIVER_V4L2:
+ 			struct v4l2_fmtdesc fmtdesc;
+@@ -2456,7 +2456,7 @@
+ {
+ 	switch(m_driver)
+ 	{
+-#if defined(__linux__) && defined(ENABLE_AV)
++#if (defined(__linux__) || defined(__FreeBSD__)) && defined(ENABLE_AV)
+ #ifdef V4L2_CAP_VIDEO_CAPTURE
+ 		case VIDEODEV_DRIVER_V4L2:
+ 			switch(standard)
+@@ -2640,7 +2640,7 @@
+ 	returnvalue = "None";
+ 	switch(m_driver)
+ 	{
+-#if defined(__linux__) && defined(ENABLE_AV)
++#if (defined(__linux__) || defined(__FreeBSD__)) && defined(ENABLE_AV)
+ #ifdef V4L2_CAP_VIDEO_CAPTURE
+ 		case VIDEODEV_DRIVER_V4L2:
+ 			switch(standard)
+@@ -2726,7 +2726,7 @@
+ 	{
+ 	switch(m_driver)
+ 		{
+-#if defined(__linux__) && defined(ENABLE_AV)
++#if (defined(__linux__) || defined(__FreeBSD__)) && defined(ENABLE_AV)
+ #ifdef V4L2_CAP_VIDEO_CAPTURE
+ 			case VIDEODEV_DRIVER_V4L2:
+ 
+@@ -2998,7 +2998,7 @@
+ }
+ 
+ 
+-#if defined(__linux__) && defined(ENABLE_AV)  && defined(V4L2_CAP_VIDEO_CAPTURE)
++#if (defined(__linux__) || defined(__FreeBSD__)) && defined(ENABLE_AV)  && defined(V4L2_CAP_VIDEO_CAPTURE)
+ /*!
+     \fn const char * VideoDevice::getUnifiedV4L2StdCtrlName(quint32 std_ctrl_id)
+     \param std_ctrl_id ID of the V4L2 standard video control
diff --git a/net/kdenetwork4/files/patch-kopete__libkopete__avdevice__videodevice.h b/net/kdenetwork4/files/patch-kopete__libkopete__avdevice__videodevice.h
index 8b5a53543e76..13840a71545f 100644
--- a/net/kdenetwork4/files/patch-kopete__libkopete__avdevice__videodevice.h
+++ b/net/kdenetwork4/files/patch-kopete__libkopete__avdevice__videodevice.h
@@ -1,52 +1,71 @@
---- ./kopete/libkopete/avdevice/videodevice.h.orig	2009-03-18 13:00:00.000000000 +0300
-+++ ./kopete/libkopete/avdevice/videodevice.h	2010-03-28 14:25:38.820037067 +0400
-@@ -63,6 +63,13 @@
+--- ./kopete/libkopete/avdevice/videodevice.h.orig	2010-03-30 12:28:37.000000000 +0400
++++ ./kopete/libkopete/avdevice/videodevice.h	2010-10-31 23:13:07.574296355 +0300
+@@ -32,9 +32,11 @@
+ #include <unistd.h>
+ #include <signal.h>
  
- #endif // __linux__
+-#if defined(__linux__) && defined(ENABLE_AV)
++#if (defined(__linux__) || defined(__FreeBSD__)) && defined(ENABLE_AV)
+ 
++#if defined(__linux__)
+ #include <asm/types.h>
++#endif
+ #undef __STRICT_ANSI__
+ #ifndef __u64 //required by videodev.h
+ #define __u64 unsigned long long
+@@ -48,8 +50,10 @@
+ #define pgoff_t unsigned long
+ #endif
  
-+#if defined(__FreeBSD__) && defined(ENABLE_AV)
-+#include <linux/videodev.h>
-+#ifdef HAVE_LIBV4L2
-+#include <libv4l2.h>
-+#endif // HAVE_LIBV4L2
++#if defined(__linux__)
+ #include <linux/fs.h>
+ #include <linux/kernel.h>
 +#endif
-+
+ #include <linux/videodev.h>
+ #define VIDEO_MODE_PAL_Nc  3
+ #define VIDEO_MODE_PAL_M   4
+@@ -61,7 +65,7 @@
+ #include <libv4l2.h>
+ #endif // HAVE_V4L2
+ 
+-#endif // __linux__
++#endif // __linux__ __FreeBSD__ ENABLE_AV
+ 
  #include <qstring.h>
  #include <qfile.h>
- #include <qimage.h>
-@@ -80,7 +87,7 @@
+@@ -80,7 +84,7 @@
  typedef enum
  {
  	VIDEODEV_DRIVER_NONE
 -#if defined( __linux__) && defined(ENABLE_AV)
-+#if (defined( __linux__) || defined(__FreeBSD__)) && defined(ENABLE_AV)
++#if (defined(__linux__) || defined(__FreeBSD__)) && defined(ENABLE_AV)
          ,
  	VIDEODEV_DRIVER_V4L
  #ifdef V4L2_CAP_VIDEO_CAPTURE
-@@ -327,7 +334,7 @@
+@@ -327,7 +331,7 @@
  	QVector<Kopete::AV::VideoInput> m_input;
  
  protected:
 -#if defined(__linux__) && defined(ENABLE_AV)
-+#if (defined( __linux__) || defined(__FreeBSD__)) && defined(ENABLE_AV)
++#if (defined(__linux__) || defined(__FreeBSD__)) && defined(ENABLE_AV)
  	/*!
  	    \enum VideoDevice::imgctrl_id Control-IDs used for V4L1- and software-controls
  	 */
-@@ -356,7 +363,7 @@
+@@ -356,7 +360,7 @@
  	int descriptor;
  	videodev_driver m_driver;
  	QString m_model;
 -#if defined(__linux__) && defined(ENABLE_AV)
-+#if (defined( __linux__) || defined(__FreeBSD__)) && defined(ENABLE_AV)
++#if (defined(__linux__) || defined(__FreeBSD__)) && defined(ENABLE_AV)
  #ifdef V4L2_CAP_VIDEO_CAPTURE
  	struct v4l2_capability V4L2_capabilities;
  	struct v4l2_format fmt;
-@@ -388,7 +395,7 @@
+@@ -388,7 +392,7 @@
  	virtual int initDevice();
  
  	void setupControls();
 -#if defined(__linux__) && defined(ENABLE_AV) && defined(V4L2_CAP_VIDEO_CAPTURE)
-+#if (defined( __linux__) || defined(__FreeBSD__)) && defined(ENABLE_AV) && defined(V4L2_CAP_VIDEO_CAPTURE)
++#if (defined(__linux__) || defined(__FreeBSD__)) && defined(ENABLE_AV) && defined(V4L2_CAP_VIDEO_CAPTURE)
  	bool getMenuCtrlOptions(quint32 id, quint32 maxindex, QStringList * options);
  	void saveV4L2ControlData(struct v4l2_queryctrl qctrl);
  	const char *getUnifiedV4L2StdCtrlName(quint32 std_ctrl_id);
diff --git a/net/kdenetwork4/files/patch-kopete__libkopete__avdevice__videodevicepool.cpp b/net/kdenetwork4/files/patch-kopete__libkopete__avdevice__videodevicepool.cpp
new file mode 100644
index 000000000000..d7caaea9bc0b
--- /dev/null
+++ b/net/kdenetwork4/files/patch-kopete__libkopete__avdevice__videodevicepool.cpp
@@ -0,0 +1,11 @@
+--- ./kopete/libkopete/avdevice/videodevicepool.cpp.orig	2010-10-01 01:22:38.000000000 +0400
++++ ./kopete/libkopete/avdevice/videodevicepool.cpp	2010-10-31 23:13:07.588295799 +0300
+@@ -557,7 +557,7 @@
+ 
+ 	if (m_videodevice.isEmpty()) {
+ 		kDebug() << "called";
+-#if defined(__linux__) && defined(ENABLE_AV)
++#if (defined(__linux__) || defined(__FreeBSD__)) && defined(ENABLE_AV)
+ 		foreach (Solid::Device device,
+ 				Solid::Device::listFromType(Solid::DeviceInterface::Video, QString())) {
+ 			registerDevice( device );