View | Details | Raw Unified | Return to bug 229198 | Differences between
and this patch

Collapse All | Expand All

(-)uTox/Makefile (-24 / +15 lines)
Lines 1-48 Link Here
1
# $FreeBSD$
1
# $FreeBSD$
2
2
3
PORTNAME=	uTox
3
PORTNAME=	uTox
4
PORTVERSION=	0.11.1
4
DISTVERSION=	0.17.0
5
PORTREVISION=	6
5
DISTVERSIONSUFFIX=	-full
6
CATEGORIES=	net-im net-p2p
6
CATEGORIES=	net-im net-p2p
7
MASTER_SITES=	https://github.com/uTox/uTox/releases/download/v${PORTVERSION}/
7
8
8
MAINTAINER=	portmaster@BSDforge.com
9
MAINTAINER=	portmaster@BSDforge.com
9
COMMENT=	Lightweight Tox client
10
COMMENT=	Lightweight Tox client
10
11
11
LICENSE=	GPLv3
12
LICENSE=	MIT
12
LICENSE_FILE=	${WRKSRC}/LICENSE
13
LICENSE_FILE=	${WRKSRC}/LICENSE
13
14
14
BUILD_DEPENDS=	${LOCALBASE}/lib/libtoxcore.a:net-im/tox12 \
15
BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
15
		${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
16
LIB_DEPENDS=	libfreetype.so:print/freetype2 \
16
LIB_DEPENDS=	libfreetype.so:print/freetype2 \
17
		libfontconfig.so:x11-fonts/fontconfig \
17
		libfontconfig.so:x11-fonts/fontconfig \
18
		libsodium.so:security/libsodium \
18
		libsodium.so:security/libsodium \
19
		libv4lconvert.so:multimedia/libv4l \
19
		libv4lconvert.so:multimedia/libv4l \
20
		libvpx.so:multimedia/libvpx \
20
		libvpx.so:multimedia/libvpx \
21
		libfilteraudio.so:audio/libfilteraudio\
21
		libopus.so:audio/opus \
22
		libopus.so:audio/opus
22
		libtoxcore.so:net-im/tox
23
RUN_DEPENDS=	${LOCALBASE}/lib/libtoxcore.a:net-im/tox12
24
23
25
USE_GITHUB=	yes
24
USES=		cmake:outsource compiler:c11 desktop-file-utils dos2unix \
26
GH_TAGNAME=	1835eae
25
		openal pkgconfig
27
26
USE_XORG=	ice sm x11 xext xrender
28
USES=		cmake compiler:c11 desktop-file-utils localbase:ldflags openal:al	\
27
CMAKE_OFF=	ENABLE_LTO
29
		pkgconfig
28
DOS2UNIX_GLOB=	*
30
USE_XORG=	x11 xext xrender
31
LLD_UNSAFE=	yes
29
LLD_UNSAFE=	yes
30
WRKSRC=		${WRKDIR}/uTox
32
31
33
OPTIONS_DEFINE=		DBUS
32
OPTIONS_DEFINE=		DBUS
34
OPTIONS_DEFAULT=	DBUS
33
OPTIONS_DEFAULT=	DBUS
35
34
35
DBUS_CMAKE_BOOL=	ENABLE_DBUS
36
36
DBUS_LIB_DEPENDS=	libdbus-1.so:devel/dbus
37
DBUS_LIB_DEPENDS=	libdbus-1.so:devel/dbus
37
DBUS_MAKE_ARGS_OFF=	DBUS=0
38
38
39
pre-configure:
40
	${REINPLACE_CMD} -e 's|resolv dl||'	\
41
		-e 's|/usr/include/freetype2|${LOCALBASE}/include/freetype2|'	\
42
		${WRKSRC}/CMakeLists.txt
43
44
post-install:
45
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/utox
46
	${INSTALL_DATA} ${WRKSRC}/icons/utox-128x128.png ${STAGEDIR}${PREFIX}/share/pixmaps/utox.png
47
48
.include <bsd.port.mk>
39
.include <bsd.port.mk>
(-)uTox/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1483474222
1
TIMESTAMP =  1529593873
2
SHA256 (uTox-uTox-0.11.1-1835eae_GH0.tar.gz) = bd6c093c30ee56315dc97dc70bc32a761b748c761353eadb6e940a5cdbc5891d
2
SHA256 (uTox-0.17.0-full.tar.gz) = 219ae83e9139d3a421c7bb6d03cc3f8953dd36fb8e8b67100d47d92d413e9d46
3
SIZE (uTox-uTox-0.11.1-1835eae_GH0.tar.gz) = 2378596
3
SIZE (uTox-0.17.0-full.tar.gz) = 3946812
(-)uTox/files/patch-CMakeLists.txt (+22 lines)
Line 0 Link Here
1
--- CMakeLists.txt.orig	2018-06-21 08:16:43 UTC
2
+++ CMakeLists.txt
3
@@ -184,8 +184,7 @@ add_cflag("-fPIC")
4
 # Fix GNU stack
5
 if(CMAKE_C_COMPILER_ID MATCHES "GNU")
6
     # Have ld strip the symbols from Release and MinSizeRel build types.
7
-    set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -Os")
8
-    set(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL} -Os -s")
9
+    set(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL} -s")
10
 
11
     if(LINUX)
12
         # enable Link Time Optimization on gcc (linux only currently)
13
@@ -220,8 +219,7 @@ elseif(CMAKE_C_COMPILER_ID MATCHES "Clang")
14
     endif()
15
 
16
     # Have ld strip the symbols from Release and MinSizeRel build types. (-Oz is clang specific)
17
-    set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -Os")
18
-    set(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL} -Oz -s")
19
+    set(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL} -s")
20
 
21
     if(NOT ENABLE_ASAN)
22
         if(NOT APPLE)
(-)uTox/files/patch-src_main.h (-13 lines)
Lines 1-13 Link Here
1
--- src/main.h.orig	2016-12-21 09:12:44 UTC
2
+++ src/main.h
3
@@ -80,8 +80,8 @@
4
 #define volatile(x) (*((volatile typeof(x)*)&x))
5
 #endif */
6
 
7
-#ifndef __OBJC__
8
-#define volatile(x)(x)
9
+#if !defined(__OBJC__) || defined(__NetBSD__) || defined(__FreeBSD__)
10
+#define volatile(x)(x)
11
 #endif
12
 
13
 #define SCALE(x) (((int)((ui_scale / 10.0) * ((double)x))) ?: 1)
(-)uTox/files/patch-src_xlib_main.c (-28 lines)
Lines 1-28 Link Here
1
--- src/xlib/main.c.orig	2016-12-21 09:12:44 UTC
2
+++ src/xlib/main.c
3
@@ -35,7 +35,9 @@ void postmessage(uint32_t msg, uint16_t 
4
     XFlush(display);
5
 }
6
 
7
+#ifdef __LINUX__
8
 #include <linux/input.h>
9
+#endif
10
 FILE *   ptt_keyboard_handle;
11
 Display *ptt_display;
12
 void     init_ptt(void) {
13
@@ -60,6 +62,7 @@ bool check_ptt_key(void) {
14
     int ptt_key;
15
 
16
     /* First, we try for direct access to the keyboard. */
17
+#ifdef __LINUX__
18
     ptt_key = KEY_LEFTCTRL; // TODO allow user to change this...
19
     if (ptt_keyboard_handle) {
20
         /* Nice! we have direct access to the keyboard! */
21
@@ -78,6 +81,7 @@ bool check_ptt_key(void) {
22
             return 0;
23
         }
24
     }
25
+#endif
26
     /* Okay nope, lets' fallback to xinput... *pouts*
27
      * Fall back to Querying the X for the current keymap. */
28
     ptt_key       = XKeysymToKeycode(display, XK_Control_L);
(-)uTox/files/patch-src_xlib_video.c (-12 lines)
Lines 1-12 Link Here
1
--- src/xlib/video.c.orig	2016-12-21 09:12:44 UTC
2
+++ src/xlib/video.c
3
@@ -144,6 +144,9 @@ bool native_video_init(void *handle) {
4
     if (isdesktop(handle)) {
5
         utox_v4l_fd = -1;
6
 
7
+#ifndef volatile
8
+#define volatile(x) (*((volatile typeof(x)*)&x))
9
+#endif
10
         video_x      = volatile(grabx);
11
         video_y      = volatile(graby);
12
         video_width  = volatile(grabpx);
(-)uTox/pkg-descr (-1 / +1 lines)
Lines 9-12 Link Here
9
There are also binaries for other OS: Linux, Android, OS X and Windows, which
9
There are also binaries for other OS: Linux, Android, OS X and Windows, which
10
makes it possible to communicate between users of different OS.
10
makes it possible to communicate between users of different OS.
11
11
12
WWW: http://utox.org/
12
WWW: https://utox.io/
(-)uTox/pkg-plist (-2 / +15 lines)
Lines 1-4 Link Here
1
bin/utox
1
bin/utox
2
man/man1/utox.1.gz
2
share/applications/utox.desktop
3
share/applications/utox.desktop
3
share/pixmaps/utox.png
4
share/icons/hicolor/128x128/apps/utox-128x128.png
4
man/man1/utox.1.gz
5
share/icons/hicolor/14x14/apps/utox-14x14.png
6
share/icons/hicolor/16x16/apps/utox-16x16.png
7
share/icons/hicolor/22x22/apps/utox-22x22.png
8
share/icons/hicolor/24x24/apps/utox-24x24.png
9
share/icons/hicolor/256x256/apps/utox-256x256.png
10
share/icons/hicolor/32x32/apps/utox-32x32.png
11
share/icons/hicolor/36x36/apps/utox-36x36.png
12
share/icons/hicolor/48x48/apps/utox-48x48.png
13
share/icons/hicolor/512x512/apps/utox-512x512.png
14
share/icons/hicolor/64x64/apps/utox-64x64.png
15
share/icons/hicolor/72x72/apps/utox-72x72.png
16
share/icons/hicolor/96x96/apps/utox-96x96.png
17
share/icons/hicolor/scalable/apps/utox.svg

Return to bug 229198