svn commit: r431133 - in head/net-im/uTox: . files
Carlos J. Puga Medina
cpm at FreeBSD.org
Wed Jan 11 01:27:48 UTC 2017
Hi Thomas,
On Tue, 2017-01-10 at 20:52 +0000, Thierry Thomas wrote:
> Author: thierry
> Date: Tue Jan 10 20:52:40 2017
> New Revision: 431133
> URL: https://svnweb.freebsd.org/changeset/ports/431133
>
> Log:
> Chase toxcore and upgrade to 0.11.1.
>
> PR: 215746
> Approved by: maintainer (Chris Hutchinson)
>
> Deleted:
> 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/distinfo
> head/net-im/uTox/files/patch-src_main.h
> head/net-im/uTox/files/patch-src_xlib_main.c
> head/net-im/uTox/files/patch-src_xlib_video.c
> head/net-im/uTox/pkg-plist
>
> Modified: head/net-im/uTox/Makefile
> =====================================================================
> =========
> --- head/net-im/uTox/Makefile Tue Jan 10 20:52:05 2017
> (r431132)
> +++ head/net-im/uTox/Makefile Tue Jan 10 20:52:40 2017
> (r431133)
> @@ -1,8 +1,7 @@
> # $FreeBSD$
>
> PORTNAME= uTox
> -PORTVERSION= 0.9.8.20160729
> -PORTREVISION= 2
> +PORTVERSION= 0.11.1
> CATEGORIES= net-im net-p2p
>
> MAINTAINER= portmaster at BSDforge.com
> @@ -23,12 +22,11 @@ LIB_DEPENDS= libfreetype.so:print/freety
> RUN_DEPENDS= ${LOCALBASE}/lib/libtoxcore.a:net-im/tox
>
> USE_GITHUB= yes
> -GH_ACCOUNT= GrayHatter
> -GH_TAGNAME= 66bf323
> +GH_TAGNAME= 1835eae
>
> -USES= compiler:c11 desktop-file-utils gmake openal:al
> pkgconfig
> +USES= cmake compiler:c11 desktop-file-utils
> localbase:ldflags openal:al \
> + pkgconfig
> USE_XORG= x11 xext xrender
> -INSTALLS_ICONS= yes
>
> OPTIONS_DEFINE= DBUS
> OPTIONS_DEFAULT= DBUS
> @@ -36,15 +34,10 @@ OPTIONS_DEFAULT= DBUS
> DBUS_LIB_DEPENDS= libdbus-1.so:devel/dbus
> DBUS_MAKE_ARGS_OFF= DBUS=0
>
> -post-patch:
> - @${REINPLACE_CMD} -e 's|$$(GIT_V)|${DISTVERSION}-
> ${GH_TAGNAME}|' \
> - -e 's|(DATAROOTDIR)/man|(PREFIX)/man|'
> ${WRKSRC}/${MAKEFILE}
> -
> pre-configure:
> - @(if [ ! -e "${LOCALBASE}/lib/libtoxav.so" ]; then \
> - ${ECHO_CMD} "==> ${PKGNAME} requires net-im/tox port
> to be built with SODIUM option enabled"; \
> - ${FALSE}; \
> - fi)
> + ${REINPLACE_CMD} -e 's|resolv dl||' \
> + -e
> 's|/usr/include/freetype2|${LOCALBASE}/include/freetype2|' \
> + ${WRKSRC}/CMakeLists.txt
>
> post-install:
> @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/utox
>
> Modified: head/net-im/uTox/distinfo
> =====================================================================
> =========
> --- head/net-im/uTox/distinfo Tue Jan 10 20:52:05 2017
> (r431132)
> +++ head/net-im/uTox/distinfo Tue Jan 10 20:52:40 2017
> (r431133)
> @@ -1,3 +1,3 @@
> -TIMESTAMP = 1471099250
> -SHA256 (GrayHatter-uTox-0.9.8.20160729-66bf323_GH0.tar.gz) =
> 91924726d555b457c31f4c710fc1952684cc0c6ecfb214806e9643fab2e441fb
> -SIZE (GrayHatter-uTox-0.9.8.20160729-66bf323_GH0.tar.gz) = 2358300
> +TIMESTAMP = 1483474222
> +SHA256 (uTox-uTox-0.11.1-1835eae_GH0.tar.gz) =
> bd6c093c30ee56315dc97dc70bc32a761b748c761353eadb6e940a5cdbc5891d
> +SIZE (uTox-uTox-0.11.1-1835eae_GH0.tar.gz) = 2378596
>
> Modified: head/net-im/uTox/files/patch-src_main.h
> =====================================================================
> =========
> --- head/net-im/uTox/files/patch-src_main.h Tue Jan 10
> 20:52:05 2017 (r431132)
> +++ head/net-im/uTox/files/patch-src_main.h Tue Jan 10
> 20:52:40 2017 (r431133)
> @@ -1,11 +1,13 @@
> ---- src/main.h.orig 2016-07-26 23:53:18 UTC
> +--- src/main.h.orig 2016-12-21 09:12:44 UTC
> +++ src/main.h
> -@@ -45,7 +45,7 @@
> +@@ -80,8 +80,8 @@
> #define volatile(x) (*((volatile typeof(x)*)&x))
> #endif */
>
> -#ifndef __OBJC__
> -+#if !defined(__OBJC__) && !defined(__NetBSD__) &&
> !defined(__FreeBSD__)
> - #define volatile(x) (x)
> +-#define volatile(x)(x)
> ++#if !defined(__OBJC__) || defined(__NetBSD__) ||
> defined(__FreeBSD__)
> ++#define volatile(x) x
^^^
Please, fix missing brackets in main.h
> #endif
> - /* UTOX_SCALE is used as the default so that we have a lot of
> options for scale size.
> +
> + #define SCALE(x) (((int)((ui_scale / 10.0) * ((double)x))) ?: 1)
>
> Modified: head/net-im/uTox/files/patch-src_xlib_main.c
> =====================================================================
> =========
> --- head/net-im/uTox/files/patch-src_xlib_main.c Tue Jan 10
> 20:52:05 2017 (r431132)
> +++ head/net-im/uTox/files/patch-src_xlib_main.c Tue Jan 10
> 20:52:40 2017 (r431133)
> @@ -1,29 +1,28 @@
> ---- src/xlib/main.c.orig 2016-07-26 23:53:18 UTC
> +--- src/xlib/main.c.orig 2016-12-21 09:12:44 UTC
> +++ src/xlib/main.c
> -@@ -73,8 +73,9 @@ void postmessage(uint32_t msg, uint16_t
> +@@ -35,7 +35,9 @@ void postmessage(uint32_t msg, uint16_t
> XFlush(display);
> }
>
> --
> +#ifdef __LINUX__
> #include <linux/input.h>
> +#endif
> - FILE *ptt_keyboard_handle;
> + FILE * ptt_keyboard_handle;
> Display *ptt_display;
> - void init_ptt(void){
> -@@ -100,6 +101,7 @@ _Bool check_ptt_key(void){
> + void init_ptt(void) {
> +@@ -60,6 +62,7 @@ bool check_ptt_key(void) {
> int ptt_key;
>
> /* First, we try for direct access to the keyboard. */
> +#ifdef __LINUX__
> - ptt_key = KEY_LEFTCTRL; //
> TODO allow user to change this...
> + 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 @@ _Bool check_ptt_key(void){
> +@@ -78,6 +81,7 @@ bool check_ptt_key(void) {
> 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);
> + ptt_key = XKeysymToKeycode(display, XK_Control_L);
>
> Modified: head/net-im/uTox/files/patch-src_xlib_video.c
> =====================================================================
> =========
> --- head/net-im/uTox/files/patch-src_xlib_video.c Tue Jan 10
> 20:52:05 2017 (r431132)
> +++ head/net-im/uTox/files/patch-src_xlib_video.c Tue Jan 10
> 20:52:40 2017 (r431133)
> @@ -1,12 +1,12 @@
> ---- src/xlib/video.c.orig 2016-07-26 23:53:18 UTC
> +--- src/xlib/video.c.orig 2016-12-21 09:12:44 UTC
> +++ src/xlib/video.c
> -@@ -152,6 +152,9 @@ _Bool native_video_init(void *handle) {
> - if(isdesktop(handle)) {
> +@@ -144,6 +144,9 @@ bool native_video_init(void *handle) {
> + 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);
> + video_x = volatile(grabx);
> + video_y = volatile(graby);
> + video_width = volatile(grabpx);
>
> Modified: head/net-im/uTox/pkg-plist
> =====================================================================
> =========
> --- head/net-im/uTox/pkg-plist Tue Jan 10 20:52:05 2017
> (r431132)
> +++ head/net-im/uTox/pkg-plist Tue Jan 10 20:52:40 2017
> (r431133)
> @@ -1,18 +1,3 @@
> bin/utox
> share/applications/utox.desktop
> -share/icons/hicolor/128x128/apps/utox.png
> -share/icons/hicolor/14x14/apps/utox.png
> -share/icons/hicolor/16x16/apps/utox.png
> -share/icons/hicolor/192x192/apps/utox.png
> -share/icons/hicolor/22x22/apps/utox.png
> -share/icons/hicolor/24x24/apps/utox.png
> -share/icons/hicolor/256x256/apps/utox.png
> -share/icons/hicolor/32x32/apps/utox.png
> -share/icons/hicolor/36x36/apps/utox.png
> -share/icons/hicolor/48x48/apps/utox.png
> -share/icons/hicolor/512x512/apps/utox.png
> -share/icons/hicolor/64x64/apps/utox.png
> -share/icons/hicolor/72x72/apps/utox.png
> -share/icons/hicolor/96x96/apps/utox.png
> -share/icons/hicolor/scalable/apps/utox.svg
> man/man1/utox.1.gz
>
--
Carlos Jacobo Puga Medina <cpm at FreeBSD.org>
PGP fingerprint = C60E 9497 5302 793B CC2D BB89 A1F3 5D66 E6D0 5453
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 618 bytes
Desc: This is a digitally signed message part
URL: <http://lists.freebsd.org/pipermail/svn-ports-all/attachments/20170111/a41d631f/attachment.sig>
More information about the svn-ports-all
mailing list