Date: Fri, 30 Oct 2020 10:32:26 +0000 (UTC) From: "Jason E. Hale" <jhale@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r553677 - in head/audio/libmusicbrainz5: . files Message-ID: <202010301032.09UAWQxJ030475@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jhale Date: Fri Oct 30 10:32:26 2020 New Revision: 553677 URL: https://svnweb.freebsd.org/changeset/ports/553677 Log: audio/libmusicbrainz5: Update to snapshot from 2015-07-06 (e29cc9a) - The main purpose of this intermediate update is to eliminate unwanted debug information emitted when running console applications. - Backport commit 36262d6 to eliminate wildcards for dependencies in CMakeLists.txt which CMake complains about (CMP0058). As a result, we can switch to an outsource build. While here: - Update LICENSE (LGPL21+) and add LICENSE_FILE - Remake/rename patches with 'make makepatch' Changes: https://github.com/metabrainz/libmusicbrainz/compare/release-5.1.0...e29cc9a PR: 250567 Submitted by: Daniel Engberg <daniel.engberg.lists@pyret.net> Added: head/audio/libmusicbrainz5/files/patch-include_musicbrainz5_HTTPFetch.h - copied, changed from r553676, head/audio/libmusicbrainz5/files/patch-musicbrainz5-httpfetch-h.patch Deleted: head/audio/libmusicbrainz5/files/patch-musicbrainz5-httpfetch-h.patch head/audio/libmusicbrainz5/files/patch-src_c-int-source-funcs.inc Modified: head/audio/libmusicbrainz5/Makefile head/audio/libmusicbrainz5/distinfo head/audio/libmusicbrainz5/files/patch-src_CMakeLists.txt head/audio/libmusicbrainz5/pkg-plist Modified: head/audio/libmusicbrainz5/Makefile ============================================================================== --- head/audio/libmusicbrainz5/Makefile Fri Oct 30 09:58:47 2020 (r553676) +++ head/audio/libmusicbrainz5/Makefile Fri Oct 30 10:32:26 2020 (r553677) @@ -1,20 +1,21 @@ # $FreeBSD$ PORTNAME= libmusicbrainz -PORTVERSION= 5.1.0 -PORTREVISION= 3 DISTVERSIONPREFIX= release- +DISTVERSION= 5.1.0-19 +DISTVERSIONSUFFIX= -ge29cc9a CATEGORIES= audio PKGNAMESUFFIX= 5 MAINTAINER= jhale@FreeBSD.org COMMENT= MusicBrainz client library for audio metadata lookup -LICENSE= LGPL21 +LICENSE= LGPL21+ +LICENSE_FILE= ${WRKSRC}/COPYING.txt LIB_DEPENDS= libneon.so:www/neon -USES= cmake:insource compiler:c++11-lang gnome iconv:build pathfix +USES= cmake compiler:c++11-lang gnome iconv:build pathfix USE_GNOME= libxml2 USE_LDCONFIG= yes Modified: head/audio/libmusicbrainz5/distinfo ============================================================================== --- head/audio/libmusicbrainz5/distinfo Fri Oct 30 09:58:47 2020 (r553676) +++ head/audio/libmusicbrainz5/distinfo Fri Oct 30 10:32:26 2020 (r553677) @@ -1,2 +1,3 @@ -SHA256 (metabrainz-libmusicbrainz-release-5.1.0_GH0.tar.gz) = 6e1dc7158d884748287eb14159c4e2866eb4f4e5559765c7c17621c4a3c802c8 -SIZE (metabrainz-libmusicbrainz-release-5.1.0_GH0.tar.gz) = 78005 +TIMESTAMP = 1603483215 +SHA256 (metabrainz-libmusicbrainz-release-5.1.0-19-ge29cc9a_GH0.tar.gz) = 59ea04531607e0e1f552da150b263ee8cd55ccbc8c96f6f3cd7d2d7dab63db28 +SIZE (metabrainz-libmusicbrainz-release-5.1.0-19-ge29cc9a_GH0.tar.gz) = 78950 Copied and modified: head/audio/libmusicbrainz5/files/patch-include_musicbrainz5_HTTPFetch.h (from r553676, head/audio/libmusicbrainz5/files/patch-musicbrainz5-httpfetch-h.patch) ============================================================================== --- head/audio/libmusicbrainz5/files/patch-musicbrainz5-httpfetch-h.patch Fri Oct 30 09:58:47 2020 (r553676, copy source) +++ head/audio/libmusicbrainz5/files/patch-include_musicbrainz5_HTTPFetch.h Fri Oct 30 10:32:26 2020 (r553677) @@ -1,5 +1,10 @@ ---- include/musicbrainz5/HTTPFetch.h.orig 2016-08-06 17:10:23.956575000 +0200 -+++ include/musicbrainz5/HTTPFetch.h 2016-08-06 17:26:10.934640000 +0200 +Add visibility to C++ exceptions to prevent crashes with applications +using libkcddb. + +PR: 211630 + +--- include/musicbrainz5/HTTPFetch.h.orig 2015-07-06 20:45:19 UTC ++++ include/musicbrainz5/HTTPFetch.h @@ -29,11 +29,23 @@ #include <string> #include <vector> @@ -25,7 +30,7 @@ { public: CExceptionBase(const std::string& ErrorMessage, const std::string& Exception) -@@ -60,7 +72,7 @@ +@@ -60,7 +72,7 @@ namespace MusicBrainz5 * Exception thrown when an error occurs connecting to web service */ @@ -34,7 +39,7 @@ { public: CConnectionError(const std::string& ErrorMessage) -@@ -73,7 +85,7 @@ +@@ -73,7 +85,7 @@ namespace MusicBrainz5 * Exception thrown when a connection to the web service times out */ @@ -43,7 +48,7 @@ { public: CTimeoutError(const std::string& ErrorMessage) -@@ -86,7 +98,7 @@ +@@ -86,7 +98,7 @@ namespace MusicBrainz5 * Exception thrown when an authentication error occurs */ @@ -52,7 +57,7 @@ { public: CAuthenticationError(const std::string& ErrorMessage) -@@ -99,7 +111,7 @@ +@@ -99,7 +111,7 @@ namespace MusicBrainz5 * Exception thrown when an error occurs fetching data */ @@ -61,7 +66,7 @@ { public: CFetchError(const std::string& ErrorMessage) -@@ -112,7 +124,7 @@ +@@ -112,7 +124,7 @@ namespace MusicBrainz5 * Exception thrown when an invalid request is made */ @@ -70,7 +75,7 @@ { public: CRequestError(const std::string& ErrorMessage) -@@ -125,7 +137,7 @@ +@@ -125,7 +137,7 @@ namespace MusicBrainz5 * Exception thrown when the requested resource is not found */ Modified: head/audio/libmusicbrainz5/files/patch-src_CMakeLists.txt ============================================================================== --- head/audio/libmusicbrainz5/files/patch-src_CMakeLists.txt Fri Oct 30 09:58:47 2020 (r553676) +++ head/audio/libmusicbrainz5/files/patch-src_CMakeLists.txt Fri Oct 30 10:32:26 2020 (r553677) @@ -1,4 +1,4 @@ ---- src/CMakeLists.txt.orig 2014-11-13 13:12:24 UTC +--- src/CMakeLists.txt.orig 2015-07-06 20:45:19 UTC +++ src/CMakeLists.txt @@ -5,6 +5,7 @@ INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR}/../include @@ -8,3 +8,13 @@ ) SET(_sources Alias.cc Annotation.cc Artist.cc ArtistCredit.cc Attribute.cc CDStub.cc Collection.cc +@@ -36,7 +37,8 @@ ADD_CUSTOM_COMMAND( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/mb5_c.cc ${CMAKE_CURRENT_BINARY_DIR}/mb5_c.h ${CMAKE_CURRENT_BINARY_DIR}/../include/musicbrainz5/mb5_c.h + COMMAND make-c-interface ${CMAKE_CURRENT_SOURCE_DIR} cinterface.xml ${CMAKE_CURRENT_BINARY_DIR} mb5_c.cc mb5_c.h + COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_BINARY_DIR}/mb5_c.h ${CMAKE_CURRENT_BINARY_DIR}/../include/musicbrainz5/mb5_c.h +- DEPENDS make-c-interface cinterface.xml *.inc ++ DEPENDS make-c-interface cinterface.xml c-int-medium-defines.inc c-int-query-source.inc c-int-source-funcs.inc ++ c-int-medium-source.inc c-int-release-defines.inc c-int-query-defines.inc c-int-release-source.inc + ) + + ADD_CUSTOM_TARGET(src_gen DEPENDS mb5_c.h) Modified: head/audio/libmusicbrainz5/pkg-plist ============================================================================== --- head/audio/libmusicbrainz5/pkg-plist Fri Oct 30 09:58:47 2020 (r553676) +++ head/audio/libmusicbrainz5/pkg-plist Fri Oct 30 10:32:26 2020 (r553677) @@ -38,6 +38,8 @@ include/musicbrainz5/NameCredit.h include/musicbrainz5/NameCreditList.h include/musicbrainz5/NonMBTrack.h include/musicbrainz5/NonMBTrackList.h +include/musicbrainz5/Offset.h +include/musicbrainz5/OffsetList.h include/musicbrainz5/PUID.h include/musicbrainz5/PUIDList.h include/musicbrainz5/Query.h
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202010301032.09UAWQxJ030475>