Upgrade Tox, libfilteraudio, toxic, qTox and uTox to a recent snapshot.

PR:		ports/200865
Submitted by:	yuri (at) rawbw.com (qTox maintainer) + patches from other maintainers
Approved by:	maintainers

6 files changed, 55 insertions, 15 deletions

diff --git a/net-im/qTox/Makefile b/net-im/qTox/Makefile
index 153716e4624d..954c47a9112b 100644
--- a/net-im/qTox/Makefile
+++ b/net-im/qTox/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	qTox
-PORTVERSION=	0.150426
-PORTREVISION=	3
+PORTVERSION=	0.150614
 CATEGORIES=	net-im net-p2p
 
 MAINTAINER=	yuri@rawbw.com
@@ -11,24 +10,27 @@ COMMENT=	Qt 5 based Tox client
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libtoxcore.a:${PORTSDIR}/net-im/tox
-LIB_DEPENDS=	libopencv_highgui.so:${PORTSDIR}/graphics/opencv \
+BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat
+LIB_DEPENDS=	libtoxcore.so:${PORTSDIR}/net-im/tox \
+		libopencv_highgui.so:${PORTSDIR}/graphics/opencv \
 		libopencv_core.so:${PORTSDIR}/graphics/opencv-core \
+		libavcodec26.so:${PORTSDIR}/multimedia/ffmpeg26 \
 		libvpx.so:${PORTSDIR}/multimedia/libvpx \
 		libfilteraudio.so:${PORTSDIR}/audio/libfilteraudio \
 		libsodium.so:${PORTSDIR}/security/libsodium \
 		libqrencode.so:${PORTSDIR}/graphics/libqrencode
-RUN_DEPENDS=	${LOCALBASE}/lib/libtoxcore.a:${PORTSDIR}/net-im/tox
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	tux3
-GH_TAGNAME=	25329d3
+GH_TAGNAME=	ce2c830
 
 USES=		compiler:c++11-lib desktop-file-utils openal:soft qmake gmake
 USE_GNOME=	glib20 gtk20 cairo gdkpixbuf2
 USE_XORG=	x11 xscrnsaver
 USE_QT5=	core gui network xml opengl sql sql-sqlite3_run widgets svg \
 		concurrent buildtools_build linguisttools_build
+CXXFLAGS+=	-I${LOCALBASE}/include/ffmpeg26
+LDFLAGS+=	-L${LOCALBASE}/lib/ffmpeg26
 
 PLIST_FILES=	bin/qtox \
 		share/applications/qTox.desktop
@@ -41,9 +43,13 @@ pre-everything::
 post-patch:
 	@${REINPLACE_CMD} -e 's|$$$$system(git rev-parse HEAD)|"${GH_TAGNAME}"|' \
 		${WRKSRC}/qtox.pro
-	@${REINPLACE_CMD} -e 's|INCLUDEPATH += "/usr/include|INCLUDEPATH += "/usr/local/include|' \
+	@${REINPLACE_CMD} -e 's|INCLUDEPATH += "/usr/include|INCLUDEPATH += "${LOCALBASE}/include|' \
 		${WRKSRC}/qtox.pro
-	@${REINPLACE_CMD} -e 's|INCLUDEPATH += "/usr/lib|INCLUDEPATH += "/usr/local/lib|' \
+	@${REINPLACE_CMD} -e 's|INCLUDEPATH += "/usr/lib64|INCLUDEPATH += "${LOCALBASE}/lib|' \
+		${WRKSRC}/qtox.pro
+	@${REINPLACE_CMD} -e 's|INCLUDEPATH += "/usr/lib|INCLUDEPATH += "${LOCALBASE}/lib|' \
+		${WRKSRC}/qtox.pro
+	@${REINPLACE_CMD} -e 's|-lavformat -lavdevice -lavcodec -lavutil -lswscale|-lavformat26 -lavdevice26 -lavcodec26 -lavutil26 -lswscale26|' \
 		${WRKSRC}/qtox.pro
 
 pre-configure:
