Attachment #163182 for bug #204591

Lines 2-9 Link Here

(-)net-im/qTox/Makefile (-3 / +2 lines)
2	# $FreeBSD: head/net-im/qTox/Makefile 401587 2015-11-14 19:34:12Z jbeich $	2	# $FreeBSD: head/net-im/qTox/Makefile 401587 2015-11-14 19:34:12Z jbeich $
3		3
4	PORTNAME= qTox	4	PORTNAME= qTox
5	PORTVERSION= 0.150614	5	PORTVERSION= 0.151116
6	PORTREVISION= 2
7	CATEGORIES= net-im net-p2p	6	CATEGORIES= net-im net-p2p
8		7
9	MAINTAINER= yuri@rawbw.com	8	MAINTAINER= yuri@rawbw.com
Lines 23-29 Link Here
23		22
24	USE_GITHUB= yes	23	USE_GITHUB= yes
25	GH_ACCOUNT= tux3	24	GH_ACCOUNT= tux3
26	GH_TAGNAME= ce2c830	25	GH_TAGNAME= db52ef6
27		26
28	USES= compiler:c++11-lib desktop-file-utils openal:soft qmake gmake	27	USES= compiler:c++11-lib desktop-file-utils openal:soft qmake gmake
29	USE_GNOME= glib20 gtk20 cairo gdkpixbuf2	28	USE_GNOME= glib20 gtk20 cairo gdkpixbuf2

Lines 1-2 Link Here

(-)net-im/qTox/distinfo (-2 / +2 lines)
1	SHA256 (tux3-qTox-0.150614-ce2c830_GH0.tar.gz) = c59580b98886acf9ec5acb1a85b7f6544d53bc2d72491dddeb8865b4d64dd3f6	1	SHA256 (tux3-qTox-0.151116-db52ef6_GH0.tar.gz) = 3920a71131666bef8044c7428e56e75ac9136b22b9e7d51d2c506da24e34ff91
2	SIZE (tux3-qTox-0.150614-ce2c830_GH0.tar.gz) = 4556369	2	SIZE (tux3-qTox-0.151116-db52ef6_GH0.tar.gz) = 4627473

Lines 1-6 Link Here

(-)net-im/qTox/files/patch-src_main.cpp (-2 / +2 lines)
1	--- src/main.cpp.orig 2015-06-12 10:53:59 UTC	1	--- src/main.cpp.orig 2015-11-14 22:51:30 UTC
2	+++ src/main.cpp	2	+++ src/main.cpp
3	@@ -280,3 +280,10 @@ int main(int argc, char *argv[])	3	@@ -269,3 +269,10 @@ int main(int argc, char *argv[])
4	qDebug() << "Clean exit with status"<<errorcode;	4	qDebug() << "Clean exit with status"<<errorcode;
5	return errorcode;	5	return errorcode;
6	}	6	}

Lines 1-10 Link Here

