Wed Oct 18 20:25:41 2017 UTC ()
ffmpeg3: update to 3.4

version 3.4:
- deflicker video filter
- doubleweave video filter
- lumakey video filter
- pixscope video filter
- oscilloscope video filter
- config.log and other configuration files moved into ffbuild/ directory
- update cuvid/nvenc headers to Video Codec SDK 8.0.14
- afir audio filter
- scale_cuda CUDA based video scale filter
- librsvg support for svg rasterization
- crossfeed audio filter
- spec compliant VP9 muxing support in MP4
- remove the libnut muxer/demuxer wrappers
- remove the libschroedinger encoder/decoder wrappers
- surround audio filter
- sofalizer filter switched to libmysofa
- Gremlin Digital Video demuxer and decoder
- headphone audio filter
- superequalizer audio filter
- roberts video filter
- The x86 assembler default switched from yasm to nasm, pass
  --x86asmexe=yasm to configure to restore the old behavior.
- additional frame format support for Interplay MVE movies
- support for decoding through D3D11VA in ffmpeg
- limiter video filter
- libvmaf video filter
- Dolby E decoder and SMPTE 337M demuxer
- unpremultiply video filter
- tlut2 video filter
- floodfill video filter
- pseudocolor video filter
- raw G.726 muxer and demuxer, left- and right-justified
- NewTek NDI input/output device
- Some video filters with several inputs now use a common set of options:
  blend, libvmaf, lut3d, overlay, psnr, ssim.
  They must always be used by name.
- FITS demuxer and decoder
- FITS muxer and encoder
- add --disable-autodetect build switch
- drop deprecated qtkit input device (use avfoundation instead)
- despill video filter
- haas audio filter
- SUP/PGS subtitle muxer
- convolve video filter
- VP9 tile threading support
- KMS screen grabber
- CUDA thumbnail filter
- V4L2 mem2mem HW assisted codecs
- Rockchip MPP hardware decoding
- vmafmotion video filter
- use MIME type "G726" for little-endian G.726, "AAL2-G726" for big-endian G.726


(adam)
diff -r1.21 -r1.22 pkgsrc/multimedia/ffmpeg3/Makefile.common
diff -r1.10 -r1.11 pkgsrc/multimedia/ffmpeg3/PLIST
diff -r1.6 -r1.7 pkgsrc/multimedia/ffmpeg3/buildlink3.mk
diff -r1.22 -r1.23 pkgsrc/multimedia/ffmpeg3/distinfo
diff -r1.9 -r1.10 pkgsrc/multimedia/ffmpeg3/options.mk
diff -r1.2 -r1.3 pkgsrc/multimedia/ffmpeg3/patches/patch-Makefile
diff -r1.4 -r1.5 pkgsrc/multimedia/ffmpeg3/patches/patch-configure
cvs diff -r1.21 -r1.22 pkgsrc/multimedia/ffmpeg3/Makefile.common (expand / switch to unified diff)

--- pkgsrc/multimedia/ffmpeg3/Makefile.common 2017/09/12 06:39:31 1.21
+++ pkgsrc/multimedia/ffmpeg3/Makefile.common 2017/10/18 20:25:41 1.22
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile.common,v 1.21 2017/09/12 06:39:31 adam Exp $ 1# $NetBSD: Makefile.common,v 1.22 2017/10/18 20:25:41 adam 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.3.4 5DISTNAME= ffmpeg-3.4
6CATEGORIES= multimedia 6CATEGORIES= multimedia
7MASTER_SITES= http://www.ffmpeg.org/releases/ 7MASTER_SITES= http://www.ffmpeg.org/releases/
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
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}
@@ -58,27 +58,27 @@ CONFIGURE_ENV+= TMPDIR=${WRKSRC}/tmp @@ -58,27 +58,27 @@ CONFIGURE_ENV+= TMPDIR=${WRKSRC}/tmp
58.include "../../mk/compiler.mk" 58.include "../../mk/compiler.mk"
59 59
60.if ${OPSYS} == "SunOS" && empty(CC_VERSION:Mgcc*) 60.if ${OPSYS} == "SunOS" && empty(CC_VERSION:Mgcc*)
61SUBST_CLASSES+= sunwspro 61SUBST_CLASSES+= sunwspro
62SUBST_MESSAGE.sunwspro= Fixing compiler options for SunStudio C compiler. 62SUBST_MESSAGE.sunwspro= Fixing compiler options for SunStudio C compiler.
63SUBST_STAGE.sunwspro= post-configure 63SUBST_STAGE.sunwspro= post-configure
64SUBST_FILES.sunwspro= config.mak 64SUBST_FILES.sunwspro= config.mak
65SUBST_SED.sunwspro= -e "s/-O /-KPIC -DPIC /" 65SUBST_SED.sunwspro= -e "s/-O /-KPIC -DPIC /"
66SUBST_SED.sunwspro+= -e "s/-O3/-xO2/g" 66SUBST_SED.sunwspro+= -e "s/-O3/-xO2/g"
67SUBST_SED.sunwspro+= -e "s/-std=c99/-xc99=all/" 67SUBST_SED.sunwspro+= -e "s/-std=c99/-xc99=all/"
68SUBST_SED.sunwspro+= -e "s/-Wl,-rpath-link,/-L /g" 68SUBST_SED.sunwspro+= -e "s/-Wl,-rpath-link,/-L /g"
69.endif 69.endif
70 70
71BUILD_DEPENDS+= yasm>=0.7.2:../../devel/yasm 71BUILD_DEPENDS+= nasm>=2.13:../../devel/nasm
72 72
73REPLACE_PERL+= doc/texi2pod.pl 73REPLACE_PERL+= doc/texi2pod.pl
74REPLACE_SH+= configure version.sh 74REPLACE_SH+= configure version.sh
75 75
76SUBST_CLASSES+= conf 76SUBST_CLASSES+= conf
77SUBST_STAGE.conf= post-patch 77SUBST_STAGE.conf= post-patch
78SUBST_FILES.conf= ffserver.c 78SUBST_FILES.conf= ffserver.c
79SUBST_SED.conf= -e 's,/etc/ffserver.conf,${PKG_SYSCONFDIR}/ffserver.conf,g' 79SUBST_SED.conf= -e 's,/etc/ffserver.conf,${PKG_SYSCONFDIR}/ffserver.conf,g'
80SUBST_MESSAGE.conf= Fixing configuration path. 80SUBST_MESSAGE.conf= Fixing configuration path.
81 81
82PLIST_SRC+= ${PKGDIR}/PLIST 82PLIST_SRC+= ${PKGDIR}/PLIST
83 83
84MAKE_ENV+= EXTRA_LIBS=${LIBGETOPT:Q} 84MAKE_ENV+= EXTRA_LIBS=${LIBGETOPT:Q}
cvs diff -r1.10 -r1.11 pkgsrc/multimedia/ffmpeg3/PLIST (expand / switch to unified diff)

