diff options
| author | ryoon <ryoon@pkgsrc.org> | 2012-12-01 10:15:53 +0000 |
|---|---|---|
| committer | ryoon <ryoon@pkgsrc.org> | 2012-12-01 10:15:53 +0000 |
| commit | f8adbd9438edd407ff3b5001add2a022fa62834e (patch) | |
| tree | f2e111e59282335d845e2624eae6b0230feb2755 /multimedia/ffmpeg010 | |
| parent | fe5698754280937db42221567388ef660078e4a1 (diff) | |
| download | pkgsrc-f8adbd9438edd407ff3b5001add2a022fa62834e.tar.gz | |
* Try to fix bad conditionals.
* Convert whitespaces to tab
* Change PKG_OPTIONS.ffmpeg to PKG_OPTIONS.ffmpeg010
Diffstat (limited to 'multimedia/ffmpeg010')
| -rw-r--r-- | multimedia/ffmpeg010/Makefile.common | 6 | ||||
| -rw-r--r-- | multimedia/ffmpeg010/buildlink3.mk | 16 | ||||
| -rw-r--r-- | multimedia/ffmpeg010/options.mk | 4 |
3 files changed, 12 insertions, 14 deletions
diff --git a/multimedia/ffmpeg010/Makefile.common b/multimedia/ffmpeg010/Makefile.common index b58a6dfe60d..c7d09ad146e 100644 --- a/multimedia/ffmpeg010/Makefile.common +++ b/multimedia/ffmpeg010/Makefile.common @@ -1,6 +1,5 @@ -# $NetBSD: Makefile.common,v 1.4 2012/11/28 15:50:03 ryoon Exp $ -# used by multimedia/ffplay/Makefile -# used by multimedia/ffmpeg/Makefile +# $NetBSD: Makefile.common,v 1.5 2012/12/01 10:15:53 ryoon Exp $ +# used by multimedia/ffmpeg010/Makefile DISTNAME= ffmpeg-${DISTVERSION:S/-//g} CATEGORIES= multimedia @@ -8,7 +7,6 @@ MASTER_SITES= http://www.ffmpeg.org/releases/ EXTRACT_SUFX= .tar.bz2 DISTVERSION= 0.10.4 -PREV_PKGPATH= multimedia/ffmpeg-devel PATCHDIR= ${.CURDIR}/../../multimedia/ffmpeg010/patches HAS_CONFIGURE= YES diff --git a/multimedia/ffmpeg010/buildlink3.mk b/multimedia/ffmpeg010/buildlink3.mk index bf065ee002f..1c79ffe678f 100644 --- a/multimedia/ffmpeg010/buildlink3.mk +++ b/multimedia/ffmpeg010/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2012/11/28 15:50:03 ryoon Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2012/12/01 10:15:53 ryoon Exp $ BUILDLINK_TREE+= ffmpeg010 @@ -9,8 +9,8 @@ BUILDLINK_API_DEPENDS.ffmpeg010+= ffmpeg010>=20120609.0.10.4<20121028.1.0 BUILDLINK_ABI_DEPENDS.ffmpeg010+= ffmpeg010>=20111104.0.7.7nb1 BUILDLINK_PKGSRCDIR.ffmpeg010?= ../../multimedia/ffmpeg010 -BUILDLINK_INCDIRS.ffmpeg010+= include/ffmpeg010 -BUILDLINK_LIBDIRS.ffmpeg010+= lib/ffmpeg010 +BUILDLINK_INCDIRS.ffmpeg010+= include/ffmpeg010 +BUILDLINK_LIBDIRS.ffmpeg010+= lib/ffmpeg010 BUILDLINK_FNAME_TRANSFORM.ffmpeg010+= -e 's|lib/ffmpeg010/pkgconfig/|lib/pkgconfig/|' pkgbase := ffmpeg010 @@ -18,23 +18,23 @@ pkgbase := ffmpeg010 .include "../../mk/bsd.fast.prefs.mk" -.if !empty(PKG_BUILD_OPTIONS.ffmpeg:Mtheora) +.if !empty(PKG_BUILD_OPTIONS.ffmpeg010:Mtheora) . include "../../multimedia/libtheora/buildlink3.mk" .endif -.if !empty(PKG_BUILD_OPTIONS.ffmpeg:Mxvid) +.if !empty(PKG_BUILD_OPTIONS.ffmpeg010:Mxvid) . include "../../multimedia/xvidcore/buildlink3.mk" .endif -.if !empty(PKG_BUILD_OPTIONS.ffmpeg:Mx264) +.if !empty(PKG_BUILD_OPTIONS.ffmpeg010:Mx264) . include "../../multimedia/x264-devel/buildlink3.mk" .endif -.if !empty(PKG_BUILD_OPTIONS.ffmpeg:Mfaac) +.if !empty(PKG_BUILD_OPTIONS.ffmpeg010:Mfaac) . include "../../audio/faac/buildlink3.mk" .endif -.if !empty(PKG_BUILD_OPTIONS.ffmpeg:Mlibvpx) +.if !empty(PKG_BUILD_OPTIONS.ffmpeg010:Mlibvpx) . include "../../multimedia/libvpx/buildlink3.mk" .endif diff --git a/multimedia/ffmpeg010/options.mk b/multimedia/ffmpeg010/options.mk index 22b705fe9bd..d5fa81b7ece 100644 --- a/multimedia/ffmpeg010/options.mk +++ b/multimedia/ffmpeg010/options.mk @@ -1,8 +1,8 @@ -# $NetBSD: options.mk,v 1.3 2012/11/28 15:50:03 ryoon Exp $ +# $NetBSD: options.mk,v 1.4 2012/12/01 10:15:53 ryoon Exp $ # Global and legacy options -PKG_OPTIONS_VAR= PKG_OPTIONS.ffmpeg +PKG_OPTIONS_VAR= PKG_OPTIONS.ffmpeg010 PKG_SUPPORTED_OPTIONS= faac lame libvpx opencore-amr theora vorbis x264 xvid PKG_SUGGESTED_OPTIONS= lame libvpx theora vorbis x264 xvid #PKG_OPTIONS_OPTIONAL_GROUPS= aac-decoder |