Download raw body.
UPDATE: libmusicbrainz5-5.1.0
Simple update libmusicbrainz5-5.1.0. Tested with all consumers on amd64. OK?
Cheers Rafael
diff --git a/audio/libmusicbrainz5/Makefile b/audio/libmusicbrainz5/Makefile
index 3db8ae5db6f..3eabcd4a0db 100644
--- a/audio/libmusicbrainz5/Makefile
+++ b/audio/libmusicbrainz5/Makefile
@@ -2,12 +2,11 @@ PORTROACH= limit:^5
COMMENT= library for audio metadata lookup (v5)
-V= 5.0.1
+V= 5.1.0
DISTNAME= libmusicbrainz-${V}
PKGNAME= libmusicbrainz5-${V}
-REVISION = 5
-SHARED_LIBS += musicbrainz5 0.0 # 0.0
+SHARED_LIBS += musicbrainz5 1.0 # 0.0
CATEGORIES= audio devel
@@ -16,9 +15,9 @@ HOMEPAGE= http://musicbrainz.org/doc/libmusicbrainz
# LGPLv2.1
PERMIT_PACKAGE= Yes
-WANTLIB += m neon ${COMPILER_LIBCXX}
+WANTLIB += ${COMPILER_LIBCXX} m neon xml2
-SITES= https://github.com/downloads/metabrainz/libmusicbrainz/
+SITES= https://github.com/metabrainz/libmusicbrainz/releases/download/release-${V}/
COMPILER = base-clang ports-gcc base-gcc
@@ -26,7 +25,10 @@ MODULES= devel/cmake
NO_TEST= Yes
-LIB_DEPENDS= net/neon
+LIB_DEPENDS= net/neon \
+ textproc/libxml
+
+CXXFLAGS += -I${LOCALBASE}/include
pre-configure:
sed -i 's,/usr/local,${LOCALBASE},g' \
diff --git a/audio/libmusicbrainz5/distinfo b/audio/libmusicbrainz5/distinfo
index 398794bfa1e..967032d9139 100644
--- a/audio/libmusicbrainz5/distinfo
+++ b/audio/libmusicbrainz5/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libmusicbrainz-5.0.1.tar.gz) = HKdeHFBZo2ILDYJjOx9GiswqZfzEMF+ETsRPb7XbgtU=
-SIZE (libmusicbrainz-5.0.1.tar.gz) = 109119
+SHA256 (libmusicbrainz-5.1.0.tar.gz) = Z0klnom7snPz9a16zf+3xHos+Pyuq0xGlUhM719Ma0Y=
+SIZE (libmusicbrainz-5.1.0.tar.gz) = 77220
diff --git a/audio/libmusicbrainz5/patches/patch-CMakeLists_txt b/audio/libmusicbrainz5/patches/patch-CMakeLists_txt
deleted file mode 100644
index 6dbeef965f0..00000000000
--- a/audio/libmusicbrainz5/patches/patch-CMakeLists_txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Unbreak SEPARATE_BUILD
-
---- CMakeLists.txt.orig Fri Jun 21 16:40:13 2013
-+++ CMakeLists.txt Fri Jun 21 16:40:57 2013
-@@ -32,7 +32,7 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.cm
- CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_SOURCE_DIR}/config.h)
-
- FILE(GLOB headers ${CMAKE_CURRENT_SOURCE_DIR}/include/musicbrainz5/*.h)
--INSTALL(FILES ${headers} include/musicbrainz5/mb5_c.h DESTINATION ${INCLUDE_INSTALL_DIR}/musicbrainz5)
-+INSTALL(FILES ${headers} ${CMAKE_BINARY_DIR}/include/musicbrainz5/mb5_c.h DESTINATION ${INCLUDE_INSTALL_DIR}/musicbrainz5)
- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libmusicbrainz5.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
-
- ADD_SUBDIRECTORY(src)
diff --git a/audio/libmusicbrainz5/patches/patch-examples_CMakeLists_txt b/audio/libmusicbrainz5/patches/patch-examples_CMakeLists_txt
deleted file mode 100644
index ffa353ea532..00000000000
--- a/audio/libmusicbrainz5/patches/patch-examples_CMakeLists_txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Unbreak SEPARATE_BUILD
-
---- examples/CMakeLists.txt.orig Fri Jun 21 16:20:21 2013
-+++ examples/CMakeLists.txt Fri Jun 21 16:20:55 2013
-@@ -1,4 +1,4 @@
--INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../include)
-+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../include ${CMAKE_CURRENT_BINARY_DIR}/../include)
- LINK_LIBRARIES(musicbrainz5 ${NEON_LIBRARIES})
-
- ADD_EXECUTABLE(cdlookup cdlookup.cc)
diff --git a/audio/libmusicbrainz5/patches/patch-src_CMakeLists_txt b/audio/libmusicbrainz5/patches/patch-src_CMakeLists_txt
deleted file mode 100644
index be4498ef3ac..00000000000
--- a/audio/libmusicbrainz5/patches/patch-src_CMakeLists_txt
+++ /dev/null
@@ -1,47 +0,0 @@
-Unbreak SEPARATE_BUILD
-Unbreak with Ninja
-
---- src/CMakeLists.txt.orig Wed May 16 21:48:34 2012
-+++ src/CMakeLists.txt Mon Jun 24 12:07:34 2013
-@@ -1,5 +1,5 @@
- SET(CMAKE_INCLUDE_CURRENT_DIR ON)
--INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/../include ${NEON_INCLUDE_DIR})
-+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/../include ${CMAKE_CURRENT_BINARY_DIR}/../include ${NEON_INCLUDE_DIR})
-
- SET(_sources Alias.cc Annotation.cc Artist.cc ArtistCredit.cc Attribute.cc CDStub.cc Collection.cc
- Disc.cc Entity.cc FreeDBDisc.cc HTTPFetch.cc ISRC.cc Label.cc LabelInfo.cc Lifespan.cc List.cc
-@@ -8,18 +8,33 @@ SET(_sources Alias.cc Annotation.cc Artist.cc ArtistCr
- TextRepresentation.cc Track.cc UserRating.cc UserTag.cc Work.cc xmlParser.cpp
- RelationListList.cc ISWCList.cc ISWC.cc SecondaryType.cc SecondaryTypeList.cc IPI.cc)
-
-+FILE(GLOB inc_src_files RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/*.inc")
-+
-+foreach(inc_file ${inc_src_files})
-+ ADD_CUSTOM_COMMAND(
-+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${inc_file}
-+ COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/${inc_file} ${CMAKE_CURRENT_BINARY_DIR}/${inc_file}
-+ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${inc_file}
-+ )
-+ list(APPEND inc_binary_files ${CMAKE_CURRENT_BINARY_DIR}/${inc_file})
-+endforeach()
-+
-+ADD_CUSTOM_TARGET(Copy_inc_Files DEPENDS ${inc_binary_files})
-+
- ADD_EXECUTABLE(make-c-interface make-c-interface.cc xmlParser.cpp)
-
- 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 ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/include/musicbrainz5
- 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
-- DEPENDS make-c-interface cinterface.xml *.inc
-+ DEPENDS Copy_inc_Files make-c-interface cinterface.xml
- )
-
- ADD_CUSTOM_TARGET(src_gen DEPENDS mb5_c.h)
-
- ADD_LIBRARY(musicbrainz5 SHARED ${_sources})
-+ADD_DEPENDENCIES(musicbrainz5 src_gen)
-
- SET_TARGET_PROPERTIES(musicbrainz5 PROPERTIES
- VERSION ${musicbrainz5_VERSION}
diff --git a/audio/libmusicbrainz5/patches/patch-src_xmlParser_cc b/audio/libmusicbrainz5/patches/patch-src_xmlParser_cc
new file mode 100644
index 00000000000..1949dea9345
--- /dev/null
+++ b/audio/libmusicbrainz5/patches/patch-src_xmlParser_cc
@@ -0,0 +1,21 @@
+Index: src/xmlParser.cc
+--- src/xmlParser.cc.orig
++++ src/xmlParser.cc
+@@ -56,7 +56,7 @@ XMLNode *XMLRootNode::parseFile(const std::string &fil
+
+ doc = xmlParseFile(filename.c_str());
+ if ((doc == NULL) && (results != NULL)) {
+- xmlErrorPtr error = xmlGetLastError();
++ const xmlError* error = xmlGetLastError();
+ results->message = error->message;
+ results->line = error->line;
+ results->code = error->code;
+@@ -71,7 +71,7 @@ XMLNode *XMLRootNode::parseString(const std::string &x
+
+ doc = xmlParseMemory(xml.c_str(), xml.length());
+ if ((doc == NULL) && (results != NULL)) {
+- xmlErrorPtr error = xmlGetLastError();
++ const xmlError* error = xmlGetLastError();
+ results->message = error->message;
+ results->line = error->line;
+ results->code = error->code;
diff --git a/audio/libmusicbrainz5/patches/patch-src_xmlParser_cpp b/audio/libmusicbrainz5/patches/patch-src_xmlParser_cpp
deleted file mode 100644
index ba5207d7ddd..00000000000
--- a/audio/libmusicbrainz5/patches/patch-src_xmlParser_cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: src/xmlParser.cpp
---- src/xmlParser.cpp.orig
-+++ src/xmlParser.cpp
-@@ -673,7 +673,7 @@ XMLSTR stringDup(XMLCSTR lpszData, int cbData)
- if (lpszNew)
- {
- memcpy(lpszNew, lpszData, (cbData) * sizeof(XMLCHAR));
-- lpszNew[cbData] = (XMLCHAR)NULL;
-+ lpszNew[cbData] = '\0';
- }
- return lpszNew;
- }
diff --git a/audio/libmusicbrainz5/patches/patch-tests_CMakeLists_txt b/audio/libmusicbrainz5/patches/patch-tests_CMakeLists_txt
deleted file mode 100644
index 39051ec050e..00000000000
--- a/audio/libmusicbrainz5/patches/patch-tests_CMakeLists_txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Unbreak SEPARATE_BUILD
-
---- tests/CMakeLists.txt.orig Fri Jun 21 16:24:01 2013
-+++ tests/CMakeLists.txt Fri Jun 21 16:24:22 2013
-@@ -1,4 +1,4 @@
--INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../include)
-+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../include ${CMAKE_CURRENT_BINARY_DIR}/../include)
- LINK_LIBRARIES(musicbrainz5 ${NEON_LIBRARIES})
- ADD_EXECUTABLE(mbtest mbtest.cc)
- ADD_EXECUTABLE(ctest ctest.c)
UPDATE: libmusicbrainz5-5.1.0