Index: head/net-im/qTox/Makefile =================================================================== --- head/net-im/qTox/Makefile (revision 402147) +++ head/net-im/qTox/Makefile (revision 402148) @@ -1,56 +1,55 @@ # Created by: Yuri Victorovich # $FreeBSD$ PORTNAME= qTox -PORTVERSION= 0.150614 -PORTREVISION= 2 +PORTVERSION= 0.151116 CATEGORIES= net-im net-p2p MAINTAINER= yuri@rawbw.com COMMENT= Qt 5 based Tox client 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 \ libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \ libvpx.so:${PORTSDIR}/multimedia/libvpx \ libfilteraudio.so:${PORTSDIR}/audio/libfilteraudio \ libsodium.so:${PORTSDIR}/security/libsodium \ libqrencode.so:${PORTSDIR}/graphics/libqrencode 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 USE_XORG= x11 xscrnsaver USE_QT5= core gui network xml opengl sql sql-sqlite3_run widgets svg \ concurrent buildtools_build linguisttools_build PLIST_FILES= bin/qtox \ share/applications/qTox.desktop pre-everything:: @${ECHO_MSG} @${ECHO_MSG} "Warning: qTox won't build if the option NaCl was selected for Tox!" @${ECHO_MSG} 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 pre-configure: @${REINPLACE_CMD} '/Comment/s,=.*,=${COMMENT},' \ ${WRKSRC}/qTox.desktop .include Index: head/net-im/qTox/distinfo =================================================================== --- head/net-im/qTox/distinfo (revision 402147) +++ head/net-im/qTox/distinfo (revision 402148) @@ -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 Index: head/net-im/qTox/files/patch-src_platform_camera_v4l2.cpp =================================================================== --- head/net-im/qTox/files/patch-src_platform_camera_v4l2.cpp (revision 402147) +++ head/net-im/qTox/files/patch-src_platform_camera_v4l2.cpp (nonexistent) @@ -1,10 +0,0 @@ ---- src/platform/camera/v4l2.cpp.orig 2015-06-15 03:25:21 UTC -+++ src/platform/camera/v4l2.cpp -@@ -26,6 +26,7 @@ - #include - #include - #include -+#include - - /** - * Most of this file is adapted from libavdevice's v4l2.c, Property changes on: head/net-im/qTox/files/patch-src_platform_camera_v4l2.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net-im/qTox/files/patch-src_main.cpp =================================================================== --- head/net-im/qTox/files/patch-src_main.cpp (revision 402147) +++ head/net-im/qTox/files/patch-src_main.cpp (revision 402148) @@ -1,13 +1,13 @@ ---- 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"< #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 Index: head/net-im/qTox/files/patch-src_video_cameradevice.cpp =================================================================== --- head/net-im/qTox/files/patch-src_video_cameradevice.cpp (nonexistent) +++ head/net-im/qTox/files/patch-src_video_cameradevice.cpp (revision 402148) @@ -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> 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 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 Property changes on: head/net-im/qTox/files/patch-src_video_cameradevice.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property