[SCM] lives/master: Refresh patchset in debian/patches/:
alessio at users.alioth.debian.org
alessio at users.alioth.debian.org
Sun Apr 13 22:36:48 UTC 2014
The following commit has been merged in the master branch:
commit df79975a91d0ef6ed5d7d6bbbdcb8575a843bc06
Author: Alessio Treglia <alessio at debian.org>
Date: Sun Apr 13 23:34:47 2014 +0100
Refresh patchset in debian/patches/:
- Drop 99-reload_osc.patch, applied upstream.
- Drop 99-workaround_av_find_stream_info.patch, applied upstream.
diff --git a/debian/patches/01-cdda2wav_to_icedax.patch b/debian/patches/01-cdda2wav_to_icedax.patch
index f67e3df..787a52a 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
-@@ -1222,7 +1222,7 @@ void create_LiVES (void) {
+@@ -1195,7 +1195,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);
}
-@@ -2871,7 +2871,7 @@ void create_LiVES (void) {
+@@ -2816,7 +2816,7 @@ void create_LiVES (void) {
g_signal_connect (GTK_OBJECT (mainw->load_audio), "activate",
G_CALLBACK (on_load_audio_activate),
NULL);
@@ -99,7 +99,7 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
get_location("jackd",string,256);
if (strlen(string)) capable->has_jackd=TRUE;
-@@ -3153,7 +3153,7 @@ void sensitize(void) {
+@@ -3155,7 +3155,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 128b260..a9b6ce8 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
-@@ -378,7 +378,6 @@ encoder_DATA = encodedv_encoder \
+@@ -420,7 +420,6 @@ encoder_DATA = encodedv_encoder \
ffmpeg_encoder \
mencoder_encoder \
mjpegtools_encoder \
diff --git a/debian/patches/99-reload_osc.patch b/debian/patches/99-reload_osc.patch
deleted file mode 100644
index fa85728..0000000
--- a/debian/patches/99-reload_osc.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-Description: Prevent crash when reloading OSC devices.
-Origin: upstream, commit:2028
----
- src/omc-learn.c | 36 ++++++++++++++++++++++++++----------
- 1 file changed, 26 insertions(+), 10 deletions(-)
-
---- lives.orig/src/omc-learn.c
-+++ lives/src/omc-learn.c
-@@ -2420,16 +2420,26 @@ OSCbuf *omc_learner_decode(gint type, gi
-
-
- void on_midi_save_activate (GtkMenuItem *menuitem, gpointer user_data) {
-- gchar *save_file=choose_file(NULL,NULL,NULL,LIVES_FILE_CHOOSER_ACTION_SAVE,NULL,NULL);
-- int fd;
- GSList *slist=omc_node_list;
-+
- size_t srchlen;
-+
- lives_omc_match_node_t *mnode;
- lives_omc_macro_t omacro;
-+
-+ gchar *msg;
-+ gchar *save_file;
-+
- int nnodes;
-- int i;
- int retval;
-- gchar *msg;
-+
-+ int fd;
-+
-+ register int i;
-+
-+ save_file=choose_file(NULL,NULL,NULL,LIVES_FILE_CHOOSER_ACTION_SAVE,NULL,NULL);
-+
-+ if (save_file==NULL||!strlen(save_file)) return;
-
- msg=g_strdup_printf(_("Saving device mapping to file %s..."),save_file);
- d_print(msg);
-@@ -2532,17 +2542,23 @@ static void do_midi_version_error(const
-
-
- void on_midi_load_activate (GtkMenuItem *menuitem, gpointer user_data) {
-- gchar *load_file=NULL;
-- int fd;
-- ssize_t bytes;
-- ssize_t srchlen;
- lives_omc_match_node_t *mnode;
- lives_omc_macro_t omacro;
-+
-+ ssize_t bytes;
-+
- gchar tstring[512];
-- int nnodes,i,macro,nvars,supertype,j,idx=-1;
-+
-+ gchar *load_file=NULL;
- gchar *srch;
- gchar *msg;
-
-+ uint32_t srchlen,nnodes,macro,nvars,supertype;
-+ int idx=-1;
-+ int fd;
-+
-+ register int i,j;
-+
- #ifdef OMC_MIDI_IMPL
- size_t blen;
- gchar *tmp;
-@@ -2551,7 +2567,7 @@ void on_midi_load_activate (GtkMenuItem
- if (user_data==NULL) load_file=choose_file(NULL,NULL,NULL,LIVES_FILE_CHOOSER_ACTION_OPEN,NULL,NULL);
- else load_file=g_strdup((gchar *)user_data);
-
-- if (load_file==NULL) return;
-+ if (load_file==NULL||!strlen(load_file)) return;
-
- msg=g_strdup_printf(_("Loading device mapping from file %s..."),load_file);
- d_print(msg);
diff --git a/debian/patches/99-workaround_av_find_stream_info.patch b/debian/patches/99-workaround_av_find_stream_info.patch
deleted file mode 100644
index 1797dc8..0000000
--- a/debian/patches/99-workaround_av_find_stream_info.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Workaround to prevent lives 2.2.2 suddenly crash.
-Origin: upstream, http://sourceforge.net/p/lives/code/2030/
-Reviewed-by: Alessio Treglia <alessio at debian.org>
----
- lives-plugins/plugins/decoders/Makefile.am | 4 ++++
- 1 file changed, 4 insertions(+)
-
---- lives.orig/lives-plugins/plugins/decoders/Makefile.am
-+++ lives/lives-plugins/plugins/decoders/Makefile.am
-@@ -84,6 +84,10 @@ if HAVE_AVFORMAT_NEW_STREAM
- libav_cflags += -DHAVE_AVFORMAT_NEW_STREAM=1
- endif
-
-+if HAVE_AVFORMAT_FIND_STREAM_INFO
-+libav_cflags += -DHAVE_AVFORMAT_FIND_STREAM_INFO=1
-+endif
-+
- if HAVE_AVPRIV_SET_PTS_INFO
- libav_cflags += -DHAVE_AVPRIV_SET_PTS_INFO=1
- endif
diff --git a/debian/patches/series b/debian/patches/series
index b9ff081..930dbca 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
01-cdda2wav_to_icedax.patch
02-drop_py3_multiencoder.patch
-99-workaround_av_find_stream_info.patch
-99-reload_osc.patch
libav10.patch
--
lives packaging
More information about the pkg-multimedia-commits
mailing list