diff options
| author | wiz <wiz@pkgsrc.org> | 2014-05-14 15:24:00 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2014-05-14 15:24:00 +0000 |
| commit | fb451dc5b8bc4990c6e14f0a09d6e3d22c84f50c (patch) | |
| tree | 424021d5f584c7f3ba2381ea36558cec314f926d /audio | |
| parent | 2f01ef57886ce7b1dd83e059ec3a5a1a2756eb86 (diff) | |
| download | pkgsrc-fb451dc5b8bc4990c6e14f0a09d6e3d22c84f50c.tar.gz | |
Convert to use ffmpeg2 instead of included copy of libav.
Bump PKGREVISION.
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/libgroove/Makefile | 13 | ||||
| -rw-r--r-- | audio/libgroove/distinfo | 3 | ||||
| -rw-r--r-- | audio/libgroove/patches/patch-CMakeLists.txt | 17 |
3 files changed, 4 insertions, 29 deletions
diff --git a/audio/libgroove/Makefile b/audio/libgroove/Makefile index f5bffeba071..6284c4b732f 100644 --- a/audio/libgroove/Makefile +++ b/audio/libgroove/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.1 2014/04/30 23:42:52 wiz Exp $ +# $NetBSD: Makefile,v 1.2 2014/05/14 15:24:00 wiz Exp $ DISTNAME= 3.1.1 PKGNAME= libgroove-${DISTNAME} +PKGREVISION= 1 CATEGORIES= audio MASTER_SITES= https://github.com/andrewrk/libgroove/archive/ @@ -18,15 +19,7 @@ USE_LANGUAGES= c c++ DIST_SUBDIR= libgroove -# libav has to be built first but isn't -# https://github.com/andrewrk/libgroove/issues/59 -MAKE_JOBS_SAFE= no - -# for included libav -BUILD_DEPENDS+= yasm-[0-9]*:../../devel/yasm -.include "../../audio/lame/buildlink3.mk" -.include "../../archivers/bzip2/buildlink3.mk" - +.include "../../multimedia/ffmpeg2/buildlink3.mk" .include "../../audio/chromaprint/buildlink3.mk" .include "../../audio/libebur128/buildlink3.mk" .include "../../devel/SDL2/buildlink3.mk" diff --git a/audio/libgroove/distinfo b/audio/libgroove/distinfo index 50da69e0619..7f72fe96dac 100644 --- a/audio/libgroove/distinfo +++ b/audio/libgroove/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.1 2014/04/30 23:42:52 wiz Exp $ +$NetBSD: distinfo,v 1.2 2014/05/14 15:24:00 wiz Exp $ SHA1 (libgroove/3.1.1.tar.gz) = e73b091eb9e6d81c5a223c216967f2344606a25c RMD160 (libgroove/3.1.1.tar.gz) = d494f8010188472dd0716920de760dae2b1fe7e5 Size (libgroove/3.1.1.tar.gz) = 8584469 bytes -SHA1 (patch-CMakeLists.txt) = d743ccd6eee1b9cee7af1ca61bc0c17dd9aee0d6 diff --git a/audio/libgroove/patches/patch-CMakeLists.txt b/audio/libgroove/patches/patch-CMakeLists.txt deleted file mode 100644 index 94078502ad1..00000000000 --- a/audio/libgroove/patches/patch-CMakeLists.txt +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-CMakeLists.txt,v 1.1 2014/04/30 23:42:52 wiz Exp $ - -Always use embedded libav, since there is no pkgsrc package for -libav and the ffmpeg package is misdetected as libav. -https://github.com/andrewrk/libgroove/issues/58 - ---- CMakeLists.txt.orig 2014-04-21 07:09:21.000000000 +0000 -+++ CMakeLists.txt -@@ -121,7 +121,7 @@ endif(DISABLE_PLAYER) - - # check for libav - find_package(LibAV 10.0) --if(LIBAV_AVCODEC_FOUND AND LIBAV_AVFILTER_FOUND AND LIBAV_AVFORMAT_FOUND AND LIBAV_AVUTIL_FOUND) -+if(LIBAV_AVCODEC_FOUND AND LIBAV_AVFILTER_FOUND AND LIBAV_AVFORMAT_FOUND AND LIBAV_AVUTIL_FOUND AND FALSE) - set(LIBAV_IS_BUNDLED FALSE) - set(STATUS_DEP_LIBAV "using system libraries") - set(STATUS_BZIP2 "not needed") |