[SCM] lives/master: Removed, included upstream
sramacher at users.alioth.debian.org
sramacher at users.alioth.debian.org
Sun Jan 17 17:01:45 UTC 2016
The following commit has been merged in the master branch:
commit b24f48d9ce94d5ba2abd965f60f1d66ee9c265f9
Author: Sebastian Ramacher <sramacher at debian.org>
Date: Sun Jan 17 16:01:47 2016 +0100
Removed, included upstream
diff --git a/debian/patches/01-cdda2wav_to_icedax.patch b/debian/patches/01-cdda2wav_to_icedax.patch
deleted file mode 100644
index eaa7a25..0000000
--- a/debian/patches/01-cdda2wav_to_icedax.patch
+++ /dev/null
@@ -1,150 +0,0 @@
-Description: This patch ensures that lives looks for icedax (the Debian clone
- of cdda2wav) instead of cdda2wav.
-Forwarded: not-needed
-Author: Harry Rickards <hrickards at l33tmyst.com>
----
- README | 2 +-
- smogrify | 8 ++++----
- src/gui.c | 4 ++--
- src/main.c | 12 ++++++------
- src/main.h | 2 +-
- src/preferences.c | 6 +++---
- 6 files changed, 17 insertions(+), 17 deletions(-)
-
---- lives.orig/README
-+++ lives/README
-@@ -33,7 +33,7 @@ libmjpeg-tools (recommended)
- *Highly* Recommended runtime dependencies include:
- theora-bin, mkvtoolnix, vorbis-tools, mencoder,
- libmatroska, ogmtools, dvgrab, x264, ffmpeg,
--libdv2-apps/libdv-bin, cdda2wav, lame, python, youtube-dl
-+libdv2-apps/libdv-bin, icedax, lame, python, youtube-dl
-
- Optional - libvisual-actors, frei0r-plugins
-
---- lives.orig/smogrify
-+++ lives/smogrify
-@@ -3566,9 +3566,9 @@ if ($file=~/:\/\//) {
-
- if ($command eq "cdopen") {
-
-- $cdda2wav_command=&location("cdda2wav");
-- if ($cdda2wav_command eq "") {
-- &sig_error("cdda2wav is required for this function.","Please install it first.");
-+ $icedax_command=&location("icedax");
-+ if ($icedax_command eq "") {
-+ &sig_error("icedax is required for this function.","Please install it first.");
- }
-
- $cdplay_device=&rc_get("cdplay_device");
-@@ -3583,7 +3583,7 @@ if ($file=~/:\/\//) {
- unlink "$audiofile";
- }
-
-- $com="\"$cdda2wav_command\" -q -x -D \"$cdplay_device\" -t $track \"$audiofile\"| >$nulfile 2>&1";
-+ $com="\"$icedax_command\" -q -x -D \"$cdplay_device\" -t $track \"$audiofile\"| >$nulfile 2>&1";
- $smerr=smog_system($com);
- if ($smerr) {
- sig_system_error("$com",$smerr);
---- lives.orig/src/gui.c
-+++ lives/src/gui.c
-@@ -1192,7 +1192,7 @@ void create_LiVES(void) {
- lives_container_add(LIVES_CONTAINER(audio_menu), mainw->eject_cd);
-
- if (capable->smog_version_correct) {
-- if (!(capable->has_cdda2wav&&strlen(prefs->cdplay_device))) {
-+ if (!(capable->has_icedax&&strlen(prefs->cdplay_device))) {
- lives_widget_set_sensitive(mainw->load_cdtrack, FALSE);
- lives_widget_set_sensitive(mainw->eject_cd, FALSE);
- }
-@@ -2829,7 +2829,7 @@ void create_LiVES(void) {
- lives_signal_connect(LIVES_GUI_OBJECT(mainw->load_audio), LIVES_WIDGET_ACTIVATE_SIGNAL,
- LIVES_GUI_CALLBACK(on_load_audio_activate),
- NULL);
-- if (capable->has_cdda2wav) {
-+ if (capable->has_icedax) {
- lives_signal_connect(LIVES_GUI_OBJECT(mainw->load_cdtrack), LIVES_WIDGET_ACTIVATE_SIGNAL,
- LIVES_GUI_CALLBACK(on_load_cdtrack_activate),
- NULL);
---- lives.orig/src/main.c
-+++ lives/src/main.c
-@@ -1833,8 +1833,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"));
-- if (capable->has_cdda2wav) d_print(_("cdda2wav...detected..."));
-- else d_print(_("cdda2wav...NOT DETECTED..."));
-+ if (capable->has_icedax) d_print(_("icedax...detected..."));
-+ else d_print(_("icedax...NOT DETECTED..."));
- if (capable->has_jackd) d_print(_("jackd...detected..."));
- else d_print(_("jackd...NOT DETECTED..."));
- if (capable->has_pulse_audio) d_print(_("pulse audio...detected..."));
-@@ -2129,7 +2129,7 @@ capability *get_capabilities(void) {
- capable->has_sox_play=FALSE;
- capable->has_sox_sox=FALSE;
- capable->has_dvgrab=FALSE;
-- capable->has_cdda2wav=FALSE;
-+ capable->has_icedax=FALSE;
- capable->has_autolives=FALSE;
- capable->has_jackd=FALSE;
- capable->has_gdb=FALSE;
-@@ -2291,8 +2291,8 @@ capability *get_capabilities(void) {
- get_location("dvgrab",string,256);
- if (strlen(string)) capable->has_dvgrab=TRUE;
-
-- get_location("cdda2wav",string,256);
-- if (strlen(string)) capable->has_cdda2wav=TRUE;
-+ get_location("icedax",string,256);
-+ if (strlen(string)) capable->has_icedax=TRUE;
-
- get_location("jackd",string,256);
- if (strlen(string)) capable->has_jackd=TRUE;
-@@ -3315,7 +3315,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);
-- if (capable->has_cdda2wav&&strlen(prefs->cdplay_device)) lives_widget_set_sensitive(mainw->load_cdtrack, TRUE);
-+ if (capable->has_icedax&&strlen(prefs->cdplay_device)) lives_widget_set_sensitive(mainw->load_cdtrack, TRUE);
- lives_widget_set_sensitive(mainw->rename, mainw->current_file>0&&!cfile->opening);
- lives_widget_set_sensitive(mainw->change_speed, mainw->current_file>0);
- lives_widget_set_sensitive(mainw->resample_video, mainw->current_file>0&&cfile->frames>0);
---- lives.orig/src/main.h
-+++ lives/src/main.h
-@@ -676,7 +676,7 @@ typedef struct {
- boolean has_convert;
- boolean has_composite;
- boolean has_identify;
-- boolean has_cdda2wav;
-+ boolean has_icedax;
- boolean has_midistartstop;
- boolean has_jackd;
- boolean has_pulse_audio;
---- lives.orig/src/preferences.c
-+++ lives/src/preferences.c
-@@ -1053,7 +1053,7 @@ boolean apply_prefs(boolean skip_warn) {
- }
-
- // cd play device
-- if (!capable->has_cdda2wav) {
-+ if (!capable->has_icedax) {
- if (strcmp(prefs->cdplay_device,cdplay_device)) {
- lives_snprintf(prefs->cdplay_device,256,"%s",cdplay_device);
- set_pref("cdplay_device",prefs->cdplay_device);
-@@ -1911,7 +1911,7 @@ void on_prefDomainChanged(LiVESTreeSelec
- case LIST_ENTRY_MISC:
- lives_widget_show_all(prefsw->scrollw_right_misc);
- prefsw->right_shown = prefsw->scrollw_right_misc;
-- if (!capable->has_cdda2wav) {
-+ if (!capable->has_icedax) {
- lives_widget_hide(prefsw->cdda_hbox);
- }
- break;
-@@ -3826,7 +3826,7 @@ _prefsw *create_prefs_dialog(void) {
- lives_container_add(LIVES_CONTAINER(dialog_table), prefsw->scrollw_right_misc);
-
-
-- if (!capable->has_cdda2wav) {
-+ if (!capable->has_icedax) {
- lives_widget_hide(prefsw->cdda_hbox);
- }
-
diff --git a/debian/patches/04-gtk-3.16.patch b/debian/patches/04-gtk-3.16.patch
deleted file mode 100644
index 6cbc5d2..0000000
--- a/debian/patches/04-gtk-3.16.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Fix compilation with GTK+ 3.16
-Origin: upstream,
- http://sourceforge.net/p/lives/code/2240/
-Bug-Debian: https://bugs.debian.org/789858
-Last-Update: 2015-07-05
-
---- lives-2.4.0~ds0.orig/src/widget-helper.c
-+++ lives-2.4.0~ds0/src/widget-helper.c
-@@ -2404,7 +2404,7 @@ LIVES_INLINE LiVESWidget *lives_expander
- LIVES_INLINE boolean lives_label_set_halignment(LiVESLabel *label, float yalign) {
- #ifdef GUI_GTK
- #if GTK_CHECK_VERSION(3,16,0)
-- gtk_label_set_y_align(label,yalign);
-+ gtk_label_set_yalign(label,yalign);
- #else
- gtk_misc_set_alignment(GTK_MISC(label),0.,yalign);
- #endif
diff --git a/debian/patches/05-gcc-5.patch b/debian/patches/05-gcc-5.patch
deleted file mode 100644
index c64b6ec..0000000
--- a/debian/patches/05-gcc-5.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Fix compilation with GCC 5
-Origin: upstream,
- http://sourceforge.net/p/lives/code/2241/
-Bug-Debian: https://bugs.debian.org/777984
-Last-Update: 2015-07-05
-
---- lives-2.4.0~ds0.orig/src/cvirtual.c
-+++ lives-2.4.0~ds0/src/cvirtual.c
-@@ -19,7 +19,7 @@
-
-
- /** count virtual frames between start and end (inclusive) */
--LIVES_INLINE int count_virtual_frames(int *findex, int start, int end) {
-+int count_virtual_frames(int *findex, int start, int end) {
- register int i;
- int count=0;
- for (i=start-1; i<end; i++) if (findex[i]!=-1) count++;
diff --git a/debian/patches/9990-buildsystem.patch b/debian/patches/9990-buildsystem.patch
deleted file mode 100644
index b1ab533..0000000
--- a/debian/patches/9990-buildsystem.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Fix broken dependency to avoid FTBFS.
-Author: Alessio Treglia <alessio at debian.org>
-Forwarded: salsaman at gmail.com
----
- libOSC/sendOSC/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- lives.orig/libOSC/sendOSC/Makefile.am
-+++ lives/libOSC/sendOSC/Makefile.am
-@@ -22,7 +22,7 @@ sendOSC_PROGRAMS = sendOSC
- installdirs:
- $(MKDIR_P) "$(DESTDIR)$(bindir)"
-
--install-exec-local:
-+install-exec-local: installdirs
- cp -f $(sendOSC) "$(DESTDIR)$(bindir)" && chmod a+rx "$(DESTDIR)$(bindir)/$(sendOSC)"
-
-
diff --git a/debian/patches/series b/debian/patches/series
index 2801844..4046572 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,3 @@
-01-cdda2wav_to_icedax.patch
02-drop_py3_multiencoder.patch
03-libav10.patch
-04-gtk-3.16.patch
-05-gcc-5.patch
parallel-build.patch
-9990-buildsystem.patch
--
lives packaging
More information about the pkg-multimedia-commits
mailing list