[SCM] lives/master: Refresh patches

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Sat Feb 14 13:44:45 UTC 2015 

The following commit has been merged in the master branch:
commit 359239ca3667ac3869aeaee9c3951cc77636683d
Author: Alessio Treglia <alessio at debian.org>
Date:   Sat Feb 14 13:19:33 2015 +0000

    Refresh patches

diff --git a/debian/patches/01-cdda2wav_to_icedax.patch b/debian/patches/01-cdda2wav_to_icedax.patch
index c61e4e5..e3cbdb0 100644
--- a/debian/patches/01-cdda2wav_to_icedax.patch
+++ b/debian/patches/01-cdda2wav_to_icedax.patch
@@ -24,7 +24,7 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
  
 --- lives.orig/smogrify
 +++ lives/smogrify
-@@ -3540,9 +3540,9 @@ if (defined($ARGV[0])) {
+@@ -3598,9 +3598,9 @@ if (defined($ARGV[0])) {
  
      if ($command eq "cdopen") {
  
@@ -37,7 +37,7 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
  	}
  
  	$cdplay_device=&rc_get("cdplay_device");
-@@ -3557,7 +3557,7 @@ if (defined($ARGV[0])) {
+@@ -3615,7 +3615,7 @@ if (defined($ARGV[0])) {
  	    unlink "$audiofile";
  	}
  
@@ -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
-@@ -1201,7 +1201,7 @@ void create_LiVES (void) {
+@@ -1193,7 +1193,7 @@ void create_LiVES (void) {
    lives_container_add (LIVES_CONTAINER (audio_menu), mainw->eject_cd);
  
    if (capable->smog_version_correct) {
@@ -57,18 +57,18 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
        lives_widget_set_sensitive (mainw->load_cdtrack, FALSE);
        lives_widget_set_sensitive (mainw->eject_cd, FALSE);
      }
-@@ -2827,7 +2827,7 @@ void create_LiVES (void) {
-   g_signal_connect (GTK_OBJECT (mainw->load_audio), "activate",
-                       G_CALLBACK (on_load_audio_activate),
+@@ -2815,7 +2815,7 @@ void create_LiVES (void) {
+   lives_signal_connect (LIVES_GUI_OBJECT (mainw->load_audio), LIVES_WIDGET_ACTIVATE_EVENT,
+                       LIVES_GUI_CALLBACK (on_load_audio_activate),
                        NULL);
 -  if (capable->has_cdda2wav) {
 +  if (capable->has_icedax) {
-     g_signal_connect (GTK_OBJECT (mainw->load_cdtrack), "activate",
-                       G_CALLBACK (on_load_cdtrack_activate),
+     lives_signal_connect (LIVES_GUI_OBJECT (mainw->load_cdtrack), LIVES_WIDGET_ACTIVATE_EVENT,
+                       LIVES_GUI_CALLBACK (on_load_cdtrack_activate),
                        NULL);
 --- lives.orig/src/main.c
 +++ lives/src/main.c
-@@ -1754,8 +1754,8 @@ void do_start_messages(void) {
+@@ -1773,8 +1773,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..."));
-@@ -2047,7 +2047,7 @@ capability *get_capabilities (void) {
+@@ -2066,7 +2066,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;
-@@ -2210,8 +2210,8 @@ capability *get_capabilities (void) {
+@@ -2229,8 +2229,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;
-@@ -3170,7 +3170,7 @@ void sensitize(void) {
+@@ -3192,7 +3192,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);
@@ -110,7 +110,7 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
    lives_widget_set_sensitive (mainw->resample_video, mainw->current_file>0&&cfile->frames>0);
 --- lives.orig/src/main.h
 +++ lives/src/main.h
-@@ -680,7 +680,7 @@ typedef struct {
+@@ -662,7 +662,7 @@ typedef struct {
    boolean has_convert;
    boolean has_composite;
    boolean has_identify;
@@ -121,7 +121,7 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
    boolean has_pulse_audio;
 --- lives.orig/src/preferences.c
 +++ lives/src/preferences.c
-@@ -982,7 +982,7 @@ lives_toggle_button_get_active(LIVES_TOG
+@@ -998,7 +998,7 @@ lives_toggle_button_get_active(LIVES_TOG
    }
  
    // cd play device
@@ -130,7 +130,7 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
      if (strcmp(prefs->cdplay_device,cdplay_device)) {
        g_snprintf(prefs->cdplay_device,256,"%s",cdplay_device);
        set_pref("cdplay_device",prefs->cdplay_device);
-@@ -1862,7 +1862,7 @@ void on_prefDomainChanged(GtkTreeSelecti
+@@ -1878,7 +1878,7 @@ void on_prefDomainChanged(LiVESTreeSelec
        case LIST_ENTRY_MISC:
  	lives_widget_show_all(prefsw->scrollw_right_misc);
  	prefsw->right_shown = prefsw->scrollw_right_misc;
@@ -139,7 +139,7 @@ Author: Harry Rickards <hrickards at l33tmyst.com>
  	  lives_widget_hide (prefsw->cdda_hbox);
  	}
  	break;
-@@ -3742,7 +3742,7 @@ _prefsw *create_prefs_dialog (void) {
+@@ -3758,7 +3758,7 @@ _prefsw *create_prefs_dialog (void) {
    lives_container_add (LIVES_CONTAINER (dialog_table), prefsw->scrollw_right_misc);
  
  
diff --git a/debian/patches/02-drop_py3_multiencoder.patch b/debian/patches/02-drop_py3_multiencoder.patch
index b483a40..63c0971 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
-@@ -422,7 +422,6 @@ encoder_DATA = encodedv_encoder \
+@@ -424,7 +424,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 6ec2750..c2a922d 100644
--- a/debian/patches/03-libav10.patch
+++ b/debian/patches/03-libav10.patch
@@ -134,7 +134,7 @@ Last-Update: 2014-05-12
  #endif
  
  #if ((LIBAVUTIL_VERSION_MAJOR < 51) || (LIBAVUTIL_VERSION_MAJOR == 51) && (LIBAVUTIL_VERSION_MINOR < 22))
-@@ -214,6 +228,8 @@ static void av_set_pts_info(AVStream *s,
+@@ -219,6 +233,8 @@ static void av_set_pts_info(AVStream *s,
      s->time_base = new_tb;
  #ifdef HAVE_AV_CODEC_SET_PKT_TIMEBASE
      av_codec_set_pkt_timebase(s->codec, new_tb);

-- 
lives packaging

More information about the pkg-multimedia-commits mailing list