[SCM] lives/master: Git refresh patches.
alessio at users.alioth.debian.org
alessio at users.alioth.debian.org
Fri Aug 22 23:24:53 UTC 2014
The following commit has been merged in the master branch:
commit 313788cdb07944428a43897d191608f26da59966
Author: Alessio Treglia <alessio at debian.org>
Date: Sat Aug 23 00:24:41 2014 +0100
Git refresh patches.
diff --git a/debian/patches/01-cdda2wav_to_icedax.patch b/debian/patches/01-cdda2wav_to_icedax.patch
index 7c897bf..c61e4e5 100644
--- a/debian/patches/01-cdda2wav_to_icedax.patch
+++ b/debian/patches/01-cdda2wav_to_icedax.patch
@@ -48,7 +48,7 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
sig_system_error("$com",$smerr);
--- lives.orig/src/gui.c
+++ lives/src/gui.c
-@@ -1195,7 +1195,7 @@ void create_LiVES (void) {
+@@ -1201,7 +1201,7 @@ void create_LiVES (void) {
lives_container_add (LIVES_CONTAINER (audio_menu), mainw->eject_cd);
if (capable->smog_version_correct) {
@@ -57,7 +57,7 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
lives_widget_set_sensitive (mainw->load_cdtrack, FALSE);
lives_widget_set_sensitive (mainw->eject_cd, FALSE);
}
-@@ -2818,7 +2818,7 @@ void create_LiVES (void) {
+@@ -2827,7 +2827,7 @@ void create_LiVES (void) {
g_signal_connect (GTK_OBJECT (mainw->load_audio), "activate",
G_CALLBACK (on_load_audio_activate),
NULL);
@@ -68,7 +68,7 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
NULL);
--- lives.orig/src/main.c
+++ lives/src/main.c
-@@ -1757,8 +1757,8 @@ void do_start_messages(void) {
+@@ -1754,8 +1754,8 @@ void do_start_messages(void) {
else d_print(_ ("composite...NOT DETECTED..."));
if (capable->has_sox_sox) d_print(_ ("sox...detected\n"));
else d_print(_ ("sox...NOT DETECTED\n"));
@@ -79,7 +79,7 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
if (capable->has_jackd) d_print(_ ("jackd...detected..."));
else d_print(_ ("jackd...NOT DETECTED..."));
if (capable->has_pulse_audio) d_print(_ ("pulse audio...detected..."));
-@@ -2050,7 +2050,7 @@ capability *get_capabilities (void) {
+@@ -2047,7 +2047,7 @@ capability *get_capabilities (void) {
capable->has_sox_play=FALSE;
capable->has_sox_sox=FALSE;
capable->has_dvgrab=FALSE;
@@ -88,7 +88,7 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
capable->has_autolives=FALSE;
capable->has_jackd=FALSE;
capable->has_gdb=FALSE;
-@@ -2213,8 +2213,8 @@ capability *get_capabilities (void) {
+@@ -2210,8 +2210,8 @@ capability *get_capabilities (void) {
get_location("dvgrab",string,256);
if (strlen(string)) capable->has_dvgrab=TRUE;
@@ -99,7 +99,7 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
get_location("jackd",string,256);
if (strlen(string)) capable->has_jackd=TRUE;
-@@ -3173,7 +3173,7 @@ void sensitize(void) {
+@@ -3170,7 +3170,7 @@ void sensitize(void) {
lives_widget_set_sensitive (mainw->load_audio, TRUE);
lives_widget_set_sensitive (mainw->load_subs, mainw->current_file>0);
lives_widget_set_sensitive (mainw->erase_subs, mainw->current_file>0&&cfile->subt!=NULL);
diff --git a/debian/patches/02-drop_py3_multiencoder.patch b/debian/patches/02-drop_py3_multiencoder.patch
index a9b6ce8..b483a40 100644
--- a/debian/patches/02-drop_py3_multiencoder.patch
+++ b/debian/patches/02-drop_py3_multiencoder.patch
@@ -19,7 +19,7 @@ Forwarded: not-needed
sswf_encoder \
--- lives.orig/lives-plugins/plugins/encoders/Makefile.in
+++ lives/lives-plugins/plugins/encoders/Makefile.in
-@@ -420,7 +420,6 @@ encoder_DATA = encodedv_encoder \
+@@ -422,7 +422,6 @@ encoder_DATA = encodedv_encoder \
ffmpeg_encoder \
mencoder_encoder \
mjpegtools_encoder \
diff --git a/debian/patches/03-libav10.patch b/debian/patches/03-libav10.patch
index 1096518..6ec2750 100644
--- a/debian/patches/03-libav10.patch
+++ b/debian/patches/03-libav10.patch
@@ -4,9 +4,17 @@ Description: Fix build with libav 10
Author: Sebastian Ramacher <sramacher at debian.org>
Last-Update: 2014-05-12
---- a/libweed/weed-compat.h
-+++ b/libweed/weed-compat.h
-@@ -260,7 +260,6 @@
+---
+ libweed/weed-compat.h | 22 +++++++++++++++++-----
+ lives-plugins/plugins/decoders/avformat_decoder.c | 2 +-
+ lives-plugins/plugins/decoders/libav_helper.h | 22 +++++++++++++++++++---
+ lives-plugins/plugins/decoders/mkv_decoder.c | 1 -
+ lives-plugins/plugins/decoders/mkv_decoder.h | 1 -
+ 5 files changed, 37 insertions(+), 11 deletions(-)
+
+--- lives.orig/libweed/weed-compat.h
++++ lives/libweed/weed-compat.h
+@@ -260,7 +260,6 @@ typedef struct AVCodecTag {
#define CODEC_ID_TRUEMOTION2 AV_CODEC_ID_TRUEMOTION2
#define CODEC_ID_MSZH AV_CODEC_ID_MSZH
#define CODEC_ID_ZLIB AV_CODEC_ID_ZLIB
@@ -14,7 +22,7 @@ Last-Update: 2014-05-12
#define CODEC_ID_4XM AV_CODEC_ID_4XM
#define CODEC_ID_FLV1 AV_CODEC_ID_FLV1
#define CODEC_ID_FLASHSV AV_CODEC_ID_FLASHSV
-@@ -294,14 +293,14 @@
+@@ -294,14 +293,14 @@ typedef struct AVCodecTag {
#define CODEC_ID_FLASHSV2 AV_CODEC_ID_FLASHSV2
#define CODEC_ID_TEXT AV_CODEC_ID_TEXT
#define CODEC_ID_SSA AV_CODEC_ID_SSA
@@ -31,7 +39,7 @@ Last-Update: 2014-05-12
#define CODEC_ID_AAC AV_CODEC_ID_AAC
#define CODEC_ID_PCM_BLURAY AV_CODEC_ID_PCM_BLURAY
#define CODEC_ID_AC3 AV_CODEC_ID_AC3
-@@ -339,7 +338,7 @@
+@@ -339,7 +338,7 @@ typedef struct AVCodecTag {
#define CODEC_ID_PCM_U8 AV_CODEC_ID_PCM_U8
@@ -40,7 +48,7 @@ Last-Update: 2014-05-12
#define CODEC_ID_RA_144 AV_CODEC_ID_RA_144
#define CODEC_ID_RA_288 AV_CODEC_ID_RA_288
#define CODEC_ID_ATRAC3 AV_CODEC_ID_ATRAC3
-@@ -350,6 +349,20 @@
+@@ -350,6 +349,20 @@ typedef struct AVCodecTag {
#define CODEC_ID_TTF AV_CODEC_ID_TTF
@@ -61,7 +69,7 @@ Last-Update: 2014-05-12
#endif
const AVCodecTag codec_bmp_tags[] = {
-@@ -526,7 +539,6 @@
+@@ -526,7 +539,6 @@ const AVCodecTag codec_bmp_tags[] = {
{ CODEC_ID_TRUEMOTION1, MKTAG('P', 'V', 'E', 'Z') },
{ CODEC_ID_MSZH, MKTAG('M', 'S', 'Z', 'H') },
{ CODEC_ID_ZLIB, MKTAG('Z', 'L', 'I', 'B') },
@@ -69,8 +77,8 @@ Last-Update: 2014-05-12
{ CODEC_ID_4XM, MKTAG('4', 'X', 'M', 'V') },
{ CODEC_ID_FLV1, MKTAG('F', 'L', 'V', '1') },
{ CODEC_ID_FLASHSV, MKTAG('F', 'S', 'V', '1') },
---- a/lives-plugins/plugins/decoders/libav_helper.h
-+++ b/lives-plugins/plugins/decoders/libav_helper.h
+--- lives.orig/lives-plugins/plugins/decoders/libav_helper.h
++++ lives/lives-plugins/plugins/decoders/libav_helper.h
@@ -60,6 +60,7 @@
#define CODEC_ID_VP3 AV_CODEC_ID_VP3
#define CODEC_ID_VP5 AV_CODEC_ID_VP5
@@ -126,18 +134,18 @@ Last-Update: 2014-05-12
#endif
#if ((LIBAVUTIL_VERSION_MAJOR < 51) || (LIBAVUTIL_VERSION_MAJOR == 51) && (LIBAVUTIL_VERSION_MINOR < 22))
-@@ -212,7 +226,7 @@
- return;
- }
+@@ -214,6 +228,8 @@ static void av_set_pts_info(AVStream *s,
s->time_base = new_tb;
-- av_codec_set_pkt_timebase(s->codec, new_tb);
+ #ifdef HAVE_AV_CODEC_SET_PKT_TIMEBASE
+ av_codec_set_pkt_timebase(s->codec, new_tb);
++#else
+ s->codec->time_base = new_tb;
+ #endif
s->pts_wrap_bits = pts_wrap_bits;
}
-
---- a/lives-plugins/plugins/decoders/mkv_decoder.c
-+++ b/lives-plugins/plugins/decoders/mkv_decoder.c
-@@ -1610,7 +1610,6 @@
+--- lives.orig/lives-plugins/plugins/decoders/mkv_decoder.c
++++ lives/lives-plugins/plugins/decoders/mkv_decoder.c
+@@ -1610,7 +1610,6 @@ static int lives_mkv_read_header(lives_c
switch (priv->vidst->codec->codec_id) {
case CODEC_ID_VP8 : sprintf(cdata->video_name,"%s","vp8"); break;
case CODEC_ID_THEORA : sprintf(cdata->video_name,"%s","theora"); break;
@@ -145,9 +153,9 @@ Last-Update: 2014-05-12
case CODEC_ID_DIRAC : sprintf(cdata->video_name,"%s","dirac"); break;
case CODEC_ID_MJPEG : sprintf(cdata->video_name,"%s","mjpeg"); break;
case CODEC_ID_MPEG1VIDEO : sprintf(cdata->video_name,"%s","mpeg1"); break;
---- a/lives-plugins/plugins/decoders/mkv_decoder.h
-+++ b/lives-plugins/plugins/decoders/mkv_decoder.h
-@@ -334,7 +334,6 @@
+--- lives.orig/lives-plugins/plugins/decoders/mkv_decoder.h
++++ lives/lives-plugins/plugins/decoders/mkv_decoder.h
+@@ -334,7 +334,6 @@ const CodecTags ff_mkv_codec_tags[]={
{"V_REAL/RV20" , CODEC_ID_RV20},
{"V_REAL/RV30" , CODEC_ID_RV30},
{"V_REAL/RV40" , CODEC_ID_RV40},
@@ -155,9 +163,9 @@ Last-Update: 2014-05-12
{"V_THEORA" , CODEC_ID_THEORA},
{"V_UNCOMPRESSED" , CODEC_ID_RAWVIDEO},
{"V_VP8" , CODEC_ID_VP8},
---- a/lives-plugins/plugins/decoders/avformat_decoder.c
-+++ b/lives-plugins/plugins/decoders/avformat_decoder.c
-@@ -673,7 +673,7 @@
+--- lives.orig/lives-plugins/plugins/decoders/avformat_decoder.c
++++ lives/lives-plugins/plugins/decoders/avformat_decoder.c
+@@ -673,7 +673,7 @@ static void detach_stream (lives_clip_da
close(priv->fd);
// will close and free the context
--
lives packaging
More information about the pkg-multimedia-commits
mailing list