--- pkgsrc/multimedia/ffmpeg3/PLIST 2017/07/22 12:29:00 1.10
+++ pkgsrc/multimedia/ffmpeg3/PLIST 2017/10/18 20:25:41 1.11
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.10 2017/07/22 12:29:00 adam Exp $ 1@comment $NetBSD: PLIST,v 1.11 2017/10/18 20:25:41 adam Exp $
2bin/ffmpeg3 2bin/ffmpeg3
3bin/ffprobe3 3bin/ffprobe3
4bin/ffserver3 4bin/ffserver3
5include/ffmpeg3/libavcodec/avcodec.h 5include/ffmpeg3/libavcodec/avcodec.h
6include/ffmpeg3/libavcodec/avdct.h 6include/ffmpeg3/libavcodec/avdct.h
7include/ffmpeg3/libavcodec/avfft.h 7include/ffmpeg3/libavcodec/avfft.h
8include/ffmpeg3/libavcodec/d3d11va.h 8include/ffmpeg3/libavcodec/d3d11va.h
9include/ffmpeg3/libavcodec/dirac.h 9include/ffmpeg3/libavcodec/dirac.h
10include/ffmpeg3/libavcodec/dv_profile.h 10include/ffmpeg3/libavcodec/dv_profile.h
11include/ffmpeg3/libavcodec/dxva2.h 11include/ffmpeg3/libavcodec/dxva2.h
12include/ffmpeg3/libavcodec/jni.h 12include/ffmpeg3/libavcodec/jni.h
13include/ffmpeg3/libavcodec/mediacodec.h 13include/ffmpeg3/libavcodec/mediacodec.h
14include/ffmpeg3/libavcodec/qsv.h 14include/ffmpeg3/libavcodec/qsv.h
@@ -55,30 +55,33 @@ include/ffmpeg3/libavutil/des.h @@ -55,30 +55,33 @@ include/ffmpeg3/libavutil/des.h
55include/ffmpeg3/libavutil/dict.h 55include/ffmpeg3/libavutil/dict.h
56include/ffmpeg3/libavutil/display.h 56include/ffmpeg3/libavutil/display.h
57include/ffmpeg3/libavutil/downmix_info.h 57include/ffmpeg3/libavutil/downmix_info.h
58include/ffmpeg3/libavutil/error.h 58include/ffmpeg3/libavutil/error.h
59include/ffmpeg3/libavutil/eval.h 59include/ffmpeg3/libavutil/eval.h
60include/ffmpeg3/libavutil/ffversion.h 60include/ffmpeg3/libavutil/ffversion.h
61include/ffmpeg3/libavutil/fifo.h 61include/ffmpeg3/libavutil/fifo.h
62include/ffmpeg3/libavutil/file.h 62include/ffmpeg3/libavutil/file.h
63include/ffmpeg3/libavutil/frame.h 63include/ffmpeg3/libavutil/frame.h
64include/ffmpeg3/libavutil/hash.h 64include/ffmpeg3/libavutil/hash.h
65include/ffmpeg3/libavutil/hmac.h 65include/ffmpeg3/libavutil/hmac.h
66include/ffmpeg3/libavutil/hwcontext.h 66include/ffmpeg3/libavutil/hwcontext.h
67include/ffmpeg3/libavutil/hwcontext_cuda.h 67include/ffmpeg3/libavutil/hwcontext_cuda.h
 68include/ffmpeg3/libavutil/hwcontext_d3d11va.h
 69include/ffmpeg3/libavutil/hwcontext_drm.h
