Attachment #207669 for bug #240721

View | Details | Raw Unified | Return to bug 240721
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	uTox
DISTVERSIONPREFIX=	v
DISTVERSION=	0.17.1
PORTREVISION=	7
CATEGORIES=	net-im net-p2p
MASTER_SITES=	https://github.com/uTox/uTox/releases/download/v${PORTVERSION}/

MAINTAINER=	tobik@FreeBSD.org
COMMENT=	Lightweight Tox client

LICENSE=	MIT
LICENSE_FILE=	${WRKSRC}/LICENSE

BROKEN_aarch64=	fails to compile: endian.h:68:20: too many arguments provided to function-like macro invocation
BROKEN_armv6=	fails to compile: endian.h:68:20: too many arguments provided to function-like macro invocation
BROKEN_armv7=	fails to compile: endian.h:68:20: too many arguments provided to function-like macro invocation

BUILD_DEPENDS=	${LOCALBASE}/include/linux/input.h:devel/evdev-proto \
		${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
LIB_DEPENDS=	libfilteraudio.so:audio/libfilteraudio \
		libfontconfig.so:x11-fonts/fontconfig \
		libfreetype.so:print/freetype2 \
		libopus.so:audio/opus \
		libsodium.so:security/libsodium \
		libtoxcore.so:net-im/tox \
		libv4lconvert.so:multimedia/libv4l \
		libvpx.so:multimedia/libvpx
		libopus.so:audio/opus \
		libtoxcore.so:net-im/tox

USES=		cmake compiler:c11 desktop-file-utils dos2unix openal pkgconfig \
		xorg
USE_GITHUB=	yes
GH_TUPLE=	compuphase:minIni:8ce144c3c287fa4e59f8ed4c405cd8b7e29f189b:miniini/third-party/minini \
		nayuki:QR-Code-generator:fe992753d2c7d55a16c1b966961bd27e11e622dd:qrcodegen/third-party/qrcodegen \
		nothings:stb:052dce117ed989848a950308bd99eef55525dfb1:stb/third-party/stb
USE_XORG=	ice sm x11 xext xrender

CMAKE_OFF=	ENABLE_LTO ENABLE_TESTS
# Uses ld -b binary without -m 
LLD_UNSAFE=	yes
WRKSRC=		${WRKDIR}/uTox

OPTIONS_DEFINE=		DBUS
OPTIONS_DEFAULT=	DBUS

DBUS_LIB_DEPENDS=	libdbus-1.so:devel/dbus
DBUS_CMAKE_BOOL=	ENABLE_DBUS
DBUS_LIB_DEPENDS=	libdbus-1.so:devel/dbus

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)net-im/uTox/distinfo (-3 / +9 lines)
1	TIMESTAMP = 1529567839	1	TIMESTAMP = 1569041277
2	SHA256 (uTox-0.17.0-full.tar.gz) = 219ae83e9139d3a421c7bb6d03cc3f8953dd36fb8e8b67100d47d92d413e9d46	2	SHA256 (uTox-uTox-v0.17.1_GH0.tar.gz) = 5db81c9ec89246707d903647404e1fc7deda4fa555d4ded16f994b1c235e9059
3	SIZE (uTox-0.17.0-full.tar.gz) = 3946812	3	SIZE (uTox-uTox-v0.17.1_GH0.tar.gz) = 2375502
		4	SHA256 (compuphase-minIni-8ce144c3c287fa4e59f8ed4c405cd8b7e29f189b_GH0.tar.gz) = 7da8957a7afb46c33f3ec2c82f4274f6e26b8940d8b09af1968f4ab23239af16
		5	SIZE (compuphase-minIni-8ce144c3c287fa4e59f8ed4c405cd8b7e29f189b_GH0.tar.gz) = 172200
		6	SHA256 (nayuki-QR-Code-generator-fe992753d2c7d55a16c1b966961bd27e11e622dd_GH0.tar.gz) = 521090ef8b36d40acd52d50e4c3fb0f80ad38ca6cf13da0233974d6d461fddfe
		7	SIZE (nayuki-QR-Code-generator-fe992753d2c7d55a16c1b966961bd27e11e622dd_GH0.tar.gz) = 136512
		8	SHA256 (nothings-stb-052dce117ed989848a950308bd99eef55525dfb1_GH0.tar.gz) = 978de595fcc62448dbdc8ca8def7879fbe63245dd7f57c1898270e53a0abf95b
		9	SIZE (nothings-stb-052dce117ed989848a950308bd99eef55525dfb1_GH0.tar.gz) = 1358923

Lines 1-6 Link Here

