Attachment #157754 for bug #200865




# $FreeBSD: head/net-im/qTox/Makefile 389468 2015-06-13 16:14:54Z vsevolod $

PORTNAME=	qTox
PORTVERSION=	0.150614
PORTREVISION=	3
CATEGORIES=	net-im net-p2p

MAINTAINER=	yuri@rawbw.com


LICENSE=	GPLv3

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=	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

post-patch:
	@${REINPLACE_CMD} -e 's|$$$$system(git rev-parse HEAD)|"${GH_TAGNAME}"|' \
		${WRKSRC}/qtox.pro
	@${REINPLACE_CMD} -e 's|INCLUDEPATH += "/usr/include|INCLUDEPATH += "${LOCALBASE}/include|' \
		${WRKSRC}/qtox.pro
	@${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:

Lines 1-2 Link Here

(-)net-im/qTox/distinfo (-2 / +2 lines)
1	SHA256 (tux3-qTox-0.150426-25329d3_GH0.tar.gz) = aa8615a0e57fce5dd4ed4bf19a9934b8e1d8f34bf6dbaeb1d16ece2ef9405869	1	SHA256 (tux3-qTox-0.150614-ce2c830_GH0.tar.gz) = c59580b98886acf9ec5acb1a85b7f6544d53bc2d72491dddeb8865b4d64dd3f6
2	SIZE (tux3-qTox-0.150426-25329d3_GH0.tar.gz) = 4643786	2	SIZE (tux3-qTox-0.150614-ce2c830_GH0.tar.gz) = 4556369

Lines 1-8 Link Here

(-)net-im/qTox/files/patch-qtox.pro (-5 / +5 lines)
1	--- qtox.pro.orig 2015-04-27 03:03:27 UTC	1	--- qtox.pro.orig 2015-06-12 10:53:59 UTC
2	+++ qtox.pro	2	+++ qtox.pro
3	@@ -433,6 +433,18 @@ SOURCES += \	3	@@ -483,6 +483,18 @@ SOURCES += \
4	src/profilelocker.cpp \	4	src/widget/translator.cpp \
5	src/avatarbroadcaster.cpp	5	src/persistence/settingsserializer.cpp
6		6
7	+unix {	7	+unix {
8	+ target.path = $$PREFIX/bin	8	+ target.path = $$PREFIX/bin
Lines 17-21 Link Here
17	+}	17	+}
18	+	18	+
19	HEADERS += \	19	HEADERS += \
20	src/audio.h \	20	src/audio/audio.h \
21	src/core/core.h \	21	src/core/core.h \




--- 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();
+}
+

Line 0 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,

Line 0 Link Here

(-)net-im/qTox/files/patch-src_platform_camera_v4l2.h (+11 lines)
	1	--- src/platform/camera/v4l2.h.orig 2015-06-12 10:53:59 UTC
	2	+++ src/platform/camera/v4l2.h
	3	@@ -24,7 +24,7 @@
	4	#include <QPair>
	5	#include "src/video/videomode.h"
	6
	7	-#ifndef Q_OS_LINUX
	8	+#ifndef Q_OS_UNIX
	9	#error "This file is only meant to be compiled for Linux targets"
	10	#endif
	11

Return to bug 200865

Lines 2-9 Link Here

(-)net-im/qTox/Makefile (-8 / +14 lines)
2	# $FreeBSD: head/net-im/qTox/Makefile 389468 2015-06-13 16:14:54Z vsevolod $	2	# $FreeBSD: head/net-im/qTox/Makefile 389468 2015-06-13 16:14:54Z vsevolod $
3		3
4	PORTNAME= qTox	4	PORTNAME= qTox
5	PORTVERSION= 0.150426	5	PORTVERSION= 0.150614
6	PORTREVISION= 3
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 11-34 Link Here
11		10
12	LICENSE= GPLv3	11	LICENSE= GPLv3
13		12
14	BUILD_DEPENDS= ${LOCALBASE}/lib/libtoxcore.a:${PORTSDIR}/net-im/tox	13	BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat
15	LIB_DEPENDS= libopencv_highgui.so:${PORTSDIR}/graphics/opencv \	14	LIB_DEPENDS= libtoxcore.so:${PORTSDIR}/net-im/tox \
		15	libopencv_highgui.so:${PORTSDIR}/graphics/opencv \
16	libopencv_core.so:${PORTSDIR}/graphics/opencv-core \	16	libopencv_core.so:${PORTSDIR}/graphics/opencv-core \
		17	libavcodec26.so:${PORTSDIR}/multimedia/ffmpeg26 \
