diff options
author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2012-04-27 07:38:32 +0000 |
---|---|---|
committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2012-04-27 07:38:32 +0000 |
commit | f011a2393faaa9fcaf0cfbbcfd29cb36f978fb8f (patch) | |
tree | dc7534f72b9255fb1bad910116e930f3122d5da6 /audio | |
parent | Update to 2.2.2. (diff) |
Disable obsolete Musicbrainz support.
PR: 165839
Submitted by: Jason E. Hale <bsdkaffee@gmail.com>
Notes
Notes:
svn path=/head/; revision=295599
Diffstat (limited to 'audio')
-rw-r--r-- | audio/rhythmbox/Makefile | 5 | ||||
-rw-r--r-- | audio/rhythmbox/files/patch-configure | 83 |
2 files changed, 82 insertions, 6 deletions
diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile index 30a75205d8f2..a7dec0aa3030 100644 --- a/audio/rhythmbox/Makefile +++ b/audio/rhythmbox/Makefile @@ -8,7 +8,7 @@ PORTNAME= rhythmbox PORTVERSION= 0.12.8 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= audio gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -17,8 +17,7 @@ MAINTAINER= marcus@FreeBSD.org COMMENT= Audio player for GNOME BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat -LIB_DEPENDS= musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \ - musicbrainz3.6:${PORTSDIR}/audio/libmusicbrainz3 \ +LIB_DEPENDS= musicbrainz3.6:${PORTSDIR}/audio/libmusicbrainz3 \ id3tag.0:${PORTSDIR}/audio/libid3tag \ totem-plparser.17:${PORTSDIR}/multimedia/totem-pl-parser \ dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ diff --git a/audio/rhythmbox/files/patch-configure b/audio/rhythmbox/files/patch-configure index 9e512187f4fc..50003ed5827c 100644 --- a/audio/rhythmbox/files/patch-configure +++ b/audio/rhythmbox/files/patch-configure @@ -1,6 +1,83 @@ ---- configure.orig 2009-03-21 13:56:32.000000000 -0400 -+++ configure 2009-03-21 13:57:17.000000000 -0400 -@@ -20763,7 +20763,7 @@ else +--- ./configure.orig 2010-03-28 05:06:14.000000000 -0400 ++++ ./configure 2012-03-07 16:27:36.000000000 -0500 +@@ -15627,76 +15627,7 @@ + have_musicbrainz3=yes + fi + +-pkg_failed=no +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MUSICBRAINZ" >&5 +-$as_echo_n "checking for MUSICBRAINZ... " >&6; } +- +-if test -n "$PKG_CONFIG"; then +- if test -n "$MUSICBRAINZ_CFLAGS"; then +- pkg_cv_MUSICBRAINZ_CFLAGS="$MUSICBRAINZ_CFLAGS" +- else +- if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmusicbrainz >= \$MUSICBRAINZ_REQS\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "libmusicbrainz >= $MUSICBRAINZ_REQS") 2>&5 +- ac_status=$? +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; }; then +- pkg_cv_MUSICBRAINZ_CFLAGS=`$PKG_CONFIG --cflags "libmusicbrainz >= $MUSICBRAINZ_REQS" 2>/dev/null` +-else +- pkg_failed=yes +-fi +- fi +-else +- pkg_failed=untried +-fi +-if test -n "$PKG_CONFIG"; then +- if test -n "$MUSICBRAINZ_LIBS"; then +- pkg_cv_MUSICBRAINZ_LIBS="$MUSICBRAINZ_LIBS" +- else +- if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmusicbrainz >= \$MUSICBRAINZ_REQS\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "libmusicbrainz >= $MUSICBRAINZ_REQS") 2>&5 +- ac_status=$? +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; }; then +- pkg_cv_MUSICBRAINZ_LIBS=`$PKG_CONFIG --libs "libmusicbrainz >= $MUSICBRAINZ_REQS" 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 +- MUSICBRAINZ_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libmusicbrainz >= $MUSICBRAINZ_REQS"` +- else +- MUSICBRAINZ_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libmusicbrainz >= $MUSICBRAINZ_REQS"` +- fi +- # Put the nasty error message in config.log where it belongs +- echo "$MUSICBRAINZ_PKG_ERRORS" >&5 +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +- have_musicbrainz=no +-elif test $pkg_failed = untried; then + have_musicbrainz=no +-else +- MUSICBRAINZ_CFLAGS=$pkg_cv_MUSICBRAINZ_CFLAGS +- MUSICBRAINZ_LIBS=$pkg_cv_MUSICBRAINZ_LIBS +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-$as_echo "yes" >&6; } +- have_musicbrainz=yes +-fi + + + +@@ -18954,7 +18885,7 @@ fi |