Sun Apr 14 01:36:45 2013 UTC ()
Add option "vaapi" and enable it if it is supported.
Explicitely add --enable-vdpau if "vdpau" option is turned on.
++pkgrevision.


(cheusov)
diff -r1.104 -r1.105 pkgsrc/multimedia/ffmpeg/Makefile
diff -r1.27 -r1.28 pkgsrc/multimedia/ffmpeg/options.mk
cvs diff -r1.104 -r1.105 pkgsrc/multimedia/ffmpeg/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/ffmpeg/Attic/Makefile 2013/03/17 15:18:11 1.104
+++ pkgsrc/multimedia/ffmpeg/Attic/Makefile 2013/04/14 01:36:44 1.105
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.104 2013/03/17 15:18:11 wiz Exp $ 1# $NetBSD: Makefile,v 1.105 2013/04/14 01:36:44 cheusov Exp $
2 2
3PKGNAME= ffmpeg-20130315.${DISTVERSION} 3PKGNAME= ffmpeg-20130315.${DISTVERSION}
4 4PKGREVISION= 1
5MAINTAINER= pkgsrc-users@NetBSD.org 5MAINTAINER= pkgsrc-users@NetBSD.org
6HOMEPAGE= http://ffmpeg.mplayerhq.hu/ 6HOMEPAGE= http://ffmpeg.mplayerhq.hu/
7COMMENT= Decoding, encoding and streaming software 7COMMENT= Decoding, encoding and streaming software
8 8
9CONFIGURE_ARGS+= --enable-avfilter 9CONFIGURE_ARGS+= --enable-avfilter
10#CONFIGURE_ARGS+= --enable-avfilter-lavf 10#CONFIGURE_ARGS+= --enable-avfilter-lavf
11CONFIGURE_ARGS+= --enable-postproc 11CONFIGURE_ARGS+= --enable-postproc
12 12
13INSTALLATION_DIRS= lib share/examples/ffmpeg share/doc/ffmpeg 13INSTALLATION_DIRS= lib share/examples/ffmpeg share/doc/ffmpeg
14 14
15CONF_FILES+= ${PREFIX}/share/examples/ffmpeg/ffserver.conf \ 15CONF_FILES+= ${PREFIX}/share/examples/ffmpeg/ffserver.conf \
16 ${PKG_SYSCONFDIR}/ffserver.conf 16 ${PKG_SYSCONFDIR}/ffserver.conf
17 17
cvs diff -r1.27 -r1.28 pkgsrc/multimedia/ffmpeg/Attic/options.mk (expand / switch to unified diff)

--- pkgsrc/multimedia/ffmpeg/Attic/options.mk 2013/03/02 09:57:02 1.27
+++ pkgsrc/multimedia/ffmpeg/Attic/options.mk 2013/04/14 01:36:44 1.28
@@ -1,31 +1,39 @@ @@ -1,31 +1,39 @@
1# $NetBSD: options.mk,v 1.27 2013/03/02 09:57:02 adam Exp $ 1# $NetBSD: options.mk,v 1.28 2013/04/14 01:36:44 cheusov Exp $
2 2
3# Global and legacy options 3# Global and legacy options
4 4
5PKG_OPTIONS_VAR= PKG_OPTIONS.ffmpeg 5PKG_OPTIONS_VAR= PKG_OPTIONS.ffmpeg
6PKG_SUPPORTED_OPTIONS= faac lame ass libvpx theora vorbis x264 xvid \ 6PKG_SUPPORTED_OPTIONS= faac lame ass libvpx theora vorbis x264 xvid \
7 opencore-amr 7 opencore-amr
8PKG_SUGGESTED_OPTIONS= lame ass libvpx theora vorbis x264 xvid 8PKG_SUGGESTED_OPTIONS= lame ass libvpx theora vorbis x264 xvid
9#PKG_OPTIONS_OPTIONAL_GROUPS= aac-decoder 9#PKG_OPTIONS_OPTIONAL_GROUPS= aac-decoder
10#PKG_OPTIONS_GROUP.aac-decoder= faac 10#PKG_OPTIONS_GROUP.aac-decoder= faac
11 11
12### Add vdpau if it is available 12### Add VDPAU if it is available
13.include "../../multimedia/libvdpau/available.mk" 13.include "../../multimedia/libvdpau/available.mk"
14.if ${VDPAU_AVAILABLE} == "yes" 14.if ${VDPAU_AVAILABLE} == "yes"
15PKG_SUPPORTED_OPTIONS+= vdpau 15PKG_SUPPORTED_OPTIONS+= vdpau
16PKG_SUGGESTED_OPTIONS+= vdpau 16PKG_SUGGESTED_OPTIONS+= vdpau
17.endif 17.endif
18 18
 19### Add VAAPI if it is available
 20.include "../../multimedia/libva/available.mk"
 21.if ${VAAPI_AVAILABLE} == "yes"
 22PKG_SUPPORTED_OPTIONS+= vaapi
 23PKG_SUGGESTED_OPTIONS+= vaapi
 24.endif
 25
 26###
