update to 0.3 changes: -my patches (portability, cue sheet parser improvements) were integrated upstream -UI improvements -minor fixesdiff -r1.3 -r1.4 pkgsrc/audio/albumplayer/Makefile
(drochner)
@@ -1,28 +1,28 @@ | @@ -1,28 +1,28 @@ | |||
1 | # $NetBSD: Makefile,v 1.3 2009/08/26 19:57:07 sno Exp $ | 1 | # $NetBSD: Makefile,v 1.4 2009/09/09 16:54:13 drochner Exp $ | |
2 | # | 2 | # | |
3 | 3 | |||
4 | DISTNAME= albumplayer-0.2 | 4 | DISTNAME= albumplayer_0.3.orig | |
5 | PKGREVISION= 2 | 5 | PKGNAME= albumplayer-0.3 | |
6 | CATEGORIES= audio | 6 | CATEGORIES= audio | |
7 | MASTER_SITES= http://rvb.mytanet.de/ | 7 | MASTER_SITES= http://rvb.mytanet.de/debian/ | |
8 | # XXX distfile was modified after release | |||
9 | DIST_SUBDIR= albumplayer_modified_0.2 | |||
10 | 8 | |||
11 | MAINTAINER= pkgstc-users@NetBSD.org | 9 | MAINTAINER= pkgstc-users@NetBSD.org | |
12 | HOMEPAGE= http://rvb.mytanet.de/ | 10 | HOMEPAGE= http://rvb.mytanet.de/ | |
13 | COMMENT= FLAC album player | 11 | COMMENT= FLAC album player | |
14 | LICENSE= original-bsd | 12 | LICENSE= original-bsd | |
15 | 13 | |||
14 | WRKSRC= ${WRKDIR}/${PKGNAME} | |||
15 | ||||
16 | GNU_CONFIGURE= yes | 16 | GNU_CONFIGURE= yes | |
17 | USE_PKGLOCALEDIR= yes | 17 | USE_PKGLOCALEDIR= yes | |
18 | USE_TOOLS+= pkg-config | 18 | USE_TOOLS+= pkg-config | |
19 | USE_DIRS+= xdg-1.1 | 19 | USE_DIRS+= xdg-1.1 | |
20 | PKG_DESTDIR_SUPPORT= user-destdir | 20 | PKG_DESTDIR_SUPPORT= user-destdir | |
21 | INSTALLATION_DIRS+= share/applications | 21 | INSTALLATION_DIRS+= share/applications | |
22 | 22 | |||
23 | .include "../../devel/glib2/buildlink3.mk" | 23 | .include "../../devel/glib2/buildlink3.mk" | |
24 | .include "../../x11/gtk2/buildlink3.mk" | 24 | .include "../../x11/gtk2/buildlink3.mk" | |
25 | .include "../../multimedia/gstreamer0.10/buildlink3.mk" | 25 | .include "../../multimedia/gstreamer0.10/buildlink3.mk" | |
26 | .include "../../devel/GConf/buildlink3.mk" | 26 | .include "../../devel/GConf/buildlink3.mk" | |
27 | .include "../../audio/flac/buildlink3.mk" | 27 | .include "../../audio/flac/buildlink3.mk" | |
28 | .include "../../sysutils/desktop-file-utils/desktopdb.mk" | 28 | .include "../../sysutils/desktop-file-utils/desktopdb.mk" |
@@ -1,12 +1,14 @@ | @@ -1,12 +1,14 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.1.1.1 2009/07/27 13:40:28 drochner Exp $ | 1 | @comment $NetBSD: PLIST,v 1.2 2009/09/09 16:54:13 drochner Exp $ | |
2 | bin/albumplayer | 2 | bin/albumplayer | |
3 | bin/ap_flac_embed | 3 | bin/ap_flac_embed | |
4 | man/man1/albumplayer.1 | 4 | man/man1/albumplayer.1 | |
5 | man/man1/ap_flac_embed.1 | 5 | man/man1/ap_flac_embed.1 | |
6 | share/albumplayer/albumplayer.xml | 6 | share/albumplayer/albumplayer.xml | |
7 | share/albumplayer/coverlayer.png | 7 | share/albumplayer/coverlayer.png | |
8 | share/albumplayer/questionmark.png | 8 | share/albumplayer/questionmark.png | |
9 | share/albumplayer/record.png | |||
10 | share/albumplayer/record24.png | |||
9 | share/applications/albumplayer.desktop | 11 | share/applications/albumplayer.desktop | |
10 | share/locale/de/LC_MESSAGES/albumplayer.mo | 12 | share/locale/de/LC_MESSAGES/albumplayer.mo | |
11 | share/locale/en@boldquot/LC_MESSAGES/albumplayer.mo | 13 | share/locale/en@boldquot/LC_MESSAGES/albumplayer.mo | |
12 | share/locale/en@quot/LC_MESSAGES/albumplayer.mo | 14 | share/locale/en@quot/LC_MESSAGES/albumplayer.mo |
@@ -1,8 +1,6 @@ | @@ -1,8 +1,6 @@ | |||
1 | $NetBSD: distinfo,v 1.2 2009/08/03 09:55:36 drochner Exp $ | 1 | $NetBSD: distinfo,v 1.3 2009/09/09 16:54:13 drochner Exp $ | |
2 | 2 | |||
3 | SHA1 (albumplayer_modified_0.2/albumplayer-0.2.tar.gz) = c0ea0817be23ef0a12266f738fa85afc1f01c5d6 | 3 | SHA1 (albumplayer_0.3.orig.tar.gz) = 7dc969f18ceded545d997e98ec1ab1f11f652b2e | |
4 | RMD160 (albumplayer_modified_0.2/albumplayer-0.2.tar.gz) = ea2b76d9e8b33a51482ebc0f458e22566eeb02d3 | 4 | RMD160 (albumplayer_0.3.orig.tar.gz) = 8210fdb29856d55f172e842b1b27a02e92e2e9ed | |
5 | Size (albumplayer_modified_0.2/albumplayer-0.2.tar.gz) = 183040 bytes | 5 | Size (albumplayer_0.3.orig.tar.gz) = 203517 bytes | |
6 | SHA1 (patch-aa) = b7ae1b2da44c2711f1c5b93706c50460692a271c | 6 | SHA1 (patch-ad) = 8960d9e4c3119a93cfaed97c4075bc45d7be1744 | |
7 | SHA1 (patch-ab) = 7b9023de64ea5d0cf360d5f57c3f2e17cb0fc40f | |||
8 | SHA1 (patch-ac) = d47b001b6a08940ab8d11cee69afe13409f72fc2 |
$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));