diff options
| author | jperkin <jperkin> | 2016-03-30 12:46:38 +0000 |
|---|---|---|
| committer | jperkin <jperkin> | 2016-03-30 12:46:38 +0000 |
| commit | 7117aa6fdf792ac956c86adb9cfae27723c6f25e (patch) | |
| tree | ef945fb62b77f4376f619bc591e6e9620d41fd82 /multimedia | |
| parent | 11fd2b31034565c03827ef3d8f0cd12b30786882 (diff) | |
| download | pkgsrc-7117aa6fdf792ac956c86adb9cfae27723c6f25e.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.
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/ffmpeg2/Makefile | 4 | ||||
| -rw-r--r-- | multimedia/ffmpeg2/Makefile.common | 3 | ||||
| -rw-r--r-- | multimedia/ffmpeg2/buildlink3.mk | 3 |
3 files changed, 6 insertions, 4 deletions
diff --git a/multimedia/ffmpeg2/Makefile b/multimedia/ffmpeg2/Makefile index 1f793ef558b..c00c59479b1 100644 --- a/multimedia/ffmpeg2/Makefile +++ b/multimedia/ffmpeg2/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.25 2016/03/05 11:28:59 jperkin Exp $ +# $NetBSD: Makefile,v 1.26 2016/03/30 12:46:38 jperkin Exp $ PKGNAME= ${DISTNAME:S/ffmpeg/ffmpeg2/} -PKGREVISION= 1 +PKGREVISION= 2 MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://ffmpeg.mplayerhq.hu/ COMMENT= Decoding, encoding and streaming software (v2.x) diff --git a/multimedia/ffmpeg2/Makefile.common b/multimedia/ffmpeg2/Makefile.common index 1226ccf6c91..8106814e6ad 100644 --- a/multimedia/ffmpeg2/Makefile.common +++ b/multimedia/ffmpeg2/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.44 2016/02/03 21:00:00 adam Exp $ +# $NetBSD: Makefile.common,v 1.45 2016/03/30 12:46:38 jperkin Exp $ # used by multimedia/ffmpeg2/Makefile # used by multimedia/ffplay2/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/ffmpeg2/buildlink3.mk b/multimedia/ffmpeg2/buildlink3.mk index 96d98cb9fcd..5b9ea5abd27 100644 --- a/multimedia/ffmpeg2/buildlink3.mk +++ b/multimedia/ffmpeg2/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.7 2015/11/18 14:19:47 ryoon Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2016/03/30 12:46:38 jperkin Exp $ BUILDLINK_TREE+= ffmpeg2 @@ -47,6 +47,7 @@ BUILDLINK_LIBDIRS.ffmpeg2+= lib/ffmpeg2 BUILDLINK_FNAME_TRANSFORM.ffmpeg2+= -e 's|lib/ffmpeg2/pkgconfig/|lib/pkgconfig/|' .include "../../archivers/bzip2/buildlink3.mk" +.include "../../archivers/xz/buildlink3.mk" .include "../../devel/libgetopt/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .endif # FFMPEG2_BUILDLINK3_MK |