svn commit: r427585 - in head/net-im/qTox: . files
Jason E. Hale
jhale at FreeBSD.org
Fri Dec 2 22:25:50 UTC 2016
Author: jhale
Date: Fri Dec 2 22:25:47 2016
New Revision: 427585
URL: https://svnweb.freebsd.org/changeset/ports/427585
Log:
Update to 1.6.0
This should fix audio output issues addressed in the PR
PR: 214393
Submitted by: Yuri Victorovich <yuri at rawbw.com> (maintainer)
Reported by: <aeuii at posteo.de>
Added:
head/net-im/qTox/files/patch-src_platform_camera_v4l2.cpp (contents, props changed)
Modified:
head/net-im/qTox/Makefile
head/net-im/qTox/distinfo
head/net-im/qTox/files/patch-qtox.pro
head/net-im/qTox/files/patch-src_main.cpp
head/net-im/qTox/files/patch-src_platform_camera_v4l2.h
head/net-im/qTox/files/patch-src_video_cameradevice.cpp
head/net-im/qTox/files/patch-src_video_videomode.cpp
head/net-im/qTox/files/patch-src_widget_form_settings_aboutsettings.ui
Modified: head/net-im/qTox/Makefile
==============================================================================
--- head/net-im/qTox/Makefile Fri Dec 2 22:01:01 2016 (r427584)
+++ head/net-im/qTox/Makefile Fri Dec 2 22:25:47 2016 (r427585)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= qTox
-PORTVERSION= 1.5.2
+PORTVERSION= 1.6.0
DISTVERSIONPREFIX= v
CATEGORIES= net-im net-p2p
@@ -25,7 +25,7 @@ LIB_DEPENDS= libtoxcore.so:net-im/tox \
libfontconfig.so:x11-fonts/fontconfig
USE_GITHUB= yes
-GH_ACCOUNT= tux3
+GH_ACCOUNT= qTox
SUB_FILES= pkg-message
Modified: head/net-im/qTox/distinfo
==============================================================================
--- head/net-im/qTox/distinfo Fri Dec 2 22:01:01 2016 (r427584)
+++ head/net-im/qTox/distinfo Fri Dec 2 22:25:47 2016 (r427585)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1475432358
-SHA256 (tux3-qTox-v1.5.2_GH0.tar.gz) = 0307122993d7999b44f5310bd690cbb9bd4a43646a88edecf56a315a36ce84be
-SIZE (tux3-qTox-v1.5.2_GH0.tar.gz) = 3452479
+TIMESTAMP = 1480684987
+SHA256 (qTox-qTox-v1.6.0_GH0.tar.gz) = 7450e751da5cc6dce00b58df6d06a309e2674c7bd9311de6af21e53c36c3f155
+SIZE (qTox-qTox-v1.6.0_GH0.tar.gz) = 3481328
Modified: head/net-im/qTox/files/patch-qtox.pro
==============================================================================
--- head/net-im/qTox/files/patch-qtox.pro Fri Dec 2 22:01:01 2016 (r427584)
+++ head/net-im/qTox/files/patch-qtox.pro Fri Dec 2 22:25:47 2016 (r427585)
@@ -1,6 +1,6 @@
---- qtox.pro.orig 2016-08-09 23:12:33 UTC
+--- qtox.pro.orig 2016-11-13 15:20:00 UTC
+++ qtox.pro
-@@ -48,11 +48,11 @@ include(translations/i18n.pri)
+@@ -53,11 +53,11 @@ include(translations/i18n.pri)
system($$fromfile(translations/i18n.pri, updateallqm))
isEmpty(GIT_VERSION) {
@@ -14,10 +14,10 @@
}
DEFINES += GIT_DESCRIBE=\"\\\"$$quote($$GIT_DESCRIBE)\\\"\"
# date works on linux/mac, but it would hangs qmake on windows
-@@ -481,3 +481,15 @@ SOURCES += \
+@@ -493,3 +493,15 @@ SOURCES += \
+ src/widget/form/groupinviteform.cpp \
src/widget/tool/profileimporter.cpp \
- src/widget/passwordedit.cpp \
- src/video/videomode.cpp
+ src/widget/passwordedit.cpp
+
+unix {
+ target.path = $$PREFIX/bin
Modified: head/net-im/qTox/files/patch-src_main.cpp
==============================================================================
--- head/net-im/qTox/files/patch-src_main.cpp Fri Dec 2 22:01:01 2016 (r427584)
+++ head/net-im/qTox/files/patch-src_main.cpp Fri Dec 2 22:25:47 2016 (r427585)
@@ -1,6 +1,6 @@
---- src/main.cpp.orig 2016-08-09 23:12:33 UTC
+--- src/main.cpp.orig 2016-11-13 15:20:00 UTC
+++ src/main.cpp
-@@ -306,3 +306,10 @@ int main(int argc, char *argv[])
+@@ -317,3 +317,10 @@ int main(int argc, char *argv[])
#endif
return errorcode;
}
Added: head/net-im/qTox/files/patch-src_platform_camera_v4l2.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net-im/qTox/files/patch-src_platform_camera_v4l2.cpp Fri Dec 2 22:25:47 2016 (r427585)
@@ -0,0 +1,14 @@
+Fix build with GCC 4.9
+src/platform/camera/v4l2.cpp:204:24: error: 'printf' was not declared in this scope
+ printf("BAD!\n");
+
+--- src/platform/camera/v4l2.cpp.orig 2016-12-02 20:44:09 UTC
++++ src/platform/camera/v4l2.cpp
+@@ -29,6 +29,7 @@
+ #include <linux/videodev2.h>
+ #include <dirent.h>
+ #include <map>
++#include <cstdio>
+
+ /**
+ * Most of this file is adapted from libavdevice's v4l2.c,
Modified: head/net-im/qTox/files/patch-src_platform_camera_v4l2.h
==============================================================================
--- head/net-im/qTox/files/patch-src_platform_camera_v4l2.h Fri Dec 2 22:01:01 2016 (r427584)
+++ head/net-im/qTox/files/patch-src_platform_camera_v4l2.h Fri Dec 2 22:25:47 2016 (r427585)
@@ -1,4 +1,4 @@
---- src/platform/camera/v4l2.h.orig 2016-08-09 23:12:33 UTC
+--- src/platform/camera/v4l2.h.orig 2016-11-13 15:20:00 UTC
+++ src/platform/camera/v4l2.h
@@ -24,7 +24,7 @@
#include <QPair>
Modified: head/net-im/qTox/files/patch-src_video_cameradevice.cpp
==============================================================================
--- head/net-im/qTox/files/patch-src_video_cameradevice.cpp Fri Dec 2 22:01:01 2016 (r427584)
+++ head/net-im/qTox/files/patch-src_video_cameradevice.cpp Fri Dec 2 22:25:47 2016 (r427585)
@@ -1,4 +1,4 @@
---- src/video/cameradevice.cpp.orig 2016-08-09 23:12:33 UTC
+--- src/video/cameradevice.cpp.orig 2016-11-13 15:20:00 UTC
+++ src/video/cameradevice.cpp
@@ -31,7 +31,7 @@ extern "C" {
#ifdef Q_OS_WIN
@@ -27,7 +27,7 @@
else if (iformat->name == QString("video4linux2,v4l2"))
devices += v4l2::getDeviceList();
#endif
-@@ -461,7 +461,7 @@ QVector<VideoMode> CameraDevice::getVide
+@@ -467,7 +467,7 @@ QVector<VideoMode> CameraDevice::getVide
else if (iformat->name == QString("dshow"))
return DirectShow::getDeviceModes(devName);
#endif
@@ -36,8 +36,8 @@
else if (iformat->name == QString("video4linux2,v4l2"))
return v4l2::getDeviceModes(devName);
#endif
-@@ -482,7 +482,7 @@ QVector<VideoMode> CameraDevice::getVide
- */
+@@ -488,7 +488,7 @@ QVector<VideoMode> CameraDevice::getVide
+ */
QString CameraDevice::getPixelFormatString(uint32_t pixel_format)
{
-#ifdef Q_OS_LINUX
@@ -45,8 +45,8 @@
return v4l2::getPixelFormatString(pixel_format);
#else
return QString("unknown");
-@@ -498,7 +498,7 @@ false otherwise (such as if there's no p
- */
+@@ -504,7 +504,7 @@ QString CameraDevice::getPixelFormatStri
+ */
bool CameraDevice::betterPixelFormat(uint32_t a, uint32_t b)
{
-#ifdef Q_OS_LINUX
@@ -54,7 +54,7 @@
return v4l2::betterPixelFormat(a, b);
#else
return false;
-@@ -518,7 +518,7 @@ bool CameraDevice::getDefaultInputFormat
+@@ -524,7 +524,7 @@ bool CameraDevice::getDefaultInputFormat
avdevice_register_all();
// Desktop capture input formats
@@ -63,7 +63,7 @@
idesktopFormat = av_find_input_format("x11grab");
#endif
#ifdef Q_OS_WIN
-@@ -526,7 +526,7 @@ bool CameraDevice::getDefaultInputFormat
+@@ -532,7 +532,7 @@ bool CameraDevice::getDefaultInputFormat
#endif
// Webcam input formats
Modified: head/net-im/qTox/files/patch-src_video_videomode.cpp
==============================================================================
--- head/net-im/qTox/files/patch-src_video_videomode.cpp Fri Dec 2 22:01:01 2016 (r427584)
+++ head/net-im/qTox/files/patch-src_video_videomode.cpp Fri Dec 2 22:25:47 2016 (r427585)
@@ -1,4 +1,4 @@
---- src/video/videomode.cpp.orig 2016-08-10 16:00:51 UTC
+--- src/video/videomode.cpp.orig 2016-11-13 15:20:00 UTC
+++ src/video/videomode.cpp
@@ -18,6 +18,7 @@
*/
@@ -7,4 +7,4 @@
+#include <stdlib.h>
/**
- @struct VideoMode
+ * @struct VideoMode
Modified: head/net-im/qTox/files/patch-src_widget_form_settings_aboutsettings.ui
==============================================================================
--- head/net-im/qTox/files/patch-src_widget_form_settings_aboutsettings.ui Fri Dec 2 22:01:01 2016 (r427584)
+++ head/net-im/qTox/files/patch-src_widget_form_settings_aboutsettings.ui Fri Dec 2 22:25:47 2016 (r427585)
@@ -1,8 +1,8 @@
---- src/widget/form/settings/aboutsettings.ui.orig 2016-08-09 23:12:33 UTC
+--- src/widget/form/settings/aboutsettings.ui.orig 2016-11-13 15:20:00 UTC
+++ src/widget/form/settings/aboutsettings.ui
@@ -111,6 +111,9 @@
<property name="text">
- <string>Commit hash: <a href="https://github.com/qTox/qTox/commit/$GIT_VERSION">$GIT_VERSION</a></string>
+ <string notr="true">{GIT_VERSION}</string>
</property>
+ <property name="visible">
+ <bool>false</bool>
More information about the svn-ports-head
mailing list