mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-02-02 11:09:29 +00:00
Code Issues Releases Activity

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

Browse Source 
PR:		ports/200865
Submitted by:	yuri (at) rawbw.com (qTox maintainer) + patches from other maintainers
Approved by:	maintainers
This commit is contained in:
Thierry Thomas 2015-06-18 19:50:53 +00:00
parent 7de8786295
commit a4c17142e1
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=390058
15 changed files with 74 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
audio/libfilteraudio/Makefile
View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= libfilteraudio
PORTVERSION= 0.150426
PORTVERSION= 0.150524
CATEGORIES= audio
MAINTAINER= yuri@rawbw.com
@ -12,8 +12,8 @@ LICENSE= BSD3CLAUSE
USE_GITHUB= yes
GH_ACCOUNT= irungentoo
GH_PROJECT= libfilteraudio
GH_TAGNAME= d64d957
GH_PROJECT= filter_audio
GH_TAGNAME= 612c5a1
USES= gmake
USE_LDCONFIG= yes

4
audio/libfilteraudio/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (irungentoo-libfilteraudio-0.150426-d64d957_GH0.tar.gz) = b25d0fdd2434499f9c036214a2930c0881d448444ce70f7bda63bd13a74affa9
SIZE (irungentoo-libfilteraudio-0.150426-d64d957_GH0.tar.gz) = 191873
SHA256 (irungentoo-filter_audio-0.150524-612c5a1_GH0.tar.gz) = 76847f06097707d50a07a72791bde0e32a06353bf6abd677f11163e1cd1ce14d
SIZE (irungentoo-filter_audio-0.150524-612c5a1_GH0.tar.gz) = 208659

22
net-im/qTox/Makefile
View File

@ -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:

4
net-im/qTox/distinfo
View File

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

10
net-im/qTox/files/patch-qtox.pro
View File

@ -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 \

13
net-im/qTox/files/patch-src_main.cpp Normal file
View File

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

10
net-im/qTox/files/patch-src_platform_camera_v4l2.cpp Normal file
View File

@ -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,

11
net-im/qTox/files/patch-src_platform_camera_v4l2.h Normal file
View File

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

9
net-im/tox/Makefile
View File

@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= toxcore
PORTVERSION= 0.150519
PORTREVISION= 2
PORTVERSION= 0.150616
CATEGORIES= net-im net-p2p
MAINTAINER= thierry@FreeBSD.org
@ -13,14 +12,12 @@ LICENSE= GPLv3
BUILD_DEPENDS= checkmk:${PORTSDIR}/devel/libcheck
LIB_DEPENDS= libvpx.so:${PORTSDIR}/multimedia/libvpx \
libopus.so:${PORTSDIR}/audio/opus \
libv4l2.so:${PORTSDIR}/multimedia/libv4l \
libswscale.so:${PORTSDIR}/multimedia/ffmpeg
libopus.so:${PORTSDIR}/audio/opus
USE_GITHUB= yes
GH_ACCOUNT= irungentoo
GH_PROJECT= ${PORTNAME}
GH_TAGNAME= 8760aba
GH_TAGNAME= 836daa9
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-tests

4
net-im/tox/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (irungentoo-toxcore-0.150519-8760aba_GH0.tar.gz) = 356cba5a275f9d88a5f8536b7ac361add62e3234021fb194152c1c066d68dbdb
SIZE (irungentoo-toxcore-0.150519-8760aba_GH0.tar.gz) = 369589
SHA256 (irungentoo-toxcore-0.150616-836daa9_GH0.tar.gz) = f8cf884bfeecae599778679eac28803fb2963683d0be163f84b28194cf8072b4
SIZE (irungentoo-toxcore-0.150616-836daa9_GH0.tar.gz) = 371142

5
net-im/toxic/Makefile
View File

