Mon Mar 5 21:17:08 2018 UTC ()
Make use of multimedia/libbluray optional.


(rjs)
diff -r1.27 -r1.28 pkgsrc/multimedia/ffmpeg3/Makefile.common
diff -r1.10 -r1.11 pkgsrc/multimedia/ffmpeg3/options.mk
cvs diff -r1.27 -r1.28 pkgsrc/multimedia/ffmpeg3/Makefile.common (expand / switch to unified diff)

--- pkgsrc/multimedia/ffmpeg3/Makefile.common 2018/02/26 07:40:28 1.27
+++ pkgsrc/multimedia/ffmpeg3/Makefile.common 2018/03/05 21:17:07 1.28
@@ -1,36 +1,35 @@ @@ -1,36 +1,35 @@
1# $NetBSD: Makefile.common,v 1.27 2018/02/26 07:40:28 adam Exp $ 1# $NetBSD: Makefile.common,v 1.28 2018/03/05 21:17:07 rjs Exp $
2# used by multimedia/ffmpeg3/Makefile 2# used by multimedia/ffmpeg3/Makefile
3# used by multimedia/ffplay3/Makefile 3# used by multimedia/ffplay3/Makefile
4 4
5DISTNAME= ffmpeg-3.4.2 5DISTNAME= ffmpeg-3.4.2
6CATEGORIES= multimedia 6CATEGORIES= multimedia
7MASTER_SITES= http://www.ffmpeg.org/releases/ 7MASTER_SITES= http://www.ffmpeg.org/releases/
8EXTRACT_SUFX= .tar.xz 8EXTRACT_SUFX= .tar.xz
9 9
10LICENSE= gnu-lgpl-v2.1 AND gnu-gpl-v2 10LICENSE= gnu-lgpl-v2.1 AND gnu-gpl-v2
11 11
12PATCHDIR= ${.CURDIR}/../../multimedia/ffmpeg3/patches 12PATCHDIR= ${.CURDIR}/../../multimedia/ffmpeg3/patches
13 13
14USE_LANGUAGES= c99 14USE_LANGUAGES= c99
15USE_LIBTOOL= yes 15USE_LIBTOOL= yes
16USE_TOOLS+= gmake pod2man perl 16USE_TOOLS+= gmake pod2man perl
17HAS_CONFIGURE= yes 17HAS_CONFIGURE= yes
18CONFIGURE_ARGS+= --cc=${CC:Q} 18CONFIGURE_ARGS+= --cc=${CC:Q}
19CONFIGURE_ARGS+= --disable-debug 19CONFIGURE_ARGS+= --disable-debug
20CONFIGURE_ARGS+= --disable-optimizations 20CONFIGURE_ARGS+= --disable-optimizations
21CONFIGURE_ARGS+= --disable-stripping 21CONFIGURE_ARGS+= --disable-stripping
22CONFIGURE_ARGS+= --enable-gpl 22CONFIGURE_ARGS+= --enable-gpl
23CONFIGURE_ARGS+= --enable-libbluray 
24CONFIGURE_ARGS+= --enable-libxml2 23CONFIGURE_ARGS+= --enable-libxml2
25CONFIGURE_ARGS+= --enable-pthreads 24CONFIGURE_ARGS+= --enable-pthreads
26CONFIGURE_ARGS+= --enable-shared 25CONFIGURE_ARGS+= --enable-shared
27CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR} 26CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR}
28CONFIGURE_ARGS+= --prefix=${PREFIX} 27CONFIGURE_ARGS+= --prefix=${PREFIX}
29 28
30CONFIGURE_ARGS+= --progs-suffix=3 29CONFIGURE_ARGS+= --progs-suffix=3
31CONFIGURE_ARGS+= --datadir=${PREFIX}/share/ffmpeg3 30CONFIGURE_ARGS+= --datadir=${PREFIX}/share/ffmpeg3
32CONFIGURE_ARGS+= --docdir=${PREFIX}/share/doc/ffmpeg3 31CONFIGURE_ARGS+= --docdir=${PREFIX}/share/doc/ffmpeg3
33CONFIGURE_ARGS+= --incdir=${PREFIX}/include/ffmpeg3 32CONFIGURE_ARGS+= --incdir=${PREFIX}/include/ffmpeg3
34CONFIGURE_ARGS+= --libdir=${PREFIX}/lib/ffmpeg3 33CONFIGURE_ARGS+= --libdir=${PREFIX}/lib/ffmpeg3
35CONFIGURE_ARGS+= --shlibdir=${PREFIX}/lib/ffmpeg3 34CONFIGURE_ARGS+= --shlibdir=${PREFIX}/lib/ffmpeg3
36LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/ffmpeg3 35LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/ffmpeg3
@@ -82,17 +81,16 @@ SUBST_SED.conf= -e 's,/etc/ffserver.con @@ -82,17 +81,16 @@ SUBST_SED.conf= -e 's,/etc/ffserver.con
82SUBST_MESSAGE.conf= Fixing configuration path. 81SUBST_MESSAGE.conf= Fixing configuration path.
83 82
84PLIST_SRC+= ${PKGDIR}/PLIST 83PLIST_SRC+= ${PKGDIR}/PLIST
85 84
86MAKE_ENV+= EXTRA_LIBS=${LIBGETOPT:Q} 85MAKE_ENV+= EXTRA_LIBS=${LIBGETOPT:Q}
87 86
88pre-configure: 87pre-configure:
89 mkdir ${WRKSRC}/tmp 88 mkdir ${WRKSRC}/tmp
90 89
91.include "../../archivers/bzip2/buildlink3.mk" 90.include "../../archivers/bzip2/buildlink3.mk"
92.include "../../archivers/xz/buildlink3.mk" 91.include "../../archivers/xz/buildlink3.mk"
93.include "../../devel/libgetopt/buildlink3.mk" 92.include "../../devel/libgetopt/buildlink3.mk"
94.include "../../devel/zlib/buildlink3.mk" 93.include "../../devel/zlib/buildlink3.mk"
95.include "../../multimedia/libbluray/buildlink3.mk" 
96.include "../../textproc/libxml2/buildlink3.mk" 94.include "../../textproc/libxml2/buildlink3.mk"
97.include "../../mk/pthread.buildlink3.mk" 95.include "../../mk/pthread.buildlink3.mk"
98.include "../../mk/bsd.pkg.mk" 96.include "../../mk/bsd.pkg.mk"
cvs diff -r1.10 -r1.11 pkgsrc/multimedia/ffmpeg3/options.mk (expand / switch to unified diff)