19.include "../../mk/bsd.options.mk" 27.include "../../mk/bsd.options.mk"
20 28
21### 29###
22### ass option 30### ass option
23### 31###
24.if !empty(PKG_OPTIONS:Mass) 32.if !empty(PKG_OPTIONS:Mass)
25USE_TOOLS+= pkg-config 33USE_TOOLS+= pkg-config
26CONFIGURE_ARGS+= --enable-libass 34CONFIGURE_ARGS+= --enable-libass
27.include "../../multimedia/libass/buildlink3.mk" 35.include "../../multimedia/libass/buildlink3.mk"
28.else 36.else
29CONFIGURE_ARGS+= --disable-libass 37CONFIGURE_ARGS+= --disable-libass
30.endif 38.endif
31 39
@@ -103,24 +111,38 @@ CONFIGURE_ARGS+= --enable-libxvid @@ -103,24 +111,38 @@ CONFIGURE_ARGS+= --enable-libxvid
103# ABI change between 20090326 and 20100201 111# ABI change between 20090326 and 20100201
104BUILDLINK_API_DEPENDS.x264-devel+= x264-devel>=20111207 112BUILDLINK_API_DEPENDS.x264-devel+= x264-devel>=20111207
105#BUILDLINK_API_DEPENDS.x264-devel+= x264-devel<20110102 113#BUILDLINK_API_DEPENDS.x264-devel+= x264-devel<20110102
106CONFIGURE_ARGS+= --enable-libx264 114CONFIGURE_ARGS+= --enable-libx264
107.include "../../multimedia/x264-devel/buildlink3.mk" 115.include "../../multimedia/x264-devel/buildlink3.mk"
108.else 116.else
109CONFIGURE_ARGS+= --disable-libx264 117CONFIGURE_ARGS+= --disable-libx264
110.endif 118.endif
111 119
112### 120###
113### VDPAU support 121### VDPAU support
114### 122###
115.if !empty(PKG_OPTIONS:Mvdpau) 123.if !empty(PKG_OPTIONS:Mvdpau)
 124CONFIGURE_ARGS+= --enable-vdpau
116.include "../../multimedia/libvdpau/buildlink3.mk" 125.include "../../multimedia/libvdpau/buildlink3.mk"
117.else 126.else
118CONFIGURE_ARGS+= --disable-vdpau 127CONFIGURE_ARGS+= --disable-vdpau
119.endif 128.endif
120 129
 130###
 131### VAAPI support
 132###
 133.if !empty(PKG_OPTIONS:Mvaapi)
 134CONFIGURE_ARGS+= --enable-vaapi
 135.include "../../multimedia/libva/buildlink3.mk"
 136.else
 137CONFIGURE_ARGS+= --disable-vaapi
 138.endif
 139
 140###
 141### VPX support
 142###
121.if !empty(PKG_OPTIONS:Mlibvpx) 143.if !empty(PKG_OPTIONS:Mlibvpx)
122CONFIGURE_ARGS+= --enable-libvpx 144CONFIGURE_ARGS+= --enable-libvpx
123.include "../../multimedia/libvpx/buildlink3.mk" 145.include "../../multimedia/libvpx/buildlink3.mk"
124.else 146.else
125CONFIGURE_ARGS+= --disable-libvpx 147CONFIGURE_ARGS+= --disable-libvpx
126.endif 148.endif