From f0cdd311c6ce5471b18b77e6703b82292a48c21a Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Sun, 19 Sep 2010 14:48:18 +0000 Subject: [PATCH] Several cleanups: - add missing run_depends on py-gnome-desktop (needed for the magnatune plugin) - remove the audiocd plugin which requires cdda support in gvfs and that is only possible with either HAL or gudev - remove the "Scan Removable Media" from the interface, as for the same reason we disable the audiocd plugin - enable support for iPod (untested I own no such device) --- audio/rhythmbox/Makefile | 51 +++++---- audio/rhythmbox/patches/patch-configure | 106 ++++++++++++++++++ .../patches/patch-data_ui_rhythmbox-ui_xml | 16 +++ .../patches/patch-plugins_Makefile_in | 25 +++++ audio/rhythmbox/pkg/PLIST | 16 +-- 5 files changed, 182 insertions(+), 32 deletions(-) create mode 100644 audio/rhythmbox/patches/patch-configure create mode 100644 audio/rhythmbox/patches/patch-data_ui_rhythmbox-ui_xml create mode 100644 audio/rhythmbox/patches/patch-plugins_Makefile_in diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile index 0b8634bd622..d1fb732ae1b 100644 --- a/audio/rhythmbox/Makefile +++ b/audio/rhythmbox/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.56 2010/09/03 11:53:24 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.57 2010/09/19 14:48:18 ajacoutot Exp $ # coherence plugin is installed but not activated by default so we don't # enforce dependency on multimedia/coherence to lower requirements @@ -8,7 +8,7 @@ COMMENT= music management application for GNOME GNOME_PROJECT= rhythmbox GNOME_VERSION= 0.12.8 -REVISION = 4 +REVISION = 5 SHARED_LIBS += rhythmbox-core 0.0 # .0.0 @@ -25,17 +25,17 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB += ICE ORBit-2 SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp -WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender asn1 atk-1.0 -WANTLIB += c cairo crypto dbus-1 dbus-glib-1 expat fontconfig -WANTLIB += freetype gcrypt gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 -WANTLIB += glib-2.0 glitz gmime-2.4 gmodule-2.0 gnome-keyring -WANTLIB += gnutls gobject-2.0 gpg-error gssapi gstbase-0.10 gstcontroller-0.10 -WANTLIB += gstinterfaces-0.10 gstpbutils-0.10 gstreamer-0.10 gsttag-0.10 -WANTLIB += gthread-2.0 gtk-x11-2.0 krb5 m neon pango-1.0 pangocairo-1.0 -WANTLIB += pangoft2-1.0 pcre pixman-1 png proxy pthread pthread-stubs -WANTLIB += soup-2.4 sqlite3 ssl tasn1 util xcb xml2 z -WANTLIB += eggdbus-1 xcb-render xcb-render-util +WANTLIB += ICE ORBit-2 SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp ffi +WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender atk-1.0 notify c cairo +WANTLIB += dbus-1 dbus-glib-1 expat fontconfig gnutls freetype gcrypt +WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 gmime-2.4 glib-2.0 glitz +WANTLIB += gmodule-2.0 gnome-keyring avahi-glib gpod gobject-2.0 +WANTLIB += gpg-error gstbase-0.10 gstcontroller-0.10 gstinterfaces-0.10 +WANTLIB += gstpbutils-0.10 gstreamer-0.10 gthread-2.0 gtk-x11-2.0 m +WANTLIB += pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png proxy +WANTLIB += pthread pthread-stubs soup-2.4 sqlite3 tasn1 util xcb xml2 z +WANTLIB += eggdbus-1 xcb-render xcb-render-util gnome-media-profiles +WANTLIB += totem-plparser soup-gnome-2.4 avahi-client avahi-common MODULES= devel/gettext \ x11/gnome \ @@ -44,16 +44,18 @@ MODULES= devel/gettext \ BUILD_DEPENDS= ::multimedia/gstreamer-0.10/py-gstreamer LIB_DEPENDS= ${MODPY_LIB_DEPENDS} \ - musicbrainz3::audio/libmusicbrainz \ - notify::devel/libnotify \ - gnome-media-profiles::x11/gnome/media \ - totem-plparser:totem-pl-parser->=2.28.1:x11/gnome/totem-pl-parser \ - gstcdda-0.10:gstreamer-cdda->=0.10.25:multimedia/gstreamer-0.10/plugins-base,-cdda \ - soup-gnome-2.4.>=1::devel/libsoup,-gnome \ - avahi-client,avahi-common,avahi-glib::net/avahi \ - ffi::devel/libffi -RUN_DEPENDS= ::x11/gnome/icon-theme \ + ::devel/libnotify \ + ::x11/gnome/media \ + ::x11/gnome/totem-pl-parser \ + ::multimedia/gstreamer-0.10/plugins-base \ + ::devel/libsoup,-gnome \ + ::net/avahi \ + ::audio/libgpod +RUN_DEPENDS+= ::x11/gnome/icon-theme \ ::multimedia/gstreamer-0.10/py-gstreamer + +# needed for the magnatune plugin +RUN_DEPENDS+= ::x11/gnome/py-gnome-desktop # needed for sndio RUN_DEPENDS+= ::multimedia/gstreamer-0.10/plugins-good @@ -75,14 +77,15 @@ CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ --enable-daap \ --disable-scrollkeeper \ --without-hal \ - --without-mtp \ - --without-ipod \ --without-libbrasero-media \ --without-libnautilus-burn \ --disable-vala \ --disable-fm-radio \ --disable-lirc +# requires libmtp >= 0.3 +CONFIGURE_ARGS+= --without-mtp + CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" diff --git a/audio/rhythmbox/patches/patch-configure b/audio/rhythmbox/patches/patch-configure new file mode 100644 index 00000000000..51da58c5d61 --- /dev/null +++ b/audio/rhythmbox/patches/patch-configure @@ -0,0 +1,106 @@ +$OpenBSD: patch-configure,v 1.10 2010/09/19 14:48:18 ajacoutot Exp $ + +audiocd plugin requires cdda support in gvfs which we do not provide as +this would require HAL or gudev. + +--- configure.orig Sun Sep 19 12:13:26 2010 ++++ configure Sun Sep 19 12:14:01 2010 +@@ -15456,98 +15456,6 @@ fi + + + +-pkg_failed=no +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GSTCDDA" >&5 +-$as_echo_n "checking for GSTCDDA... " >&6; } +- +-if test -n "$PKG_CONFIG"; then +- if test -n "$GSTCDDA_CFLAGS"; then +- pkg_cv_GSTCDDA_CFLAGS="$GSTCDDA_CFLAGS" +- else +- if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-cdda-0.10\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "gstreamer-cdda-0.10") 2>&5 +- ac_status=$? +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; }; then +- pkg_cv_GSTCDDA_CFLAGS=`$PKG_CONFIG --cflags "gstreamer-cdda-0.10" 2>/dev/null` +-else +- pkg_failed=yes +-fi +- fi +-else +- pkg_failed=untried +-fi +-if test -n "$PKG_CONFIG"; then +- if test -n "$GSTCDDA_LIBS"; then +- pkg_cv_GSTCDDA_LIBS="$GSTCDDA_LIBS" +- else +- if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-cdda-0.10\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "gstreamer-cdda-0.10") 2>&5 +- ac_status=$? +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; }; then +- pkg_cv_GSTCDDA_LIBS=`$PKG_CONFIG --libs "gstreamer-cdda-0.10" 2>/dev/null` +-else +- pkg_failed=yes +-fi +- fi +-else +- pkg_failed=untried +-fi +- +- +- +-if test $pkg_failed = yes; then +- +-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then +- _pkg_short_errors_supported=yes +-else +- _pkg_short_errors_supported=no +-fi +- if test $_pkg_short_errors_supported = yes; then +- GSTCDDA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gstreamer-cdda-0.10"` +- else +- GSTCDDA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gstreamer-cdda-0.10"` +- fi +- # Put the nasty error message in config.log where it belongs +- echo "$GSTCDDA_PKG_ERRORS" >&5 +- +- as_fn_error "Package requirements (gstreamer-cdda-0.10) were not met: +- +-$GSTCDDA_PKG_ERRORS +- +-Consider adjusting the PKG_CONFIG_PATH environment variable if you +-installed software in a non-standard prefix. +- +-Alternatively, you may set the environment variables GSTCDDA_CFLAGS +-and GSTCDDA_LIBS to avoid the need to call pkg-config. +-See the pkg-config man page for more details. +-" "$LINENO" 5 +-elif test $pkg_failed = untried; then +- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error "The pkg-config script could not be found or is too old. Make sure it +-is in your PATH or set the PKG_CONFIG environment variable to the full +-path to pkg-config. +- +-Alternatively, you may set the environment variables GSTCDDA_CFLAGS +-and GSTCDDA_LIBS to avoid the need to call pkg-config. +-See the pkg-config man page for more details. +- +-To get pkg-config, see . +-See \`config.log' for more details." "$LINENO" 5; } +-else +- GSTCDDA_CFLAGS=$pkg_cv_GSTCDDA_CFLAGS +- GSTCDDA_LIBS=$pkg_cv_GSTCDDA_LIBS +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-$as_echo "yes" >&6; } +- : +-fi +- +- +- + have_sj_metadata_getter=no + # Check whether --enable-musicbrainz was given. + if test "${enable_musicbrainz+set}" = set; then : diff --git a/audio/rhythmbox/patches/patch-data_ui_rhythmbox-ui_xml b/audio/rhythmbox/patches/patch-data_ui_rhythmbox-ui_xml new file mode 100644 index 00000000000..f8262bbb89f --- /dev/null +++ b/audio/rhythmbox/patches/patch-data_ui_rhythmbox-ui_xml @@ -0,0 +1,16 @@ +$OpenBSD: patch-data_ui_rhythmbox-ui_xml,v 1.1 2010/09/19 14:48:18 ajacoutot Exp $ + +audiocd plugin requires cdda support in gvfs which we do not provide as +this would require HAL or gudev. + +--- data/ui/rhythmbox-ui.xml.orig Sun Sep 19 14:03:36 2010 ++++ data/ui/rhythmbox-ui.xml Sun Sep 19 14:04:02 2010 +@@ -4,8 +4,6 @@ + + + +- +- + + + diff --git a/audio/rhythmbox/patches/patch-plugins_Makefile_in b/audio/rhythmbox/patches/patch-plugins_Makefile_in new file mode 100644 index 00000000000..f495ea88041 --- /dev/null +++ b/audio/rhythmbox/patches/patch-plugins_Makefile_in @@ -0,0 +1,25 @@ +$OpenBSD: patch-plugins_Makefile_in,v 1.1 2010/09/19 14:48:18 ajacoutot Exp $ + +audiocd plugin requires cdda support in gvfs which we do not provide as +this would require HAL or gudev. + +--- plugins/Makefile.in.orig Sun Sep 19 12:12:32 2010 ++++ plugins/Makefile.in Sun Sep 19 12:12:42 2010 +@@ -96,7 +96,7 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive= + distdir + ETAGS = etags + CTAGS = ctags +-DIST_SUBDIRS = audiocd audioscrobbler generic-player iradio mmkeys \ ++DIST_SUBDIRS = audioscrobbler generic-player iradio mmkeys \ + power-manager sample status-icon visualizer lirc pythonconsole \ + sample-python artdisplay lyrics magnatune jamendo coherence \ + im-status context sendto replaygain rb sample-vala ipod \ +@@ -354,7 +354,7 @@ target_alias = @target_alias@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-SUBDIRS = audiocd audioscrobbler generic-player iradio mmkeys \ ++SUBDIRS = audioscrobbler generic-player iradio mmkeys \ + power-manager sample status-icon visualizer $(am__append_1) \ + $(am__append_2) $(am__append_3) $(am__append_4) \ + $(am__append_5) $(am__append_6) $(am__append_7) \ diff --git a/audio/rhythmbox/pkg/PLIST b/audio/rhythmbox/pkg/PLIST index dd01fb982eb..80060bdc682 100644 --- a/audio/rhythmbox/pkg/PLIST +++ b/audio/rhythmbox/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.21 2010/03/28 10:48:50 ajacoutot Exp $ +@comment $OpenBSD: PLIST,v 1.22 2010/09/19 14:48:18 ajacoutot Exp $ @bin bin/rhythmbox @bin bin/rhythmbox-client lib/librhythmbox-core.la @@ -30,13 +30,6 @@ lib/rhythmbox/plugins/artdisplay/__init__.pyo lib/rhythmbox/plugins/artdisplay/artdisplay.rb-plugin lib/rhythmbox/plugins/artdisplay/lastfm_red_small.png lib/rhythmbox/plugins/artdisplay/rhythmbox-missing-artwork.svg -lib/rhythmbox/plugins/audiocd/ -lib/rhythmbox/plugins/audiocd/album-info.ui -lib/rhythmbox/plugins/audiocd/audiocd-ui.xml -lib/rhythmbox/plugins/audiocd/audiocd.rb-plugin -lib/rhythmbox/plugins/audiocd/libaudiocd.la -lib/rhythmbox/plugins/audiocd/libaudiocd.so -lib/rhythmbox/plugins/audiocd/multiple-album.ui lib/rhythmbox/plugins/audioscrobbler/ lib/rhythmbox/plugins/audioscrobbler/as-icon.png lib/rhythmbox/plugins/audioscrobbler/audioscrobbler-prefs.ui @@ -91,6 +84,13 @@ lib/rhythmbox/plugins/im-status/__init__.py lib/rhythmbox/plugins/im-status/__init__.pyc lib/rhythmbox/plugins/im-status/__init__.pyo lib/rhythmbox/plugins/im-status/im-status.rb-plugin +lib/rhythmbox/plugins/ipod/ +lib/rhythmbox/plugins/ipod/ipod-info.ui +lib/rhythmbox/plugins/ipod/ipod-init.ui +lib/rhythmbox/plugins/ipod/ipod-ui.xml +lib/rhythmbox/plugins/ipod/ipod.rb-plugin +lib/rhythmbox/plugins/ipod/libipod.la +lib/rhythmbox/plugins/ipod/libipod.so lib/rhythmbox/plugins/iradio/ lib/rhythmbox/plugins/iradio/iradio-initial.pls lib/rhythmbox/plugins/iradio/iradio-ui.xml