Date: Wed, 11 Jan 2017 02:27:45 +0100 From: "Carlos J. Puga Medina" <cpm@FreeBSD.org> To: Thierry Thomas <thierry@FreeBSD.org>, ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r431133 - in head/net-im/uTox: . files Message-ID: <1484098065.64484.8.camel@FreeBSD.org> In-Reply-To: <201701102052.v0AKqf6p077492@repo.freebsd.org> References: <201701102052.v0AKqf6p077492@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--=-efuKm8Yysyd2f3sF268g Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable 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 >=20 > Log: > =C2=A0 Chase toxcore and upgrade to 0.11.1. > =C2=A0=C2=A0 > =C2=A0 PR: 215746 > =C2=A0 Approved by: maintainer (Chris Hutchinson) >=20 > Deleted: > =C2=A0 head/net-im/uTox/files/patch-Makefile > =C2=A0 head/net-im/uTox/files/patch-src_ui.c > Modified: > =C2=A0 head/net-im/uTox/Makefile > =C2=A0 head/net-im/uTox/distinfo > =C2=A0 head/net-im/uTox/files/patch-src_main.h > =C2=A0 head/net-im/uTox/files/patch-src_xlib_main.c > =C2=A0 head/net-im/uTox/files/patch-src_xlib_video.c > =C2=A0 head/net-im/uTox/pkg-plist >=20 > Modified: head/net-im/uTox/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > =3D=3D=3D=3D=3D=3D=3D=3D=3D > --- head/net-im/uTox/Makefile Tue Jan 10 20:52:05 2017=09 > (r431132) > +++ head/net-im/uTox/Makefile Tue Jan 10 20:52:40 2017=09 > (r431133) > @@ -1,8 +1,7 @@ > =C2=A0# $FreeBSD$ > =C2=A0 > =C2=A0PORTNAME=3D uTox > -PORTVERSION=3D 0.9.8.20160729 > -PORTREVISION=3D 2 > +PORTVERSION=3D 0.11.1 > =C2=A0CATEGORIES=3D net-im net-p2p > =C2=A0 > =C2=A0MAINTAINER=3D portmaster@BSDforge.com > @@ -23,12 +22,11 @@ LIB_DEPENDS=3D libfreetype.so:print/freety > =C2=A0RUN_DEPENDS=3D ${LOCALBASE}/lib/libtoxcore.a:net-im/tox > =C2=A0 > =C2=A0USE_GITHUB=3D yes > -GH_ACCOUNT=3D GrayHatter > -GH_TAGNAME=3D 66bf323 > +GH_TAGNAME=3D 1835eae > =C2=A0 > -USES=3D compiler:c11 desktop-file-utils gmake openal:al > pkgconfig > +USES=3D cmake compiler:c11 desktop-file-utils > localbase:ldflags openal:al \ > + pkgconfig > =C2=A0USE_XORG=3D x11 xext xrender > -INSTALLS_ICONS=3D yes > =C2=A0 > =C2=A0OPTIONS_DEFINE=3D DBUS > =C2=A0OPTIONS_DEFAULT=3D DBUS > @@ -36,15 +34,10 @@ OPTIONS_DEFAULT=3D DBUS > =C2=A0DBUS_LIB_DEPENDS=3D libdbus-1.so:devel/dbus > =C2=A0DBUS_MAKE_ARGS_OFF=3D DBUS=3D0 > =C2=A0 > -post-patch: > - @${REINPLACE_CMD} -e 's|$$(GIT_V)|${DISTVERSION}- > ${GH_TAGNAME}|' \ > - -e 's|(DATAROOTDIR)/man|(PREFIX)/man|' > ${WRKSRC}/${MAKEFILE} > - > =C2=A0pre-configure: > - @(if [ ! -e "${LOCALBASE}/lib/libtoxav.so" ]; then \ > - ${ECHO_CMD} "=3D=3D> ${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 > =C2=A0 > =C2=A0post-install: > =C2=A0 @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/utox >=20 > Modified: head/net-im/uTox/distinfo > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > =3D=3D=3D=3D=3D=3D=3D=3D=3D > --- head/net-im/uTox/distinfo Tue Jan 10 20:52:05 2017=09 > (r431132) > +++ head/net-im/uTox/distinfo Tue Jan 10 20:52:40 2017=09 > (r431133) > @@ -1,3 +1,3 @@ > -TIMESTAMP =3D 1471099250 > -SHA256 (GrayHatter-uTox-0.9.8.20160729-66bf323_GH0.tar.gz) =3D > 91924726d555b457c31f4c710fc1952684cc0c6ecfb214806e9643fab2e441fb > -SIZE (GrayHatter-uTox-0.9.8.20160729-66bf323_GH0.tar.gz) =3D 2358300 > +TIMESTAMP =3D 1483474222 > +SHA256 (uTox-uTox-0.11.1-1835eae_GH0.tar.gz) =3D > bd6c093c30ee56315dc97dc70bc32a761b748c761353eadb6e940a5cdbc5891d > +SIZE (uTox-uTox-0.11.1-1835eae_GH0.tar.gz) =3D 2378596 >=20 > Modified: head/net-im/uTox/files/patch-src_main.h > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > =3D=3D=3D=3D=3D=3D=3D=3D=3D > --- 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 > =C2=A0+++ src/main.h > -@@ -45,7 +45,7 @@ > +@@ -80,8 +80,8 @@ > =C2=A0 #define volatile(x) (*((volatile typeof(x)*)&x)) > =C2=A0 #endif */ > =C2=A0=C2=A0 > =C2=A0-#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 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0^^^ Please, fix missing brackets in main.h > =C2=A0 #endif > - /* UTOX_SCALE is used as the default so that we have a lot of > options for scale size. > +=C2=A0 > + #define SCALE(x) (((int)((ui_scale / 10.0) * ((double)x))) ?: 1) >=20 > Modified: head/net-im/uTox/files/patch-src_xlib_main.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > =3D=3D=3D=3D=3D=3D=3D=3D=3D > --- 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 > =C2=A0+++ src/xlib/main.c > -@@ -73,8 +73,9 @@ void postmessage(uint32_t msg, uint16_t=C2=A0 > +@@ -35,7 +35,9 @@ void postmessage(uint32_t msg, uint16_t=C2=A0 > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0XFlush(display); > =C2=A0 } > =C2=A0=C2=A0 > -- > =C2=A0+#ifdef __LINUX__ > =C2=A0 #include <linux/input.h> > =C2=A0+#endif > - FILE *ptt_keyboard_handle; > + FILE *=C2=A0=C2=A0=C2=A0ptt_keyboard_handle; > =C2=A0 Display *ptt_display; > - void init_ptt(void){ > -@@ -100,6 +101,7 @@ _Bool check_ptt_key(void){ > + void=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0init_ptt(void) { > +@@ -60,6 +62,7 @@ bool check_ptt_key(void) { > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0int ptt_key; > =C2=A0=C2=A0 > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0/* First, we try for direct access to= the keyboard. */ > =C2=A0+#ifdef __LINUX__ > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0ptt_key =3D KEY_LEFTCTRL;=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0// > TODO allow user to change this... > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0ptt_key =3D KEY_LEFTCTRL; // TODO allow us= er to change this... > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0if (ptt_keyboard_handle) { > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0/* Nice! we h= ave direct access to the keyboard! */ > -@@ -117,6 +119,7 @@ _Bool check_ptt_key(void){ > +@@ -78,6 +81,7 @@ bool check_ptt_key(void) { > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0return 0; > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0} > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0} > =C2=A0+#endif > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0/* Okay nope, lets' fallback to xinpu= t... *pouts* > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0* Fall back to Querying the X f= or the current keymap. */ > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0ptt_key =3D XKeysymToKeycode(display, XK_C= ontrol_L); > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0ptt_key=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=3D XKeysymToKeycode(display, XK_Control_L); >=20 > Modified: head/net-im/uTox/files/patch-src_xlib_video.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > =3D=3D=3D=3D=3D=3D=3D=3D=3D > --- 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 > =C2=A0+++ src/xlib/video.c > -@@ -152,6 +152,9 @@ _Bool native_video_init(void *handle) { > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0if(isdesktop(handle)) { > +@@ -144,6 +144,9 @@ bool native_video_init(void *handle) { > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0if (isdesktop(handle)) { > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0utox_v4l_fd = =3D -1; > =C2=A0=C2=A0 > =C2=A0+#ifndef volatile > =C2=A0+#define volatile(x) (*((volatile typeof(x)*)&x)) > =C2=A0+#endif > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0video_x =3D volati= le(grabx); > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0video_y =3D volati= le(graby); > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0video_width =3D vo= latile(grabpx); > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0video_x=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=3D volatile(grabx); > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0video_y=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=3D volatile(graby); > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0video_width=C2=A0= =C2=A0=3D volatile(grabpx); >=20 > Modified: head/net-im/uTox/pkg-plist > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > =3D=3D=3D=3D=3D=3D=3D=3D=3D > --- head/net-im/uTox/pkg-plist Tue Jan 10 20:52:05 2017=09 > (r431132) > +++ head/net-im/uTox/pkg-plist Tue Jan 10 20:52:40 2017=09 > (r431133) > @@ -1,18 +1,3 @@ > =C2=A0bin/utox > =C2=A0share/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 > =C2=A0man/man1/utox.1.gz >=20 --=20 Carlos Jacobo Puga Medina <cpm@FreeBSD.org> PGP fingerprint =3D C60E 9497 5302 793B CC2D BB89 A1F3 5D66 E6D0 5453 --=-efuKm8Yysyd2f3sF268g Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iQGTBAABCgB9FiEExg6Ul1MCeTvMLbuJofNdZubQVFMFAlh1ihFfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEM2 MEU5NDk3NTMwMjc5M0JDQzJEQkI4OUExRjM1RDY2RTZEMDU0NTMACgkQofNdZubQ VFNm9QgAr1RWwlLHLIoSyvZZSTjCPn3uchaAE4/1n5IZRBkEcL2sFOYTuf74HoYv JRHcyDCuyZHPWZ8Ltd1eUwBS1jUzQQnNUgp0pI8CCvMe1Ku3mb115aJs1NXuttiM Fw+ctf9Dufrk2gZUSsUw0Z6xVkLGslasU0YgmcQQRzRJ7mXLFBmTJ3h56ef8N2IM uP+MSorM3FeBJvqb1wLxd+2S8Yyoawa3UcWD0xzQKdi0iVqaQtJcaRrjiCgEmwY8 DXvwJ6R8PkWegaH4MyhDace4AyiXeeU+YJG8EAsmb2Y8b46QfH/PA8qB160I0mrA XOX8qPwDtHLclI73/yrESj0y+nSDww== =Pi6x -----END PGP SIGNATURE----- --=-efuKm8Yysyd2f3sF268g--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1484098065.64484.8.camel>