diff options
| author | abs <abs> | 2011-08-05 14:21:31 +0000 |
|---|---|---|
| committer | abs <abs> | 2011-08-05 14:21:31 +0000 |
| commit | 603ae407eb071f452847d887c4aafa3ffe8503c5 (patch) | |
| tree | aa30d60a1ab4e04da2cfab851f67266cb356ccc0 /audio/amarok | |
| parent | c72e2ea3037c6cdffdb3fab8ead6e939d4431978 (diff) | |
| download | pkgsrc-603ae407eb071f452847d887c4aafa3ffe8503c5.tar.gz | |
- fix taglib version check for current pkgsrc taglib version
- fix build against mysql55-server
- bump pkgrevision
Diffstat (limited to 'audio/amarok')
| -rw-r--r-- | audio/amarok/Makefile | 6 | ||||
| -rw-r--r-- | audio/amarok/distinfo | 3 | ||||
| -rw-r--r-- | audio/amarok/patches/patch-CMakeLists.txt | 16 |
3 files changed, 21 insertions, 4 deletions
diff --git a/audio/amarok/Makefile b/audio/amarok/Makefile index 32faca1d5fc..17204ee4a40 100644 --- a/audio/amarok/Makefile +++ b/audio/amarok/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.97 2011/07/09 10:26:52 abs Exp $ +# $NetBSD: Makefile,v 1.98 2011/08/05 14:21:31 abs Exp $ # DISTNAME= amarok-${VERS} VERS= 2.4.0 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= audio multimedia #MASTER_SITES= http://download.kde.org/unstable/amarok/${VERS}/src/ \ # ftp://gd.tuwien.ac.at/kde/unstable/amarok/${VERS}/src/ @@ -43,7 +43,7 @@ SUBST_SED.mysql= -e s:/opt/mysqle/:${BUILDLINK_PREFIX.mysql-server}: .include "../../mk/mysql.buildlink3.mk" .if ${_MYSQL_VERSION} == "55" -DEPENDS+= mysql-server-[0-9]*:../../databases/mysql55-server +.include "../../databases/mysql55-server/buildlink3.mk" SUBST_SED.mysql+= -e s:@@WLR@@:${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.mysql-server}/lib: .elif ${_MYSQL_VERSION} == "51" DEPENDS+= mysql-server-[0-9]*:../../databases/mysql51-server diff --git a/audio/amarok/distinfo b/audio/amarok/distinfo index 44c5a82fb30..715300d67eb 100644 --- a/audio/amarok/distinfo +++ b/audio/amarok/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.46 2011/01/27 17:24:18 wiz Exp $ +$NetBSD: distinfo,v 1.47 2011/08/05 14:21:31 abs Exp $ SHA1 (amarok-2.4.0.tar.bz2) = d37ecda0fecdba88bb239f11c6d4ff885d7ac23f RMD160 (amarok-2.4.0.tar.bz2) = f32a664521b9827ef8e7d49100e39b69fa87dd29 Size (amarok-2.4.0.tar.bz2) = 15219572 bytes +SHA1 (patch-CMakeLists.txt) = 3ac402cd841e8e98198a372fd697b17f4be4ab33 SHA1 (patch-ab) = dc89394f02639c27bbcef2954aa199032c6a9ca1 diff --git a/audio/amarok/patches/patch-CMakeLists.txt b/audio/amarok/patches/patch-CMakeLists.txt new file mode 100644 index 00000000000..bb473df0b87 --- /dev/null +++ b/audio/amarok/patches/patch-CMakeLists.txt @@ -0,0 +1,16 @@ +$NetBSD: patch-CMakeLists.txt,v 1.1 2011/08/05 14:21:31 abs Exp $ +At time of writing pkgsrc includes taglib 1.10, whih the cmake check +incorrectly views as older than 1.6, so just update the check to match +1.10 or later... + +--- CMakeLists.txt.orig 2011-08-01 15:23:14.000000000 +0000 ++++ CMakeLists.txt +@@ -13,7 +13,7 @@ option(WITH_MYSQL_EMBEDDED "Build the em + include(CheckLibraryExists) + check_library_exists(dl dlopen "" LIBDL_FOUND) + +-set(TAGLIB_MIN_VERSION "1.6") ++set(TAGLIB_MIN_VERSION "1.10") + find_package(Taglib REQUIRED) + + # Check if TagLib is built with ASF and MP4 support |