68include/ffmpeg3/libavutil/hwcontext_dxva2.h 70include/ffmpeg3/libavutil/hwcontext_dxva2.h
69include/ffmpeg3/libavutil/hwcontext_qsv.h 71include/ffmpeg3/libavutil/hwcontext_qsv.h
70include/ffmpeg3/libavutil/hwcontext_vaapi.h 72include/ffmpeg3/libavutil/hwcontext_vaapi.h
71include/ffmpeg3/libavutil/hwcontext_vdpau.h 73include/ffmpeg3/libavutil/hwcontext_vdpau.h
 74include/ffmpeg3/libavutil/hwcontext_videotoolbox.h
72include/ffmpeg3/libavutil/imgutils.h 75include/ffmpeg3/libavutil/imgutils.h
73include/ffmpeg3/libavutil/intfloat.h 76include/ffmpeg3/libavutil/intfloat.h
74include/ffmpeg3/libavutil/intreadwrite.h 77include/ffmpeg3/libavutil/intreadwrite.h
75include/ffmpeg3/libavutil/lfg.h 78include/ffmpeg3/libavutil/lfg.h
76include/ffmpeg3/libavutil/log.h 79include/ffmpeg3/libavutil/log.h
77include/ffmpeg3/libavutil/lzo.h 80include/ffmpeg3/libavutil/lzo.h
78include/ffmpeg3/libavutil/macros.h 81include/ffmpeg3/libavutil/macros.h
79include/ffmpeg3/libavutil/mastering_display_metadata.h 82include/ffmpeg3/libavutil/mastering_display_metadata.h
80include/ffmpeg3/libavutil/mathematics.h 83include/ffmpeg3/libavutil/mathematics.h
81include/ffmpeg3/libavutil/md5.h 84include/ffmpeg3/libavutil/md5.h
82include/ffmpeg3/libavutil/mem.h 85include/ffmpeg3/libavutil/mem.h
83include/ffmpeg3/libavutil/motion_vector.h 86include/ffmpeg3/libavutil/motion_vector.h
84include/ffmpeg3/libavutil/murmur3.h 87include/ffmpeg3/libavutil/murmur3.h
@@ -106,59 +109,59 @@ include/ffmpeg3/libavutil/timestamp.h @@ -106,59 +109,59 @@ include/ffmpeg3/libavutil/timestamp.h
106include/ffmpeg3/libavutil/tree.h 109include/ffmpeg3/libavutil/tree.h
107include/ffmpeg3/libavutil/twofish.h 110include/ffmpeg3/libavutil/twofish.h
108include/ffmpeg3/libavutil/version.h 111include/ffmpeg3/libavutil/version.h
109include/ffmpeg3/libavutil/xtea.h 112include/ffmpeg3/libavutil/xtea.h
110include/ffmpeg3/libpostproc/postprocess.h 113include/ffmpeg3/libpostproc/postprocess.h
111include/ffmpeg3/libpostproc/version.h 114include/ffmpeg3/libpostproc/version.h
112include/ffmpeg3/libswresample/swresample.h 115include/ffmpeg3/libswresample/swresample.h
113include/ffmpeg3/libswresample/version.h 116include/ffmpeg3/libswresample/version.h
114include/ffmpeg3/libswscale/swscale.h 117include/ffmpeg3/libswscale/swscale.h
115include/ffmpeg3/libswscale/version.h 118include/ffmpeg3/libswscale/version.h
116lib/ffmpeg3/libavcodec.a 119lib/ffmpeg3/libavcodec.a
117lib/ffmpeg3/libavcodec.so 120lib/ffmpeg3/libavcodec.so
118lib/ffmpeg3/libavcodec.so.57 121lib/ffmpeg3/libavcodec.so.57
119lib/ffmpeg3/libavcodec.so.57.89.100 122lib/ffmpeg3/libavcodec.so.57.107.100
120lib/ffmpeg3/libavdevice.a 123lib/ffmpeg3/libavdevice.a
121lib/ffmpeg3/libavdevice.so 124lib/ffmpeg3/libavdevice.so
122lib/ffmpeg3/libavdevice.so.57 125lib/ffmpeg3/libavdevice.so.57
123lib/ffmpeg3/libavdevice.so.57.6.100 126lib/ffmpeg3/libavdevice.so.57.10.100
124lib/ffmpeg3/libavfilter.a 127lib/ffmpeg3/libavfilter.a
125lib/ffmpeg3/libavfilter.so 128lib/ffmpeg3/libavfilter.so
126lib/ffmpeg3/libavfilter.so.6 129lib/ffmpeg3/libavfilter.so.6
127lib/ffmpeg3/libavfilter.so.6.82.100 130lib/ffmpeg3/libavfilter.so.6.107.100
128lib/ffmpeg3/libavformat.a 131lib/ffmpeg3/libavformat.a
129lib/ffmpeg3/libavformat.so 132lib/ffmpeg3/libavformat.so
130lib/ffmpeg3/libavformat.so.57 133lib/ffmpeg3/libavformat.so.57
131lib/ffmpeg3/libavformat.so.57.71.100 134lib/ffmpeg3/libavformat.so.57.83.100
132lib/ffmpeg3/libavresample.a 135lib/ffmpeg3/libavresample.a
133lib/ffmpeg3/libavresample.so 136lib/ffmpeg3/libavresample.so
134lib/ffmpeg3/libavresample.so.3 137lib/ffmpeg3/libavresample.so.3
135lib/ffmpeg3/libavresample.so.3.5.0 138lib/ffmpeg3/libavresample.so.3.7.0
136lib/ffmpeg3/libavutil.a 139lib/ffmpeg3/libavutil.a
137lib/ffmpeg3/libavutil.so 140lib/ffmpeg3/libavutil.so
138lib/ffmpeg3/libavutil.so.55 141lib/ffmpeg3/libavutil.so.55
139lib/ffmpeg3/libavutil.so.55.58.100 142lib/ffmpeg3/libavutil.so.55.78.100
140lib/ffmpeg3/libpostproc.a 143lib/ffmpeg3/libpostproc.a
141lib/ffmpeg3/libpostproc.so 144lib/ffmpeg3/libpostproc.so
142lib/ffmpeg3/libpostproc.so.54 145lib/ffmpeg3/libpostproc.so.54
143lib/ffmpeg3/libpostproc.so.54.5.100 146lib/ffmpeg3/libpostproc.so.54.7.100
144lib/ffmpeg3/libswresample.a 147lib/ffmpeg3/libswresample.a
145lib/ffmpeg3/libswresample.so 148lib/ffmpeg3/libswresample.so
146lib/ffmpeg3/libswresample.so.2 149lib/ffmpeg3/libswresample.so.2
147lib/ffmpeg3/libswresample.so.2.7.100 150lib/ffmpeg3/libswresample.so.2.9.100
148lib/ffmpeg3/libswscale.a 151lib/ffmpeg3/libswscale.a
149lib/ffmpeg3/libswscale.so 152lib/ffmpeg3/libswscale.so
150lib/ffmpeg3/libswscale.so.4 153lib/ffmpeg3/libswscale.so.4
151lib/ffmpeg3/libswscale.so.4.6.100 154lib/ffmpeg3/libswscale.so.4.8.100
152lib/ffmpeg3/pkgconfig/libavcodec.pc 155lib/ffmpeg3/pkgconfig/libavcodec.pc
153lib/ffmpeg3/pkgconfig/libavdevice.pc 156lib/ffmpeg3/pkgconfig/libavdevice.pc
154lib/ffmpeg3/pkgconfig/libavfilter.pc 157lib/ffmpeg3/pkgconfig/libavfilter.pc
155lib/ffmpeg3/pkgconfig/libavformat.pc 158lib/ffmpeg3/pkgconfig/libavformat.pc
156lib/ffmpeg3/pkgconfig/libavresample.pc 159lib/ffmpeg3/pkgconfig/libavresample.pc
157lib/ffmpeg3/pkgconfig/libavutil.pc 160lib/ffmpeg3/pkgconfig/libavutil.pc
158lib/ffmpeg3/pkgconfig/libpostproc.pc 161lib/ffmpeg3/pkgconfig/libpostproc.pc
159lib/ffmpeg3/pkgconfig/libswresample.pc 162lib/ffmpeg3/pkgconfig/libswresample.pc
160lib/ffmpeg3/pkgconfig/libswscale.pc 163lib/ffmpeg3/pkgconfig/libswscale.pc
161man/man1/ffmpeg-all3.1 164man/man1/ffmpeg-all3.1
162man/man1/ffmpeg-bitstream-filters3.1 165man/man1/ffmpeg-bitstream-filters3.1
163man/man1/ffmpeg-codecs3.1 166man/man1/ffmpeg-codecs3.1
164man/man1/ffmpeg-devices3.1 167man/man1/ffmpeg-devices3.1
@@ -213,42 +216,44 @@ ${PLIST.doc}share/doc/ffmpeg3/libavforma @@ -213,42 +216,44 @@ ${PLIST.doc}share/doc/ffmpeg3/libavforma
213${PLIST.doc}share/doc/ffmpeg3/libavutil.html 216${PLIST.doc}share/doc/ffmpeg3/libavutil.html
214${PLIST.doc}share/doc/ffmpeg3/libswresample.html 217${PLIST.doc}share/doc/ffmpeg3/libswresample.html
215${PLIST.doc}share/doc/ffmpeg3/libswscale.html 218${PLIST.doc}share/doc/ffmpeg3/libswscale.html
216share/doc/ffmpeg3/mips.txt 219share/doc/ffmpeg3/mips.txt
217share/doc/ffmpeg3/multithreading.txt 220share/doc/ffmpeg3/multithreading.txt
218${PLIST.doc}share/doc/ffmpeg3/nut.html 221${PLIST.doc}share/doc/ffmpeg3/nut.html
219share/doc/ffmpeg3/optimization.txt 222share/doc/ffmpeg3/optimization.txt
220${PLIST.doc}share/doc/ffmpeg3/platform.html 223${PLIST.doc}share/doc/ffmpeg3/platform.html
221share/doc/ffmpeg3/rate_distortion.txt 224share/doc/ffmpeg3/rate_distortion.txt
222share/doc/ffmpeg3/snow.txt 225share/doc/ffmpeg3/snow.txt
223share/doc/ffmpeg3/swresample.txt 226share/doc/ffmpeg3/swresample.txt
224share/doc/ffmpeg3/swscale.txt 227share/doc/ffmpeg3/swscale.txt
225share/doc/ffmpeg3/tablegen.txt 228share/doc/ffmpeg3/tablegen.txt
 229share/doc/ffmpeg3/undefined.txt
