Sat Sep 29 14:25:39 2018 UTC ()
ffmpeg4: pkg-config is needed to find libxml2, so it is always needed

(this fixes ffplay4)


(tnn)
diff -r1.5 -r1.6 pkgsrc/multimedia/ffmpeg4/Makefile.common
diff -r1.3 -r1.4 pkgsrc/multimedia/ffmpeg4/options.mk
cvs diff -r1.5 -r1.6 pkgsrc/multimedia/ffmpeg4/Makefile.common (expand / switch to unified diff)

--- pkgsrc/multimedia/ffmpeg4/Makefile.common 2018/09/25 09:39:56 1.5
+++ pkgsrc/multimedia/ffmpeg4/Makefile.common 2018/09/29 14:25:39 1.6
@@ -1,29 +1,29 @@ @@ -1,29 +1,29 @@
1# $NetBSD: Makefile.common,v 1.5 2018/09/25 09:39:56 wiz Exp $ 1# $NetBSD: Makefile.common,v 1.6 2018/09/29 14:25:39 tnn Exp $
2# used by multimedia/ffmpeg4/Makefile 2# used by multimedia/ffmpeg4/Makefile
3# used by multimedia/ffplay4/Makefile 3# used by multimedia/ffplay4/Makefile
4 4
5DISTNAME= ffmpeg-4.0.2 5DISTNAME= ffmpeg-4.0.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 ${ADDITIONAL_LICENSE} 10LICENSE= gnu-lgpl-v2.1 AND gnu-gpl-v2 ${ADDITIONAL_LICENSE}
11 11
12PATCHDIR= ${.CURDIR}/../../multimedia/ffmpeg4/patches 12PATCHDIR= ${.CURDIR}/../../multimedia/ffmpeg4/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 pkg-config
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-libxml2 23CONFIGURE_ARGS+= --enable-libxml2
24CONFIGURE_ARGS+= --enable-pthreads 24CONFIGURE_ARGS+= --enable-pthreads
25CONFIGURE_ARGS+= --enable-shared 25CONFIGURE_ARGS+= --enable-shared
26CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR} 26CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR}
27CONFIGURE_ARGS+= --prefix=${PREFIX} 27CONFIGURE_ARGS+= --prefix=${PREFIX}
28 28
29CONFIGURE_ARGS+= --progs-suffix=4 29CONFIGURE_ARGS+= --progs-suffix=4
cvs diff -r1.3 -r1.4 pkgsrc/multimedia/ffmpeg4/options.mk (expand / switch to unified diff)