diff --git a/net-im/qTox/distinfo b/net-im/qTox/distinfo
index 5125309226d2..982e5487b94e 100644
--- a/net-im/qTox/distinfo
+++ b/net-im/qTox/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tux3-qTox-0.150426-25329d3_GH0.tar.gz) = aa8615a0e57fce5dd4ed4bf19a9934b8e1d8f34bf6dbaeb1d16ece2ef9405869
-SIZE (tux3-qTox-0.150426-25329d3_GH0.tar.gz) = 4643786
+SHA256 (tux3-qTox-0.150614-ce2c830_GH0.tar.gz) = c59580b98886acf9ec5acb1a85b7f6544d53bc2d72491dddeb8865b4d64dd3f6
+SIZE (tux3-qTox-0.150614-ce2c830_GH0.tar.gz) = 4556369
diff --git a/net-im/qTox/files/patch-qtox.pro b/net-im/qTox/files/patch-qtox.pro
index 984ef8c9ce6f..c3322ca2f839 100644
--- a/net-im/qTox/files/patch-qtox.pro
+++ b/net-im/qTox/files/patch-qtox.pro
@@ -1,8 +1,8 @@
---- qtox.pro.orig	2015-04-27 03:03:27 UTC
+--- qtox.pro.orig	2015-06-12 10:53:59 UTC
 +++ qtox.pro
-@@ -433,6 +433,18 @@ SOURCES += \
-     src/profilelocker.cpp \
-     src/avatarbroadcaster.cpp
+@@ -483,6 +483,18 @@ SOURCES += \
+     src/widget/translator.cpp \
+     src/persistence/settingsserializer.cpp
  
 +unix {
 +    target.path  = $$PREFIX/bin
@@ -17,5 +17,5 @@
 +}
 +
  HEADERS += \
-     src/audio.h \
+     src/audio/audio.h \
      src/core/core.h \
diff --git a/net-im/qTox/files/patch-src_main.cpp b/net-im/qTox/files/patch-src_main.cpp
new file mode 100644
index 000000000000..fce8ccc494eb
--- /dev/null
+++ b/net-im/qTox/files/patch-src_main.cpp
@@ -0,0 +1,13 @@
+--- src/main.cpp.orig	2015-06-12 10:53:59 UTC
++++ src/main.cpp
+@@ -280,3 +280,10 @@ int main(int argc, char *argv[])
+     qDebug() << "Clean exit with status"<<errorcode;
+     return errorcode;
+ }
++
++// Missing in libxccrt.so function __cxa_deleted_virtual, see FreeBSD Bug#200863
++extern "C" void __cxa_deleted_virtual()
++{
++  abort();
++}
++
diff --git a/net-im/qTox/files/patch-src_platform_camera_v4l2.cpp b/net-im/qTox/files/patch-src_platform_camera_v4l2.cpp
new file mode 100644
index 000000000000..8d94e9c04ff4
--- /dev/null
+++ b/net-im/qTox/files/patch-src_platform_camera_v4l2.cpp
@@ -0,0 +1,10 @@
+--- src/platform/camera/v4l2.cpp.orig	2015-06-15 03:25:21 UTC
++++ src/platform/camera/v4l2.cpp
+@@ -26,6 +26,7 @@
+ #include <fcntl.h>
+ #include <sys/ioctl.h>
+ #include <linux/videodev2.h>
++#include <errno.h>
+ 
+ /**
+  * Most of this file is adapted from libavdevice's v4l2.c,
diff --git a/net-im/qTox/files/patch-src_platform_camera_v4l2.h b/net-im/qTox/files/patch-src_platform_camera_v4l2.h
new file mode 100644
index 000000000000..f8ba4ab59af3
--- /dev/null
+++ b/net-im/qTox/files/patch-src_platform_camera_v4l2.h
@@ -0,0 +1,11 @@
+--- src/platform/camera/v4l2.h.orig	2015-06-12 10:53:59 UTC
++++ src/platform/camera/v4l2.h
+@@ -24,7 +24,7 @@
+ #include <QPair>
+ #include "src/video/videomode.h"
+ 
+-#ifndef Q_OS_LINUX
++#ifndef Q_OS_UNIX
+ #error "This file is only meant to be compiled for Linux targets"
+ #endif
+