226share/doc/ffmpeg3/writing_filters.txt 230share/doc/ffmpeg3/writing_filters.txt
227share/examples/ffmpeg3/ffserver.conf 231share/examples/ffmpeg3/ffserver.conf
228share/ffmpeg3/examples/Makefile 232share/ffmpeg3/examples/Makefile
229share/ffmpeg3/examples/README 233share/ffmpeg3/examples/README
230share/ffmpeg3/examples/avio_dir_cmd.c 234share/ffmpeg3/examples/avio_dir_cmd.c
231share/ffmpeg3/examples/avio_reading.c 235share/ffmpeg3/examples/avio_reading.c
232share/ffmpeg3/examples/decode_audio.c 236share/ffmpeg3/examples/decode_audio.c
233share/ffmpeg3/examples/decode_video.c 237share/ffmpeg3/examples/decode_video.c
234share/ffmpeg3/examples/demuxing_decoding.c 238share/ffmpeg3/examples/demuxing_decoding.c
235share/ffmpeg3/examples/encode_audio.c 239share/ffmpeg3/examples/encode_audio.c
236share/ffmpeg3/examples/encode_video.c 240share/ffmpeg3/examples/encode_video.c
237share/ffmpeg3/examples/extract_mvs.c 241share/ffmpeg3/examples/extract_mvs.c
238share/ffmpeg3/examples/filter_audio.c 242share/ffmpeg3/examples/filter_audio.c
239share/ffmpeg3/examples/filtering_audio.c 243share/ffmpeg3/examples/filtering_audio.c
240share/ffmpeg3/examples/filtering_video.c 244share/ffmpeg3/examples/filtering_video.c
241share/ffmpeg3/examples/http_multiclient.c 245share/ffmpeg3/examples/http_multiclient.c
 246share/ffmpeg3/examples/hw_decode.c
