diff options
| author | cheusov <cheusov> | 2012-12-14 21:50:46 +0000 |
|---|---|---|
| committer | cheusov <cheusov> | 2012-12-14 21:50:46 +0000 |
| commit | c1b255b648a909c757800c75c731fef9155e925c (patch) | |
| tree | 6f257d3a4a10f874a8aab6a78d12db315bcdb02a | |
| parent | 5392c2a660c72bb60ff98f8de20ee5e2e2b4e613 (diff) | |
| download | pkgsrc-c1b255b648a909c757800c75c731fef9155e925c.tar.gz | |
ffmpeg: add option "ass" for subtitle renderer support and enable it by
default. ++pkgrevision. Tested on NetBSD-6
| -rw-r--r-- | mk/defaults/options.description | 1 | ||||
| -rw-r--r-- | multimedia/ffmpeg/Makefile | 3 | ||||
| -rw-r--r-- | multimedia/ffmpeg/options.mk | 18 | ||||
| -rw-r--r-- | multimedia/libass/buildlink3.mk | 5 |
4 files changed, 22 insertions, 5 deletions
diff --git a/mk/defaults/options.description b/mk/defaults/options.description index c12f2d2d21d..7fbe6c8a447 100644 --- a/mk/defaults/options.description +++ b/mk/defaults/options.description @@ -34,6 +34,7 @@ ares Use the ares library for asynchronous name resolution. aria2-metalink Enable Metalink support. arts Use the aRts audio daemon. aspell Add spell checking support using aspell. +ass Enable subtitle renderer for the ASS/SSA format aterm-big5 Enable Chinese support. aterm-greek Enable Greek keyboard support. aterm-kanji Enable kanji support. diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index d66af96aac5..b9c814359f1 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.93 2012/11/09 07:56:26 tron Exp $ +# $NetBSD: Makefile,v 1.94 2012/12/14 21:50:46 cheusov Exp $ PKGNAME= ffmpeg-20121028.${DISTVERSION} +PKGREVISION= 1 MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://ffmpeg.mplayerhq.hu/ diff --git a/multimedia/ffmpeg/options.mk b/multimedia/ffmpeg/options.mk index 64bf44832e8..4d6edf0c0ea 100644 --- a/multimedia/ffmpeg/options.mk +++ b/multimedia/ffmpeg/options.mk @@ -1,10 +1,11 @@ -# $NetBSD: options.mk,v 1.25 2012/10/10 13:33:44 drochner Exp $ +# $NetBSD: options.mk,v 1.26 2012/12/14 21:50:46 cheusov Exp $ # Global and legacy options PKG_OPTIONS_VAR= PKG_OPTIONS.ffmpeg -PKG_SUPPORTED_OPTIONS= faac lame libvpx opencore-amr theora vorbis x264 xvid -PKG_SUGGESTED_OPTIONS= lame libvpx theora vorbis x264 xvid +PKG_SUPPORTED_OPTIONS= faac lame ass libvpx theora vorbis x264 xvid \ + opencore-amr +PKG_SUGGESTED_OPTIONS= lame ass libvpx theora vorbis x264 xvid #PKG_OPTIONS_OPTIONAL_GROUPS= aac-decoder #PKG_OPTIONS_GROUP.aac-decoder= faac @@ -18,6 +19,17 @@ PKG_SUGGESTED_OPTIONS+= vdpau .include "../../mk/bsd.options.mk" ### +### ass option +### +.if !empty(PKG_OPTIONS:Mass) +USE_TOOLS+= pkg-config +CONFIGURE_ARGS+= --enable-libass +.include "../../multimedia/libass/buildlink3.mk" +.else +CONFIGURE_ARGS+= --disable-libass +.endif + +### ### faac option ### .if !empty(PKG_OPTIONS:Mfaac) diff --git a/multimedia/libass/buildlink3.mk b/multimedia/libass/buildlink3.mk index dd7ce8836ea..d73e62c2065 100644 --- a/multimedia/libass/buildlink3.mk +++ b/multimedia/libass/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2011/07/09 10:24:18 abs Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2012/12/14 21:50:46 cheusov Exp $ BUILDLINK_TREE+= libass @@ -7,6 +7,9 @@ LIBASS_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libass+= libass>=0.9.12 BUILDLINK_PKGSRCDIR.libass?= ../../multimedia/libass + +.include "../../graphics/freetype2/buildlink3.mk" +.include "../../textproc/enca/buildlink3.mk" .endif # LIBASS_BUILDLINK3_MK BUILDLINK_TREE+= -libass |