diff options
author | drochner <drochner@pkgsrc.org> | 2009-09-09 16:54:13 +0000 |
---|---|---|
committer | drochner <drochner@pkgsrc.org> | 2009-09-09 16:54:13 +0000 |
commit | f1ff183850d1c9aba5c080c0df68db25ea8ded3d (patch) | |
tree | 2ae052fac1fb1875bc21f4f4b22f5dced16f0828 /audio/albumplayer/patches | |
parent | 0dfc3e4e6251f127e751deaee082f7ecf2656858 (diff) | |
download | pkgsrc-f1ff183850d1c9aba5c080c0df68db25ea8ded3d.tar.gz |
update to 0.3
changes:
-my patches (portability, cue sheet parser improvements) were integrated
upstream
-UI improvements
-minor fixes
Diffstat (limited to 'audio/albumplayer/patches')
-rw-r--r-- | audio/albumplayer/patches/patch-aa | 24 | ||||
-rw-r--r-- | audio/albumplayer/patches/patch-ab | 13 | ||||
-rw-r--r-- | audio/albumplayer/patches/patch-ac | 42 | ||||
-rw-r--r-- | audio/albumplayer/patches/patch-ad | 29 |
4 files changed, 29 insertions, 79 deletions
diff --git a/audio/albumplayer/patches/patch-aa b/audio/albumplayer/patches/patch-aa deleted file mode 100644 index b21dc4e9e3f..00000000000 --- a/audio/albumplayer/patches/patch-aa +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2009/07/27 13:40:28 drochner Exp $ - ---- main.c.orig 2009-07-17 16:37:33.000000000 +0200 -+++ main.c -@@ -7,6 +7,7 @@ - #include <assert.h> - #include <gst/gst.h> - #include <libintl.h> -+#include <locale.h> - #include "config.h" - - #define _(x) gettext(x) -@@ -144,6 +145,11 @@ FLAC__byte* get_track_tag(unsigned tr, c - query_string = g_strdup_printf("%s(%d)", what, get_track_number(tr)); - - if((try = get_comment(query_string))) goto finished; -+ -+ g_free(query_string); -+ query_string = g_strdup_printf("%s[%d]", what, get_track_number(tr)); -+ -+ if((try = get_comment(query_string))) goto finished; - - if(!g_strcmp0(what,"TITLE")) - g_message(_("The %s tag is unset. Using %s instead."), diff --git a/audio/albumplayer/patches/patch-ab b/audio/albumplayer/patches/patch-ab deleted file mode 100644 index b2601296836..00000000000 --- a/audio/albumplayer/patches/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ab,v 1.1.1.1 2009/07/27 13:40:28 drochner Exp $ - ---- Makefile.in.orig 2009-07-18 10:29:57.000000000 +0200 -+++ Makefile.in -@@ -820,7 +820,7 @@ albumplayer.desktop: albumplayer.desktop - sed 's,@AP_EXEC@,@bindir@,' < albumplayer.desktop.in > albumplayer.desktop - - install-data-local: albumplayer.desktop -- install -m 644 albumplayer.desktop -D $(DESTDIR)/$(datadir)/applications/albumplayer.desktop -+ install -m 644 albumplayer.desktop $(DESTDIR)/$(datadir)/applications/albumplayer.desktop - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: diff --git a/audio/albumplayer/patches/patch-ac b/audio/albumplayer/patches/patch-ac deleted file mode 100644 index d83773f1026..00000000000 --- a/audio/albumplayer/patches/patch-ac +++ /dev/null @@ -1,42 +0,0 @@ -$NetBSD: patch-ac,v 1.1.1.1 2009/07/27 13:40:28 drochner Exp $ - ---- ap_flac_embed.orig 2009-07-14 16:55:44.000000000 +0200 -+++ ap_flac_embed -@@ -4,7 +4,7 @@ - # - - if [ "$#" -lt 2 ]; then -- echo Usage: $0 my_album.flac cue_sheet.flac [artwork.png] -+ echo Usage: $0 my_album.flac cue_sheet.cue [artwork.png] - exit 1 - fi - -@@ -18,8 +18,27 @@ if ! which metaflac > /dev/null; then - exit 1 - fi - -+AWKEX=' -+BEGIN { havetrack=0 } -+/^[ \t]*TRACK/ {trackno=$2; havetrack=1} -+/^[ \t]*TITLE/ { -+ split($0, st, "\""); -+ if (havetrack) -+ printf "TITLE[%d]=%s\n",trackno,st[2]; -+ else -+ printf "ALBUM=%s\n",st[2] -+} -+/^[ \t]*PERFORMER/ { -+ split($0, st, "\""); -+ if (havetrack) -+ printf "ARTIST[%d]=%s\n",trackno,st[2]; -+ else -+ printf "ARTIST=%s\n",st[2] -+} -+' -+ - if [ -f "$1" -a -f "$2" ]; then -- awk -v r='"' '/^[ \t][ \t]*TRACK/ {printf "TITLE(%s)=",$2} /^[ \t][ \t]*TITLE/ {split($0, st, r); printf "%s\n",st[2]}' < "$2" | metaflac --import-tags-from=- "$1" -+ awk "$AWKEX" < "$2" | metaflac --import-tags-from=- "$1" - else - echo FLAC or CUE file does not exist. - fi diff --git a/audio/albumplayer/patches/patch-ad b/audio/albumplayer/patches/patch-ad new file mode 100644 index 00000000000..5274f03c8e2 --- /dev/null +++ b/audio/albumplayer/patches/patch-ad @@ -0,0 +1,29 @@ +$NetBSD: patch-ad,v 1.1 2009/09/09 16:54:13 drochner Exp $ + +--- main.c.orig 2009-09-08 22:05:17.000000000 +0200 ++++ main.c +@@ -55,6 +55,7 @@ GdkPixbuf *questionmark; + GdkPixbuf *coverlayer; + gchar *last_canteen = NULL; + int sched_seek = -1; ++int shutting_down; + + GdkPixbuf* scale_width(GdkPixbuf* pb, float nw) { + double width = gdk_pixbuf_get_width(pb); +@@ -601,6 +602,8 @@ void pause_cb(gpointer seekbar) { + } + + gboolean progress_timeout_cb(gpointer seekbar) { ++ if (shutting_down) /* seekbar can be already invalid */ ++ return false; + if(loaded) { + g_signal_handlers_block_by_func(seekbar, seek_cb, seekbar); + +@@ -860,6 +863,7 @@ main (int argc, char *argv[]) + gst_element_set_state(pipeline, GST_STATE_NULL); + gst_object_unref(GST_OBJECT(pipeline)); + } ++ shutting_down = 1; + g_object_unref (G_OBJECT (builder)); + g_object_unref (G_OBJECT (gconf)); + |