242share/ffmpeg3/examples/metadata.c 247share/ffmpeg3/examples/metadata.c
243share/ffmpeg3/examples/muxing.c 248share/ffmpeg3/examples/muxing.c
244share/ffmpeg3/examples/qsvdec.c 249share/ffmpeg3/examples/qsvdec.c
245share/ffmpeg3/examples/remuxing.c 250share/ffmpeg3/examples/remuxing.c
246share/ffmpeg3/examples/resampling_audio.c 251share/ffmpeg3/examples/resampling_audio.c
247share/ffmpeg3/examples/scaling_video.c 252share/ffmpeg3/examples/scaling_video.c
248share/ffmpeg3/examples/transcode_aac.c 253share/ffmpeg3/examples/transcode_aac.c
249share/ffmpeg3/examples/transcoding.c 254share/ffmpeg3/examples/transcoding.c
250share/ffmpeg3/ffprobe.xsd 255share/ffmpeg3/ffprobe.xsd
251share/ffmpeg3/libvpx-1080p.ffpreset 256share/ffmpeg3/libvpx-1080p.ffpreset
252share/ffmpeg3/libvpx-1080p50_60.ffpreset 257share/ffmpeg3/libvpx-1080p50_60.ffpreset
253share/ffmpeg3/libvpx-360p.ffpreset 258share/ffmpeg3/libvpx-360p.ffpreset
254share/ffmpeg3/libvpx-720p.ffpreset 259share/ffmpeg3/libvpx-720p.ffpreset
cvs diff -r1.6 -r1.7 pkgsrc/multimedia/ffmpeg3/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/multimedia/ffmpeg3/buildlink3.mk 2017/02/24 21:48:08 1.6
+++ pkgsrc/multimedia/ffmpeg3/buildlink3.mk 2017/10/18 20:25:41 1.7
@@ -1,26 +1,26 @@ @@ -1,26 +1,26 @@
1# $NetBSD: buildlink3.mk,v 1.6 2017/02/24 21:48:08 maya Exp $ 1# $NetBSD: buildlink3.mk,v 1.7 2017/10/18 20:25:41 adam Exp $
2 2
3BUILDLINK_TREE+= ffmpeg3 3BUILDLINK_TREE+= ffmpeg3
4 4
5.if !defined(FFMPEG3_BUILDLINK3_MK) 5.if !defined(FFMPEG3_BUILDLINK3_MK)
6FFMPEG3_BUILDLINK3_MK:= 6FFMPEG3_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.ffmpeg3+= ffmpeg3>=3.0 8BUILDLINK_API_DEPENDS.ffmpeg3+= ffmpeg3>=3.0
9BUILDLINK_ABI_DEPENDS.ffmpeg3+= ffmpeg3>=3.2.2nb1 9BUILDLINK_ABI_DEPENDS.ffmpeg3+= ffmpeg3>=3.2.2nb1
10BUILDLINK_PKGSRCDIR.ffmpeg3?= ../../multimedia/ffmpeg3 10BUILDLINK_PKGSRCDIR.ffmpeg3?= ../../multimedia/ffmpeg3
11 11
12pkgbase := ffmpeg3 12pkgbase := ffmpeg3
13. include "../../mk/pkg-build-options.mk" 13.include "../../mk/pkg-build-options.mk"
14 14
15.include "../../mk/bsd.fast.prefs.mk" 15.include "../../mk/bsd.fast.prefs.mk"
16 16
17.if !empty(PKG_BUILD_OPTIONS.ffmpeg3:Mfreetype) 17.if !empty(PKG_BUILD_OPTIONS.ffmpeg3:Mfreetype)
18. include "../../graphics/freetype2/buildlink3.mk" 18. include "../../graphics/freetype2/buildlink3.mk"
19.endif 19.endif
20 20
21.if !empty(PKG_BUILD_OPTIONS.ffmpeg3:Mfontconfig) 21.if !empty(PKG_BUILD_OPTIONS.ffmpeg3:Mfontconfig)
22. include "../../fonts/fontconfig/buildlink3.mk" 22. include "../../fonts/fontconfig/buildlink3.mk"
23.endif 23.endif
24 24
25.if !empty(PKG_BUILD_OPTIONS.ffmpeg3:Mtheora) 25.if !empty(PKG_BUILD_OPTIONS.ffmpeg3:Mtheora)
26. include "../../multimedia/libtheora/buildlink3.mk" 26. include "../../multimedia/libtheora/buildlink3.mk"
cvs diff -r1.22 -r1.23 pkgsrc/multimedia/ffmpeg3/distinfo (expand / switch to unified diff)

