svn commit: r356184 - in head/net-im/tox: . files

[Thierry Thomas]

Author: thierry
Date: Sun Jun  1 22:13:54 2014
New Revision: 356184
URL: http://svnweb.freebsd.org/changeset/ports/356184
QAT: https://qat.redports.org/buildarchive/r356184/

Log:
  Refresh.

Added:
  head/net-im/tox/files/patch-toxav_toxav.c   (contents, props changed)
Deleted:
  head/net-im/tox/files/patch-toxav_phone.c
Modified:
  head/net-im/tox/Makefile
  head/net-im/tox/distinfo

Modified: head/net-im/tox/Makefile
==============================================================================
--- head/net-im/tox/Makefile	Sun Jun  1 22:04:16 2014	(r356183)
+++ head/net-im/tox/Makefile	Sun Jun  1 22:13:54 2014	(r356184)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	ProjectTox-Core
-PORTVERSION=	0.140514
+PORTVERSION=	0.140601
 PORTREVISION=	1
 CATEGORIES=	net-im net-p2p
 
@@ -13,34 +13,30 @@ LICENSE=	GPLv3
 
 BUILD_DEPENDS=	checkmk:${PORTSDIR}/devel/libcheck
 LIB_DEPENDS=	libvpx.so:${PORTSDIR}/multimedia/libvpx		\
-		libopus.so:${PORTSDIR}/audio/opus
+		libopus.so:${PORTSDIR}/audio/opus		\
+		libopenal.so.1:${PORTSDIR}/audio/openal-soft	\
+		libv4l2.so:${PORTSDIR}/multimedia/libv4l	\
+		libswscale.so:${PORTSDIR}/multimedia/ffmpeg
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	irungentoo
 GH_PROJECT=	ProjectTox-Core
 GH_TAGNAME=	${GH_COMMIT}
-GH_COMMIT=	8902232
+GH_COMMIT=	9684339
 
 USE_AUTOTOOLS=	libtoolize aclocal autoconf autoheader automake
 AUTOMAKE_ARGS=	-a -c -f
 USES=		pkgconfig pathfix libtool
+USE_SDL=	yes
 USE_LDCONFIG=	yes
 PATHFIX_MAKEFILEIN=	Makefile.am
 INSTALL_TARGET=		install-strip
 
 OPTIONS_RADIO=		CRYPTO
 OPTIONS_RADIO_CRYPTO=	SODIUM NACL
-OPTIONS_DEFINE=		PHONE
-OPTIONS_DEFAULT=	PHONE SODIUM
+OPTIONS_DEFAULT=	SODIUM
 OPTIONS_SUB=		yes
 
-PHONE_DESC=		Enable phone test
-PHONE_CONFIGURE_ENABLE=	phone
-PHONE_LIB_DEPENDS=	libopenal.so.1:${PORTSDIR}/audio/openal-soft	\
-			libv4l2.so:${PORTSDIR}/multimedia/libv4l	\
-			libswscale.so:${PORTSDIR}/multimedia/ffmpeg
-PHONE_USE=		SDL=sdl
-
 SODIUM_DESC=		Prefer libsodium
 SODIUM_LIB_DEPENDS=	libsodium.so:${PORTSDIR}/security/libsodium
 

Modified: head/net-im/tox/distinfo
==============================================================================
--- head/net-im/tox/distinfo	Sun Jun  1 22:04:16 2014	(r356183)
+++ head/net-im/tox/distinfo	Sun Jun  1 22:13:54 2014	(r356184)
@@ -1,2 +1,2 @@
-SHA256 (ProjectTox-Core-0.140514.tar.gz) = d6389cd49f5411aedae7e8bcaef8dbc3de207afb86d9e6be68adee2ee5cdb38a
-SIZE (ProjectTox-Core-0.140514.tar.gz) = 267723
+SHA256 (ProjectTox-Core-0.140601.tar.gz) = aba9ffbad2d26059905f88101ae73df9eaed6f6edbd121bcea3ca21adc60500b
+SIZE (ProjectTox-Core-0.140601.tar.gz) = 272908

Added: head/net-im/tox/files/patch-toxav_toxav.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-im/tox/files/patch-toxav_toxav.c	Sun Jun  1 22:13:54 2014	(r356184)
@@ -0,0 +1,18 @@
+--- toxav/toxav.c.orig	2014-05-31 21:36:37.000000000 +0200
++++ toxav/toxav.c	2014-06-02 00:11:25.000000000 +0200
+@@ -532,7 +532,7 @@
+         if (pkt->kind == VPX_CODEC_CX_FRAME_PKT) {
+             if ( copied + pkt->data.frame.sz > dest_max ) return ErrorPacketTooLarge;
+ 
+-            mempcpy(dest + copied, pkt->data.frame.buf, pkt->data.frame.sz);
++            memcpy(dest + copied, pkt->data.frame.buf, pkt->data.frame.sz);
+             copied += pkt->data.frame.sz;
+         }
+     }
+@@ -713,4 +713,4 @@
+ inline__ Tox *toxav_get_tox(ToxAv *av)
+ {
+     return (Tox *)av->messenger;
+-}
+\ No newline at end of file
++}