@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= toxic
PORTVERSION= 0.6.0.150519
PORTREVISION= 1
PORTVERSION= 0.6.0.160615
CATEGORIES= net-im
MAINTAINER= thierry@FreeBSD.org
@ -19,7 +18,7 @@ RUN_DEPENDS= ${LOCALBASE}/lib/libtoxcore.a:${PORTSDIR}/net-im/tox
USE_GITHUB= yes
GH_ACCOUNT= Tox
GH_TAGNAME= 231078b
GH_TAGNAME= 409e4dd
OPTIONS_DEFINE= X11
OPTIONS_DEFAULT=X11

4
net-im/toxic/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (Tox-toxic-0.6.0.150519-231078b_GH0.tar.gz) = 6283b58223c110c6dcf88920c21379bff24076097b72df0a3186c9639031b440
SIZE (Tox-toxic-0.6.0.150519-231078b_GH0.tar.gz) = 1107750
SHA256 (Tox-toxic-0.6.0.160615-409e4dd_GH0.tar.gz) = 1af21150bd14edd6c8795de96519e0c68167d2aba7ae30023775606ff234fda1
SIZE (Tox-toxic-0.6.0.160615-409e4dd_GH0.tar.gz) = 1107918

5
net-im/uTox/Makefile
View File

@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= uTox
DISTVERSION= 0.2.s.20150514
PORTREVISION= 1
DISTVERSION= 0.3.2.20150613
CATEGORIES= net-im net-p2p
MAINTAINER= fidaj@ukr.net
@ -23,7 +22,7 @@ RUN_DEPENDS= ${LOCALBASE}/lib/libtoxcore.a:${PORTSDIR}/net-im/tox
USE_GITHUB= yes
GH_ACCOUNT= notsecure
#GH_PROJECT= ${PORTNAME}
GH_TAGNAME= 6e6b64a
GH_TAGNAME= 5a5132f
USES= compiler:c11 desktop-file-utils gmake openal:al pkgconfig
USE_XORG= x11 xext xrender

4
net-im/uTox/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (notsecure-uTox-0.2.s.20150514-6e6b64a_GH0.tar.gz) = e6bcc6ff396cc16817ec0272a224b2675e506c35ab2c2bd596c9388e72eed28b
SIZE (notsecure-uTox-0.2.s.20150514-6e6b64a_GH0.tar.gz) = 778219
SHA256 (notsecure-uTox-0.3.2.20150613-5a5132f_GH0.tar.gz) = 8d52c35dde8148934a4e02db8a0c477e88ac66e1459e06ec806da0363ac1eceb
SIZE (notsecure-uTox-0.3.2.20150613-5a5132f_GH0.tar.gz) = 942638

11
net-im/uTox/files/patch-Makefile
View File

@ -1,4 +1,4 @@
--- Makefile.orig 2015-04-19 07:13:44 UTC
--- Makefile.orig 2015-06-13 00:14:56 UTC
+++ Makefile
@@ -16,10 +16,6 @@ ifeq ($(V4LCONVERT), 1)
DEPS += libv4lconvert
@ -19,12 +19,3 @@
endif
ifeq ($(UNITY), 1)
@@ -100,7 +97,7 @@ install: utox
mkdir -p $(DESTDIR)$(PREFIX)/share/applications
install -m 644 utox.desktop $(DESTDIR)$(PREFIX)/share/applications/utox.desktop
- if [ "$UNITY" -eq "1" ]; then echo "X-MessagingMenu-UsesChatSection=true" >> $(DESTDIR)$(PREFIX)/share/applications/utox.desktop; fi
+ if [ "$(UNITY)" -eq "1" ]; then echo "X-MessagingMenu-UsesChatSection=true" >> $(DESTDIR)$(PREFIX)/share/applications/utox.desktop; fi
mkdir -p $(DESTDIR)$(PREFIX)/share/man/man1
install -m 644 utox.1 $(DESTDIR)$(PREFIX)/share/man/man1/utox.1