Update audio/taglib to the latest version. Comments, OKs?
ciao, David Index: Makefile =================================================================== RCS file: /cvs/ports/audio/taglib/Makefile,v retrieving revision 1.14 diff -u -p -r1.14 Makefile --- Makefile 17 May 2010 11:21:50 -0000 1.14 +++ Makefile 13 Oct 2011 11:05:21 -0000 @@ -1,14 +1,14 @@ # $OpenBSD: Makefile,v 1.14 2010/05/17 11:21:50 jasper Exp $ COMMENT= managing meta-data of audio formats -DISTNAME= taglib-1.6.3 +DISTNAME= taglib-1.7 CATEGORIES= audio devel -MASTER_SITES= http://ktown.kde.org/~wheeler/files/src/ -SHARED_LIBS += tag 8.0 # .10.0 -SHARED_LIBS += tag_c 2.0 # .0.0 +MASTER_SITES= http://developer.kde.org/~wheeler/files/src/ +SHARED_LIBS += tag 8.1 # .1.7.0 +SHARED_LIBS += tag_c 2.0 # .0.0.0 -HOMEPAGE= http://ktown.kde.org/~wheeler/taglib.html +HOMEPAGE= http://developer.kde.org/~wheeler/taglib.html # LGPLv2.1 / MPLv1.1 PERMIT_DISTFILES_CDROM= Yes @@ -16,13 +16,27 @@ PERMIT_DISTFILES_FTP= Yes PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes +MODULES= devel/cmake + USE_LIBTOOL= Yes WANTLIB= stdc++ m z +BUILD_DEPENDS= devel/cppunit + CONFIGURE_ENV= LIBS="-lstdc++ -lm" -CONFIGURE_STYLE=gnu -CONFIGURE_ARGS+=--enable-asf \ - --enable-mp4 +CONFIGURE_STYLE=cmake +CONFIGURE_ARGS+=-DCMAKE_BUILD_TYPE=Release \ + -DWITH_MP4=ON \ + -DWITH_ASF=ON \ + -DBUILD_TESTS=ON + +REGRESS_DEPENDS=${BUILD_DEPENDS} + +pre-configure: + ${SUBST_CMD} ${WRKSRC}/cmake/modules/FindCppUnit.cmake + +do-regress: + @cd ${WRKBUILD}/tests && ./test_runner .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/audio/taglib/distinfo,v retrieving revision 1.6 diff -u -p -r1.6 distinfo --- distinfo 17 May 2010 11:21:50 -0000 1.6 +++ distinfo 13 Oct 2011 11:05:21 -0000 @@ -1,5 +1,5 @@ -MD5 (taglib-1.6.3.tar.gz) = 3fAvTh0tww92c034BuYT6w== -RMD160 (taglib-1.6.3.tar.gz) = 9c1Cz6RxAukucPDEkSVjv/qCk0k= -SHA1 (taglib-1.6.3.tar.gz) = 7lTxDGPyNu8cKcguOcInp1p+N4U= -SHA256 (taglib-1.6.3.tar.gz) = qboInMLG0m0ma61JLeMcra64eN6oWOIq4xlgkXGPKEs= -SIZE (taglib-1.6.3.tar.gz) = 1127286 +MD5 (taglib-1.7.tar.gz) = an4xJmjxU/qQWoFxSuvCVw== +RMD160 (taglib-1.7.tar.gz) = IDCvX2Gx3N6r/IY0fBB9E6MIqAA= +SHA1 (taglib-1.7.tar.gz) = UTjhZlGCvCFx4pj/MVGMmtct3yM= +SHA256 (taglib-1.7.tar.gz) = Cd77jb/DWREXmrI3V9dEd0c4Zk34k8D8bY8TmLOrdz8= +SIZE (taglib-1.7.tar.gz) = 533974 Index: patches/patch-cmake_modules_FindCppUnit_cmake =================================================================== RCS file: patches/patch-cmake_modules_FindCppUnit_cmake diff -N patches/patch-cmake_modules_FindCppUnit_cmake --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-cmake_modules_FindCppUnit_cmake 13 Oct 2011 11:05:21 -0000 @@ -0,0 +1,14 @@ +$OpenBSD$ +--- cmake/modules/FindCppUnit.cmake.orig Thu Oct 13 10:21:42 2011 ++++ cmake/modules/FindCppUnit.cmake Thu Oct 13 10:22:30 2011 +@@ -30,8 +30,8 @@ ELSE(CPPUNIT_INCLUDE_DIR AND CPPUNIT_LIBRARIES) + STRING(REGEX REPLACE "-I(.+)" "\\1" CPPUNIT_CFLAGS "${CPPUNIT_CFLAGS}") + ELSE(CPPUNIT_CONFIG_EXECUTABLE) + # in case win32 needs to find it the old way? +- FIND_PATH(CPPUNIT_CFLAGS cppunit/TestRunner.h PATHS /usr/include /usr/local/include ) +- FIND_LIBRARY(CPPUNIT_LIBRARIES NAMES cppunit PATHS /usr/lib /usr/local/lib ) ++ FIND_PATH(CPPUNIT_CFLAGS cppunit/TestRunner.h PATHS ${LOCALBASE}/include ) ++ FIND_LIBRARY(CPPUNIT_LIBRARIES NAMES cppunit PATHS ${LOCALBASE}/lib ) + # how can we find cppunit version? + MESSAGE (STATUS "Ensure you cppunit installed version is at least ${CPPUNIT_MIN_VERSION}") + SET (CPPUNIT_INSTALLED_VERSION ${CPPUNIT_MIN_VERSION}) Index: patches/patch-taglib_ape_apeproperties_cpp =================================================================== RCS file: patches/patch-taglib_ape_apeproperties_cpp diff -N patches/patch-taglib_ape_apeproperties_cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-taglib_ape_apeproperties_cpp 13 Oct 2011 11:05:21 -0000 @@ -0,0 +1,16 @@ +$OpenBSD$ + +Fix: crash parsing ID3v2 tag in ape file due to null pointer +dereference (https://bugs.kde.org/show_bug.cgi?id=278773) + +--- taglib/ape/apeproperties.cpp.orig Fri Mar 11 14:15:38 2011 ++++ taglib/ape/apeproperties.cpp Thu Oct 13 12:45:05 2011 +@@ -137,7 +137,7 @@ long APE::Properties::findDescriptor() + long ID3v2OriginalSize = 0; + bool hasID3v2 = false; + if(ID3v2Location >= 0) { +- ID3v2::Tag tag(d->file, ID3v2Location, 0); ++ ID3v2::Tag tag(d->file, ID3v2Location); + ID3v2OriginalSize = tag.header()->completeTagSize(); + if(tag.header()->tagSize() > 0) + hasID3v2 = true; Index: patches/patch-tests_CMakeLists_txt =================================================================== RCS file: patches/patch-tests_CMakeLists_txt diff -N patches/patch-tests_CMakeLists_txt --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-tests_CMakeLists_txt 13 Oct 2011 11:05:21 -0000 @@ -0,0 +1,11 @@ +$OpenBSD$ +--- tests/CMakeLists.txt.orig Thu Oct 13 10:26:30 2011 ++++ tests/CMakeLists.txt Thu Oct 13 10:26:54 2011 +@@ -1,6 +1,7 @@ + if(BUILD_TESTS) + + INCLUDE_DIRECTORIES( ++ ${CPPUNIT_INCLUDE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/../taglib + ${CMAKE_CURRENT_SOURCE_DIR}/../taglib/toolkit + ${CMAKE_CURRENT_SOURCE_DIR}/../taglib/ape Index: patches/patch-tests_utils_h =================================================================== RCS file: patches/patch-tests_utils_h diff -N patches/patch-tests_utils_h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-tests_utils_h 13 Oct 2011 11:05:21 -0000 @@ -0,0 +1,14 @@ +$OpenBSD$ + +Add missing include, needed for S_IRUSR/S_IWUSR macros + +--- tests/utils.h.orig Thu Oct 13 10:28:58 2011 ++++ tests/utils.h Thu Oct 13 10:29:23 2011 +@@ -4,6 +4,7 @@ + #include <unistd.h> + #include <fcntl.h> + #include <sys/fcntl.h> ++#include <sys/stat.h> + #endif + #include <stdio.h> + #include <string> Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/audio/taglib/pkg/PLIST,v retrieving revision 1.5 diff -u -p -r1.5 PLIST --- pkg/PLIST 17 May 2010 11:21:50 -0000 1.5 +++ pkg/PLIST 13 Oct 2011 11:05:21 -0000 @@ -4,11 +4,14 @@ bin/taglib-config include/taglib/ include/taglib/aifffile.h include/taglib/aiffproperties.h +include/taglib/apefile.h include/taglib/apefooter.h include/taglib/apeitem.h +include/taglib/apeproperties.h include/taglib/apetag.h include/taglib/asfattribute.h include/taglib/asffile.h +include/taglib/asfpicture.h include/taglib/asfproperties.h include/taglib/asftag.h include/taglib/attachedpictureframe.h @@ -16,6 +19,8 @@ include/taglib/audioproperties.h include/taglib/commentsframe.h include/taglib/fileref.h include/taglib/flacfile.h +include/taglib/flacmetadatablock.h +include/taglib/flacpicture.h include/taglib/flacproperties.h include/taglib/generalencapsulatedobjectframe.h include/taglib/id3v1genres.h @@ -77,10 +82,6 @@ include/taglib/wavpackproperties.h include/taglib/wavproperties.h include/taglib/xingheader.h include/taglib/xiphcomment.h -lib/libtag.a -lib/libtag.la -lib/libtag_c.a -lib/libtag_c.la lib/pkgconfig/ lib/pkgconfig/taglib.pc lib/pkgconfig/taglib_c.pc
Index: Makefile =================================================================== RCS file: /cvs/ports/audio/taglib/Makefile,v retrieving revision 1.14 diff -u -p -r1.14 Makefile --- Makefile 17 May 2010 11:21:50 -0000 1.14 +++ Makefile 13 Oct 2011 11:05:21 -0000 @@ -1,14 +1,14 @@ # $OpenBSD: Makefile,v 1.14 2010/05/17 11:21:50 jasper Exp $ COMMENT= managing meta-data of audio formats -DISTNAME= taglib-1.6.3 +DISTNAME= taglib-1.7 CATEGORIES= audio devel -MASTER_SITES= http://ktown.kde.org/~wheeler/files/src/ -SHARED_LIBS += tag 8.0 # .10.0 -SHARED_LIBS += tag_c 2.0 # .0.0 +MASTER_SITES= http://developer.kde.org/~wheeler/files/src/ +SHARED_LIBS += tag 8.1 # .1.7.0 +SHARED_LIBS += tag_c 2.0 # .0.0.0 -HOMEPAGE= http://ktown.kde.org/~wheeler/taglib.html +HOMEPAGE= http://developer.kde.org/~wheeler/taglib.html # LGPLv2.1 / MPLv1.1 PERMIT_DISTFILES_CDROM= Yes @@ -16,13 +16,27 @@ PERMIT_DISTFILES_FTP= Yes PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes +MODULES= devel/cmake + USE_LIBTOOL= Yes WANTLIB= stdc++ m z +BUILD_DEPENDS= devel/cppunit + CONFIGURE_ENV= LIBS="-lstdc++ -lm" -CONFIGURE_STYLE=gnu -CONFIGURE_ARGS+=--enable-asf \ - --enable-mp4 +CONFIGURE_STYLE=cmake +CONFIGURE_ARGS+=-DCMAKE_BUILD_TYPE=Release \ + -DWITH_MP4=ON \ + -DWITH_ASF=ON \ + -DBUILD_TESTS=ON + +REGRESS_DEPENDS=${BUILD_DEPENDS} + +pre-configure: + ${SUBST_CMD} ${WRKSRC}/cmake/modules/FindCppUnit.cmake + +do-regress: + @cd ${WRKBUILD}/tests && ./test_runner .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/audio/taglib/distinfo,v retrieving revision 1.6 diff -u -p -r1.6 distinfo --- distinfo 17 May 2010 11:21:50 -0000 1.6 +++ distinfo 13 Oct 2011 11:05:21 -0000 @@ -1,5 +1,5 @@ -MD5 (taglib-1.6.3.tar.gz) = 3fAvTh0tww92c034BuYT6w== -RMD160 (taglib-1.6.3.tar.gz) = 9c1Cz6RxAukucPDEkSVjv/qCk0k= -SHA1 (taglib-1.6.3.tar.gz) = 7lTxDGPyNu8cKcguOcInp1p+N4U= -SHA256 (taglib-1.6.3.tar.gz) = qboInMLG0m0ma61JLeMcra64eN6oWOIq4xlgkXGPKEs= -SIZE (taglib-1.6.3.tar.gz) = 1127286 +MD5 (taglib-1.7.tar.gz) = an4xJmjxU/qQWoFxSuvCVw== +RMD160 (taglib-1.7.tar.gz) = IDCvX2Gx3N6r/IY0fBB9E6MIqAA= +SHA1 (taglib-1.7.tar.gz) = UTjhZlGCvCFx4pj/MVGMmtct3yM= +SHA256 (taglib-1.7.tar.gz) = Cd77jb/DWREXmrI3V9dEd0c4Zk34k8D8bY8TmLOrdz8= +SIZE (taglib-1.7.tar.gz) = 533974 Index: patches/patch-cmake_modules_FindCppUnit_cmake =================================================================== RCS file: patches/patch-cmake_modules_FindCppUnit_cmake diff -N patches/patch-cmake_modules_FindCppUnit_cmake --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-cmake_modules_FindCppUnit_cmake 13 Oct 2011 11:05:21 -0000 @@ -0,0 +1,14 @@ +$OpenBSD$ +--- cmake/modules/FindCppUnit.cmake.orig Thu Oct 13 10:21:42 2011 ++++ cmake/modules/FindCppUnit.cmake Thu Oct 13 10:22:30 2011 +@@ -30,8 +30,8 @@ ELSE(CPPUNIT_INCLUDE_DIR AND CPPUNIT_LIBRARIES) + STRING(REGEX REPLACE "-I(.+)" "\\1" CPPUNIT_CFLAGS "${CPPUNIT_CFLAGS}") + ELSE(CPPUNIT_CONFIG_EXECUTABLE) + # in case win32 needs to find it the old way? +- FIND_PATH(CPPUNIT_CFLAGS cppunit/TestRunner.h PATHS /usr/include /usr/local/include ) +- FIND_LIBRARY(CPPUNIT_LIBRARIES NAMES cppunit PATHS /usr/lib /usr/local/lib ) ++ FIND_PATH(CPPUNIT_CFLAGS cppunit/TestRunner.h PATHS ${LOCALBASE}/include ) ++ FIND_LIBRARY(CPPUNIT_LIBRARIES NAMES cppunit PATHS ${LOCALBASE}/lib ) + # how can we find cppunit version? + MESSAGE (STATUS "Ensure you cppunit installed version is at least ${CPPUNIT_MIN_VERSION}") + SET (CPPUNIT_INSTALLED_VERSION ${CPPUNIT_MIN_VERSION}) Index: patches/patch-taglib_ape_apeproperties_cpp =================================================================== RCS file: patches/patch-taglib_ape_apeproperties_cpp diff -N patches/patch-taglib_ape_apeproperties_cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-taglib_ape_apeproperties_cpp 13 Oct 2011 11:05:21 -0000 @@ -0,0 +1,16 @@ +$OpenBSD$ + +Fix: crash parsing ID3v2 tag in ape file due to null pointer +dereference (https://bugs.kde.org/show_bug.cgi?id=278773) + +--- taglib/ape/apeproperties.cpp.orig Fri Mar 11 14:15:38 2011 ++++ taglib/ape/apeproperties.cpp Thu Oct 13 12:45:05 2011 +@@ -137,7 +137,7 @@ long APE::Properties::findDescriptor() + long ID3v2OriginalSize = 0; + bool hasID3v2 = false; + if(ID3v2Location >= 0) { +- ID3v2::Tag tag(d->file, ID3v2Location, 0); ++ ID3v2::Tag tag(d->file, ID3v2Location); + ID3v2OriginalSize = tag.header()->completeTagSize(); + if(tag.header()->tagSize() > 0) + hasID3v2 = true; Index: patches/patch-tests_CMakeLists_txt =================================================================== RCS file: patches/patch-tests_CMakeLists_txt diff -N patches/patch-tests_CMakeLists_txt --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-tests_CMakeLists_txt 13 Oct 2011 11:05:21 -0000 @@ -0,0 +1,11 @@ +$OpenBSD$ +--- tests/CMakeLists.txt.orig Thu Oct 13 10:26:30 2011 ++++ tests/CMakeLists.txt Thu Oct 13 10:26:54 2011 +@@ -1,6 +1,7 @@ + if(BUILD_TESTS) + + INCLUDE_DIRECTORIES( ++ ${CPPUNIT_INCLUDE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/../taglib + ${CMAKE_CURRENT_SOURCE_DIR}/../taglib/toolkit + ${CMAKE_CURRENT_SOURCE_DIR}/../taglib/ape Index: patches/patch-tests_utils_h =================================================================== RCS file: patches/patch-tests_utils_h diff -N patches/patch-tests_utils_h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-tests_utils_h 13 Oct 2011 11:05:21 -0000 @@ -0,0 +1,14 @@ +$OpenBSD$ + +Add missing include, needed for S_IRUSR/S_IWUSR macros + +--- tests/utils.h.orig Thu Oct 13 10:28:58 2011 ++++ tests/utils.h Thu Oct 13 10:29:23 2011 +@@ -4,6 +4,7 @@ + #include <unistd.h> + #include <fcntl.h> + #include <sys/fcntl.h> ++#include <sys/stat.h> + #endif + #include <stdio.h> + #include <string> Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/audio/taglib/pkg/PLIST,v retrieving revision 1.5 diff -u -p -r1.5 PLIST --- pkg/PLIST 17 May 2010 11:21:50 -0000 1.5 +++ pkg/PLIST 13 Oct 2011 11:05:21 -0000 @@ -4,11 +4,14 @@ bin/taglib-config include/taglib/ include/taglib/aifffile.h include/taglib/aiffproperties.h +include/taglib/apefile.h include/taglib/apefooter.h include/taglib/apeitem.h +include/taglib/apeproperties.h include/taglib/apetag.h include/taglib/asfattribute.h include/taglib/asffile.h +include/taglib/asfpicture.h include/taglib/asfproperties.h include/taglib/asftag.h include/taglib/attachedpictureframe.h @@ -16,6 +19,8 @@ include/taglib/audioproperties.h include/taglib/commentsframe.h include/taglib/fileref.h include/taglib/flacfile.h +include/taglib/flacmetadatablock.h +include/taglib/flacpicture.h include/taglib/flacproperties.h include/taglib/generalencapsulatedobjectframe.h include/taglib/id3v1genres.h @@ -77,10 +82,6 @@ include/taglib/wavpackproperties.h include/taglib/wavproperties.h include/taglib/xingheader.h include/taglib/xiphcomment.h -lib/libtag.a -lib/libtag.la -lib/libtag_c.a -lib/libtag_c.la lib/pkgconfig/ lib/pkgconfig/taglib.pc lib/pkgconfig/taglib_c.pc
