svn commit: r415337 - in head/net-im/uTox: . files
Dmitry Marakasov
amdmi3 at FreeBSD.org
Mon May 16 16:01:32 UTC 2016
Author: amdmi3
Date: Mon May 16 16:01:29 2016
New Revision: 415337
URL: https://svnweb.freebsd.org/changeset/ports/415337
Log:
- Update to 0.8.2.20160511
PR: 209424
Submitted by: fidaj at ukr.net (maintainer)
Added:
head/net-im/uTox/files/patch-src_main.h (contents, props changed)
head/net-im/uTox/files/patch-src_xlib_main.c (contents, props changed)
head/net-im/uTox/files/patch-src_xlib_video.c (contents, props changed)
Modified:
head/net-im/uTox/Makefile
head/net-im/uTox/distinfo
head/net-im/uTox/files/patch-Makefile
head/net-im/uTox/files/patch-src_ui.c
Modified: head/net-im/uTox/Makefile
==============================================================================
--- head/net-im/uTox/Makefile Mon May 16 15:38:33 2016 (r415336)
+++ head/net-im/uTox/Makefile Mon May 16 16:01:29 2016 (r415337)
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= uTox
-PORTVERSION= 0.7.0.20160321
+PORTVERSION= 0.8.2.20160511
CATEGORIES= net-im net-p2p
MAINTAINER= fidaj at ukr.net
@@ -22,7 +22,7 @@ RUN_DEPENDS= ${LOCALBASE}/lib/libtoxcore
USE_GITHUB= yes
GH_ACCOUNT= GrayHatter
-GH_TAGNAME= 9524f98
+GH_TAGNAME= cc4388c
USES= compiler:c11 desktop-file-utils gmake openal:al pkgconfig
USE_XORG= x11 xext xrender
Modified: head/net-im/uTox/distinfo
==============================================================================
--- head/net-im/uTox/distinfo Mon May 16 15:38:33 2016 (r415336)
+++ head/net-im/uTox/distinfo Mon May 16 16:01:29 2016 (r415337)
@@ -1,2 +1,2 @@
-SHA256 (GrayHatter-uTox-0.7.0.20160321-9524f98_GH0.tar.gz) = 5e6a6023e63ec77f5378541ed5f03981aa8b71b5586d8b02b24335dfcc88a636
-SIZE (GrayHatter-uTox-0.7.0.20160321-9524f98_GH0.tar.gz) = 1986717
+SHA256 (GrayHatter-uTox-0.8.2.20160511-cc4388c_GH0.tar.gz) = 7c436cec5bd524ffcce3e1824dbebb7a93a121d0bc5d6860f8dadd1494e67067
+SIZE (GrayHatter-uTox-0.8.2.20160511-cc4388c_GH0.tar.gz) = 2015584
Modified: head/net-im/uTox/files/patch-Makefile
==============================================================================
--- head/net-im/uTox/files/patch-Makefile Mon May 16 15:38:33 2016 (r415336)
+++ head/net-im/uTox/files/patch-Makefile Mon May 16 16:01:29 2016 (r415337)
@@ -1,4 +1,4 @@
---- Makefile.orig 2016-03-21 02:14:57 UTC
+--- Makefile.orig 2016-05-10 07:09:15 UTC
+++ Makefile
@@ -2,9 +2,9 @@
# set to anything else to disable them
@@ -12,7 +12,7 @@
DEPS = libtoxav libtoxcore openal vpx libsodium
-@@ -53,6 +53,37 @@ ifeq ($(UNAME_S), Linux)
+@@ -54,6 +54,37 @@ ifeq ($(UNAME_S), Linux)
TRAY_OBJ = icons/utox-128x128.o
TRAY_GEN = $(LD) -r -b binary icons/utox-128x128.png -o
@@ -49,4 +49,3 @@
+ TRAY_GEN = $(LD) -r -b binary icons/utox-128x128.png -o
else ifeq ($(UNAME_O), Cygwin)
OUT_FILE = utox.exe
-
Added: head/net-im/uTox/files/patch-src_main.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net-im/uTox/files/patch-src_main.h Mon May 16 16:01:29 2016 (r415337)
@@ -0,0 +1,11 @@
+--- src/main.h.orig 2016-05-13 18:05:27.586256000 +0300
++++ src/main.h 2016-05-13 18:06:21.738883000 +0300
+@@ -74,7 +74,7 @@
+ #define volatile(x) (*((volatile typeof(x)*)&x))
+ #endif */
+
+-#ifndef __OBJC__
++#if !defined(__OBJC__) && !defined(__NetBSD__) && !defined(__FreeBSD__)
+ #define volatile(x) (x)
+ #endif
+ /* UTOX_SCALE is used as the default so that we have a lot of options for scale size.
Modified: head/net-im/uTox/files/patch-src_ui.c
==============================================================================
--- head/net-im/uTox/files/patch-src_ui.c Mon May 16 15:38:33 2016 (r415336)
+++ head/net-im/uTox/files/patch-src_ui.c Mon May 16 16:01:29 2016 (r415337)
@@ -1,6 +1,6 @@
---- src/ui.c.orig 2016-03-21 02:14:57 UTC
+--- src/ui.c.orig 2016-05-10 07:09:15 UTC
+++ src/ui.c
-@@ -275,16 +275,9 @@ static void draw_settings_header(int UNU
+@@ -271,16 +271,9 @@ static void draw_settings_header(int UNU
setfont(FONT_SELF_NAME);
drawstr(MAIN_LEFT + SCALE(10), SCALE(10), UTOX_SETTINGS);
#ifdef GIT_VERSION
Added: head/net-im/uTox/files/patch-src_xlib_main.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net-im/uTox/files/patch-src_xlib_main.c Mon May 16 16:01:29 2016 (r415337)
@@ -0,0 +1,29 @@
+--- src/xlib/main.c.orig 2016-05-13 17:52:03.371614000 +0300
++++ src/xlib/main.c 2016-05-13 17:53:38.294993000 +0300
+@@ -73,8 +73,9 @@
+ XFlush(display);
+ }
+
+-
++#ifdef __LINUX__
+ #include <linux/input.h>
++#endif
+ FILE *ptt_keyboard_handle;
+ Display *ptt_display;
+ void init_ptt(void){
+@@ -100,6 +101,7 @@
+ int ptt_key;
+
+ /* First, we try for direct access to the keyboard. */
++#ifdef __LINUX__
+ ptt_key = KEY_LEFTCTRL; // TODO allow user to change this...
+ if (ptt_keyboard_handle) {
+ /* Nice! we have direct access to the keyboard! */
+@@ -117,6 +119,7 @@
+ return 0;
+ }
+ }
++#endif
+ /* Okay nope, lets' fallback to xinput... *pouts*
+ * Fall back to Querying the X for the current keymap. */
+ ptt_key = XKeysymToKeycode(display, XK_Control_L);
Added: head/net-im/uTox/files/patch-src_xlib_video.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net-im/uTox/files/patch-src_xlib_video.c Mon May 16 16:01:29 2016 (r415337)
@@ -0,0 +1,12 @@
+--- src/xlib/video.c.orig 2016-05-13 18:12:01.175591000 +0300
++++ src/xlib/video.c 2016-05-13 18:12:27.944571000 +0300
+@@ -152,6 +152,9 @@
+ if(isdesktop(handle)) {
+ utox_v4l_fd = -1;
+
++#ifndef volatile
++#define volatile(x) (*((volatile typeof(x)*)&x))
++#endif
+ video_x = volatile(grabx);
+ video_y = volatile(graby);
+ video_width = volatile(grabpx);
More information about the svn-ports-all
mailing list