--- pkgsrc/multimedia/ffmpeg3/distinfo 2017/09/12 06:39:31 1.22
+++ pkgsrc/multimedia/ffmpeg3/distinfo 2017/10/18 20:25:41 1.23
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1$NetBSD: distinfo,v 1.22 2017/09/12 06:39:31 adam Exp $ 1$NetBSD: distinfo,v 1.23 2017/10/18 20:25:41 adam Exp $
2 2
3SHA1 (ffmpeg-3.3.4.tar.bz2) = 6cf8f6d927d705b1844f601d93dd4036bd8d5b5d 3SHA1 (ffmpeg-3.4.tar.bz2) = 6cfb7f4549a5b2dce6a8442ce16c76739c09dd6d
4RMD160 (ffmpeg-3.3.4.tar.bz2) = 652ce9876a21b68e7da76b47debb8c39b542a461 4RMD160 (ffmpeg-3.4.tar.bz2) = ea510945e0d28f7df27a22b00bd68e85ee093414
5SHA512 (ffmpeg-3.3.4.tar.bz2) = d2257a71f9ae7856390b807d70bf643d4360fe4f2ad7c76af3ac5332cda353a1a543cdcdea0c510dbb6141f7a3a36ffbf26ae87b0ffc9ce4b3b7641814a40e3a 5SHA512 (ffmpeg-3.4.tar.bz2) = 43a8825140efdd41e2dd53fb0475adeb74e003842690cbc189aea0f1af696eec675951db30f9742d063f4e31ae6883256bdceaf2cc73d1dab0d144f72a0741e0
6Size (ffmpeg-3.3.4.tar.bz2) = 9944256 bytes 6Size (ffmpeg-3.4.tar.bz2) = 10171702 bytes
7SHA1 (patch-Makefile) = acbb261efbb87e0ddacb827b3484033180b9fb83 7SHA1 (patch-Makefile) = 0c35f53878b0420aeea49d8ccb249279e705eb40
8SHA1 (patch-configure) = 9ab46d77e8368011d098de3fae36127cdbfd6627 8SHA1 (patch-configure) = ed50009ff973844427af7b5720af6493ebfce298
9SHA1 (patch-doc_Makefile) = 50ee7aaf74f8a5c439b11f141b5408322659543a 9SHA1 (patch-doc_Makefile) = 50ee7aaf74f8a5c439b11f141b5408322659543a
10SHA1 (patch-libavutil_common.h) = d0f1093bc82567807b39dde990ee347f90a082c9 10SHA1 (patch-libavutil_common.h) = d0f1093bc82567807b39dde990ee347f90a082c9
11SHA1 (patch-libavutil_x86_asm.h) = 8f48f9e8ec08b5176bb40fc0021f3bb913dbef22 11SHA1 (patch-libavutil_x86_asm.h) = 8f48f9e8ec08b5176bb40fc0021f3bb913dbef22
12SHA1 (patch-libavutil_x86_cpu.c) = 9c97e68fde0fcb19741e034a803d509040ea4487 12SHA1 (patch-libavutil_x86_cpu.c) = 9c97e68fde0fcb19741e034a803d509040ea4487
cvs diff -r1.9 -r1.10 pkgsrc/multimedia/ffmpeg3/options.mk (expand / switch to unified diff)