17	libvpx.so:${PORTSDIR}/multimedia/libvpx \	18	libvpx.so:${PORTSDIR}/multimedia/libvpx \
18	libfilteraudio.so:${PORTSDIR}/audio/libfilteraudio \	19	libfilteraudio.so:${PORTSDIR}/audio/libfilteraudio \
19	libsodium.so:${PORTSDIR}/security/libsodium \	20	libsodium.so:${PORTSDIR}/security/libsodium \
20	libqrencode.so:${PORTSDIR}/graphics/libqrencode	21	libqrencode.so:${PORTSDIR}/graphics/libqrencode
21	RUN_DEPENDS= ${LOCALBASE}/lib/libtoxcore.a:${PORTSDIR}/net-im/tox
22		22
23	USE_GITHUB= yes	23	USE_GITHUB= yes
24	GH_ACCOUNT= tux3	24	GH_ACCOUNT= tux3
25	GH_TAGNAME= 25329d3	25	GH_TAGNAME= ce2c830
26		26
27	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
28	USE_GNOME= glib20 gtk20 cairo gdkpixbuf2	28	USE_GNOME= glib20 gtk20 cairo gdkpixbuf2
29	USE_XORG= x11 xscrnsaver	29	USE_XORG= x11 xscrnsaver
30	USE_QT5= core gui network xml opengl sql sql-sqlite3_run widgets svg \	30	USE_QT5= core gui network xml opengl sql sql-sqlite3_run widgets svg \
31	concurrent buildtools_build linguisttools_build	31	concurrent buildtools_build linguisttools_build
		32	CXXFLAGS+= -I${LOCALBASE}/include/ffmpeg26
		33	LDFLAGS+= -L${LOCALBASE}/lib/ffmpeg26
32		34
33	PLIST_FILES= bin/qtox \	35	PLIST_FILES= bin/qtox \
34	share/applications/qTox.desktop	36	share/applications/qTox.desktop
Lines 41-49 Link Here
41	post-patch:	43	post-patch:
42	@${REINPLACE_CMD} -e 's\|$$$$system(git rev-parse HEAD)\|"${GH_TAGNAME}"\|' \	44	@${REINPLACE_CMD} -e 's\|$$$$system(git rev-parse HEAD)\|"${GH_TAGNAME}"\|' \
43	${WRKSRC}/qtox.pro	45	${WRKSRC}/qtox.pro
44	@${REINPLACE_CMD} -e 's\|INCLUDEPATH += "/usr/include\|INCLUDEPATH += "/usr/local/include\|' \	46	@${REINPLACE_CMD} -e 's\|INCLUDEPATH += "/usr/include\|INCLUDEPATH += "${LOCALBASE}/include\|' \
45	${WRKSRC}/qtox.pro	47	${WRKSRC}/qtox.pro
46	@${REINPLACE_CMD} -e 's\|INCLUDEPATH += "/usr/lib\|INCLUDEPATH += "/usr/local/lib\|' \	48	@${REINPLACE_CMD} -e 's\|INCLUDEPATH += "/usr/lib64\|INCLUDEPATH += "${LOCALBASE}/lib\|' \
		49	${WRKSRC}/qtox.pro
		50	@${REINPLACE_CMD} -e 's\|INCLUDEPATH += "/usr/lib\|INCLUDEPATH += "${LOCALBASE}/lib\|' \
		51	${WRKSRC}/qtox.pro
		52	@${REINPLACE_CMD} -e 's\|-lavformat -lavdevice -lavcodec -lavutil -lswscale\|-lavformat26 -lavdevice26 -lavcodec26 -lavutil26 -lswscale26\|' \
47	${WRKSRC}/qtox.pro	53	${WRKSRC}/qtox.pro
48		54
49	pre-configure:	55	pre-configure:

Line 0 Link Here

(-)net-im/qTox/files/patch-src_main.cpp (+13 lines)
	1	--- src/main.cpp.orig 2015-06-12 10:53:59 UTC
	2	+++ src/main.cpp
	3	@@ -280,3 +280,10 @@ int main(int argc, char *argv[])
	4	qDebug() << "Clean exit with status"<<errorcode;
	5	return errorcode;
	6	}
	7	+
	8	+// Missing in libxccrt.so function __cxa_deleted_virtual, see FreeBSD Bug#200863
	9	+extern "C" void __cxa_deleted_virtual()
	10	+{
	11	+ abort();
	12	+}
	13	+