Update to 20160530 v0.9.5.

PR:		209906
Submitted by:	Ivan Klymenko (maintainer)
This commit is contained in:
Thierry Thomas 2016-05-31 20:06:41 +00:00
parent ae38172850
commit 03ecb47a77
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=416216
3 changed files with 14 additions and 9 deletions

View file

@ -1,7 +1,7 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME= uTox PORTNAME= uTox
PORTVERSION= 0.8.2.20160511 PORTVERSION= 0.9.5.20160530
CATEGORIES= net-im net-p2p CATEGORIES= net-im net-p2p
MAINTAINER= fidaj@ukr.net MAINTAINER= fidaj@ukr.net
@ -17,12 +17,13 @@ LIB_DEPENDS= libfreetype.so:print/freetype2 \
libsodium.so:security/libsodium \ libsodium.so:security/libsodium \
libv4lconvert.so:multimedia/libv4l \ libv4lconvert.so:multimedia/libv4l \
libvpx.so:multimedia/libvpx \ libvpx.so:multimedia/libvpx \
libfilteraudio.so:audio/libfilteraudio libfilteraudio.so:audio/libfilteraudio\
libopus.so:audio/opus
RUN_DEPENDS= ${LOCALBASE}/lib/libtoxcore.a:net-im/tox RUN_DEPENDS= ${LOCALBASE}/lib/libtoxcore.a:net-im/tox
USE_GITHUB= yes USE_GITHUB= yes
GH_ACCOUNT= GrayHatter GH_ACCOUNT= GrayHatter
GH_TAGNAME= cc4388c GH_TAGNAME= c85c747
USES= compiler:c11 desktop-file-utils gmake openal:al pkgconfig USES= compiler:c11 desktop-file-utils gmake openal:al pkgconfig
USE_XORG= x11 xext xrender USE_XORG= x11 xext xrender

View file

@ -1,2 +1,2 @@
SHA256 (GrayHatter-uTox-0.8.2.20160511-cc4388c_GH0.tar.gz) = 7c436cec5bd524ffcce3e1824dbebb7a93a121d0bc5d6860f8dadd1494e67067 SHA256 (GrayHatter-uTox-0.9.5.20160530-c85c747_GH0.tar.gz) = 43aaad041c7a830bc7e422908855f314f396c4c9e30577e86c225a3b5377c93e
SIZE (GrayHatter-uTox-0.8.2.20160511-cc4388c_GH0.tar.gz) = 2015584 SIZE (GrayHatter-uTox-0.9.5.20160530-c85c747_GH0.tar.gz) = 2020325

View file

@ -1,4 +1,4 @@
--- Makefile.orig 2016-05-10 07:09:15 UTC --- Makefile.orig 2016-05-30 04:33:35 UTC
+++ Makefile +++ Makefile
@@ -2,9 +2,9 @@ @@ -2,9 +2,9 @@
# set to anything else to disable them # set to anything else to disable them
@ -12,7 +12,7 @@
DEPS = libtoxav libtoxcore openal vpx libsodium DEPS = libtoxav libtoxcore openal vpx libsodium
@@ -54,6 +54,37 @@ ifeq ($(UNAME_S), Linux) @@ -54,6 +54,40 @@ ifeq ($(UNAME_S), Linux)
TRAY_OBJ = icons/utox-128x128.o TRAY_OBJ = icons/utox-128x128.o
TRAY_GEN = $(LD) -r -b binary icons/utox-128x128.png -o TRAY_GEN = $(LD) -r -b binary icons/utox-128x128.png -o
@ -34,13 +34,16 @@
+ +
+ ifeq ($(DBUS), 1) + ifeq ($(DBUS), 1)
+ DEPS += dbus-1 + DEPS += dbus-1
+ CFLAGS += -DHAVE_DBUS
+ else + else
+ CFLAGS += -DNO_DBUS + CFLAGS += -DNO_DBUS
+ endif + endif
+ +
+ CFLAGS += $(shell pkg-config --cflags $(DEPS)) + PKG_CONFIG = pkg-config
+ +
+ LDFLAGS += $(shell pkg-config --libs $(DEPS)) + CFLAGS += $(shell $(PKG_CONFIG) --cflags $(DEPS))
+
+ LDFLAGS += $(shell $(PKG_CONFIG) --libs $(DEPS))
+ +
+ OS_SRC = $(wildcard src/xlib/*.c) + OS_SRC = $(wildcard src/xlib/*.c)
+ OS_OBJ = $(OS_SRC:.c=.o) + OS_OBJ = $(OS_SRC:.c=.o)
@ -49,3 +52,4 @@
+ TRAY_GEN = $(LD) -r -b binary icons/utox-128x128.png -o + TRAY_GEN = $(LD) -r -b binary icons/utox-128x128.png -o
else ifeq ($(UNAME_O), Cygwin) else ifeq ($(UNAME_O), Cygwin)
OUT_FILE = utox.exe OUT_FILE = utox.exe