(-)net-im/uTox/files/patch-CMakeLists.txt (-5 / +5 lines)
1	--- CMakeLists.txt.orig 2018-06-21 08:33:29 UTC	1	--- CMakeLists.txt.orig 2019-09-21 02:09:21 UTC
2	+++ CMakeLists.txt	2	+++ CMakeLists.txt
3	@@ -184,8 +184,7 @@ add_cflag("-fPIC")	3	@@ -178,8 +178,7 @@ add_cflag("-fPIC")
4	# Fix GNU stack	4	# Fix GNU stack
5	if(CMAKE_C_COMPILER_ID MATCHES "GNU")	5	if(CMAKE_C_COMPILER_ID MATCHES "GNU")
6	# Have ld strip the symbols from Release and MinSizeRel build types.	6	# Have ld strip the symbols from Release and MinSizeRel build types.
Lines 10-16 Link Here
10		10
11	if(LINUX)	11	if(LINUX)
12	# enable Link Time Optimization on gcc (linux only currently)	12	# enable Link Time Optimization on gcc (linux only currently)
13	@@ -220,8 +219,7 @@ elseif(CMAKE_C_COMPILER_ID MATCHES "Clang")	13	@@ -214,8 +213,7 @@ elseif(CMAKE_C_COMPILER_ID MATCHES "Clang")
14	endif()	14	endif()
15		15
16	# Have ld strip the symbols from Release and MinSizeRel build types. (-Oz is clang specific)	16	# Have ld strip the symbols from Release and MinSizeRel build types. (-Oz is clang specific)
Lines 18-22 Link Here
18	- set(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL} -Oz -s")	18	- set(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL} -Oz -s")
19	+ set(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL} -s")	19	+ set(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL} -s")
20		20
21	if(NOT ENABLE_ASAN)	21	if(FREEBSD)
22	if(NOT APPLE)	22	set(LIBRARIES ${LIBRARIES} "cxxrt")




--- src/xlib/main.c.orig	2019-09-21 02:05:53 UTC
https://github.com/uTox/uTox/commit/22b183433c37d51867ec4eb55813ac2b1db6477c