--- pkgsrc/multimedia/ffmpeg4/options.mk 2018/09/25 09:39:56 1.3
+++ pkgsrc/multimedia/ffmpeg4/options.mk 2018/09/29 14:25:39 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.3 2018/09/25 09:39:56 wiz Exp $ 1# $NetBSD: options.mk,v 1.4 2018/09/29 14:25:39 tnn Exp $
2 2
3# Global and legacy options 3# Global and legacy options
4 4
5PKG_OPTIONS_VAR= PKG_OPTIONS.ffmpeg4 5PKG_OPTIONS_VAR= PKG_OPTIONS.ffmpeg4
6PKG_SUPPORTED_OPTIONS= ass bluray 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 rtmp \ 7 lame libvpx opencore-amr openssl opus rpi rtmp \
8 tesseract theora vorbis x11 x264 x265 xcb xvid 8 tesseract theora vorbis x11 x264 x265 xcb xvid
9PKG_SUGGESTED_OPTIONS= lame ass bluray 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
@@ -19,45 +19,42 @@ PKG_SUGGESTED_OPTIONS+= vdpau @@ -19,45 +19,42 @@ PKG_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"
23.if ${VAAPI_AVAILABLE} == "yes" 23.if ${VAAPI_AVAILABLE} == "yes"
24PKG_SUPPORTED_OPTIONS+= vaapi 24PKG_SUPPORTED_OPTIONS+= vaapi
25PKG_SUGGESTED_OPTIONS+= vaapi 25PKG_SUGGESTED_OPTIONS+= vaapi
26.endif 26.endif
27 27
28.include "../../mk/bsd.options.mk" 28.include "../../mk/bsd.options.mk"
29 29
30# Fontconfig 30# Fontconfig
31.if !empty(PKG_OPTIONS:Mfontconfig) 31.if !empty(PKG_OPTIONS:Mfontconfig)
32USE_TOOLS+= pkg-config 
33CONFIGURE_ARGS+= --enable-fontconfig 32CONFIGURE_ARGS+= --enable-fontconfig
34.include "../../fonts/fontconfig/buildlink3.mk" 33.include "../../fonts/fontconfig/buildlink3.mk"
35.else 34.else
36CONFIGURE_ARGS+= --disable-fontconfig 35CONFIGURE_ARGS+= --disable-fontconfig
37.endif 36.endif
38 37
39# freetype option 38# freetype option
40.if !empty(PKG_OPTIONS:Mfreetype) 39.if !empty(PKG_OPTIONS:Mfreetype)
41USE_TOOLS+= pkg-config 
42CONFIGURE_ARGS+= --enable-libfreetype 40CONFIGURE_ARGS+= --enable-libfreetype
43.include "../../graphics/freetype2/buildlink3.mk" 41.include "../../graphics/freetype2/buildlink3.mk"
44.else 42.else
45CONFIGURE_ARGS+= --disable-libfreetype 43CONFIGURE_ARGS+= --disable-libfreetype
46.endif 44.endif
47 45
48# ass option 46# ass option
49.if !empty(PKG_OPTIONS:Mass) 47.if !empty(PKG_OPTIONS:Mass)
50USE_TOOLS+= pkg-config 
51CONFIGURE_ARGS+= --enable-libass 48CONFIGURE_ARGS+= --enable-libass
52.include "../../multimedia/libass/buildlink3.mk" 49.include "../../multimedia/libass/buildlink3.mk"
53.else 50.else
54CONFIGURE_ARGS+= --disable-libass 51CONFIGURE_ARGS+= --disable-libass
55.endif 52.endif
56 53
57# doc option 54# doc option
58.if !empty(PKG_OPTIONS:Mdoc) 55.if !empty(PKG_OPTIONS:Mdoc)
59PLIST.doc= yes 56PLIST.doc= yes
60USE_TOOLS+= texi2html 57USE_TOOLS+= texi2html
61CONFIGURE_ARGS+= --enable-htmlpages 58CONFIGURE_ARGS+= --enable-htmlpages
62.else 59.else
63CONFIGURE_ARGS+= --disable-htmlpages 60CONFIGURE_ARGS+= --disable-htmlpages
@@ -100,27 +97,26 @@ CONFIGURE_ARGS+= --disable-libopencore-a @@ -100,27 +97,26 @@ CONFIGURE_ARGS+= --disable-libopencore-a
100 97
101# OpenSSL support 98# OpenSSL support
102.if !empty(PKG_OPTIONS:Mopenssl) 99.if !empty(PKG_OPTIONS:Mopenssl)
103CONFIGURE_ARGS+= --enable-nonfree 100CONFIGURE_ARGS+= --enable-nonfree
104CONFIGURE_ARGS+= --enable-openssl 101CONFIGURE_ARGS+= --enable-openssl
105.include "../../security/openssl/buildlink3.mk" 102.include "../../security/openssl/buildlink3.mk"
106.else 103.else
107CONFIGURE_ARGS+= --disable-openssl 104CONFIGURE_ARGS+= --disable-openssl
108.endif 105.endif
109 106
110# RTMP support via librtmp 107# RTMP support via librtmp
111.if !empty(PKG_OPTIONS:Mrtmp) 108.if !empty(PKG_OPTIONS:Mrtmp)
112CONFIGURE_ARGS+= --enable-librtmp 109CONFIGURE_ARGS+= --enable-librtmp
113USE_TOOLS+= pkg-config 
114.include "../../net/rtmpdump/buildlink3.mk" 110.include "../../net/rtmpdump/buildlink3.mk"
115.endif 111.endif
116 112
117# OCR filter using Tesseract 113# OCR filter using Tesseract
118.if !empty(PKG_OPTIONS:Mtesseract) 114.if !empty(PKG_OPTIONS:Mtesseract)
119CONFIGURE_ARGS+= --enable-libtesseract 115CONFIGURE_ARGS+= --enable-libtesseract
120.include "../../graphics/tesseract/buildlink3.mk" 116.include "../../graphics/tesseract/buildlink3.mk"
121.else 117.else
122CONFIGURE_ARGS+= --disable-libtesseract 118CONFIGURE_ARGS+= --disable-libtesseract
123.endif 119.endif
124 120
125# OGG Theora support 121# OGG Theora support
126.if !empty(PKG_OPTIONS:Mtheora) 122.if !empty(PKG_OPTIONS:Mtheora)