svn commit: r402148 - in head/net-im/qTox: . files
Thierry Thomas
thierry at FreeBSD.org
Sat Nov 21 10:57:20 UTC 2015
Author: thierry
Date: Sat Nov 21 10:57:18 2015
New Revision: 402148
URL: https://svnweb.freebsd.org/changeset/ports/402148
Log:
Update to 0.151116.
PR: ports/204591
Submitted by: yuri (at) rawbw.com (maintainer)
Added:
head/net-im/qTox/files/patch-src_video_cameradevice.cpp (contents, props changed)
Deleted:
head/net-im/qTox/files/patch-src_platform_camera_v4l2.cpp
Modified:
head/net-im/qTox/Makefile
head/net-im/qTox/distinfo
head/net-im/qTox/files/patch-src_main.cpp
head/net-im/qTox/files/patch-src_platform_camera_v4l2.h
Modified: head/net-im/qTox/Makefile
==============================================================================
--- head/net-im/qTox/Makefile Sat Nov 21 10:41:58 2015 (r402147)
+++ head/net-im/qTox/Makefile Sat Nov 21 10:57:18 2015 (r402148)
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= qTox
-PORTVERSION= 0.150614
-PORTREVISION= 2
+PORTVERSION= 0.151116
CATEGORIES= net-im net-p2p
MAINTAINER= yuri at rawbw.com
@@ -23,7 +22,7 @@ LIB_DEPENDS= libtoxcore.so:${PORTSDIR}/n
USE_GITHUB= yes
GH_ACCOUNT= tux3
-GH_TAGNAME= ce2c830
+GH_TAGNAME= db52ef6
USES= compiler:c++11-lib desktop-file-utils openal:soft qmake gmake
USE_GNOME= glib20 gtk20 cairo gdkpixbuf2
Modified: head/net-im/qTox/distinfo
==============================================================================
--- head/net-im/qTox/distinfo Sat Nov 21 10:41:58 2015 (r402147)
+++ head/net-im/qTox/distinfo Sat Nov 21 10:57:18 2015 (r402148)
@@ -1,2 +1,2 @@
-SHA256 (tux3-qTox-0.150614-ce2c830_GH0.tar.gz) = c59580b98886acf9ec5acb1a85b7f6544d53bc2d72491dddeb8865b4d64dd3f6
-SIZE (tux3-qTox-0.150614-ce2c830_GH0.tar.gz) = 4556369
+SHA256 (tux3-qTox-0.151116-db52ef6_GH0.tar.gz) = 3920a71131666bef8044c7428e56e75ac9136b22b9e7d51d2c506da24e34ff91
+SIZE (tux3-qTox-0.151116-db52ef6_GH0.tar.gz) = 4627473
Modified: head/net-im/qTox/files/patch-src_main.cpp
==============================================================================
--- head/net-im/qTox/files/patch-src_main.cpp Sat Nov 21 10:41:58 2015 (r402147)
+++ head/net-im/qTox/files/patch-src_main.cpp Sat Nov 21 10:57:18 2015 (r402148)
@@ -1,6 +1,6 @@
---- src/main.cpp.orig 2015-06-12 10:53:59 UTC
+--- src/main.cpp.orig 2015-11-14 22:51:30 UTC
+++ src/main.cpp
-@@ -280,3 +280,10 @@ int main(int argc, char *argv[])
+@@ -269,3 +269,10 @@ int main(int argc, char *argv[])
qDebug() << "Clean exit with status"<<errorcode;
return errorcode;
}
Modified: head/net-im/qTox/files/patch-src_platform_camera_v4l2.h
==============================================================================
--- head/net-im/qTox/files/patch-src_platform_camera_v4l2.h Sat Nov 21 10:41:58 2015 (r402147)
+++ head/net-im/qTox/files/patch-src_platform_camera_v4l2.h Sat Nov 21 10:57:18 2015 (r402148)
@@ -1,4 +1,4 @@
---- src/platform/camera/v4l2.h.orig 2015-06-12 10:53:59 UTC
+--- src/platform/camera/v4l2.h.orig 2015-11-14 22:51:30 UTC
+++ src/platform/camera/v4l2.h
@@ -24,7 +24,7 @@
#include <QPair>
Added: head/net-im/qTox/files/patch-src_video_cameradevice.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net-im/qTox/files/patch-src_video_cameradevice.cpp Sat Nov 21 10:57:18 2015 (r402148)
@@ -0,0 +1,65 @@
+--- 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
More information about the svn-ports-all
mailing list