From b6dc0a9f4e3fe57d44a13c002ffafc047080016d Mon Sep 17 00:00:00 2001 From: jhale Date: Sun, 14 Jun 2015 17:55:49 +0000 Subject: - Update audio/libmusicbrainz5 to 5.1.0 - Fix a crash in audio/sound-juicer caused by libmusicbrainz5 (fix added upstream, but not in this release) [1] - Bump PORTREVISION on dependent ports PR: 196959 [1] Submitted by: Pete Johanson [1] --- UPDATING | 12 ++++++++++++ audio/cantata/Makefile | 2 +- audio/goobox/Makefile | 2 +- audio/libkcddb/Makefile | 1 + audio/libmusicbrainz5/Makefile | 10 +++++++--- audio/libmusicbrainz5/distinfo | 4 ++-- audio/libmusicbrainz5/files/patch-src_c-int-source-funcs.inc | 11 +++++++++++ audio/libmusicbrainz5/pkg-plist | 4 ++-- audio/rhythmbox/Makefile | 2 +- audio/sound-juicer/Makefile | 1 + deskutils/nemo-extensions/Makefile | 2 +- x11-fm/sushi/Makefile | 2 +- 12 files changed, 41 insertions(+), 12 deletions(-) create mode 100644 audio/libmusicbrainz5/files/patch-src_c-int-source-funcs.inc diff --git a/UPDATING b/UPDATING index f3fd29167069..37d3c3d93430 100644 --- a/UPDATING +++ b/UPDATING @@ -5,6 +5,18 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20150614: + AFFECTS: users of audio/libmusicbrainz5 + AUTHOR: jhale@FreeBSD.org + + libmusicbrainz5 has been updated to 5.1.0. Please rebuild all ports that + depend on it. PORTREVISIONS have been bumped on dependent ports. + + If you use portmaster: + portmaster -w -r libmusicbrainz5 + If you use portupgrade: + portupgrade -fr audio/libmusicbrainz5 + 20150613: AFFECTS: users of multimedia/avidemux26-* AUTHOR: riggs@FreeBSD.org diff --git a/audio/cantata/Makefile b/audio/cantata/Makefile index bac4408f8ed3..3f005bfe7407 100644 --- a/audio/cantata/Makefile +++ b/audio/cantata/Makefile @@ -2,7 +2,7 @@ PORTNAME= cantata PORTVERSION= 1.5.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio kde MASTER_SITES= https://drive.google.com/uc?export=download&id=0Bzghs6gQWi60UktwaTRMTjRIUW8&dummy= diff --git a/audio/goobox/Makefile b/audio/goobox/Makefile index 1815e60246ba..b9e923fcf015 100644 --- a/audio/goobox/Makefile +++ b/audio/goobox/Makefile @@ -4,7 +4,7 @@ PORTNAME= goobox PORTVERSION= 3.3.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= audio gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 diff --git a/audio/libkcddb/Makefile b/audio/libkcddb/Makefile index 2f8dcba770e4..38c18f40bca3 100644 --- a/audio/libkcddb/Makefile +++ b/audio/libkcddb/Makefile @@ -3,6 +3,7 @@ PORTNAME= libkcddb PORTVERSION= ${KDE4_VERSION} +PORTREVISION= 1 CATEGORIES= audio kde MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src DIST_SUBDIR= KDE/${PORTVERSION} diff --git a/audio/libmusicbrainz5/Makefile b/audio/libmusicbrainz5/Makefile index 0b86fd185351..69f7d86fe445 100644 --- a/audio/libmusicbrainz5/Makefile +++ b/audio/libmusicbrainz5/Makefile @@ -1,10 +1,8 @@ # $FreeBSD$ PORTNAME= libmusicbrainz -PORTVERSION= 5.0.1 -PORTREVISION= 1 +PORTVERSION= 5.1.0 CATEGORIES= audio -MASTER_SITES= https://cloud.github.com/downloads/metabrainz/${PORTNAME}/ PKGNAMESUFFIX= 5 MAINTAINER= jhale@FreeBSD.org @@ -15,12 +13,18 @@ LICENSE= LGPL21 LIB_DEPENDS= libneon.so:${PORTSDIR}/www/neon USES= cmake +USE_GNOME= libxml2 USE_LDCONFIG= yes +USE_GITHUB= yes +GH_ACCOUNT= metabrainz +GH_TAGNAME= release-${PORTVERSION} + post-patch: ${REINPLACE_CMD} -e '/pkgconfig/s|$${LIB_INSTALL_DIR}|libdata|' \ ${WRKSRC}/CMakeLists.txt ${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ ${WRKSRC}/cmake/modules/*.cmake + ${RM} -f ${WRKSRC}/cmake/modules/FindLibXml2.cmake .include diff --git a/audio/libmusicbrainz5/distinfo b/audio/libmusicbrainz5/distinfo index 723e90c9f4ff..e6ecd0d646f6 100644 --- a/audio/libmusicbrainz5/distinfo +++ b/audio/libmusicbrainz5/distinfo @@ -1,2 +1,2 @@ -SHA256 (libmusicbrainz-5.0.1.tar.gz) = 1ca75e1c5059a3620b0d82633b1f468acc2a65fcc4305f844ec44f6fb5db82d5 -SIZE (libmusicbrainz-5.0.1.tar.gz) = 109119 +SHA256 (metabrainz-libmusicbrainz-5.1.0-release-5.1.0_GH0.tar.gz) = 6e1dc7158d884748287eb14159c4e2866eb4f4e5559765c7c17621c4a3c802c8 +SIZE (metabrainz-libmusicbrainz-5.1.0-release-5.1.0_GH0.tar.gz) = 78005 diff --git a/audio/libmusicbrainz5/files/patch-src_c-int-source-funcs.inc b/audio/libmusicbrainz5/files/patch-src_c-int-source-funcs.inc new file mode 100644 index 000000000000..ae5245b88d8d --- /dev/null +++ b/audio/libmusicbrainz5/files/patch-src_c-int-source-funcs.inc @@ -0,0 +1,11 @@ +--- src/c-int-source-funcs.inc.orig 2014-11-13 13:12:24 UTC ++++ src/c-int-source-funcs.inc +@@ -157,7 +157,7 @@ std::string GetMapValue(std::mapSet##PROP1(str); \ ++ ((MusicBrainz5::C##TYPE1 *)o)->Set##PROP1(str ? str : ""); \ + } \ + catch (...) { \ + } \ diff --git a/audio/libmusicbrainz5/pkg-plist b/audio/libmusicbrainz5/pkg-plist index c3f3790ff987..a7230e8dbb15 100644 --- a/audio/libmusicbrainz5/pkg-plist +++ b/audio/libmusicbrainz5/pkg-plist @@ -67,6 +67,6 @@ include/musicbrainz5/defines.h include/musicbrainz5/mb5_c.h include/musicbrainz5/xmlParser.h lib/libmusicbrainz5.so -lib/libmusicbrainz5.so.0 -lib/libmusicbrainz5.so.0.0.1 +lib/libmusicbrainz5.so.1 +lib/libmusicbrainz5.so.1.0.0 libdata/pkgconfig/libmusicbrainz5.pc diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile index ec6c58867f02..3ae8747da087 100644 --- a/audio/rhythmbox/Makefile +++ b/audio/rhythmbox/Makefile @@ -4,7 +4,7 @@ PORTNAME= rhythmbox PORTVERSION= 3.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= audio gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 diff --git a/audio/sound-juicer/Makefile b/audio/sound-juicer/Makefile index 61a9f716d3d7..251ab289ed44 100644 --- a/audio/sound-juicer/Makefile +++ b/audio/sound-juicer/Makefile @@ -3,6 +3,7 @@ PORTNAME= sound-juicer PORTVERSION= 3.14.0 +PORTREVISION= 1 CATEGORIES= audio gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 diff --git a/deskutils/nemo-extensions/Makefile b/deskutils/nemo-extensions/Makefile index fbc6ce5a17e7..b0beb9716a3e 100644 --- a/deskutils/nemo-extensions/Makefile +++ b/deskutils/nemo-extensions/Makefile @@ -3,7 +3,7 @@ PORTNAME= nemo-extensions PORTVERSION= 2.4.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= deskutils gnome DIST_SUBDIR= gnome3 diff --git a/x11-fm/sushi/Makefile b/x11-fm/sushi/Makefile index 8a641d33fc77..2ee78b7ce484 100644 --- a/x11-fm/sushi/Makefile +++ b/x11-fm/sushi/Makefile @@ -4,7 +4,7 @@ PORTNAME= sushi PORTVERSION= 3.12.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-fm gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 -- cgit