diff options
| author | jperkin <jperkin@pkgsrc.org> | 2016-03-30 12:47:47 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2016-03-30 12:47:47 +0000 |
| commit | 1f9afe2e492a48a61b078b696935da6b31cb0674 (patch) | |
| tree | 8b93876daa5350a14f5dc75104fcb984fa4360c9 | |
| parent | 6b8aa1a63a3cc83a514fe906a7fe703e4bb34a7d (diff) | |
| download | pkgsrc-1f9afe2e492a48a61b078b696935da6b31cb0674.tar.gz | |
Explicitly pull in archivers/xz, ffmpeg goes looking for it and if it's
already installed will fail during install as a missing runtime dependency.
Bump PKGREVISION.
| -rw-r--r-- | multimedia/ffmpeg3/Makefile | 4 | ||||
| -rw-r--r-- | multimedia/ffmpeg3/Makefile.common | 3 | ||||
| -rw-r--r-- | multimedia/ffmpeg3/buildlink3.mk | 3 |
3 files changed, 6 insertions, 4 deletions
diff --git a/multimedia/ffmpeg3/Makefile b/multimedia/ffmpeg3/Makefile index 276b6496f37..a2ca576fb80 100644 --- a/multimedia/ffmpeg3/Makefile +++ b/multimedia/ffmpeg3/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.3 2016/03/11 15:42:59 fhajny Exp $ +# $NetBSD: Makefile,v 1.4 2016/03/30 12:47:47 jperkin Exp $ PKGNAME= ${DISTNAME:S/ffmpeg/ffmpeg3/} -PKGREVISION= 2 +PKGREVISION= 3 MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://ffmpeg.mplayerhq.hu/ COMMENT= Decoding, encoding and streaming software (v3.x) diff --git a/multimedia/ffmpeg3/Makefile.common b/multimedia/ffmpeg3/Makefile.common index b19c2b884d8..41fde4eaca5 100644 --- a/multimedia/ffmpeg3/Makefile.common +++ b/multimedia/ffmpeg3/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.2 2016/03/11 15:42:59 fhajny Exp $ +# $NetBSD: Makefile.common,v 1.3 2016/03/30 12:47:47 jperkin Exp $ # used by multimedia/ffmpeg3/Makefile # used by multimedia/ffplay3/Makefile @@ -87,6 +87,7 @@ pre-configure: mkdir ${WRKSRC}/tmp .include "../../archivers/bzip2/buildlink3.mk" +.include "../../archivers/xz/buildlink3.mk" .include "../../devel/libgetopt/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" diff --git a/multimedia/ffmpeg3/buildlink3.mk b/multimedia/ffmpeg3/buildlink3.mk index e4ab9f54d69..78f11556832 100644 --- a/multimedia/ffmpeg3/buildlink3.mk +++ b/multimedia/ffmpeg3/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2016/03/05 08:52:23 ryoon Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2016/03/30 12:47:47 jperkin Exp $ BUILDLINK_TREE+= ffmpeg3 @@ -47,6 +47,7 @@ BUILDLINK_LIBDIRS.ffmpeg3+= lib/ffmpeg3 BUILDLINK_FNAME_TRANSFORM.ffmpeg3+= -e 's|lib/ffmpeg3/pkgconfig/|lib/pkgconfig/|' .include "../../archivers/bzip2/buildlink3.mk" +.include "../../archivers/xz/buildlink3.mk" .include "../../devel/libgetopt/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .endif # FFMPEG3_BUILDLINK3_MK |