summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Wills <swills@FreeBSD.org>2019-04-19 19:08:01 +0000
committerSteve Wills <swills@FreeBSD.org>2019-04-19 19:08:01 +0000
commitb45626d7bd931fb3c39bda9949b8cb05696e8459 (patch)
tree8d461bb34b9b070cb4f2ab2e056994a66c51d2a4
parent- update to 3.5-20190330 (diff)
net-im/uTox: Fix push to talk
PR: 235799 Submitted by: Darren Mulligan <fixer@bsdmail.com> Approved by: maintainer timeout (portmaster@bsdforge.com, >2 months)
-rw-r--r--net-im/uTox/Makefile6
-rw-r--r--net-im/uTox/files/patch-src_xlib_main.c23
2 files changed, 27 insertions, 2 deletions
diff --git a/net-im/uTox/Makefile b/net-im/uTox/Makefile
index a0d58363cb95..5bb60e60ae4a 100644
--- a/net-im/uTox/Makefile
+++ b/net-im/uTox/Makefile
@@ -3,7 +3,7 @@
PORTNAME= uTox
DISTVERSION= 0.17.0
DISTVERSIONSUFFIX= -full
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= net-im net-p2p
MASTER_SITES= https://github.com/uTox/uTox/releases/download/v${PORTVERSION}/
@@ -17,7 +17,8 @@ BROKEN_aarch64= fails to compile: endian.h:68:20: too many arguments provided t
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/videodev2.h:multimedia/v4l_compat
+BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat \
+ ${LOCALBASE}/include/linux/input.h:devel/evdev-proto
LIB_DEPENDS= libfreetype.so:print/freetype2 \
libfontconfig.so:x11-fonts/fontconfig \
libsodium.so:security/libsodium \
@@ -29,6 +30,7 @@ LIB_DEPENDS= libfreetype.so:print/freetype2 \
USES= cmake compiler:c11 desktop-file-utils dos2unix \
openal pkgconfig
USE_XORG= ice sm x11 xext xrender
+
CMAKE_OFF= ENABLE_LTO
DOS2UNIX_GLOB= *
LLD_UNSAFE= yes
diff --git a/net-im/uTox/files/patch-src_xlib_main.c b/net-im/uTox/files/patch-src_xlib_main.c
new file mode 100644
index 000000000000..7e0ffeb96d50
--- /dev/null
+++ b/net-im/uTox/files/patch-src_xlib_main.c
@@ -0,0 +1,23 @@
+--- src/xlib/main.c.orig 2019-02-17 05:10:45 UTC
++++ src/xlib/main.c
+@@ -94,6 +94,11 @@ 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__)
+ return linux_check_ptt();
+ #else
+ return bsd_check_ptt();