Enable wikipedia plugin, which fetches artist info from wikipedia.

As it drags webkit as a dependency, subpackage it, and only build it on
archs where webkit builds.
Add a patch from upstream git repo to fix a bug.
Explicitely depend on taglib 1.5 for tagedit plugin while here.
looks good to jasper@
This commit is contained in:
landry 2009-06-23 19:21:02 +00:00
parent fe23ecfe34
commit 29673e8a85
7 changed files with 56 additions and 43 deletions

View File

@ -1,12 +1,14 @@
# $OpenBSD: Makefile,v 1.4 2009/06/06 18:41:41 landry Exp $
# $OpenBSD: Makefile,v 1.5 2009/06/23 19:21:02 landry Exp $
SHARED_ONLY = Yes
COMMENT = bundle of plugins for gmpc
COMMENT-main = bundle of plugins for gmpc
COMMENT-wikipedia = wikipedia plugin for gmpc
VERSION = 0.18.0
DISTNAME = gmpc-plugins-${VERSION}
PKGNAME = ${DISTNAME}p1
PKGNAME-main = ${DISTNAME}p2
PKGNAME-wikipedia = gmpc-wikipedia-${VERSION}
CATEGORIES = audio
@ -21,19 +23,35 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
LIB_DEPENDS = tag,tag_c::audio/taglib \
xosd::x11/xosd \
avahi-client,avahi-common,avahi-glib::net/avahi
MULTI_PACKAGES = -main
.if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "i386" || \
${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "amd64"
# XXX give it a chance to build on systems where webkit is not built
MULTI_PACKAGES+= -wikipedia
.endif
MODULES = devel/gettext
LIB_DEPENDS-main = ${LIB_DEPENDS} \
tag,tag_c:taglib->=1.5:audio/taglib \
xosd::x11/xosd \
avahi-client,avahi-common,avahi-glib::net/avahi
WANTLIB-main = ${WANTLIB} crypto curl dbus-1 glade-2.0 idn pthread ssl
LIB_DEPENDS-wikipedia = ${LIB_DEPENDS} \
webkit-1.0::www/webkit
WANTLIB-wikipedia = ${WANTLIB} enchant gcrypt gnutls gpg-error \
icudata icui18n icuuc jpeg soup-2.4 tasn1 xslt
WANTLIB += ICE SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext
WANTLIB += Xfixes Xi Xinerama Xrandr Xrender Xt atk-1.0 cairo
WANTLIB += crypto curl dbus-1 expat fontconfig freetype gdk-x11-2.0
WANTLIB += gdk_pixbuf-2.0 gio-2.0 glade-2.0 glib-2.0 glitz gmodule-2.0
WANTLIB += gobject-2.0 gthread-2.0 gtk-x11-2.0 idn m mpd pango-1.0
WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pthread
WANTLIB += sqlite3 ssl stdc++ xml2 z
WANTLIB += expat fontconfig freetype gdk-x11-2.0
WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 glitz gmodule-2.0
WANTLIB += gobject-2.0 gthread-2.0 gtk-x11-2.0 m mpd pango-1.0
WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png
WANTLIB += sqlite3 stdc++ xml2 z
MODULES = devel/gettext
RUN_DEPENDS = :gmpc->=${VERSION}:audio/gmpc \
::audio/vorbis-tools
@ -43,10 +61,9 @@ USE_LIBTOOL = Yes
USE_X11 = Yes
USE_GMAKE = Yes
CONFIGURE_STYLE=gnu
CONFIGURE_ARGS= --disable-mserver \
CONFIGURE_STYLE =gnu
CONFIGURE_ARGS =--disable-mserver \
--disable-libnotify \
--disable-wikipedia \
--disable-lirc
.include <bsd.port.mk>

View File

@ -1,27 +0,0 @@
$OpenBSD: patch-Makefile_in,v 1.1.1.1 2009/04/23 19:26:47 landry Exp $
./configure is a bit fucked, it disables tagedit
when you disable wikipedia, and enters wikipedia
subdir anyway. it's already fixed in upstream git
--- Makefile.in.orig Mon Mar 9 18:13:05 2009
+++ Makefile.in Tue Apr 21 22:45:56 2009
@@ -158,7 +158,7 @@ AUTOMAKE_OPTIONS = foreign 1.6
@AVAHI_OPT_TRUE@AVAHI_OPT_DIR = gmpc-avahi
-@LIBNOTIFY_OPT_TRUE@LIBNOTIFY_OPT_DIR = gmpc-avahi
+@LIBNOTIFY_OPT_TRUE@LIBNOTIFY_OPT_DIR = gmpc-libnotify
@ALARM_OPT_TRUE@ALARM_OPT_DIR = gmpc-alarm
@@ -178,9 +178,9 @@ AUTOMAKE_OPTIONS = foreign 1.6
#if LASTFMRADIO_OPT
#LASTFMRADIO_OPT_DIR= gmpc-shout
#endif
-@TAGEDIT_OPT_TRUE@TAGEDIT_OPT_DIR = gmpc-tagedit
+TAGEDIT_OPT_DIR = gmpc-tagedit
-@WIKIPEDIA_OPT_TRUE@WIKIPEDIA_OPT_DIR = gmpc-wikipedia
+#@WIKIPEDIA_OPT_TRUE@WIKIPEDIA_OPT_DIR = gmpc-wikipedia
SUBDIRS = \
$(ALARM_OPT_DIR)\

View File

@ -0,0 +1,14 @@
$OpenBSD: patch-gmpc-wikipedia_src_plugin_c,v 1.1 2009/06/23 19:21:02 landry Exp $
backport from git for http://musicpd.org/mantis/view.php?id=2378
--- gmpc-wikipedia/src/plugin.c.orig Tue Jun 23 20:54:45 2009
+++ gmpc-wikipedia/src/plugin.c Tue Jun 23 20:54:57 2009
@@ -207,9 +207,6 @@ void wp_selected(GtkWidget *container)
{
gtk_widget_hide(pgb);
}
- while (gtk_events_pending ())
- gtk_main_iteration ();
-
}
void wp_unselected(GtkWidget *container)

View File

@ -1,5 +1,6 @@
A bundle of plugins for gmpc :
* Amazon.com cover fetcher
* Avahi: zeroconf profile scanning
* Music directory metadata fetcher
* Last.fm metadata fetcher
* Lyricwiki lyrics fetcher

View File

@ -0,0 +1 @@
This package contains the wikipedia plugin for gmpc.

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.2 2009/06/03 16:34:51 ajacoutot Exp $
@comment $OpenBSD: PLIST-main,v 1.1 2009/06/23 19:21:02 landry Exp $
@conflict gmpc-coveramazon-*
@conflict gmpc-osd-*
@conflict gmpc-lyrics-*
@ -11,6 +11,7 @@
@pkgpath audio/gmpc-lastfm
@pkgpath audio/gmpc-magnatune
@pkgpath audio/gmpc-shout
@pkgpath audio/gmpc-plugins
lib/gmpc/
lib/gmpc/plugins/
lib/gmpc/plugins/alarmplugin.a

View File

@ -0,0 +1,6 @@
@comment $OpenBSD: PLIST-wikipedia,v 1.1 2009/06/23 19:21:02 landry Exp $
lib/gmpc/
lib/gmpc/plugins/
lib/gmpc/plugins/wikiplugin.a
lib/gmpc/plugins/wikiplugin.la
lib/gmpc/plugins/wikiplugin.so