summaryrefslogtreecommitdiff
path: root/multimedia/ffmpeg2
diff options
context:
space:
mode:
authorleot <leot@pkgsrc.org>2015-10-08 01:02:42 +0000
committerleot <leot@pkgsrc.org>2015-10-08 01:02:42 +0000
commit9fae220813645af31cac6c9c3b8a6393891e5e76 (patch)
treee2b0b97ace6a91ccd5776af0d58460c4b3dff382 /multimedia/ffmpeg2
parent7df3392bc37fae39c4ba260bf392725eba5c378a (diff)
downloadpkgsrc-9fae220813645af31cac6c9c3b8a6393891e5e76.tar.gz
Add fontconfig and freetype options.
From Konrad Schroder, closes PR pkg/50307.
Diffstat (limited to 'multimedia/ffmpeg2')
-rw-r--r--multimedia/ffmpeg2/Makefile3
-rw-r--r--multimedia/ffmpeg2/buildlink3.mk10
-rw-r--r--multimedia/ffmpeg2/options.mk27
3 files changed, 34 insertions, 6 deletions
diff --git a/multimedia/ffmpeg2/Makefile b/multimedia/ffmpeg2/Makefile
index 11ffb6e5567..4f0a3f70095 100644
--- a/multimedia/ffmpeg2/Makefile
+++ b/multimedia/ffmpeg2/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2015/09/09 10:42:41 adam Exp $
+# $NetBSD: Makefile,v 1.19 2015/10/08 01:02:42 leot Exp $
PKGNAME= ${DISTNAME:S/ffmpeg/ffmpeg2/}
+PKGREVISION= 1
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://ffmpeg.mplayerhq.hu/
COMMENT= Decoding, encoding and streaming software (v2.x)
diff --git a/multimedia/ffmpeg2/buildlink3.mk b/multimedia/ffmpeg2/buildlink3.mk
index 5a16197e9db..4f243c506f3 100644
--- a/multimedia/ffmpeg2/buildlink3.mk
+++ b/multimedia/ffmpeg2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2015/06/30 10:02:22 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2015/10/08 01:02:42 leot Exp $
BUILDLINK_TREE+= ffmpeg2
@@ -14,6 +14,14 @@ pkgbase := ffmpeg2
.include "../../mk/bsd.fast.prefs.mk"
+.if !empty(PKG_BUILD_OPTIONS.ffmpeg2:Mfreetype)
+. include "../../graphics/freetype2/buildlink3.mk"
+.endif
+
+.if !empty(PKG_BUILD_OPTIONS.ffmpeg2:Mfontconfig)
+. include "../../fonts/fontconfig/buildlink3.mk"
+.endif
+
.if !empty(PKG_BUILD_OPTIONS.ffmpeg2:Mtheora)
. include "../../multimedia/libtheora/buildlink3.mk"
.endif
diff --git a/multimedia/ffmpeg2/options.mk b/multimedia/ffmpeg2/options.mk
index e4ff01731d4..4258f7aff9e 100644
--- a/multimedia/ffmpeg2/options.mk
+++ b/multimedia/ffmpeg2/options.mk
@@ -1,11 +1,12 @@
-# $NetBSD: options.mk,v 1.7 2015/02/12 08:54:15 adam Exp $
+# $NetBSD: options.mk,v 1.8 2015/10/08 01:02:42 leot Exp $
# Global and legacy options
PKG_OPTIONS_VAR= PKG_OPTIONS.ffmpeg2
-PKG_SUPPORTED_OPTIONS= ass faac fdk-aac gnutls lame libvpx opencore-amr \
- openssl theora vorbis x264 x265 xvid
-PKG_SUGGESTED_OPTIONS= lame ass libvpx theora vorbis x264 xvid
+PKG_SUPPORTED_OPTIONS= ass faac fdk-aac fontconfig freetype gnutls lame \
+ libvpx opencore-amr openssl theora vorbis x264 x265 xvid
+PKG_SUGGESTED_OPTIONS= lame ass freetype fontconfig libvpx theora vorbis x264 \
+ xvid
# Add VDPAU if it is available
.include "../../multimedia/libvdpau/available.mk"
@@ -23,6 +24,24 @@ PKG_SUGGESTED_OPTIONS+= vaapi
.include "../../mk/bsd.options.mk"
+# Fontconfig
+.if !empty(PKG_OPTIONS:Mfontconfig)
+USE_TOOLS+= pkg-config
+CONFIGURE_ARGS+= --enable-fontconfig
+.include "../../fonts/fontconfig/buildlink3.mk"
+.else
+CONFIGURE_ARGS+= --disable-fontconfig
+.endif
+
+# freetype option
+.if !empty(PKG_OPTIONS:Mfreetype)
+USE_TOOLS+= pkg-config
+CONFIGURE_ARGS+= --enable-libfreetype
+.include "../../graphics/freetype2/buildlink3.mk"
+.else
+CONFIGURE_ARGS+= --disable-libfreetype
+.endif
+
# ass option
.if !empty(PKG_OPTIONS:Mass)
USE_TOOLS+= pkg-config