From nobody Sun Aug 25 13:03:30 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WsDWk5TSrz5SGQq; Sun, 25 Aug 2024 13:03:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WsDWk4kF6z4cFr; Sun, 25 Aug 2024 13:03:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724591010; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vwhHSsar/0MDiboFRpgmz7MB5FCyMA5htK5t1FzaugM=; b=lc2qeM6eUkh755IC5yIUmPGNV1xmg01A6eP/GtvJTxNgcA/06DBKGphkb9FLF9hSIoqrA+ sGa4GodbVotsA4GgnlmLOri+oHdrW84vgs0PfhIGXrTpHTOMHTuXbMFcU6RGof32zElkBr MMEDsiCbpj2JNcoszJN9eCicnRwvbr+LbFTFwZSiMeBU6sbgRO7Qc5U7F1kg9r/HzSYVNo a1emb/eD2YVthOafIeAEIPh8a81qKFHW9WA0coz40Ww5Lk5Ld7nRKazDBv/PJ5jTc8FyWN YD9EMC0o1M1AN0WlXzMV5fvmxt5ESDx/OSE6M59ebdsiN0Arpz/VhJNZjFWQSg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1724591010; a=rsa-sha256; cv=none; b=lIBsQV6icFkxi7ov4A4wqrWYD7hprkhWAlnb5facC7XntX4l99V7LeuYF1/3WjKxhS4xBd edSI9Ph4hxuP4wH9Cc5Kj1bHwrSzAi0fLhZ1/9lVlv6zCldHbf3b7JWsV/CFPi4eXdt+ud Rv+mhMJD/HIynIYXePNy/ZK/ivMNdsek5kxb+ym4Z8CXu/3jiQIoL/0uwrBzUjYYJzCode 4XChzm9NDqRoEpP2jH42Y0VAk+QlOtyNdBChy1Zq7b5pzmuo4YsJrxngm5ez+vhxzU6lJU DGlTxmPPBSyxgh+EqjS02Qh5Nhoy4mWMU/2KuUDvT1ClHX9O4K99ojCrYL/How== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724591010; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vwhHSsar/0MDiboFRpgmz7MB5FCyMA5htK5t1FzaugM=; b=kYXtk7nbyiHtmlCC9qfBdOYzuJuO7roEAFbM1dbm6TF2ZhoeFmOoI3bzH2+mliGDoJywYF uSbMS2wEu5VcZLvmyc/Wo6C7CiDvunGeFct/w51c/wdF/MOZYZbi2tCrFGdQCTELQqvSfb NJBwxvoDsx17bhrNRHJ2E3Rtt8N+n4C/Jibjj6h2ca3/MZJzXgaBc8JRUxiIxm5Gkk8J+T 9wBC0vmuZzAvbDaMadC4X+RpW0uRys9dTUtSToNl/5H62jpRa8kPvCTc9Dltq0Kja0SdDf mcTKQRFTBMrZ8crAour4T76pQhrKMt2cpbDfk0gKHY2cmk81xZaKPIIk9N1wVw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WsDWk4KJ1zPFs; Sun, 25 Aug 2024 13:03:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47PD3UOx090877; Sun, 25 Aug 2024 13:03:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47PD3Udm090874; Sun, 25 Aug 2024 13:03:30 GMT (envelope-from git) Date: Sun, 25 Aug 2024 13:03:30 GMT Message-Id: <202408251303.47PD3Udm090874@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: 5938202e494d - main - audio/libmusicbrainz5: Update to latest commit 2023-10-09 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5938202e494d65dc5d0082127134a6b412629552 Auto-Submitted: auto-generated The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=5938202e494d65dc5d0082127134a6b412629552 commit 5938202e494d65dc5d0082127134a6b412629552 Author: Daniel Engberg AuthorDate: 2024-08-25 12:59:30 +0000 Commit: Daniel Engberg 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 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