diff options
author | khorben <khorben@pkgsrc.org> | 2013-08-13 00:40:27 +0000 |
---|---|---|
committer | khorben <khorben@pkgsrc.org> | 2013-08-13 00:40:27 +0000 |
commit | 9eeda80cfeb8460b11437a5d554f88f621789a3b (patch) | |
tree | 2b6657c7407645131bf5d33db9bf320d372b443b /audio/bmp | |
parent | 33936c565715691542b2ef16a4db1e9bb3831d29 (diff) | |
download | pkgsrc-9eeda80cfeb8460b11437a5d554f88f621789a3b.tar.gz |
Patched bmp as recommended in xmms-crossfade.
This fixes issues occuring with this plug-in enabled, while stopping
playback or crossfading between tracks for instance.
Bump revision, as the resulting binaries are changed with this patch.
Diffstat (limited to 'audio/bmp')
-rw-r--r-- | audio/bmp/Makefile | 4 | ||||
-rw-r--r-- | audio/bmp/distinfo | 20 | ||||
-rw-r--r-- | audio/bmp/patches/patch-aa | 4 | ||||
-rw-r--r-- | audio/bmp/patches/patch-an | 10 | ||||
-rw-r--r-- | audio/bmp/patches/patch-ao | 4 | ||||
-rw-r--r-- | audio/bmp/patches/patch-ap | 6 | ||||
-rw-r--r-- | audio/bmp/patches/patch-aq | 4 | ||||
-rw-r--r-- | audio/bmp/patches/patch-ar | 6 | ||||
-rw-r--r-- | audio/bmp/patches/patch-as | 4 | ||||
-rw-r--r-- | audio/bmp/patches/patch-beep_mainwin.c | 27 | ||||
-rw-r--r-- | audio/bmp/patches/patch-beep_playback.c | 31 | ||||
-rw-r--r-- | audio/bmp/patches/patch-beep_playback.h | 14 | ||||
-rw-r--r-- | audio/bmp/patches/patch-beep_playlist.c | 45 |
13 files changed, 150 insertions, 29 deletions
diff --git a/audio/bmp/Makefile b/audio/bmp/Makefile index f7b1b709b7b..bd349565751 100644 --- a/audio/bmp/Makefile +++ b/audio/bmp/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.55 2013/06/06 12:53:53 wiz Exp $ +# $NetBSD: Makefile,v 1.56 2013/08/13 00:40:27 khorben Exp $ # BMP_ENABLE_ENCODERS= yes .include "Makefile.common" -PKGREVISION= 28 +PKGREVISION= 29 USE_TOOLS+= unzip:run diff --git a/audio/bmp/distinfo b/audio/bmp/distinfo index ff49d78c406..e046e2e30f3 100644 --- a/audio/bmp/distinfo +++ b/audio/bmp/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.14 2012/09/26 12:55:11 jperkin Exp $ +$NetBSD: distinfo,v 1.15 2013/08/13 00:40:27 khorben Exp $ SHA1 (bmp-0.9.7-ipv6-simple.diff) = d80943d504eeb06d96c2ca73ecc80a89b77e7c77 RMD160 (bmp-0.9.7-ipv6-simple.diff) = 96072b98f774ed8614818664d0fe173ea5a3e4e5 @@ -6,10 +6,14 @@ Size (bmp-0.9.7-ipv6-simple.diff) = 8660 bytes SHA1 (bmp-0.9.7.1.tar.gz) = ab6444b9a35a8bb8e920a781e72d963a3fb60547 RMD160 (bmp-0.9.7.1.tar.gz) = 9288083918913ca97ab8883d616159055931ade7 Size (bmp-0.9.7.1.tar.gz) = 2056564 bytes -SHA1 (patch-aa) = fbaa61ef68857c12b4506180a9d8d290dbf6615f -SHA1 (patch-an) = dca39915d93f99ead493bc6913469e791f2d0c79 -SHA1 (patch-ao) = c24712090587ff622d7b9df68757c984a057c6c2 -SHA1 (patch-ap) = 76d750aa820e9710d2520d3cec067d91346dc5aa -SHA1 (patch-aq) = 56f42dbd772304f9205b519b2654487b9a45091b -SHA1 (patch-ar) = 037d02b72cee6b2fdd24f9d41c28ec1220dcdf67 -SHA1 (patch-as) = dc1d9dc2100664c1ab4448234239d45741907604 +SHA1 (patch-aa) = c0dc24215a5bd97fc01159b32e8b812390c3ead5 +SHA1 (patch-an) = a9c00fcbd6a827e466451a5b0e3252c9838b2bf0 +SHA1 (patch-ao) = c9929056f514cb47265d4640695298382d6ff562 +SHA1 (patch-ap) = 897ecd2a7d91de222e098bf0bd1de6d4eea46788 +SHA1 (patch-aq) = 8129402e006c62f5b20a239b379649a13e91321f +SHA1 (patch-ar) = 3f122ed23534a2864e0453db839509fa66311c8f +SHA1 (patch-as) = ee92df73fc05ffc62aad178558579aa33cfa33a1 +SHA1 (patch-beep_mainwin.c) = 511bd333b7a49a2d3a1c333272591cb1f92dd58e +SHA1 (patch-beep_playback.c) = 6dc1e1ed66431176bafec749eaf646ce82f97fcf +SHA1 (patch-beep_playback.h) = e3fc7724a4431fb1a1ca64631d5a518daadd2354 +SHA1 (patch-beep_playlist.c) = a8f3ca1f9be0dc099927b123f5783f505c7ea164 diff --git a/audio/bmp/patches/patch-aa b/audio/bmp/patches/patch-aa index ec61dbb7aca..6850b4d64e7 100644 --- a/audio/bmp/patches/patch-aa +++ b/audio/bmp/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.1 2006/07/31 21:43:55 jmmv Exp $ +$NetBSD: patch-aa,v 1.2 2013/08/13 00:40:27 khorben Exp $ ---- beep/softvolume.c.orig 2004-06-20 20:48:54.000000000 +0200 +--- beep/softvolume.c.orig 2004-06-20 18:48:54.000000000 +0000 +++ beep/softvolume.c @@ -117,7 +117,7 @@ soft_volume_set(SoftVolumeConfig * c, gi * diff --git a/audio/bmp/patches/patch-an b/audio/bmp/patches/patch-an index dec10e8f544..0dc9066fbe0 100644 --- a/audio/bmp/patches/patch-an +++ b/audio/bmp/patches/patch-an @@ -1,8 +1,8 @@ -$NetBSD: patch-an,v 1.2 2012/09/26 12:55:12 jperkin Exp $ +$NetBSD: patch-an,v 1.3 2013/08/13 00:40:27 khorben Exp $ ---- configure.orig Sat Oct 22 10:45:08 2005 -+++ configure Wed Sep 26 12:31:51 2012 -@@ -28454,7 +28454,7 @@ +--- configure.orig 2005-10-22 10:45:08.000000000 +0000 ++++ configure +@@ -28454,7 +28454,7 @@ fi done @@ -11,7 +11,7 @@ $NetBSD: patch-an,v 1.2 2012/09/26 12:55:12 jperkin Exp $ do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` echo "$as_me:$LINENO: checking for $ac_func" >&5 -@@ -28804,7 +28804,7 @@ +@@ -28804,7 +28804,7 @@ case "$host" in i386-*-* | i486-*-* | i586-*-* | i686-*-* | i86pc-*-*) arch_type=ix86 case "$host" in diff --git a/audio/bmp/patches/patch-ao b/audio/bmp/patches/patch-ao index 8101101932c..a37e0c58c74 100644 --- a/audio/bmp/patches/patch-ao +++ b/audio/bmp/patches/patch-ao @@ -1,6 +1,6 @@ -$NetBSD: patch-ao,v 1.2 2004/08/31 15:47:56 jmmv Exp $ +$NetBSD: patch-ao,v 1.3 2013/08/13 00:40:27 khorben Exp $ ---- config.h.in.orig 2004-08-22 15:50:43.000000000 +0200 +--- config.h.in.orig 2005-10-22 10:44:55.000000000 +0000 +++ config.h.in @@ -180,6 +180,9 @@ /* Define to 1 if you have the `setlocale' function. */ diff --git a/audio/bmp/patches/patch-ap b/audio/bmp/patches/patch-ap index caa667f9495..f1cc2b286d4 100644 --- a/audio/bmp/patches/patch-ap +++ b/audio/bmp/patches/patch-ap @@ -1,8 +1,8 @@ -$NetBSD: patch-ap,v 1.2 2004/05/28 19:20:39 jmmv Exp $ +$NetBSD: patch-ap,v 1.3 2013/08/13 00:40:27 khorben Exp $ ---- Input/cdaudio/cdaudio.c.orig 2003-12-24 14:27:54.000000000 +0100 +--- Input/cdaudio/cdaudio.c.orig 2004-09-16 23:45:15.000000000 +0000 +++ Input/cdaudio/cdaudio.c -@@ -553,7 +553,11 @@ extern gboolean is_mounted(const char *d +@@ -579,7 +579,11 @@ is_mounted(const char *device_name) FILE *mounts; struct mntent *mnt; #elif defined(HAVE_GETMNTINFO) diff --git a/audio/bmp/patches/patch-aq b/audio/bmp/patches/patch-aq index e2902ffe48e..c771aca7e27 100644 --- a/audio/bmp/patches/patch-aq +++ b/audio/bmp/patches/patch-aq @@ -1,6 +1,6 @@ -$NetBSD: patch-aq,v 1.4 2006/07/31 21:43:55 jmmv Exp $ +$NetBSD: patch-aq,v 1.5 2013/08/13 00:40:27 khorben Exp $ ---- Output/OSS/Makefile.in.orig 2005-10-22 12:45:02.000000000 +0200 +--- Output/OSS/Makefile.in.orig 2005-10-22 10:45:02.000000000 +0000 +++ Output/OSS/Makefile.in @@ -295,7 +295,7 @@ soundcard.h EXTRA_DIST = $(osssources) diff --git a/audio/bmp/patches/patch-ar b/audio/bmp/patches/patch-ar index 49eaf92aada..818c5022de7 100644 --- a/audio/bmp/patches/patch-ar +++ b/audio/bmp/patches/patch-ar @@ -1,8 +1,8 @@ -$NetBSD: patch-ar,v 1.3 2004/12/25 15:22:37 jmmv Exp $ +$NetBSD: patch-ar,v 1.4 2013/08/13 00:40:27 khorben Exp $ ---- Input/cdaudio/Makefile.in.orig 2004-12-11 21:22:34.000000000 +0100 +--- Input/cdaudio/Makefile.in.orig 2005-10-22 10:45:01.000000000 +0000 +++ Input/cdaudio/Makefile.in -@@ -306,7 +306,7 @@ EXTRA_DIST = $(cdaudiosources) +@@ -296,7 +296,7 @@ EXTRA_DIST = $(cdaudiosources) lib_LTLIBRARIES = $(cdaudioltlibs) INCLUDES = @GTK_CFLAGS@ @GCONF_CFLAGS@ -I$(top_builddir)/intl -I$(top_srcdir) libcdaudio_la_LDFLAGS = @PLUGIN_LDFLAGS@ diff --git a/audio/bmp/patches/patch-as b/audio/bmp/patches/patch-as index 7292649f6ea..a20e05d949e 100644 --- a/audio/bmp/patches/patch-as +++ b/audio/bmp/patches/patch-as @@ -1,6 +1,6 @@ -$NetBSD: patch-as,v 1.2 2004/12/25 15:22:37 jmmv Exp $ +$NetBSD: patch-as,v 1.3 2013/08/13 00:40:27 khorben Exp $ ---- beep/controlsocket.c.orig 2004-12-04 13:05:16.000000000 +0100 +--- beep/controlsocket.c.orig 2005-09-04 22:36:04.000000000 +0000 +++ beep/controlsocket.c @@ -31,6 +31,7 @@ #include <sys/types.h> diff --git a/audio/bmp/patches/patch-beep_mainwin.c b/audio/bmp/patches/patch-beep_mainwin.c new file mode 100644 index 00000000000..cb88295dddb --- /dev/null +++ b/audio/bmp/patches/patch-beep_mainwin.c @@ -0,0 +1,27 @@ +$NetBSD: patch-beep_mainwin.c,v 1.1 2013/08/13 00:40:27 khorben Exp $ + +Required for audio/bmp-crossfade + +--- beep/mainwin.c.orig 2005-05-09 08:45:39.000000000 +0000 ++++ beep/mainwin.c +@@ -655,9 +655,11 @@ mainwin_shade_toggle(void) + mainwin_set_shade(!cfg.player_shaded); + } + ++gboolean is_quitting = FALSE; + void + mainwin_quit_cb(void) + { ++ is_quitting = TRUE; + gtk_widget_hide(equalizerwin); + gtk_widget_hide(playlistwin); + gtk_widget_hide(mainwin); +@@ -1318,7 +1320,7 @@ static void + change_song(guint pos) + { + if (bmp_playback_get_playing()) +- bmp_playback_stop(); ++ bmp_playback_stop_for_restart(); + + playlist_set_position(pos); + bmp_playback_initiate(); diff --git a/audio/bmp/patches/patch-beep_playback.c b/audio/bmp/patches/patch-beep_playback.c new file mode 100644 index 00000000000..295c46bd5a7 --- /dev/null +++ b/audio/bmp/patches/patch-beep_playback.c @@ -0,0 +1,31 @@ +$NetBSD: patch-beep_playback.c,v 1.1 2013/08/13 00:40:27 khorben Exp $ + +Required for audio/bmp-crossfade + +--- beep/playback.c.orig 2005-01-26 05:56:15.000000000 +0000 ++++ beep/playback.c +@@ -89,7 +89,7 @@ bmp_playback_initiate(void) + return; + + if (bmp_playback_get_playing()) +- bmp_playback_stop(); ++ bmp_playback_stop_for_restart(); + + vis_clear_data(mainwin_vis); + vis_clear_data(playlistwin_vis); +@@ -135,6 +135,15 @@ bmp_playback_pause(void) + get_current_input_plugin()->pause(ip_data.paused); + } + ++gboolean input_stopped_for_restart = FALSE; ++void ++bmp_playback_stop_for_restart(void) ++{ ++ input_stopped_for_restart = TRUE; ++ bmp_playback_stop(); ++ input_stopped_for_restart = FALSE; ++} ++ + void + bmp_playback_stop(void) + { diff --git a/audio/bmp/patches/patch-beep_playback.h b/audio/bmp/patches/patch-beep_playback.h new file mode 100644 index 00000000000..7f797fb0d8c --- /dev/null +++ b/audio/bmp/patches/patch-beep_playback.h @@ -0,0 +1,14 @@ +$NetBSD: patch-beep_playback.h,v 1.1 2013/08/13 00:40:27 khorben Exp $ + +Required for audio/bmp-crossfade + +--- beep/playback.h.orig 2004-12-04 09:04:26.000000000 +0000 ++++ beep/playback.h +@@ -26,6 +26,7 @@ gint bmp_playback_get_time(void); + void bmp_playback_initiate(void); + void bmp_playback_pause(void); + void bmp_playback_stop(void); ++void bmp_playback_stop_for_restart(void); + gboolean bmp_playback_play_file(const gchar * filename); + gboolean bmp_playback_get_playing(void); + gboolean bmp_playback_get_paused(void); diff --git a/audio/bmp/patches/patch-beep_playlist.c b/audio/bmp/patches/patch-beep_playlist.c new file mode 100644 index 00000000000..498bfd7c8aa --- /dev/null +++ b/audio/bmp/patches/patch-beep_playlist.c @@ -0,0 +1,45 @@ +$NetBSD: patch-beep_playlist.c,v 1.1 2013/08/13 00:40:27 khorben Exp $ + +Required for audio/bmp-crossfade + +--- beep/playlist.c.orig 2005-08-11 07:25:51.000000000 +0000 ++++ beep/playlist.c +@@ -817,7 +817,7 @@ playlist_next(void) + if (bmp_playback_get_playing()) { + /* We need to stop before changing playlist_position */ + PLAYLIST_UNLOCK(); +- bmp_playback_stop(); ++ bmp_playback_stop_for_restart(); + PLAYLIST_LOCK(); + restart_playing = TRUE; + } +@@ -868,7 +868,7 @@ playlist_prev(void) + if (bmp_playback_get_playing()) { + /* We need to stop before changing playlist_position */ + PLAYLIST_UNLOCK(); +- bmp_playback_stop(); ++ bmp_playback_stop_for_restart(); + PLAYLIST_LOCK(); + restart_playing = TRUE; + } +@@ -1018,7 +1018,7 @@ playlist_set_position(guint pos) + if (bmp_playback_get_playing()) { + /* We need to stop before changing playlist_position */ + PLAYLIST_UNLOCK(); +- bmp_playback_stop(); ++ bmp_playback_stop_for_restart(); + PLAYLIST_LOCK(); + restart_playing = TRUE; + } +@@ -1047,7 +1047,10 @@ playlist_eof_reached(void) + { + GList *plist_pos_list; + +- bmp_playback_stop(); ++ if (cfg.repeat) ++ bmp_playback_stop_for_restart(); ++ else ++ bmp_playback_stop(); + + PLAYLIST_LOCK(); + plist_pos_list = find_playlist_position_list(); |