diff options
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/gmpc/Makefile | 24 | ||||
| -rw-r--r-- | audio/gmpc/PLIST | 97 | ||||
| -rw-r--r-- | audio/gmpc/buildlink3.mk | 17 | ||||
| -rw-r--r-- | audio/gmpc/distinfo | 12 | ||||
| -rw-r--r-- | audio/gmpc/options.mk | 26 | ||||
| -rw-r--r-- | audio/gmpc/patches/patch-ag | 9 | ||||
| -rw-r--r-- | audio/gmpc/patches/patch-ah | 40 | ||||
| -rw-r--r-- | audio/gmpc/patches/patch-ai | 22 |
8 files changed, 185 insertions, 62 deletions
diff --git a/audio/gmpc/Makefile b/audio/gmpc/Makefile index cd4ae4ea90c..afb41ba297b 100644 --- a/audio/gmpc/Makefile +++ b/audio/gmpc/Makefile @@ -1,30 +1,38 @@ -# $NetBSD: Makefile,v 1.29 2009/01/28 12:47:35 drochner Exp $ +# $NetBSD: Makefile,v 1.30 2009/05/30 01:25:19 obache Exp $ # -DISTNAME= gmpc-0.17.0 -PKGREVISION= 1 +DISTNAME= gmpc-0.18.0 CATEGORIES= audio -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=musicpd/} +MASTER_SITES= http://download.sarine.nl/Programs/gmpc/0.18.0/ \ + ${MASTER_SITE_SOURCEFORGE:=musicpd/} MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://sarine.nl/gmpc +HOMEPAGE= http://gmpc.wikia.com/wiki/Gnome_Music_Player_Client COMMENT= GNOME client for the Music Player Daemon +LICENSE= gnu-gpl-v2 + +PKG_DESTDIR_SUPPORT= user-destdir USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes USE_TOOLS+= intltool msgfmt pkg-config gmake PKGCONFIG_OVERRIDE= data/gmpc.pc.in -PKG_DESTDIR_SUPPORT= user-destdir - USE_DIRS+= xdg-1.1 +.include "options.mk" + +CONFIGURE_ARGS+= --enable-system-libsexy +CONFIGURE_ARGS+= --with-curl=${BUILDLINK_PREFIX.curl} + +BUILDLINK_API_DEPENDS.libmpd+= libmpd>=0.17.1 .include "../../audio/libmpd/buildlink3.mk" .include "../../devel/gob2/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" .include "../../devel/libglade/buildlink3.mk" +.include "../../devel/libsexy/buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" -.include "../../textproc/libxml2/buildlink3.mk" +.include "../../net/libsoup24/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../x11/libSM/buildlink3.mk" .include "../../www/curl/buildlink3.mk" diff --git a/audio/gmpc/PLIST b/audio/gmpc/PLIST index dd9aafc1fa8..91f765d4e08 100644 --- a/audio/gmpc/PLIST +++ b/audio/gmpc/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.10 2009/01/20 22:46:09 drochner Exp $ +@comment $NetBSD: PLIST,v 1.11 2009/05/30 01:25:19 obache Exp $ bin/gmpc bin/gmpc-remote bin/gmpc-remote-stream @@ -6,7 +6,7 @@ include/gmpc/TreeSearchWidget.h include/gmpc/config1.h include/gmpc/gmpc-clicklabel.h include/gmpc/gmpc-connection.h -include/gmpc/gmpc-idle.h +include/gmpc/gmpc-easy-command.h include/gmpc/gmpc-meta-watcher.h include/gmpc/gmpc-metaimage.h include/gmpc/gmpc-mpddata-model-sort.h @@ -14,6 +14,7 @@ include/gmpc/gmpc-mpddata-model.h include/gmpc/gmpc-mpddata-treeview.h include/gmpc/gmpc-profiles.h include/gmpc/gmpc-signals.h +include/gmpc/gmpc-version.h include/gmpc/gmpc_easy_download.h include/gmpc/metadata.h include/gmpc/misc.h @@ -23,10 +24,17 @@ lib/pkgconfig/gmpc.pc man/man1/gmpc-remote.1 man/man1/gmpc.1 share/applications/gmpc.desktop -share/gmpc/gmpc.glade -share/gmpc/icons/gmpc-add-url.png +share/gmpc/aboutdialog.ui +share/gmpc/gmpc-gtk-win32.rc share/gmpc/icons/gmpc-loading-cover.png share/gmpc/icons/gmpc-no-cover.png +share/gmpc/icons/hicolor/128x128/categories/mpd.png +share/gmpc/icons/hicolor/128x128/status/fetching-artist.png +share/gmpc/icons/hicolor/128x128/status/frame-artist.png +share/gmpc/icons/hicolor/128x128/status/no-artist.png +share/gmpc/icons/hicolor/128x128/status/stylized-cover.png +share/gmpc/icons/hicolor/128x128/status/stylized-fetching-cover.png +share/gmpc/icons/hicolor/128x128/status/stylized-no-cover.png share/gmpc/icons/hicolor/16x16/actions/media-playlist.png share/gmpc/icons/hicolor/16x16/actions/media-tag.png share/gmpc/icons/hicolor/16x16/actions/playlist-browser.png @@ -37,6 +45,7 @@ share/gmpc/icons/hicolor/16x16/status/audio-volume-high.png share/gmpc/icons/hicolor/16x16/status/audio-volume-low.png share/gmpc/icons/hicolor/16x16/status/audio-volume-medium.png share/gmpc/icons/hicolor/16x16/status/audio-volume-muted.png +share/gmpc/icons/hicolor/16x16/status/emblem-favorite.png share/gmpc/icons/hicolor/16x16/status/gmpc-tray-disconnected.png share/gmpc/icons/hicolor/16x16/status/gmpc-tray-pause.png share/gmpc/icons/hicolor/16x16/status/gmpc-tray-play.png @@ -47,10 +56,12 @@ share/gmpc/icons/hicolor/22x22/status/audio-volume-high.png share/gmpc/icons/hicolor/22x22/status/audio-volume-low.png share/gmpc/icons/hicolor/22x22/status/audio-volume-medium.png share/gmpc/icons/hicolor/22x22/status/audio-volume-muted.png +share/gmpc/icons/hicolor/22x22/status/emblem-favorite.png share/gmpc/icons/hicolor/22x22/status/gmpc-tray-disconnected.png share/gmpc/icons/hicolor/22x22/status/gmpc-tray-pause.png share/gmpc/icons/hicolor/22x22/status/gmpc-tray-play.png share/gmpc/icons/hicolor/22x22/status/gmpc-tray.png +share/gmpc/icons/hicolor/32x32/actions/add-url.png share/gmpc/icons/hicolor/32x32/actions/media-playlist.png share/gmpc/icons/hicolor/32x32/actions/media-tag.png share/gmpc/icons/hicolor/32x32/actions/playlist-browser.png @@ -61,59 +72,132 @@ share/gmpc/icons/hicolor/32x32/status/audio-volume-high.png share/gmpc/icons/hicolor/32x32/status/audio-volume-low.png share/gmpc/icons/hicolor/32x32/status/audio-volume-medium.png share/gmpc/icons/hicolor/32x32/status/audio-volume-muted.png +share/gmpc/icons/hicolor/32x32/status/emblem-favorite.png +share/gmpc/icons/hicolor/32x32/status/gmpc-tray.png share/gmpc/icons/hicolor/48x48/actions/media-playlist.png share/gmpc/icons/hicolor/48x48/actions/media-tag.png share/gmpc/icons/hicolor/48x48/actions/tag-browser.png share/gmpc/icons/hicolor/48x48/apps/gmpc.png +share/gmpc/icons/hicolor/48x48/status/fetching-artist.png +share/gmpc/icons/hicolor/48x48/status/frame-artist.png +share/gmpc/icons/hicolor/48x48/status/gmpc-tray.png +share/gmpc/icons/hicolor/48x48/status/no-artist.png +share/gmpc/icons/hicolor/48x48/status/stylized-cover.png +share/gmpc/icons/hicolor/64x64/status/fetching-artist.png +share/gmpc/icons/hicolor/64x64/status/frame-artist.png +share/gmpc/icons/hicolor/64x64/status/no-artist.png +share/gmpc/icons/hicolor/64x64/status/stylized-cover.png +share/gmpc/icons/hicolor/64x64/status/stylized-fetching-cover.png +share/gmpc/icons/hicolor/64x64/status/stylized-no-cover.png +share/gmpc/icons/hicolor/72x72/status/fetching-artist.png +share/gmpc/icons/hicolor/72x72/status/frame-artist.png +share/gmpc/icons/hicolor/72x72/status/no-artist.png +share/gmpc/icons/hicolor/72x72/status/stylized-cover.png +share/gmpc/icons/hicolor/72x72/status/stylized-fetching-cover.png +share/gmpc/icons/hicolor/72x72/status/stylized-no-cover.png +share/gmpc/icons/hicolor/96x96/status/fetching-artist.png +share/gmpc/icons/hicolor/96x96/status/frame-artist.png +share/gmpc/icons/hicolor/96x96/status/no-artist.png +share/gmpc/icons/hicolor/96x96/status/stylized-fetching-cover.png +share/gmpc/icons/hicolor/96x96/status/stylized-no-cover.png share/gmpc/icons/hicolor/scalable/apps/gmpc.svg +share/gmpc/icons/hicolor/scalable/categories/mpd.svg share/gmpc/icons/hicolor/scalable/status/audio-volume-high.svg share/gmpc/icons/hicolor/scalable/status/audio-volume-low.svg share/gmpc/icons/hicolor/scalable/status/audio-volume-medium.svg share/gmpc/icons/hicolor/scalable/status/audio-volume-muted.svg +share/gmpc/icons/hicolor/scalable/status/emblem-favorite.svg +share/gmpc/icons/hicolor/scalable/status/fetching-artist.svg +share/gmpc/icons/hicolor/scalable/status/frame-artist.svg share/gmpc/icons/hicolor/scalable/status/gmpc-tray-disconnected.svg share/gmpc/icons/hicolor/scalable/status/gmpc-tray-pause.svg share/gmpc/icons/hicolor/scalable/status/gmpc-tray-play.svg share/gmpc/icons/hicolor/scalable/status/gmpc-tray.svg +share/gmpc/icons/hicolor/scalable/status/no-artist.svg +share/gmpc/icons/hicolor/scalable/status/stylized-cover.svg +share/gmpc/icons/hicolor/scalable/status/stylized-fetching-cover.svg +share/gmpc/icons/hicolor/scalable/status/stylized-no-cover.svg share/gmpc/icons/media-album.png share/gmpc/icons/media-artist.png share/gmpc/icons/media-audiofile.png -share/gmpc/icons/media-playback-start.png share/gmpc/icons/media-stream.png share/gmpc/icons/mpdBrowser_case.png +share/gmpc/password-dialog.ui +share/gmpc/playlist-message-window.ui +share/gmpc/playlist-save-dialog.ui share/gmpc/playlist3.glade +share/gmpc/preferences-connection.ui +share/gmpc/preferences-esf-dialog.ui +share/gmpc/preferences-mmkeys.ui +share/gmpc/preferences-playlist.ui +share/gmpc/preferences-plugins.ui +share/gmpc/preferences-proxy.ui +share/gmpc/preferences-server.ui +share/gmpc/preferences-trayicon.ui +share/gmpc/preferences.ui +share/gmpc/weblinks.list share/icons/hicolor/16x16/apps/gmpc.png share/icons/hicolor/22x22/apps/gmpc.png share/icons/hicolor/32x32/apps/gmpc.png share/icons/hicolor/48x48/apps/gmpc.png share/icons/hicolor/scalable/apps/gmpc.svg share/locale/bg/LC_MESSAGES/gmpc.mo +share/locale/bn/LC_MESSAGES/gmpc.mo +share/locale/bs/LC_MESSAGES/gmpc.mo share/locale/cs/LC_MESSAGES/gmpc.mo share/locale/de/LC_MESSAGES/gmpc.mo share/locale/es/LC_MESSAGES/gmpc.mo +share/locale/fi/LC_MESSAGES/gmpc.mo share/locale/fr/LC_MESSAGES/gmpc.mo share/locale/gl/LC_MESSAGES/gmpc.mo share/locale/he/LC_MESSAGES/gmpc.mo +share/locale/hi/LC_MESSAGES/gmpc.mo share/locale/hu/LC_MESSAGES/gmpc.mo +share/locale/id/LC_MESSAGES/gmpc.mo share/locale/it/LC_MESSAGES/gmpc.mo +share/locale/jv/LC_MESSAGES/gmpc.mo +share/locale/lv/LC_MESSAGES/gmpc.mo +share/locale/ms/LC_MESSAGES/gmpc.mo share/locale/nb/LC_MESSAGES/gmpc.mo +share/locale/ne/LC_MESSAGES/gmpc.mo share/locale/nl/LC_MESSAGES/gmpc.mo share/locale/pl/LC_MESSAGES/gmpc.mo +share/locale/pt/LC_MESSAGES/gmpc.mo +share/locale/pt_BR/LC_MESSAGES/gmpc.mo share/locale/ro/LC_MESSAGES/gmpc.mo share/locale/ru/LC_MESSAGES/gmpc.mo +share/locale/sq/LC_MESSAGES/gmpc.mo share/locale/sv/LC_MESSAGES/gmpc.mo share/locale/tr/LC_MESSAGES/gmpc.mo share/locale/zh_CN/LC_MESSAGES/gmpc.mo +share/locale/zh_TW/LC_MESSAGES/gmpc.mo +@dirrm share/locale/jv/LC_MESSAGES +@dirrm share/locale/jv @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/scalable/apps +@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/scalable @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/48x48/apps +@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/48x48 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/32x32/apps +@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/32x32 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/22x22/apps +@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/22x22 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/16x16/apps +@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/16x16 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor +@comment in xdg-dirs: @dirrm share/icons @dirrm share/gmpc/icons/hicolor/scalable/status +@dirrm share/gmpc/icons/hicolor/scalable/categories @dirrm share/gmpc/icons/hicolor/scalable/apps @exec ${MKDIR} %D/share/gmpc/icons/hicolor/scalable/actions @dirrm share/gmpc/icons/hicolor/scalable/actions @dirrm share/gmpc/icons/hicolor/scalable +@dirrm share/gmpc/icons/hicolor/96x96/status +@dirrm share/gmpc/icons/hicolor/96x96 +@dirrm share/gmpc/icons/hicolor/72x72/status +@dirrm share/gmpc/icons/hicolor/72x72 +@dirrm share/gmpc/icons/hicolor/64x64/status +@dirrm share/gmpc/icons/hicolor/64x64 +@dirrm share/gmpc/icons/hicolor/48x48/status @dirrm share/gmpc/icons/hicolor/48x48/apps @dirrm share/gmpc/icons/hicolor/48x48/actions @dirrm share/gmpc/icons/hicolor/48x48 @@ -129,6 +213,9 @@ share/locale/zh_CN/LC_MESSAGES/gmpc.mo @dirrm share/gmpc/icons/hicolor/16x16/apps @dirrm share/gmpc/icons/hicolor/16x16/actions @dirrm share/gmpc/icons/hicolor/16x16 +@dirrm share/gmpc/icons/hicolor/128x128/status +@dirrm share/gmpc/icons/hicolor/128x128/categories +@dirrm share/gmpc/icons/hicolor/128x128 @dirrm share/gmpc/icons/hicolor @dirrm share/gmpc/icons @dirrm share/gmpc diff --git a/audio/gmpc/buildlink3.mk b/audio/gmpc/buildlink3.mk new file mode 100644 index 00000000000..1280cf89d41 --- /dev/null +++ b/audio/gmpc/buildlink3.mk @@ -0,0 +1,17 @@ +# $NetBSD: buildlink3.mk,v 1.1 2009/05/30 01:25:19 obache Exp $ + +BUILDLINK_TREE+= gmpc + +.if !defined(GMPC_BUILDLINK3_MK) +GMPC_BUILDLINK3_MK:= + +BUILDLINK_API_DEPENDS.gmpc+= gmpc>=0.18.0 +BUILDLINK_PKGSRCDIR.gmpc?= ../../audio/gmpc + +.include "../../audio/libmpd/buildlink3.mk" +.include "../../devel/glib2/buildlink3.mk" +.include "../../x11/gtk2/buildlink3.mk" + +.endif # GMPC_BUILDLINK3_MK + +BUILDLINK_TREE+= -gmpc diff --git a/audio/gmpc/distinfo b/audio/gmpc/distinfo index bc05d430f6c..6465859e9fd 100644 --- a/audio/gmpc/distinfo +++ b/audio/gmpc/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.13 2009/01/28 12:47:35 drochner Exp $ +$NetBSD: distinfo,v 1.14 2009/05/30 01:25:19 obache Exp $ -SHA1 (gmpc-0.17.0.tar.gz) = 2b4d4f33e3374440936e91ddc790a98cff13ef1b -RMD160 (gmpc-0.17.0.tar.gz) = 5ae15f833c333e6fcd47c7ee9712782ff169ae36 -Size (gmpc-0.17.0.tar.gz) = 1041200 bytes -SHA1 (patch-ag) = 16a41bf8acfac8738a1cc589aeae102a3f9ccecb -SHA1 (patch-ah) = 85884799c561c7e6941d1af66c156cb07b79180c +SHA1 (gmpc-0.18.0.tar.gz) = 95b4ec3c094fd91007407dfa559d5aef50542d6a +RMD160 (gmpc-0.18.0.tar.gz) = 64980140fbdb4de1d35c9af8ac604780ae81c8a4 +Size (gmpc-0.18.0.tar.gz) = 1376241 bytes +SHA1 (patch-ag) = 655f2c671012d1e5ac2a6e30c54a92282020a56a +SHA1 (patch-ai) = bf9c6f1d967e343447c1fb892b47e90ab2d34508 diff --git a/audio/gmpc/options.mk b/audio/gmpc/options.mk new file mode 100644 index 00000000000..8b39108295d --- /dev/null +++ b/audio/gmpc/options.mk @@ -0,0 +1,26 @@ +# $NetBSD: options.mk,v 1.1 2009/05/30 01:25:19 obache Exp $ + +PKG_OPTIONS_VAR= PKG_OPTIONS.gmpc +PKG_SUPPORTED_OPTIONS= mac + +.include "../../mk/bsd.options.mk" + +### +### mac support +### +.if !empty(PKG_OPTIONS:Mmac) +.include "../../audio/mac/buildlink3.mk" +CONFIGURE_ARGS+= --enable-macige +.else +CONFIGURE_ARGS+= --disable-macige +.endif + +### +### libspiff support +### XXX: code not support libspiff>=1.0. +#.if !empty(PKG_OPTIONS:Mlibspiff) +#.include "../../audio/libspiff/buildlink3.mk" +#CONFIGURE_ARGS+= --enable-libspiff +#.else +#CONFIGURE_ARGS+= --disable-libspiff +#.endif diff --git a/audio/gmpc/patches/patch-ag b/audio/gmpc/patches/patch-ag index 275f8d976e1..827b5726c0d 100644 --- a/audio/gmpc/patches/patch-ag +++ b/audio/gmpc/patches/patch-ag @@ -1,8 +1,11 @@ -$NetBSD: patch-ag,v 1.1 2006/04/28 11:09:37 joerg Exp $ +$NetBSD: patch-ag,v 1.2 2009/05/30 01:25:19 obache Exp $ ---- src/TreeSearchWidget.c.orig 2006-04-28 10:38:32.000000000 +0000 +--- src/TreeSearchWidget.c.orig 2009-03-09 16:23:05.000000000 +0000 +++ src/TreeSearchWidget.c -@@ -1,3 +1,4 @@ +@@ -17,6 +17,7 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#include <sys/types.h> #include <gtk/gtk.h> #include <gtk/gtksignal.h> diff --git a/audio/gmpc/patches/patch-ah b/audio/gmpc/patches/patch-ah deleted file mode 100644 index 8f8f8c047f7..00000000000 --- a/audio/gmpc/patches/patch-ah +++ /dev/null @@ -1,40 +0,0 @@ -$NetBSD: patch-ah,v 1.1 2009/01/28 12:47:35 drochner Exp $ - ---- src/playlist3-messages.c.orig 2009-01-28 14:06:46.000000000 +0100 -+++ src/playlist3-messages.c -@@ -29,7 +29,7 @@ void playlist3_message_init(void) - { - GError *error = NULL; - gchar *path = gmpc_get_user_path("gmpc.log"); -- message_list = gtk_list_store_new(3, G_TYPE_UINT, G_TYPE_STRING, G_TYPE_STRING); -+ message_list = gtk_list_store_new(3, G_TYPE_INT64, G_TYPE_STRING, G_TYPE_STRING); - - log_file = g_io_channel_new_file(path, "a", &error); - if(error) -@@ -54,10 +54,10 @@ void playlist3_show_error_message(const - gchar *string; - playlist3_message_init(); - gtk_list_store_prepend(message_list, &iter); -- gtk_list_store_set(message_list, &iter, 0,t, 2, message,-1); -+ gtk_list_store_set(message_list, &iter, 0, (gint64)t, 2, message,-1); - - -- lt = localtime((time_t *)&t); -+ lt = localtime(&t); - strftime(text, 64,"%d/%m/%Y-%H:%M:%S", lt); - - string = g_strdup_printf("%s:%s:%s\n",text,error_levels[el], message); -@@ -160,11 +160,11 @@ static void message_cell_data_func(GtkTr - gpointer data) - { - time_t t; -- guint id; -+ gint64 id; - gchar text[64]; - struct tm *lt; - gtk_tree_model_get(tree_model, iter, 0,&id, -1); -- /* gtk_list_store only knows the type unsigned int, not time_T -+ /* gtk_list_store only knows the type int64, not time_T - * so lets do some casting) - */ - t = (time_t) id; diff --git a/audio/gmpc/patches/patch-ai b/audio/gmpc/patches/patch-ai new file mode 100644 index 00000000000..f61210522ba --- /dev/null +++ b/audio/gmpc/patches/patch-ai @@ -0,0 +1,22 @@ +$NetBSD: patch-ai,v 1.1 2009/05/30 01:25:19 obache Exp $ + +--- configure.orig 2009-03-09 16:23:16.000000000 +0000 ++++ configure +@@ -13376,7 +13376,7 @@ else + fi + + +- if test "x${libspiff}" == "x1"; ++ if test "x${libspiff}" = "x1"; + then + + cat >>confdefs.h <<\_ACEOF +@@ -13386,7 +13386,7 @@ _ACEOF + SPIFF_LIBS=-lspiff + + else +- if test "x${enable_libspiff}" == "xyes"; then ++ if test "x${enable_libspiff}" = "xyes"; then + { { $as_echo "$as_me:$LINENO: error: libspiff not found" >&5 + $as_echo "$as_me: error: libspiff not found" >&2;} + { (exit 1); exit 1; }; } |