[Pkg-voip-commits] [mediastreamer2] 05/05: Refresh patches
Dr. Tobias Quathamer
toddy at debian.org
Mon Nov 6 21:35:58 UTC 2017
This is an automated email from the git hooks/post-receive script.
toddy pushed a commit to branch master
in repository mediastreamer2.
commit b8707c2a004cb001853d09a335d784f9764a0d5f
Author: Dr. Tobias Quathamer <toddy at debian.org>
Date: Mon Nov 6 22:20:26 2017 +0100
Refresh patches
---
debian/patches/fix-spelling-errors.patch | 58 ++++++++++++++---------------
debian/patches/install-pkgconfig | 2 +-
debian/patches/remove-call-to-gettext.patch | 2 +-
3 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/debian/patches/fix-spelling-errors.patch b/debian/patches/fix-spelling-errors.patch
index 0b559a6..0475e1b 100644
--- a/debian/patches/fix-spelling-errors.patch
+++ b/debian/patches/fix-spelling-errors.patch
@@ -6,7 +6,7 @@ Last-Update: 2015-05-28
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/src/videofilters/vp8.c
+++ b/src/videofilters/vp8.c
-@@ -387,7 +387,7 @@ static void enc_fill_encoder_flags(EncSt
+@@ -389,7 +389,7 @@
/*force an independant alt ref frame to force picture to be refreshed completely, otherwise
* pixel color saturation appears due to accumulation of small predictive errors*/
*flags |= VP8_EFLAG_NO_REF_LAST | VP8_EFLAG_NO_REF_GF;
@@ -15,7 +15,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
}
}
if (!(*flags & VPX_EFLAG_FORCE_KF)){
-@@ -1046,7 +1046,7 @@ static int dec_freeze_on_error(MSFilter
+@@ -1046,7 +1046,7 @@
static int dec_reset(MSFilter *f, void *data) {
DecState *s = (DecState *)f->data;
@@ -26,7 +26,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
if (dec_initialize_impl(f) != 0){
--- a/src/crypto/ms_srtp.c
+++ b/src/crypto/ms_srtp.c
-@@ -571,6 +571,6 @@ const char * ms_srtp_stream_type_to_stri
+@@ -571,6 +571,6 @@
case MSSRTP_RTCP_STREAM: return "MSSRTP_RTCP_STREAM";
case MSSRTP_ALL_STREAMS: return "MSSRTP_ALL_STREAMS";
}
@@ -47,7 +47,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/src/crypto/dtls_srtp.c
+++ b/src/crypto/dtls_srtp.c
-@@ -232,7 +232,7 @@ static void schedule_rtcp(struct _RtpTra
+@@ -232,7 +232,7 @@
}
/**
* Check if the incoming message is a DTLS packet.
@@ -56,7 +56,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
* This function also manages the client retransmission timer
*
* @param[in] msg the incoming message
-@@ -533,7 +533,7 @@ static int ms_dtls_srtp_rtp_process_on_r
+@@ -533,7 +533,7 @@
}
if (ctx->role != MSDtlsSrtpRoleIsServer) { /* close the connection only if we are client, if we are server, the client may ask again for last packets */
@@ -65,7 +65,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
}
-@@ -614,7 +614,7 @@ static int ms_dtls_srtp_rtcp_process_on_
+@@ -614,7 +614,7 @@
}
if (ctx->role != MSDtlsSrtpRoleIsServer) { /* close the connection only if we are client, if we are server, the client may ask again for last packets */
@@ -74,7 +74,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
}
}
-@@ -734,7 +734,7 @@ void ms_dtls_srtp_set_peer_fingerprint(M
+@@ -734,7 +734,7 @@
size_t peer_fingerprint_length = strlen(peer_fingerprint)+1; // include the null termination
if (peer_fingerprint_length>sizeof(context->peer_fingerprint)) {
memcpy(context->peer_fingerprint, peer_fingerprint, sizeof(context->peer_fingerprint));
@@ -85,7 +85,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
}
--- a/src/filter-template.c
+++ b/src/filter-template.c
-@@ -28,7 +28,7 @@ Foundation, Inc., 51 Franklin Street, Fi
+@@ -28,7 +28,7 @@
* filters. *
* The procedure to follow to create a new filter is to: *
* 1. Copy this file to the file that will be your new filter *
@@ -96,7 +96,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
* FILTER_TODO *
--- a/src/otherfilters/msrtp.c
+++ b/src/otherfilters/msrtp.c
-@@ -687,7 +687,7 @@ static void receiver_process(MSFilter *
+@@ -700,7 +700,7 @@
return;
if (d->reset_jb){
@@ -107,7 +107,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
}
--- a/src/utils/audiodiff.c
+++ b/src/utils/audiodiff.c
-@@ -284,7 +284,7 @@ static int _ms_audio_diff_chunked(FileIn
+@@ -284,7 +284,7 @@
*ret = cum_res / (double)tot_energy;
ms_message("Similarity factor weighted with most significant chunks is [%g]", *ret);
*ret = *ret * (1-variance);
@@ -118,7 +118,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
return maxpos;
--- a/src/videofilters/bb10_capture.cpp
+++ b/src/videofilters/bb10_capture.cpp
-@@ -93,7 +93,7 @@ typedef struct BB10Capture {
+@@ -93,7 +93,7 @@
bool_t is_front_cam;
const char *window_group;
const char *window_id;
@@ -127,7 +127,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
bool_t capture_started;
MSAverageFPS avgfps;
MSYuvBufAllocator *yba;
-@@ -125,8 +125,8 @@ static void bb10capture_video_callback(c
+@@ -125,8 +125,8 @@
static void bb10capture_open_camera(BB10Capture *d) {
camera_error_t error;
@@ -138,7 +138,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
return;
}
-@@ -150,15 +150,15 @@ static void bb10capture_open_camera(BB10
+@@ -150,15 +150,15 @@
camera_set_vf_property(d->cam_handle, CAMERA_IMGPROP_ROTATION, rotation);
ms_debug("[bb10_capture] camera capture rotation: %i", rotation);
@@ -157,7 +157,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
return;
}
if (d->capture_started) {
-@@ -186,13 +186,13 @@ static void bb10capture_stop_capture(BB1
+@@ -186,13 +186,13 @@
}
static void bb10capture_close_camera(BB10Capture *d) {
@@ -174,7 +174,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
d->cam_handle = 0;
ms_debug("[bb10_capture] camera closed");
}
-@@ -202,7 +202,7 @@ static void bb10capture_init(MSFilter *f
+@@ -202,7 +202,7 @@
MSVideoSize def_size;
d->rotation = 0;
@@ -183,7 +183,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
d->capture_started = FALSE;
d->is_front_cam = TRUE;
def_size.width = MS_VIDEO_SIZE_QVGA_W;
-@@ -234,7 +234,7 @@ static void bb10capture_uninit(MSFilter
+@@ -234,7 +234,7 @@
static void bb10capture_preprocess(MSFilter *f) {
BB10Capture *d = (BB10Capture*) f->data;
@@ -192,7 +192,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
bb10capture_open_camera(d);
}
-@@ -282,11 +282,11 @@ static int bb10capture_set_vsize(MSFilte
+@@ -282,11 +282,11 @@
ms_filter_lock(f);
@@ -206,7 +206,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
camera_set_vf_property(d->cam_handle, CAMERA_IMGPROP_WIDTH, newSize.width, CAMERA_IMGPROP_HEIGHT, newSize.height);
camera_get_vf_property(d->cam_handle, CAMERA_IMGPROP_WIDTH, &(d->vsize.width), CAMERA_IMGPROP_HEIGHT, &(d->vsize.height));
if (ms_video_size_equal(d->vsize, newSize)) {
-@@ -318,7 +318,7 @@ static int bb10capture_set_fps(MSFilter
+@@ -318,7 +318,7 @@
ms_filter_lock(f);
d->framerate = *(float*)arg;
@@ -215,7 +215,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
if (d->framerate > 0) {
camera_set_vf_property(d->cam_handle, CAMERA_IMGPROP_VARIABLEFRAMERATE, 1);
camera_set_vf_property(d->cam_handle, CAMERA_IMGPROP_MINFRAMERATE, (double)d->framerate, CAMERA_IMGPROP_FRAMERATE, (double)d->framerate);
-@@ -379,7 +379,7 @@ static int bb10capture_set_device_rotati
+@@ -379,7 +379,7 @@
rotation = 360 - d->rotation;
}
@@ -226,7 +226,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
ms_debug("[bb10_capture] device rotation changed: %i", d->rotation);
--- a/src/videofilters/msv4l2.c
+++ b/src/videofilters/msv4l2.c
-@@ -666,7 +666,7 @@ static void *msv4l2_thread(void *ptr){
+@@ -666,7 +666,7 @@
ms_message("msv4l2_thread starting");
if (s->fd==-1){
if( msv4l2_open(s)!=0){
@@ -237,7 +237,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
}
--- a/src/voip/audiostream.c
+++ b/src/voip/audiostream.c
-@@ -893,7 +893,7 @@ int audio_stream_start_from_io(AudioStre
+@@ -901,7 +901,7 @@
}
/* sample rate is already set for rtpsend and rtprcv, check if we have to adjust it to */
@@ -248,7 +248,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
if ( ((stream->features & AUDIO_STREAM_FEATURE_EC) && !stream->use_ec) || has_builtin_ec )
--- a/src/voip/msvideo.c
+++ b/src/voip/msvideo.c
-@@ -873,7 +873,7 @@ void ms_average_fps_init(MSAverageFPS* a
+@@ -873,7 +873,7 @@
afps->mean_inter_frame = 0;
afps->context = ctx;
if (!ctx || strstr(ctx, "%f") == 0) {
@@ -259,7 +259,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/include/mediastreamer2/msfileplayer.h
+++ b/include/mediastreamer2/msfileplayer.h
-@@ -30,7 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fi
+@@ -30,7 +30,7 @@
/* set loop mode:
-1: no looping,
0: loop at end of file,
@@ -270,7 +270,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
#define MS_FILE_PLAYER_DONE MS_FILTER_METHOD(MS_FILE_PLAYER_ID,5,int)
--- a/include/mediastreamer2/msticker.h
+++ b/include/mediastreamer2/msticker.h
-@@ -39,7 +39,7 @@ Foundation, Inc., 51 Franklin Street, Fi
+@@ -39,7 +39,7 @@
/**
@@ -279,7 +279,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
* @var MSTickerTimeFunc
*/
typedef uint64_t (*MSTickerTimeFunc)(void *);
-@@ -77,7 +77,7 @@ struct _MSTicker
+@@ -77,7 +77,7 @@
MSList *execution_list; /* the list of source filters to be executed.*/
MSList *task_list; /* list of tasks (see ms_filter_postpone_task())*/
ms_thread_t thread; /* the thread ressource*/
@@ -290,7 +290,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
uint64_t time; /* a time since the start of the ticker expressed in milisec*/
--- a/src/base/msticker.c
+++ b/src/base/msticker.c
-@@ -445,7 +445,7 @@ void * ms_ticker_run(void *arg)
+@@ -445,7 +445,7 @@
s->time+=s->interval;
late=s->wait_next_tick(s->wait_next_tick_data,s->time);
if (late>s->interval*5 && late>lastlate){
@@ -301,7 +301,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
lastlate=late;
--- a/src/utils/mkv_reader.h
+++ b/src/utils/mkv_reader.h
-@@ -131,7 +131,7 @@ MKVTrackReader *mkv_reader_get_track_rea
+@@ -131,7 +131,7 @@
/**
* @brief Set the reading head of each assocated track reader at a specific position
* @param reader MKVReader
@@ -312,7 +312,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
int mkv_reader_seek(MKVReader *reader, int pos_ms);
--- a/tools/mediastream.c
+++ b/tools/mediastream.c
-@@ -210,7 +210,7 @@ const char *usage="mediastream --local <
+@@ -210,7 +210,7 @@
"[ --ice-remote-candidate <ip:port:[host|srflx|prflx|relay]> ]\n"
"[ --infile <input wav file> specify a wav file to be used for input, instead of soundcard ]\n"
"[ --interactive (run in interactive mode) ]\n"
@@ -323,7 +323,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
"[ --netsim-bandwidth <bandwidth limit in bits/s> (simulates a network download bandwidth limit) ]\n"
--- a/src/crypto/zrtp.c
+++ b/src/crypto/zrtp.c
-@@ -678,7 +678,7 @@ MSZrtpContext* ms_zrtp_multistream_new(M
+@@ -633,7 +633,7 @@
int retval;
MSZrtpContext *userData;
if ((retval = bzrtp_addChannel(activeContext->zrtpContext, sessions->rtp_session->snd.ssrc)) != 0) {
diff --git a/debian/patches/install-pkgconfig b/debian/patches/install-pkgconfig
index db7fd75..3be20b2 100644
--- a/debian/patches/install-pkgconfig
+++ b/debian/patches/install-pkgconfig
@@ -2,7 +2,7 @@ Install pkgconfig files
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -613,6 +613,13 @@ if(ENABLE_TOOLS)
+@@ -609,6 +609,13 @@
add_subdirectory(tools)
endif()
diff --git a/debian/patches/remove-call-to-gettext.patch b/debian/patches/remove-call-to-gettext.patch
index ad25129..6e3adb9 100644
--- a/debian/patches/remove-call-to-gettext.patch
+++ b/debian/patches/remove-call-to-gettext.patch
@@ -8,7 +8,7 @@ Last-Update: 2015-05-28
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/configure.ac
+++ b/configure.ac
-@@ -229,7 +229,6 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GET
+@@ -229,7 +229,6 @@
if test "$mingw_found" != "yes" ; then
dnl gettext macro does not work properly under mingw. And we want to use the one provided by GTK.
CPPFLAGS_save=$CPPFLAGS
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/mediastreamer2.git
More information about the Pkg-voip-commits
mailing list