--- pkgsrc/multimedia/ffmpeg3/options.mk 2017/10/03 12:39:42 1.9
+++ pkgsrc/multimedia/ffmpeg3/options.mk 2017/10/18 20:25:41 1.10
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.9 2017/10/03 12:39:42 wiz Exp $ 1# $NetBSD: options.mk,v 1.10 2017/10/18 20:25:41 adam 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 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 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
@@ -131,34 +131,36 @@ CONFIGURE_ARGS+= --enable-libvorbis @@ -131,34 +131,36 @@ CONFIGURE_ARGS+= --enable-libvorbis
131BUILDLINK_ABI_DEPENDS.lame+= lame>=3.98.2nb1 131BUILDLINK_ABI_DEPENDS.lame+= lame>=3.98.2nb1
132CONFIGURE_ARGS+= --enable-libmp3lame 132CONFIGURE_ARGS+= --enable-libmp3lame
133.include "../../audio/lame/buildlink3.mk" 133.include "../../audio/lame/buildlink3.mk"
134.endif 134.endif
135 135
136# OPUS support 136# OPUS support
137.if !empty(PKG_OPTIONS:Mopus) 137.if !empty(PKG_OPTIONS:Mopus)
138CONFIGURE_ARGS+= --enable-libopus 138CONFIGURE_ARGS+= --enable-libopus
139.include "../../audio/libopus/buildlink3.mk" 139.include "../../audio/libopus/buildlink3.mk"
140.endif 140.endif
141 141
142# Raspberry Pi support 142# Raspberry Pi support
143.if !empty(PKG_OPTIONS:Mrpi) 143.if !empty(PKG_OPTIONS:Mrpi)
144.include "../../misc/raspberrypi-userland/buildlink3.mk" 144CONFIGURE_ARGS+= --disable-xvmc
 145CONFIGURE_ARGS+= --enable-omx-rpi
 146CONFIGURE_ARGS+= --enable-mmal
