pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
toxic-git: Update wip/toxic-git to 0.7.1
Module Name: pkgsrc-wip
Committed By: Mateusz Poszwa <old4%o2.pl@localhost>
Pushed By: f8l
Date: Sat Oct 1 11:08:41 2016 +0200
Changeset: c3fcdd9402ccdbbf434551d9c851da8cb4882ed6
Modified Files:
toxic-git/Makefile
toxic-git/distinfo
toxic-git/patches/patch-src_video__device.c
Log Message:
toxic-git: Update wip/toxic-git to 0.7.1
Changes:
* Features and functionality:
* Rewrite DHT bootstrapping to automatically fetch and update nodes list (also added config option to disable or change update frequency)
* UI improvements for file transfers
* Add support for password managers
* Add option to toggle showing friend connection notifications
* Add toggle-able input mode that allows multi-line text pasting
* Add support for custom nospam values
* Add support for terminal bell on certain events (see config)
* Notable bug fixes:
* Fix UI flicker on some terminals/systems
* Fix tab complete bug that would sometimes clear the input box
* Fix cross-client audio issues
* Fix numerous A/V race conditions
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=c3fcdd9402ccdbbf434551d9c851da8cb4882ed6
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
toxic-git/Makefile | 2 +-
toxic-git/distinfo | 2 +-
toxic-git/patches/patch-src_video__device.c | 106 +++++++++++++++++-----------
3 files changed, 67 insertions(+), 43 deletions(-)
diffs:
diff --git a/toxic-git/Makefile b/toxic-git/Makefile
index 8e009da..d18fe4c 100644
--- a/toxic-git/Makefile
+++ b/toxic-git/Makefile
@@ -1,6 +1,6 @@
# $NetBSD$
-DISTNAME= toxic-0.7.0
+DISTNAME= toxic-0.7.1
CATEGORIES= chat
MASTER_SITES= ${MASTER_SITE_GITHUB:=JFreegman/}
diff --git a/toxic-git/distinfo b/toxic-git/distinfo
index 97cbc4c..9228aae 100644
--- a/toxic-git/distinfo
+++ b/toxic-git/distinfo
@@ -4,4 +4,4 @@ SHA1 (patch-Makefile) = c996154317aedaaa4b3a1bac2a69e4fc1b89173b
SHA1 (patch-cfg_global__vars.mk) = 5aad096f067f485c439135d3838b8912d1ad7d5e
SHA1 (patch-src_name__lookup.c) = 212742961593ff970e5d108af2f14b8f93199a76
SHA1 (patch-src_toxic.c) = 0c466bb767a77f5bf25aeef934ca61e5dc550923
-SHA1 (patch-src_video__device.c) = 27ca66738b98cbcf7be002ccd9c768f29e221297
+SHA1 (patch-src_video__device.c) = 85c8f85c9cfe7f3d478b95ca732d69b33fa0b43b
diff --git a/toxic-git/patches/patch-src_video__device.c b/toxic-git/patches/patch-src_video__device.c
index 58bb2fc..1626253 100644
--- a/toxic-git/patches/patch-src_video__device.c
+++ b/toxic-git/patches/patch-src_video__device.c
@@ -2,7 +2,7 @@ $NetBSD$
Do not assume what is not Linux or FreeBSD is OSX.
---- src/video_device.c.orig 2015-12-26 05:56:46.000000000 +0000
+--- src/video_device.c.orig 2016-10-01 08:28:56.147136487 +0000
+++ src/video_device.c
@@ -30,14 +30,18 @@
@@ -27,7 +27,7 @@ Do not assume what is not Linux or FreeBSD is OSX.
#include "line_info.h"
@@ -65,7 +69,7 @@ typedef struct VideoDevice {
- void* cb_data; /* Data to be passed to callback */
+ void *cb_data; /* Data to be passed to callback */
int32_t friend_number; /* ToxAV friend number */
-#if defined(__linux__) || defined(__FreeBSD__)
@@ -35,16 +35,25 @@ Do not assume what is not Linux or FreeBSD is OSX.
int fd; /* File descriptor of video device selected/opened */
struct v4l2_format fmt;
struct VideoBuffer *buffers;
-@@ -131,7 +135,7 @@ static void yuv420tobgr(uint16_t width,
+@@ -132,7 +136,7 @@ static void yuv420tobgr(uint16_t width,
}
}
-#if defined(__linux__) || defined(__FreeBSD__)
+#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__)
static void yuv422to420(uint8_t *plane_y, uint8_t *plane_u, uint8_t *plane_v,
- uint8_t *input, uint16_t width, uint16_t height)
+ uint8_t *input, uint16_t width, uint16_t height)
{
-@@ -177,7 +181,10 @@ VideoDeviceError init_video_devices()
+@@ -170,7 +174,7 @@ static int xioctl(int fh, unsigned long
+ return r;
+ }
+
+-#endif /* __linux__ */
++#endif
+
+ /* Meet devices */
+ #ifdef VIDEO
+@@ -181,7 +185,10 @@ VideoDeviceError init_video_devices()
{
size[vdt_input] = 0;
@@ -52,39 +61,44 @@ Do not assume what is not Linux or FreeBSD is OSX.
+#if defined(__OSX__)
+ if( osx_video_init((char**)video_devices_names[vdt_input], &size[vdt_input]) != 0 )
+ return vde_InternalError;
-+#else
++#else /* not __OSX__*/
+
for (; size[vdt_input] <= MAX_DEVICES; ++size[vdt_input]) {
int fd;
- char device_address[] = "/dev/videoXX";
-@@ -208,10 +215,6 @@ VideoDeviceError init_video_devices()
- close(fd);
+@@ -216,11 +223,6 @@ VideoDeviceError init_video_devices()
}
}
--
+
-#else /* __OSX__ */
-- if( osx_video_init((char**)video_devices_names[vdt_input], &size[vdt_input]) != 0 )
+-
+- if ( osx_video_init((char **)video_devices_names[vdt_input], &size[vdt_input]) != 0 )
- return vde_InternalError;
+-
#endif
size[vdt_output] = 1;
-@@ -257,12 +260,12 @@ VideoDeviceError terminate_video_devices
+@@ -271,15 +273,15 @@ VideoDeviceError terminate_video_devices
VideoDeviceError register_video_device_callback(int32_t friend_number, uint32_t device_idx,
- VideoDataHandleCallback callback, void* data)
+ VideoDataHandleCallback callback, void *data)
{
-#if defined(__linux__) || defined(__FreeBSD__)
-- if ( size[vdt_input] <= device_idx || !video_devices_running[vdt_input][device_idx] || !video_devices_running[vdt_input][device_idx]->fd )
-- return vde_InvalidSelection;
--#else /* __OSX__ */
+#if defined(__OSX__)
- if ( size[vdt_input] <= device_idx || !video_devices_running[vdt_input][device_idx] )
+
+- if ( size[vdt_input] <= device_idx || !video_devices_running[vdt_input][device_idx]
+- || !video_devices_running[vdt_input][device_idx]->fd )
++ if ( size[vdt_input] <= device_idx || !video_devices_running[vdt_input][device_idx] )
+ return vde_InvalidSelection;
+
+-#else /* __OSX__ */
++#else /* not __OSX__ */
+
+- if ( size[vdt_input] <= device_idx || !video_devices_running[vdt_input][device_idx] )
++ if ( size[vdt_input] <= device_idx || !video_devices_running[vdt_input][device_idx]
++ || !video_devices_running[vdt_input][device_idx]->fd )
return vde_InvalidSelection;
-+#else
-+ if ( size[vdt_input] <= device_idx || !video_devices_running[vdt_input][device_idx] || !video_devices_running[vdt_input][device_idx]->fd )
-+ return vde_InvalidSelection;
- #endif
- lock;
-@@ -336,7 +339,13 @@ VideoDeviceError open_video_device(Video
+ #endif
+@@ -355,7 +357,13 @@ VideoDeviceError open_video_device(Video
if ( type == vdt_input ) {
video_thread_paused = true;
@@ -95,25 +109,26 @@ Do not assume what is not Linux or FreeBSD is OSX.
+ unlock;
+ return vde_FailedStart;
+ }
-+#else
++#else /* not __OSX__*/
/* Open selected device */
char device_address[] = "/dev/videoXX";
snprintf(device_address + 10 , sizeof(device_address) - 10, "%i", selection);
-@@ -455,13 +464,6 @@ VideoDeviceError open_video_device(Video
- unlock;
+@@ -482,14 +490,6 @@ VideoDeviceError open_video_device(Video
return vde_FailedStart;
}
--
+
-#else /* __OSX__ */
+-
- if ( osx_video_open_device(selection, &device->video_width, &device->video_height) != 0 ) {
- free(device);
- unlock;
- return vde_FailedStart;
- }
+-
#endif
/* Create X11 window associated to device */
-@@ -632,7 +634,12 @@ void* video_thread_poll (void* arg) // T
+@@ -666,7 +666,12 @@ void *video_thread_poll (void *arg) // T
uint8_t *u = device->input.planes[1];
uint8_t *v = device->input.planes[2];
@@ -123,54 +138,63 @@ Do not assume what is not Linux or FreeBSD is OSX.
+ unlock;
+ continue;
+ }
-+#else
++#else /* not __OSX__*/
struct v4l2_buffer buf;
memset(&(buf), 0, sizeof(buf));
-@@ -648,12 +655,6 @@ void* video_thread_poll (void* arg) // T
-
+@@ -683,13 +688,6 @@ void *video_thread_poll (void *arg) // T
/* Convert frame image data to YUV420 for ToxAV */
yuv422to420(y, u, v, data, video_width, video_height);
--
+
-#else /* __OSX__*/
+-
- if ( osx_video_read_device(y, u, v, &video_width, &video_height) != 0 ) {
- unlock;
- continue;
- }
+-
#endif
/* Send frame data to friend through ToxAV */
-@@ -690,7 +691,7 @@ void* video_thread_poll (void* arg) // T
+@@ -726,14 +724,14 @@ void *video_thread_poll (void *arg) // T
XFlush(device->x_display);
free(img_data);
-#if defined(__linux__) || defined(__FreeBSD__)
+#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__)
+
if ( -1 == xioctl(device->fd, VIDIOC_QBUF, &buf) ) {
unlock;
continue;
-@@ -725,7 +726,9 @@ VideoDeviceError close_video_device(Vide
+ }
+
+-#endif /* __linux__ */
++#endif
+
+ }
+
+@@ -765,7 +763,10 @@ VideoDeviceError close_video_device(Vide
if ( !device->ref_count ) {
if ( type == vdt_input ) {
-#if defined(__linux__) || defined(__FreeBSD__)
+#if defined(__OSX__)
++
+ osx_video_close_device(device_idx);
-+#else
++#else /* not __OSX__ */
enum v4l2_buf_type buf_type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
- if( -1 == xioctl(device->fd, VIDIOC_STREAMOFF, &buf_type) ) {}
-@@ -735,9 +738,6 @@ VideoDeviceError close_video_device(Vide
- }
- }
+ if ( -1 == xioctl(device->fd, VIDIOC_STREAMOFF, &buf_type) ) {}
+@@ -779,8 +780,6 @@ VideoDeviceError close_video_device(Vide
+
close(device->fd);
--
+
-#else /* __OSX__ */
- osx_video_close_device(device_idx);
#endif
vpx_img_free(&device->input);
XDestroyWindow(device->x_display, device->x_window);
-@@ -745,7 +745,7 @@ VideoDeviceError close_video_device(Vide
+@@ -788,7 +787,7 @@ VideoDeviceError close_video_device(Vide
XCloseDisplay(device->x_display);
pthread_mutex_destroy(device->mutex);
Home |
Main Index |
Thread Index |
Old Index