(-)net-im/qTox/files/patch-src_platform_camera_v4l2.cpp (-10 lines)
1	--- src/platform/camera/v4l2.cpp.orig 2015-06-15 03:25:21 UTC
2	+++ src/platform/camera/v4l2.cpp
3	@@ -26,6 +26,7 @@
4	#include <fcntl.h>
5	#include <sys/ioctl.h>
6	#include <linux/videodev2.h>
7	+#include <errno.h>
8
9	/**
10	* Most of this file is adapted from libavdevice's v4l2.c,

Lines 1-4 Link Here

(-)net-im/qTox/files/patch-src_platform_camera_v4l2.h (-1 / +1 lines)
1	--- src/platform/camera/v4l2.h.orig 2015-06-12 10:53:59 UTC	1	--- src/platform/camera/v4l2.h.orig 2015-11-14 22:51:30 UTC
2	+++ src/platform/camera/v4l2.h	2	+++ src/platform/camera/v4l2.h
3	@@ -24,7 +24,7 @@	3	@@ -24,7 +24,7 @@
4	#include <QPair>	4	#include <QPair>




--- src/video/cameradevice.cpp.orig	2015-11-15 08:11:58 UTC
+++ src/video/cameradevice.cpp
@@ -31,7 +31,7 @@ extern "C" {
 #ifdef Q_OS_WIN
 #include "src/platform/camera/directshow.h"
 #endif
-#ifdef Q_OS_LINUX
+#ifdef Q_OS_UNIX
 #include "src/platform/camera/v4l2.h"
 #endif
 
@@ -105,7 +105,7 @@ CameraDevice* CameraDevice::open(QString
 
     AVDictionary* options = nullptr;
     if (!iformat);
-#ifdef Q_OS_LINUX
+#ifdef Q_OS_UNIX
     else if (devName.startsWith("x11grab#"))
     {
         QSize screen;
@@ -142,7 +142,7 @@ CameraDevice* CameraDevice::open(QString
         av_dict_set(&options, "framerate", QString().setNum(mode.FPS).toStdString().c_str(), 0);
     }
 #endif
-#ifdef Q_OS_LINUX
+#ifdef Q_OS_UNIX
     else if (iformat->name == QString("video4linux2,v4l2") && mode)
     {
         av_dict_set(&options, "video_size", QString("%1x%2").arg(mode.width).arg(mode.height).toStdString().c_str(), 0);
@@ -264,7 +264,7 @@ QVector<QPair<QString, QString>> CameraD
     else if (iformat->name == QString("dshow"))
         devices += DirectShow::getDeviceList();
 #endif
-#ifdef Q_OS_LINUX
+#ifdef Q_OS_UNIX
     else if (iformat->name == QString("video4linux2,v4l2"))
         devices += v4l2::getDeviceList();
 #endif
@@ -307,7 +307,7 @@ QVector<VideoMode> CameraDevice::getVide
     else if (iformat->name == QString("dshow"))
         return DirectShow::getDeviceModes(devName);
 #endif
-#ifdef Q_OS_LINUX
+#ifdef Q_OS_UNIX
     else if (iformat->name == QString("video4linux2,v4l2"))
         return v4l2::getDeviceModes(devName);
 #endif
@@ -327,7 +327,7 @@ bool CameraDevice::getDefaultInputFormat
     avdevice_register_all();
 
     // Desktop capture input formats
-#ifdef Q_OS_LINUX
+#ifdef Q_OS_UNIX
     idesktopFormat = av_find_input_format("x11grab");
 #endif
 #ifdef Q_OS_WIN
@@ -335,7 +335,7 @@ bool CameraDevice::getDefaultInputFormat
 #endif
 
     // Webcam input formats
-#ifdef Q_OS_LINUX
+#ifdef Q_OS_UNIX
     if ((iformat = av_find_input_format("v4l2")))
         return true;
 #endif

Return to bug 204591

Line 0 Link Here

(-)net-im/qTox/files/patch-src_video_cameradevice.cpp (+65 lines)
		1	--- src/video/cameradevice.cpp.orig 2015-11-15 08:11:58 UTC
		2	+++ src/video/cameradevice.cpp
		3	@@ -31,7 +31,7 @@ extern "C" {
		4	#ifdef Q_OS_WIN
		5	#include "src/platform/camera/directshow.h"
		6	#endif
		7	-#ifdef Q_OS_LINUX
		8	+#ifdef Q_OS_UNIX
		9	#include "src/platform/camera/v4l2.h"
		10	#endif
		11
		12	@@ -105,7 +105,7 @@ CameraDevice* CameraDevice::open(QString
		13
		14	AVDictionary* options = nullptr;
		15	if (!iformat);
		16	-#ifdef Q_OS_LINUX
		17	+#ifdef Q_OS_UNIX
		18	else if (devName.startsWith("x11grab#"))
		19	{
		20	QSize screen;
		21	@@ -142,7 +142,7 @@ CameraDevice* CameraDevice::open(QString
		22	av_dict_set(&options, "framerate", QString().setNum(mode.FPS).toStdString().c_str(), 0);
		23	}
		24	#endif
		25	-#ifdef Q_OS_LINUX
		26	+#ifdef Q_OS_UNIX
		27	else if (iformat->name == QString("video4linux2,v4l2") && mode)
		28	{
		29	av_dict_set(&options, "video_size", QString("%1x%2").arg(mode.width).arg(mode.height).toStdString().c_str(), 0);
		30	@@ -264,7 +264,7 @@ QVector<QPair<QString, QString>> CameraD
		31	else if (iformat->name == QString("dshow"))
		32	devices += DirectShow::getDeviceList();
		33	#endif
		34	-#ifdef Q_OS_LINUX
		35	+#ifdef Q_OS_UNIX
		36	else if (iformat->name == QString("video4linux2,v4l2"))
		37	devices += v4l2::getDeviceList();
		38	#endif
		39	@@ -307,7 +307,7 @@ QVector<VideoMode> CameraDevice::getVide
		40	else if (iformat->name == QString("dshow"))
		41	return DirectShow::getDeviceModes(devName);
		42	#endif
		43	-#ifdef Q_OS_LINUX
		44	+#ifdef Q_OS_UNIX
		45	else if (iformat->name == QString("video4linux2,v4l2"))
		46	return v4l2::getDeviceModes(devName);
		47	#endif
		48	@@ -327,7 +327,7 @@ bool CameraDevice::getDefaultInputFormat
		49	avdevice_register_all();
		50
		51	// Desktop capture input formats
		52	-#ifdef Q_OS_LINUX
		53	+#ifdef Q_OS_UNIX
		54	idesktopFormat = av_find_input_format("x11grab");
		55	#endif
		56	#ifdef Q_OS_WIN
		57	@@ -335,7 +335,7 @@ bool CameraDevice::getDefaultInputFormat
		58	#endif
		59
		60	// Webcam input formats
		61	-#ifdef Q_OS_LINUX
		62	+#ifdef Q_OS_UNIX
		63	if ((iformat = av_find_input_format("v4l2")))
		64	return true;
65	#endif