--- pkgsrc/multimedia/ffmpeg3/options.mk 2017/10/18 20:25:41 1.10
+++ pkgsrc/multimedia/ffmpeg3/options.mk 2018/03/05 21:17:07 1.11
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1# $NetBSD: options.mk,v 1.10 2017/10/18 20:25:41 adam Exp $ 1# $NetBSD: options.mk,v 1.11 2018/03/05 21:17:07 rjs Exp $
2 2
3# Global and legacy options 3# Global and legacy options
4 4
5PKG_OPTIONS_VAR= PKG_OPTIONS.ffmpeg3 5PKG_OPTIONS_VAR= PKG_OPTIONS.ffmpeg3
6PKG_SUPPORTED_OPTIONS= ass doc fdk-aac fontconfig freetype gnutls \ 6PKG_SUPPORTED_OPTIONS= ass bluray doc fdk-aac fontconfig freetype gnutls \
7 lame libvpx opencore-amr openssl opus rpi \ 7 lame libvpx opencore-amr openssl opus rpi \
8 rtmp theora vorbis x11 x264 x265 xcb xvid 8 rtmp theora vorbis x11 x264 x265 xcb xvid
9PKG_SUGGESTED_OPTIONS= lame ass freetype fontconfig libvpx openssl \ 9PKG_SUGGESTED_OPTIONS= lame ass bluray freetype fontconfig libvpx openssl \
10 theora vorbis x11 x264 xvid 10 theora vorbis x11 x264 xvid
11 11
12PLIST_VARS+= doc 12PLIST_VARS+= doc
13 13
14# Add VDPAU if it is available 14# Add VDPAU if it is available
15.include "../../multimedia/libvdpau/available.mk" 15.include "../../multimedia/libvdpau/available.mk"
16.if ${VDPAU_AVAILABLE} == "yes" 16.if ${VDPAU_AVAILABLE} == "yes"
17PKG_SUPPORTED_OPTIONS+= vdpau 17PKG_SUPPORTED_OPTIONS+= vdpau
18PKG_SUGGESTED_OPTIONS+= vdpau 18PKG_SUGGESTED_OPTIONS+= vdpau
19.endif 19.endif
20 20
21# Add VAAPI if it is available 21# Add VAAPI if it is available
22.include "../../multimedia/libva/available.mk" 22.include "../../multimedia/libva/available.mk"
@@ -201,13 +201,22 @@ CONFIGURE_ARGS+= --enable-libvpx @@ -201,13 +201,22 @@ CONFIGURE_ARGS+= --enable-libvpx
201CONFIGURE_ARGS+= --disable-libvpx 201CONFIGURE_ARGS+= --disable-libvpx
202.endif 202.endif
203 203
204# X11 screen capture support using libxcb 204# X11 screen capture support using libxcb
205.if !empty(PKG_OPTIONS:Mxcb) 205.if !empty(PKG_OPTIONS:Mxcb)
206CONFIGURE_ARGS+= --enable-libxcb 206CONFIGURE_ARGS+= --enable-libxcb
207CONFIGURE_ARGS+= --enable-libxcb-shape 207CONFIGURE_ARGS+= --enable-libxcb-shape
208CONFIGURE_ARGS+= --enable-libxcb-shm 208CONFIGURE_ARGS+= --enable-libxcb-shm
209CONFIGURE_ARGS+= --enable-libxcb-xfixes 209CONFIGURE_ARGS+= --enable-libxcb-xfixes
210.include "../../x11/libxcb/buildlink3.mk" 210.include "../../x11/libxcb/buildlink3.mk"
211.else 211.else
212CONFIGURE_ARGS+= --disable-libxcb 212CONFIGURE_ARGS+= --disable-libxcb
213.endif 213.endif
 214
 215# Bluray support
 216.if !empty(PKG_OPTIONS:Mbluray)
 217CONFIGURE_ARGS+= --enable-libbluray
 218.include "../../multimedia/libbluray/buildlink3.mk"
 219.else
 220CONFIGURE_ARGS+= --disable-libbluray
 221.endif
 222