--- src/xlib/main.c.orig	2019-02-17 05:10:45 UTC
+++ src/xlib/main.c
@@ -93,10 +93,8 @@ void init_ptt(void) {
 
 #ifdef __linux__
 #include <linux/input.h>
+#elif defined(__DragonFly__) || defined(__FreeBSD__)
+#include <linux/input.h>
+#endif
+
+#if defined(__linux__) || defined(__DragonFly__) || defined(__FreeBSD__)
 static bool linux_check_ptt(void) {
     /* First, we try for direct access to the keyboard. */
     int ptt_key = KEY_LEFTCTRL; // TODO allow user to change this...
@@ -146,7 +151,7 @@ bool check_ptt_key(void) {
         return true; /* If push to talk is disabled, return true. */
     }
 
 
-#ifdef __linux__
+#if defined(__linux__) || defined(__DragonFly__) || defined(__FreeBSD__)
 #include <linux/input.h>
-#elif defined(__DragonFly__) || defined(__FreeBSD__)
-#include <dev/misc/evdev/input.h>
 #endif
 
 #if defined(__linux__) || defined(__DragonFly__) || defined(__FreeBSD__)

Return to bug 240721

Lines 1-45 Link Here

(-)net-im/uTox/Makefile (-20 / +22 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= uTox	3	PORTNAME= uTox
4	DISTVERSION= 0.17.0	4	DISTVERSIONPREFIX= v
5	DISTVERSIONSUFFIX= -full	5	DISTVERSION= 0.17.1
6	PORTREVISION= 7
7	CATEGORIES= net-im net-p2p	6	CATEGORIES= net-im net-p2p
8	MASTER_SITES= https://github.com/uTox/uTox/releases/download/v${PORTVERSION}/
9		7
10	MAINTAINER= portmaster@BSDforge.com	8	MAINTAINER= tobik@FreeBSD.org
11	COMMENT= Lightweight Tox client	9	COMMENT= Lightweight Tox client
12		10
13	LICENSE= MIT	11	LICENSE= MIT
14	LICENSE_FILE= ${WRKSRC}/LICENSE	12	LICENSE_FILE= ${WRKSRC}/LICENSE
15		13
16	BROKEN_aarch64= fails to compile: endian.h:68:20: too many arguments provided to function-like macro invocation	14	BROKEN_aarch64= fails to compile: endian.h:68:20: too many arguments provided to function-like macro invocation
17	BROKEN_armv6= fails to compile: endian.h:68:20: too many arguments provided to function-like macro invocation	15	BROKEN_armv6= fails to compile: endian.h:68:20: too many arguments provided to function-like macro invocation
18	BROKEN_armv7= fails to compile: endian.h:68:20: too many arguments provided to function-like macro invocation	16	BROKEN_armv7= fails to compile: endian.h:68:20: too many arguments provided to function-like macro invocation
19		17
20	BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat \	18	BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto \
21	${LOCALBASE}/include/linux/input.h:devel/evdev-proto	19	${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
22	LIB_DEPENDS= libfreetype.so:print/freetype2 \	20	LIB_DEPENDS= libfilteraudio.so:audio/libfilteraudio \
23	libfontconfig.so:x11-fonts/fontconfig \	21	libfontconfig.so:x11-fonts/fontconfig \
		22	libfreetype.so:print/freetype2 \
		23	libopus.so:audio/opus \
24	libsodium.so:security/libsodium \	24	libsodium.so:security/libsodium \
		25	libtoxcore.so:net-im/tox \
25	libv4lconvert.so:multimedia/libv4l \	26	libv4lconvert.so:multimedia/libv4l \
26	libvpx.so:multimedia/libvpx \	27	libvpx.so:multimedia/libvpx
27	libopus.so:audio/opus \
28	libtoxcore.so:net-im/tox
29		28
30	USES= cmake compiler:c11 desktop-file-utils dos2unix \	29	USES= cmake compiler:c11 desktop-file-utils dos2unix openal pkgconfig \
31	openal pkgconfig	30	xorg
		31	USE_GITHUB= yes
		32	GH_TUPLE= compuphase:minIni:8ce144c3c287fa4e59f8ed4c405cd8b7e29f189b:miniini/third-party/minini \
		33	nayuki:QR-Code-generator:fe992753d2c7d55a16c1b966961bd27e11e622dd:qrcodegen/third-party/qrcodegen \
		34	nothings:stb:052dce117ed989848a950308bd99eef55525dfb1:stb/third-party/stb
32	USE_XORG= ice sm x11 xext xrender	35	USE_XORG= ice sm x11 xext xrender
33		36
34	CMAKE_OFF= ENABLE_LTO	37	CMAKE_OFF= ENABLE_LTO ENABLE_TESTS
35	DOS2UNIX_GLOB= *	38	# Uses ld -b binary without -m
36	LLD_UNSAFE= yes	39	LLD_UNSAFE= yes
37	WRKSRC= ${WRKDIR}/uTox
38		40
39	OPTIONS_DEFINE= DBUS	41	OPTIONS_DEFINE= DBUS
40	OPTIONS_DEFAULT= DBUS	42	OPTIONS_DEFAULT= DBUS
41		43
		44	DBUS_LIB_DEPENDS= libdbus-1.so:devel/dbus
42	DBUS_CMAKE_BOOL= ENABLE_DBUS	45	DBUS_CMAKE_BOOL= ENABLE_DBUS
43	DBUS_LIB_DEPENDS= libdbus-1.so:devel/dbus
44		46
45	.include <bsd.port.mk>	47	.include <bsd.port.mk>

Lines 1-26 Link Here

(-)net-im/uTox/files/patch-src_xlib_main.c (-21 / +9 lines)
1	Based on:	1	--- src/xlib/main.c.orig 2019-09-21 02:05:53 UTC
2	https://github.com/uTox/uTox/commit/22b183433c37d51867ec4eb55813ac2b1db6477c
3
4	--- src/xlib/main.c.orig 2019-02-17 05:10:45 UTC
5	+++ src/xlib/main.c	2	+++ src/xlib/main.c
6	@@ -94,6 +94,11 @@ void init_ptt(void) {	3	@@ -93,10 +93,8 @@ void init_ptt(void) {
7		4
8	#ifdef __linux__
9	#include <linux/input.h>
10	+#elif defined(__DragonFly__) \|\| defined(__FreeBSD__)
11	+#include <linux/input.h>
12	+#endif
13	+
14	+#if defined(__linux__) \|\| defined(__DragonFly__) \|\| defined(__FreeBSD__)
15	static bool linux_check_ptt(void) {
16	/* First, we try for direct access to the keyboard. */
17	int ptt_key = KEY_LEFTCTRL; // TODO allow user to change this...
18	@@ -146,7 +151,7 @@ bool check_ptt_key(void) {
19	return true; /* If push to talk is disabled, return true. */
20	}
21		5
		6
22	-#ifdef __linux__	7	-#ifdef __linux__
23	+#if defined(__linux__) \|\| defined(__DragonFly__) \|\| defined(__FreeBSD__)	8	+#if defined(__linux__) \|\| defined(__DragonFly__) \|\| defined(__FreeBSD__)
24	return linux_check_ptt();	9	#include <linux/input.h>
25	#else	10	-#elif defined(__DragonFly__) \|\| defined(__FreeBSD__)
26	return bsd_check_ptt();	11	-#include <dev/misc/evdev/input.h>
		12	#endif
		13
		14	#if defined(__linux__) \|\| defined(__DragonFly__) \|\| defined(__FreeBSD__)