145SUBST_CLASSES+= vc 147SUBST_CLASSES+= vc
146SUBST_STAGE.vc= pre-configure 148SUBST_STAGE.vc= pre-configure
147SUBST_MESSAGE.vc= Fixing path to VideoCore libraries. 149SUBST_MESSAGE.vc= Fixing path to VideoCore libraries.
148SUBST_FILES.vc= configure 150SUBST_FILES.vc= configure
149SUBST_SED.vc+= -e 's;-isystem/opt/vc;-I${PREFIX};g' 151SUBST_SED.vc+= -e 's;-isystem/opt/vc;-I${PREFIX};g'
150SUBST_SED.vc+= -e 's;/opt/vc;${PREFIX};g' 152SUBST_SED.vc+= -e 's;/opt/vc;${PREFIX};g'
151CONFIGURE_ARGS+= --enable-omx-rpi --enable-mmal --disable-xvmc 153.include "../../misc/raspberrypi-userland/buildlink3.mk"
152.endif 154.endif
153 155
154# XviD support 156# XviD support
155.if !empty(PKG_OPTIONS:Mxvid) 157.if !empty(PKG_OPTIONS:Mxvid)
156CONFIGURE_ARGS+= --enable-libxvid 158CONFIGURE_ARGS+= --enable-libxvid
157.include "../../multimedia/xvidcore/buildlink3.mk" 159.include "../../multimedia/xvidcore/buildlink3.mk"
158.endif 160.endif
159 161
160# x264 support 162# x264 support
161.if !empty(PKG_OPTIONS:Mx264) 163.if !empty(PKG_OPTIONS:Mx264)
162# ABI change between 20090326 and 20100201 164# ABI change between 20090326 and 20100201
163BUILDLINK_API_DEPENDS.x264-devel+= x264-devel>=20111207 165BUILDLINK_API_DEPENDS.x264-devel+= x264-devel>=20111207
164CONFIGURE_ARGS+= --enable-libx264 166CONFIGURE_ARGS+= --enable-libx264
cvs diff -r1.2 -r1.3 pkgsrc/multimedia/ffmpeg3/patches/patch-Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/ffmpeg3/patches/patch-Makefile 2017/05/17 15:28:51 1.2
+++ pkgsrc/multimedia/ffmpeg3/patches/patch-Makefile 2017/10/18 20:25:41 1.3
@@ -1,17 +1,15 @@ @@ -1,17 +1,15 @@
1$NetBSD: patch-Makefile,v 1.2 2017/05/17 15:28:51 he Exp $ 1$NetBSD: patch-Makefile,v 1.3 2017/10/18 20:25:41 adam Exp $
2 2
3Do "install -c". 3Do "install -c".
4 4
5--- Makefile.orig 2016-01-15 16:58:32.000000000 +0000 5--- Makefile.orig 2017-10-15 15:59:36.000000000 +0000
6+++ Makefile 6+++ Makefile
7@@ -159,8 +159,8 @@ install-progs: install-progs-yes $(AVPRO 7@@ -126,7 +126,7 @@ install-libs: install-libs-yes
8  8
9 install-data: $(DATA_FILES) $(EXAMPLES_FILES) 9 install-data: $(DATA_FILES)
10 $(Q)mkdir -p "$(DATADIR)/examples" 10 $(Q)mkdir -p "$(DATADIR)"
11- $(INSTALL) -m 644 $(DATA_FILES) "$(DATADIR)" 11- $(INSTALL) -m 644 $(DATA_FILES) "$(DATADIR)"
12- $(INSTALL) -m 644 $(EXAMPLES_FILES) "$(DATADIR)/examples" 
13+ $(INSTALL) -c -m 644 $(DATA_FILES) "$(DATADIR)" 12+ $(INSTALL) -c -m 644 $(DATA_FILES) "$(DATADIR)"
14+ $(INSTALL) -c -m 644 $(EXAMPLES_FILES) "$(DATADIR)/examples" 
15  13
16 uninstall: uninstall-libs uninstall-headers uninstall-progs uninstall-data 14 uninstall: uninstall-libs uninstall-headers uninstall-data
17  15
cvs diff -r1.4 -r1.5 pkgsrc/multimedia/ffmpeg3/patches/patch-configure (expand / switch to unified diff)

--- pkgsrc/multimedia/ffmpeg3/patches/patch-configure 2017/05/17 15:28:51 1.4
+++ pkgsrc/multimedia/ffmpeg3/patches/patch-configure 2017/10/18 20:25:41 1.5
@@ -1,44 +1,35 @@ @@ -1,44 +1,35 @@
1$NetBSD: patch-configure,v 1.4 2017/05/17 15:28:51 he Exp $ 1$NetBSD: patch-configure,v 1.5 2017/10/18 20:25:41 adam Exp $
2 2
3Enable PIC on non-i386 NetBSD. 3Enable PIC on non-i386 NetBSD.
4 4
5--- configure.orig 2016-10-27 16:17:39.000000000 +0000 5--- configure.orig 2017-10-15 15:59:36.000000000 +0000
6+++ configure 6+++ configure
7@@ -4676,6 +4676,11 @@ case $target_os in 7@@ -4939,6 +4939,11 @@ case $target_os in
8 ;; 8 ;;
9 netbsd) 9 netbsd)
10 disable symver 10 disable symver
11+ # NetBSD/macppc *really* needs PIC enabled. ffmpeg has repeatedly 11+ # NetBSD/macppc *really* needs PIC enabled. ffmpeg has repeatedly
12+ # broken time and time again because PIC support has been removed 12+ # broken time and time again because PIC support has been removed
13+ # from architectures that need it. So, if you touch this, please 13+ # from architectures that need it. So, if you touch this, please
14+ # be careful and make sure that your changes work. 14+ # be careful and make sure that your changes work.
15+ test "${subarch}" != "x86_32" && enable pic 15+ test "${subarch}" != "x86_32" && enable pic
16 oss_indev_extralibs="-lossaudio" 16 oss_indev_extralibs="-lossaudio"
17 oss_outdev_extralibs="-lossaudio" 17 oss_outdev_extralibs="-lossaudio"
18 enabled gcc || check_ldflags -Wl,-zmuldefs 18 enabled gcc || check_ldflags -Wl,-zmuldefs
19@@ -5138,10 +5143,13 @@ check_cc <<EOF && enable attribute_may_a 19@@ -5359,10 +5364,13 @@ check_cc <<EOF && enable attribute_may_a
20 union { int x; } __attribute__((may_alias)) x; 20 union { int x; } __attribute__((may_alias)) x;
21 EOF 21 EOF
22  22
23-check_cc <<EOF || die "endian test failed" 23-check_cc <<EOF || die "endian test failed"
24-unsigned int endian = 'B' << 24 | 'I' << 16 | 'G' << 8 | 'E'; 24-unsigned int endian = 'B' << 24 | 'I' << 16 | 'G' << 8 | 'E';
25+check_exec <<EOF || enable bigendian 25+check_exec <<EOF || enable bigendian
26+int main() 26+int main()
27+{ 27+{
28+ long one = 1; 28+ long one = 1;
29+ return !(*((char *)(&one))); 29+ return !(*((char *)(&one)));
30+} 30+}
31 EOF 31 EOF
32-od -t x1 $TMPO | grep -q '42 *49 *47 *45' && enable bigendian 32-od -t x1 $TMPO | grep -q '42 *49 *47 *45' && enable bigendian
33  33
34 if ! enabled ppc64 || enabled bigendian; then 34 check_cc <<EOF && enable const_nan
35 disable vsx 35 #include <math.h>
36@@ -6805,7 +6814,7 @@ Version: $version 
37 Requires: $(enabled shared || echo $requires) 
38 Requires.private: $(enabled shared && echo $requires) 
39 Conflicts: 
40-Libs: -L\${libdir} $(enabled rpath && echo "-Wl,-rpath,\${libdir}") -l${shortname} $(enabled shared || echo $libs) 
41+Libs: -L\${libdir} -Wl,-R\${libdir} $(enabled rpath && echo "-Wl,-rpath,\${libdir}") -l${shortname} $(enabled shared || echo $libs) 
42 Libs.private: $(enabled shared && echo $libs) 
43 Cflags: -I\${includedir} 
44 EOF