git: 5938202e494d - main - audio/libmusicbrainz5: Update to latest commit 2023-10-09
Date: Sun, 25 Aug 2024 13:03:30 UTC
The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=5938202e494d65dc5d0082127134a6b412629552 commit 5938202e494d65dc5d0082127134a6b412629552 Author: Daniel Engberg <diizzy@FreeBSD.org> AuthorDate: 2024-08-25 12:59:30 +0000 Commit: Daniel Engberg <diizzy@FreeBSD.org> CommitDate: 2024-08-25 13:02:49 +0000 audio/libmusicbrainz5: Update to latest commit 2023-10-09 Fixes build with libxml2 2.12.0 and newer PR: 279749 Reviewed by: jhale (maintainer) --- audio/libmusicbrainz5/Makefile | 9 ++++----- audio/libmusicbrainz5/distinfo | 6 +++--- audio/libmusicbrainz5/files/patch-src_CMakeLists.txt | 14 ++------------ audio/libmusicbrainz5/pkg-plist | 8 ++++++-- 4 files changed, 15 insertions(+), 22 deletions(-) diff --git a/audio/libmusicbrainz5/Makefile b/audio/libmusicbrainz5/Makefile index 5c4f0dcb636a..9a3309b36cbe 100644 --- a/audio/libmusicbrainz5/Makefile +++ b/audio/libmusicbrainz5/Makefile @@ -1,8 +1,7 @@ PORTNAME= libmusicbrainz DISTVERSIONPREFIX= release- -DISTVERSION= 5.1.0-19 -PORTREVISION= 2 -DISTVERSIONSUFFIX= -ge29cc9a +DISTVERSION= 5.1.0-41 +DISTVERSIONSUFFIX= -g4655b57 CATEGORIES= audio PKGNAMESUFFIX= 5 @@ -15,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING.txt LIB_DEPENDS= libneon.so:www/neon -USES= cmake compiler:c++11-lang gnome iconv:build pathfix +USES= cmake compiler:c++11-lang gnome iconv:build pathfix pkgconfig USE_GNOME= libxml2 USE_LDCONFIG= yes @@ -25,8 +24,8 @@ GH_ACCOUNT= metabrainz post-patch: ${REINPLACE_CMD} -e 's|%%ICONV_PREFIX%%|${ICONV_PREFIX}|g' \ ${WRKSRC}/src/CMakeLists.txt + ${RM} ${WRKSRC}/cmake/modules/FindLibXml2.cmake ${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ ${WRKSRC}/cmake/modules/*.cmake - ${RM} ${WRKSRC}/cmake/modules/FindLibXml2.cmake .include <bsd.port.mk> diff --git a/audio/libmusicbrainz5/distinfo b/audio/libmusicbrainz5/distinfo index 6b171e5f2cac..5c473c406d64 100644 --- a/audio/libmusicbrainz5/distinfo +++ b/audio/libmusicbrainz5/distinfo @@ -1,3 +1,3 @@ -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 +TIMESTAMP = 1719347045 +SHA256 (metabrainz-libmusicbrainz-release-5.1.0-41-g4655b57_GH0.tar.gz) = a3eca6bd3612e4d87bd67cc0128a329b740d24cfdcd5bef73c1f0fdda4d7f835 +SIZE (metabrainz-libmusicbrainz-release-5.1.0-41-g4655b57_GH0.tar.gz) = 79236 diff --git a/audio/libmusicbrainz5/files/patch-src_CMakeLists.txt b/audio/libmusicbrainz5/files/patch-src_CMakeLists.txt index 0cf2f0601718..83a16e250508 100644 --- a/audio/libmusicbrainz5/files/patch-src_CMakeLists.txt +++ b/audio/libmusicbrainz5/files/patch-src_CMakeLists.txt @@ -1,4 +1,4 @@ ---- src/CMakeLists.txt.orig 2015-07-06 20:45:19 UTC +--- src/CMakeLists.txt.orig 2024-06-25 20:26:30 UTC +++ src/CMakeLists.txt @@ -5,6 +5,7 @@ INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR}/../include @@ -7,14 +7,4 @@ + %%ICONV_PREFIX%%/include ) - 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) + SET(_sources_cc Alias.cc Annotation.cc Artist.cc ArtistCredit.cc Attribute.cc CDStub.cc Collection.cc diff --git a/audio/libmusicbrainz5/pkg-plist b/audio/libmusicbrainz5/pkg-plist index c21bd5b8af45..bd4cf6c8491a 100644 --- a/audio/libmusicbrainz5/pkg-plist +++ b/audio/libmusicbrainz5/pkg-plist @@ -69,6 +69,10 @@ include/musicbrainz5/defines.h include/musicbrainz5/mb5_c.h include/musicbrainz5/xmlParser.h lib/libmusicbrainz5.so -lib/libmusicbrainz5.so.1 -lib/libmusicbrainz5.so.1.0.0 +lib/libmusicbrainz5.so.2 +lib/libmusicbrainz5.so.2.0.0 +lib/libmusicbrainz5cc.so +lib/libmusicbrainz5cc.so.2 +lib/libmusicbrainz5cc.so.2.0.0 libdata/pkgconfig/libmusicbrainz5.pc +libdata/pkgconfig/libmusicbrainz5cc.pc