summaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/lives/lives.SlackBuild2
-rw-r--r--multimedia/lives/lives.info6
-rw-r--r--multimedia/lives/osc.patch13
-rw-r--r--multimedia/lives/pulseaudio.patch230
4 files changed, 4 insertions, 247 deletions
diff --git a/multimedia/lives/lives.SlackBuild b/multimedia/lives/lives.SlackBuild
index 66405577a6..5977487aed 100644
--- a/multimedia/lives/lives.SlackBuild
+++ b/multimedia/lives/lives.SlackBuild
@@ -27,7 +27,7 @@
PRGNAM=lives
SRCNAM=LiVES
-VERSION=${VERSION:-2.6.0}
+VERSION=${VERSION:-2.6.2}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/multimedia/lives/lives.info b/multimedia/lives/lives.info
index 4572c1a844..f984be64e5 100644
--- a/multimedia/lives/lives.info
+++ b/multimedia/lives/lives.info
@@ -1,8 +1,8 @@
PRGNAM="lives"
-VERSION="2.6.0"
+VERSION="2.6.2"
HOMEPAGE="http://lives.sourceforge.net"
-DOWNLOAD="http://lives-video.com/releases/LiVES-2.6.0.tar.bz2"
-MD5SUM="9cd5299b00f43fb321e0f132fe68bb0b"
+DOWNLOAD="http://lives-video.com/releases/LiVES-2.6.2.tar.bz2"
+MD5SUM="d2cabee22836e686488e75a7aabdece7"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="jack2"
diff --git a/multimedia/lives/osc.patch b/multimedia/lives/osc.patch
deleted file mode 100644
index 619c2af5a7..0000000000
--- a/multimedia/lives/osc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/trunk/libOSC/sendOSC/Makefile.am
-+++ b/trunk/libOSC/sendOSC/Makefile.am
-@@ -19,10 +19,10 @@
-
- sendOSC_PROGRAMS = sendOSC
-
--installdirs:
-- $(MKDIR_P) "$(DESTDIR)$(bindir)"
-+
-
- install-exec-local:
-+ $(MKDIR_P) "$(DESTDIR)$(bindir)"
- cp -f $(sendOSC) "$(DESTDIR)$(bindir)" && chmod a+rx "$(DESTDIR)$(bindir)/$(sendOSC)"
diff --git a/multimedia/lives/pulseaudio.patch b/multimedia/lives/pulseaudio.patch
deleted file mode 100644
index 11ab979245..0000000000
--- a/multimedia/lives/pulseaudio.patch
+++ /dev/null
@@ -1,230 +0,0 @@
---- src/preferences.c.orig 2015-04-17 19:02:11.000000000 +0200
-+++ src/preferences.c 2015-06-02 14:56:23.861483000 +0200
-@@ -441,14 +441,6 @@
- }
- #endif
- }
-- if (prefs->audio_player==AUD_PLAYER_PULSE) {
--#ifdef HAVE_PULSE_AUDIO
-- if (prefs->perm_audio_reader) {
-- // create reader connection now, if permanent
-- pulse_rec_audio_to_clip(-1,-1,RECA_EXTERNAL);
-- }
--#endif
-- }
- }
-
- } else if (!rec_ext_audio&&prefs->audio_src==AUDIO_SRC_EXT) {
---- src/callbacks.c.orig 2015-04-17 18:58:35.000000000 +0200
-+++ src/callbacks.c 2015-06-02 15:09:34.683508000 +0200
-@@ -147,13 +147,6 @@
- mainw->current_file=-1;
-
- if (!mainw->only_close) {
--#ifdef HAVE_PULSE_AUDIO
-- pthread_mutex_lock(&mainw->abuf_mutex);
-- if (mainw->pulsed!=NULL) pulse_close_client(mainw->pulsed);
-- if (mainw->pulsed_read!=NULL) pulse_close_client(mainw->pulsed_read);
-- pulse_shutdown();
-- pthread_mutex_unlock(&mainw->abuf_mutex);
--#endif
- #ifdef ENABLE_JACK
- pthread_mutex_lock(&mainw->abuf_mutex);
- lives_jack_end();
-@@ -1022,12 +1015,6 @@
- return;
- }
- #endif
--#ifdef HAVE_PULSE_AUDIO
-- if (mainw->pulsed!=NULL&&mainw->pulsed_read!=NULL&&mainw->pulsed->in_use) {
-- mainw->cancelled=CANCEL_KEEP;
-- return;
-- }
--#endif
-
- #ifndef IS_MINGW
- com=lives_strdup_printf("%s stopsubsubs \"%s\" 2>/dev/null",prefs->backend_sync,cfile->handle);
-@@ -3981,19 +3968,6 @@
- }
-
- #endif
--#ifdef HAVE_PULSE_AUDIO
-- if (prefs->audio_player==AUD_PLAYER_PULSE) {
-- if (mainw->agen_key==0&&!mainw->agen_needs_reinit) {
-- pulse_rec_audio_to_clip(mainw->ascrap_file, -1, RECA_EXTERNAL);
-- mainw->pulsed_read->in_use=TRUE;
-- } else {
-- if (mainw->pulsed!=NULL) {
-- pulse_rec_audio_to_clip(mainw->ascrap_file, -1, RECA_GENERATED);
-- mainw->pulsed_read->in_use=TRUE;
-- }
-- }
-- }
--#endif
- }
- return;
- }
-@@ -4006,11 +3980,6 @@
- jack_get_rec_avals(mainw->jackd);
- }
- #endif
--#ifdef HAVE_PULSE_AUDIO
-- if (prefs->audio_player==AUD_PLAYER_PULSE&&mainw->pulsed!=NULL) {
-- pulse_get_rec_avals(mainw->pulsed);
-- }
--#endif
- }
- return;
- }
-@@ -7377,14 +7346,6 @@
- } else if (mainw->jackd!=NULL) mainw->jackd->loop=AUDIO_LOOP_NONE;
- }
- #endif
--#ifdef HAVE_PULSE_AUDIO
-- if (prefs->audio_player==AUD_PLAYER_PULSE) {
-- if (mainw->pulsed!=NULL&&(mainw->loop_cont||mainw->whentostop==NEVER_STOP)) {
-- if (mainw->ping_pong&&prefs->audio_opts&AUDIO_OPTS_FOLLOW_FPS) mainw->pulsed->loop=AUDIO_LOOP_PINGPONG;
-- else mainw->pulsed->loop=AUDIO_LOOP_FORWARD;
-- } else if (mainw->pulsed!=NULL) mainw->pulsed->loop=AUDIO_LOOP_NONE;
-- }
--#endif
-
- }
-
-@@ -7397,12 +7358,6 @@
- else mainw->jackd->loop=AUDIO_LOOP_FORWARD;
- }
- #endif
--#ifdef HAVE_PULSE_AUDIO
-- if (prefs->audio_player==AUD_PLAYER_PULSE&&mainw->pulsed!=NULL&&mainw->pulsed->loop!=AUDIO_LOOP_NONE) {
-- if (mainw->ping_pong&&prefs->audio_opts&AUDIO_OPTS_FOLLOW_FPS) mainw->pulsed->loop=AUDIO_LOOP_PINGPONG;
-- else mainw->pulsed->loop=AUDIO_LOOP_FORWARD;
-- }
--#endif
- }
-
-
-@@ -7484,17 +7439,6 @@
- }
- }
- #endif
--#ifdef HAVE_PULSE_AUDIO
-- if (prefs->audio_player==AUD_PLAYER_PULSE&&mainw->playing_file>-1&&mainw->pulsed!=NULL) {
-- mainw->pulsed->mute=mainw->mute;
-- if (mainw->pulsed->playing_file==mainw->current_file&&cfile->achans>0&&!mainw->is_rendering) {
-- if (!pulse_audio_seek_bytes(mainw->pulsed, mainw->pulsed->seek_pos)) {
-- if (pulse_try_reconnect()) pulse_audio_seek_bytes(mainw->pulsed,mainw->pulsed->seek_pos);
-- }
-- mainw->pulsed->in_use=TRUE;
-- }
-- }
--#endif
- }
-
-
-@@ -9165,11 +9109,6 @@
- jack_driver_activate(mainw->jackd);
- }
- #endif
--#ifdef HAVE_PULSE_AUDIO
-- if (mainw->pulsed!=NULL) {
-- pulse_driver_activate(mainw->pulsed);
-- }
--#endif
- }
- mainw->is_ready=TRUE;
- if (palette->style&STYLE_1) widget_opts.apply_theme=TRUE;
-@@ -9283,8 +9222,7 @@
- d_print(_("paused..."));
- }
- #ifdef RT_AUDIO
-- if ((mainw->jackd!=NULL&&mainw->jackd_read!=NULL&&mainw->jackd_read->in_use)
-- ||(mainw->pulsed!=NULL&&mainw->pulsed_read!=NULL&&mainw->pulsed_read->in_use))
-+ if ((mainw->jackd!=NULL&&mainw->jackd_read!=NULL&&mainw->jackd_read->in_use))
- lives_widget_hide(cfile->proc_ptr->stop_button);
- #endif
- } else {
-@@ -9298,16 +9236,14 @@
- d_print(_("resumed..."));
- }
- #ifdef RT_AUDIO
-- if ((mainw->jackd!=NULL&&mainw->jackd_read!=NULL&&mainw->jackd_read->in_use)
-- ||(mainw->pulsed!=NULL&&mainw->pulsed_read!=NULL&&mainw->pulsed_read->in_use))
-+ if ((mainw->jackd!=NULL&&mainw->jackd_read!=NULL&&mainw->jackd_read->in_use))
- lives_widget_show(cfile->proc_ptr->stop_button);
- #endif
- }
-
- if (!cfile->opening&&!mainw->internal_messaging
- #ifdef RT_AUDIO
-- &&!((mainw->jackd!=NULL&&mainw->jackd_read!=NULL&&mainw->jackd_read->in_use)
-- ||(mainw->pulsed!=NULL&&mainw->pulsed_read!=NULL&&mainw->pulsed->in_use))
-+ &&!((mainw->jackd!=NULL&&mainw->jackd_read!=NULL&&mainw->jackd_read->in_use))
- #endif
- ) {
- lives_system(com,FALSE);
-@@ -9581,19 +9517,6 @@
- }
- }
- #endif
--
--#ifdef HAVE_PULSE_AUDIO
-- if (prefs->audio_player==AUD_PLAYER_PULSE&&mainw->pulsed!=NULL&&mainw->pulsed->playing_file==mainw->current_file&&
-- !(mainw->record&&!mainw->record_paused&&prefs->audio_src==AUDIO_SRC_EXT)) {
--
-- mainw->pulsed->in_arate=cfile->arate*cfile->pb_fps/cfile->fps;
-- if (mainw->agen_key==0&&!mainw->agen_needs_reinit&&!has_audio_filters(AF_TYPE_NONA)) {
-- mainw->rec_aclip=mainw->current_file;
-- mainw->rec_avel=cfile->pb_fps/cfile->fps;
-- mainw->rec_aseek=(double)mainw->pulsed->seek_pos/(double)(cfile->arate*cfile->achans*cfile->asampsize/8);
-- }
-- }
--#endif
- }
-
- if (cfile->play_paused) {
-@@ -10100,14 +10023,6 @@
- if (cfile->play_paused) jack_pb_stop();
- else jack_pb_start();
- #endif
--#ifdef HAVE_PULSE_AUDIO
-- if (mainw->pulsed!=NULL&&prefs->audio_player==AUD_PLAYER_PULSE&&prefs->audio_opts&AUDIO_OPTS_FOLLOW_FPS) {
-- if (!cfile->play_paused&&mainw->pulsed!=NULL&&mainw->pulsed->playing_file==mainw->current_file) {
-- mainw->pulsed->in_arate=cfile->arate*cfile->pb_fps/cfile->fps;
-- }
-- mainw->pulsed->is_paused=cfile->play_paused;
-- }
--#endif
-
- return TRUE;
- }
-@@ -10137,16 +10052,6 @@
- #else
- return FALSE;
- #endif
-- }
--
-- if (prefs->audio_player==AUD_PLAYER_PULSE) {
--#ifdef HAVE_PULSE_AUDIO
-- if (mainw->pulsed!=NULL&&mainw->pulsed->in_use) avsync=(double)mainw->pulsed->seek_pos/
-- cfile->arate/cfile->achans/cfile->asampsize*8;
-- else return FALSE;
--#else
-- return FALSE;
--#endif
- } else return FALSE;
-
- avsync-=(mainw->actual_frame-1.)/cfile->fps;
-@@ -11386,12 +11291,6 @@
- mainw->jackd_read->in_use=TRUE;
- }
- #endif
--#ifdef HAVE_PULSE_AUDIO
-- if (prefs->audio_player==AUD_PLAYER_PULSE) {
-- pulse_rec_audio_to_clip(mainw->current_file,old_file,type==0?RECA_NEW_CLIP:RECA_EXISTING);
-- mainw->pulsed_read->in_use=TRUE;
-- }
--#endif
-
- if (type==1) {
- // set these again, as playsel may have reset them
generated by cgit v1.2.3 (git 2.26.2) at 2024-11-19 23:57:03 +0000