Thu Apr 28 09:20:53 2016 UTC ()
Also install man pages and HTML documentation.

Prior to this change all USE_TOOLS were already present except "perl". That
blocked the generation of both man pages and HTML documentation.
Also handle the append of configure's --progs-suffix number to address
coexistence of multiple ffmpeg versions man pages (done via patch-doc_Makefile).

Bump PKGREVISION.


(leot)
diff -r1.26 -r1.27 pkgsrc/multimedia/ffmpeg2/Makefile
diff -r1.45 -r1.46 pkgsrc/multimedia/ffmpeg2/Makefile.common
diff -r1.10 -r1.11 pkgsrc/multimedia/ffmpeg2/PLIST
diff -r1.46 -r1.47 pkgsrc/multimedia/ffmpeg2/distinfo
diff -r0 -r1.1 pkgsrc/multimedia/ffmpeg2/patches/patch-doc_Makefile
cvs diff -r1.26 -r1.27 pkgsrc/multimedia/ffmpeg2/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/ffmpeg2/Makefile 2016/03/30 12:46:38 1.26
+++ pkgsrc/multimedia/ffmpeg2/Makefile 2016/04/28 09:20:53 1.27
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.26 2016/03/30 12:46:38 jperkin Exp $ 1# $NetBSD: Makefile,v 1.27 2016/04/28 09:20:53 leot Exp $
2 2
3PKGNAME= ${DISTNAME:S/ffmpeg/ffmpeg2/} 3PKGNAME= ${DISTNAME:S/ffmpeg/ffmpeg2/}
4PKGREVISION= 2 4PKGREVISION= 3
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 (v2.x) 7COMMENT= Decoding, encoding and streaming software (v2.x)
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
12CONFIGURE_ARGS+= --disable-ffplay 12CONFIGURE_ARGS+= --disable-ffplay
13 13
14INSTALLATION_DIRS= lib/ffmpeg2 share/doc/ffmpeg2 share/examples/ffmpeg2 14INSTALLATION_DIRS= lib/ffmpeg2 share/doc/ffmpeg2 share/examples/ffmpeg2
15 15
16CONF_FILES+= ${PREFIX}/share/examples/ffmpeg2/ffserver.conf \ 16CONF_FILES+= ${PREFIX}/share/examples/ffmpeg2/ffserver.conf \
17 ${PKG_SYSCONFDIR}/ffserver.conf 17 ${PKG_SYSCONFDIR}/ffserver.conf
cvs diff -r1.45 -r1.46 pkgsrc/multimedia/ffmpeg2/Makefile.common (expand / switch to unified diff)

--- pkgsrc/multimedia/ffmpeg2/Makefile.common 2016/03/30 12:46:38 1.45
+++ pkgsrc/multimedia/ffmpeg2/Makefile.common 2016/04/28 09:20:53 1.46
@@ -1,43 +1,44 @@ @@ -1,43 +1,44 @@
1# $NetBSD: Makefile.common,v 1.45 2016/03/30 12:46:38 jperkin Exp $ 1# $NetBSD: Makefile.common,v 1.46 2016/04/28 09:20:53 leot Exp $
2# used by multimedia/ffmpeg2/Makefile 2# used by multimedia/ffmpeg2/Makefile
3# used by multimedia/ffplay2/Makefile 3# used by multimedia/ffplay2/Makefile
4 4
5DISTNAME= ffmpeg-2.8.6 5DISTNAME= ffmpeg-2.8.6
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
12PREV_PKGPATH= multimedia/ffmpeg-devel 12PREV_PKGPATH= multimedia/ffmpeg-devel
13PATCHDIR= ${.CURDIR}/../../multimedia/ffmpeg2/patches 13PATCHDIR= ${.CURDIR}/../../multimedia/ffmpeg2/patches
14 14
15USE_LANGUAGES= c99 15USE_LANGUAGES= c99
16USE_LIBTOOL= yes 16USE_LIBTOOL= yes
17USE_TOOLS+= gmake texi2html pod2man 17USE_TOOLS+= gmake texi2html perl pod2man
18HAS_CONFIGURE= yes 18HAS_CONFIGURE= yes
19CONFIGURE_ARGS+= --cc=${CC:Q} 19CONFIGURE_ARGS+= --cc=${CC:Q}
20CONFIGURE_ARGS+= --disable-debug 20CONFIGURE_ARGS+= --disable-debug
21CONFIGURE_ARGS+= --disable-optimizations 21CONFIGURE_ARGS+= --disable-optimizations
22CONFIGURE_ARGS+= --disable-stripping 22CONFIGURE_ARGS+= --disable-stripping
23CONFIGURE_ARGS+= --enable-shared 23CONFIGURE_ARGS+= --enable-shared
24CONFIGURE_ARGS+= --enable-pthreads 24CONFIGURE_ARGS+= --enable-pthreads
25CONFIGURE_ARGS+= --enable-gpl 25CONFIGURE_ARGS+= --enable-gpl
26CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR} 26CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR}
27CONFIGURE_ARGS+= --prefix=${PREFIX} 27CONFIGURE_ARGS+= --prefix=${PREFIX}
28 28
29CONFIGURE_ARGS+= --progs-suffix=2 29CONFIGURE_ARGS+= --progs-suffix=2
30CONFIGURE_ARGS+= --datadir=${PREFIX}/share/ffmpeg2 30CONFIGURE_ARGS+= --datadir=${PREFIX}/share/ffmpeg2
 31CONFIGURE_ARGS+= --docdir=${PREFIX}/share/doc/ffmpeg2
31CONFIGURE_ARGS+= --incdir=${PREFIX}/include/ffmpeg2 32CONFIGURE_ARGS+= --incdir=${PREFIX}/include/ffmpeg2
32CONFIGURE_ARGS+= --libdir=${PREFIX}/lib/ffmpeg2 33CONFIGURE_ARGS+= --libdir=${PREFIX}/lib/ffmpeg2
33CONFIGURE_ARGS+= --shlibdir=${PREFIX}/lib/ffmpeg2 34CONFIGURE_ARGS+= --shlibdir=${PREFIX}/lib/ffmpeg2
34LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/ffmpeg2 35LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/ffmpeg2
35 36
36PLIST_VARS+= opencl 37PLIST_VARS+= opencl
37 38
38.if !empty(MACHINE_PLATFORM:MDarwin-1[2-9].*-*) 39.if !empty(MACHINE_PLATFORM:MDarwin-1[2-9].*-*)
39CONFIGURE_ARGS+= --enable-opencl 40CONFIGURE_ARGS+= --enable-opencl
40PLIST.opencl= yes 41PLIST.opencl= yes
41.endif 42.endif
42 43
43.if ${OPSYS} == "SunOS" 44.if ${OPSYS} == "SunOS"
cvs diff -r1.10 -r1.11 pkgsrc/multimedia/ffmpeg2/PLIST (expand / switch to unified diff)

--- pkgsrc/multimedia/ffmpeg2/PLIST 2015/09/09 10:42:41 1.10
+++ pkgsrc/multimedia/ffmpeg2/PLIST 2016/04/28 09:20:53 1.11
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.10 2015/09/09 10:42:41 adam Exp $ 1@comment $NetBSD: PLIST,v 1.11 2016/04/28 09:20:53 leot Exp $
2bin/ffmpeg2 2bin/ffmpeg2
3bin/ffprobe2 3bin/ffprobe2
4bin/ffserver2 4bin/ffserver2
5include/ffmpeg2/libavcodec/avcodec.h 5include/ffmpeg2/libavcodec/avcodec.h
6include/ffmpeg2/libavcodec/avfft.h 6include/ffmpeg2/libavcodec/avfft.h
7include/ffmpeg2/libavcodec/d3d11va.h 7include/ffmpeg2/libavcodec/d3d11va.h
8include/ffmpeg2/libavcodec/dv_profile.h 8include/ffmpeg2/libavcodec/dv_profile.h
9include/ffmpeg2/libavcodec/dxva2.h 9include/ffmpeg2/libavcodec/dxva2.h
10include/ffmpeg2/libavcodec/old_codec_ids.h 10include/ffmpeg2/libavcodec/old_codec_ids.h
11include/ffmpeg2/libavcodec/qsv.h 11include/ffmpeg2/libavcodec/qsv.h
12include/ffmpeg2/libavcodec/vaapi.h 12include/ffmpeg2/libavcodec/vaapi.h
13include/ffmpeg2/libavcodec/vda.h 13include/ffmpeg2/libavcodec/vda.h
14include/ffmpeg2/libavcodec/vdpau.h 14include/ffmpeg2/libavcodec/vdpau.h
@@ -130,34 +130,85 @@ lib/ffmpeg2/libswresample.so.1 @@ -130,34 +130,85 @@ lib/ffmpeg2/libswresample.so.1
130lib/ffmpeg2/libswresample.so.1.2.101 130lib/ffmpeg2/libswresample.so.1.2.101
131lib/ffmpeg2/libswscale.a 131lib/ffmpeg2/libswscale.a
132lib/ffmpeg2/libswscale.so 132lib/ffmpeg2/libswscale.so
133lib/ffmpeg2/libswscale.so.3 133lib/ffmpeg2/libswscale.so.3
134lib/ffmpeg2/libswscale.so.3.1.101 134lib/ffmpeg2/libswscale.so.3.1.101
135lib/ffmpeg2/pkgconfig/libavcodec.pc 135lib/ffmpeg2/pkgconfig/libavcodec.pc
136lib/ffmpeg2/pkgconfig/libavdevice.pc 136lib/ffmpeg2/pkgconfig/libavdevice.pc
137lib/ffmpeg2/pkgconfig/libavfilter.pc 137lib/ffmpeg2/pkgconfig/libavfilter.pc
138lib/ffmpeg2/pkgconfig/libavformat.pc 138lib/ffmpeg2/pkgconfig/libavformat.pc
139lib/ffmpeg2/pkgconfig/libavutil.pc 139lib/ffmpeg2/pkgconfig/libavutil.pc
140lib/ffmpeg2/pkgconfig/libpostproc.pc 140lib/ffmpeg2/pkgconfig/libpostproc.pc
141lib/ffmpeg2/pkgconfig/libswresample.pc 141lib/ffmpeg2/pkgconfig/libswresample.pc
142lib/ffmpeg2/pkgconfig/libswscale.pc 142lib/ffmpeg2/pkgconfig/libswscale.pc
 143man/man1/ffmpeg-all2.1
 144man/man1/ffmpeg-bitstream-filters2.1
 145man/man1/ffmpeg-codecs2.1
 146man/man1/ffmpeg-devices2.1
 147man/man1/ffmpeg-filters2.1
 148man/man1/ffmpeg-formats2.1
 149man/man1/ffmpeg-protocols2.1
 150man/man1/ffmpeg-resampler2.1
 151man/man1/ffmpeg-scaler2.1
 152man/man1/ffmpeg-utils2.1
 153man/man1/ffmpeg2.1
 154man/man1/ffprobe-all2.1
 155man/man1/ffprobe2.1
 156man/man1/ffserver-all2.1
 157man/man1/ffserver2.1
 158man/man3/libavcodec2.3
 159man/man3/libavdevice2.3
 160man/man3/libavfilter2.3
 161man/man3/libavformat2.3
 162man/man3/libavutil2.3
 163man/man3/libswresample2.3
 164man/man3/libswscale2.3
143share/doc/ffmpeg2/build_system.txt 165share/doc/ffmpeg2/build_system.txt
 166share/doc/ffmpeg2/developer.html
144share/doc/ffmpeg2/errno.txt 167share/doc/ffmpeg2/errno.txt
 168share/doc/ffmpeg2/faq.html
 169share/doc/ffmpeg2/fate.html
 170share/doc/ffmpeg2/ffmpeg-all.html
 171share/doc/ffmpeg2/ffmpeg-bitstream-filters.html
 172share/doc/ffmpeg2/ffmpeg-codecs.html
 173share/doc/ffmpeg2/ffmpeg-devices.html
 174share/doc/ffmpeg2/ffmpeg-filters.html
 175share/doc/ffmpeg2/ffmpeg-formats.html
 176share/doc/ffmpeg2/ffmpeg-protocols.html
 177share/doc/ffmpeg2/ffmpeg-resampler.html
 178share/doc/ffmpeg2/ffmpeg-scaler.html
 179share/doc/ffmpeg2/ffmpeg-utils.html
 180share/doc/ffmpeg2/ffmpeg.html
145share/doc/ffmpeg2/ffmpeg.txt 181share/doc/ffmpeg2/ffmpeg.txt
 182share/doc/ffmpeg2/ffprobe-all.html
 183share/doc/ffmpeg2/ffprobe.html
 184share/doc/ffmpeg2/ffserver-all.html
 185share/doc/ffmpeg2/ffserver.html
146share/doc/ffmpeg2/filter_design.txt 186share/doc/ffmpeg2/filter_design.txt
 187share/doc/ffmpeg2/general.html
 188share/doc/ffmpeg2/git-howto.html
147share/doc/ffmpeg2/issue_tracker.txt 189share/doc/ffmpeg2/issue_tracker.txt
 190share/doc/ffmpeg2/libavcodec.html
 191share/doc/ffmpeg2/libavdevice.html
 192share/doc/ffmpeg2/libavfilter.html
 193share/doc/ffmpeg2/libavformat.html
 194share/doc/ffmpeg2/libavutil.html
 195share/doc/ffmpeg2/libswresample.html
 196share/doc/ffmpeg2/libswscale.html
148share/doc/ffmpeg2/mips.txt 197share/doc/ffmpeg2/mips.txt
149share/doc/ffmpeg2/multithreading.txt 198share/doc/ffmpeg2/multithreading.txt
 199share/doc/ffmpeg2/nut.html
150share/doc/ffmpeg2/optimization.txt 200share/doc/ffmpeg2/optimization.txt
 201share/doc/ffmpeg2/platform.html
151share/doc/ffmpeg2/rate_distortion.txt 202share/doc/ffmpeg2/rate_distortion.txt
152share/doc/ffmpeg2/snow.txt 203share/doc/ffmpeg2/snow.txt
153share/doc/ffmpeg2/swresample.txt 204share/doc/ffmpeg2/swresample.txt
154share/doc/ffmpeg2/swscale.txt 205share/doc/ffmpeg2/swscale.txt
155share/doc/ffmpeg2/tablegen.txt 206share/doc/ffmpeg2/tablegen.txt
156share/doc/ffmpeg2/writing_filters.txt 207share/doc/ffmpeg2/writing_filters.txt
157share/examples/ffmpeg2/ffserver.conf 208share/examples/ffmpeg2/ffserver.conf
158share/ffmpeg2/examples/Makefile 209share/ffmpeg2/examples/Makefile
159share/ffmpeg2/examples/README 210share/ffmpeg2/examples/README
160share/ffmpeg2/examples/avio_dir_cmd.c 211share/ffmpeg2/examples/avio_dir_cmd.c
161share/ffmpeg2/examples/avio_reading.c 212share/ffmpeg2/examples/avio_reading.c
162share/ffmpeg2/examples/decoding_encoding.c 213share/ffmpeg2/examples/decoding_encoding.c
163share/ffmpeg2/examples/demuxing_decoding.c 214share/ffmpeg2/examples/demuxing_decoding.c
cvs diff -r1.46 -r1.47 pkgsrc/multimedia/ffmpeg2/distinfo (expand / switch to unified diff)

--- pkgsrc/multimedia/ffmpeg2/distinfo 2016/02/03 21:00:00 1.46
+++ pkgsrc/multimedia/ffmpeg2/distinfo 2016/04/28 09:20:53 1.47
@@ -1,13 +1,14 @@ @@ -1,13 +1,14 @@
1$NetBSD: distinfo,v 1.46 2016/02/03 21:00:00 adam Exp $ 1$NetBSD: distinfo,v 1.47 2016/04/28 09:20:53 leot Exp $
2 2
3SHA1 (ffmpeg-2.8.6.tar.xz) = 5720c4204ed0b72513fa2fd6e4dcaed6ebb7f35c 3SHA1 (ffmpeg-2.8.6.tar.xz) = 5720c4204ed0b72513fa2fd6e4dcaed6ebb7f35c
4RMD160 (ffmpeg-2.8.6.tar.xz) = fea9b87575330707e6a871425fc62731779ef65d 4RMD160 (ffmpeg-2.8.6.tar.xz) = fea9b87575330707e6a871425fc62731779ef65d
5SHA512 (ffmpeg-2.8.6.tar.xz) = 15fc0c05963a69664713f1fb40a34bb85efc6477cd655e76b610c453e82c9170b81d6225676a0d9fc73f86806ea597a4f868d402598fef41c7413523b374de35 5SHA512 (ffmpeg-2.8.6.tar.xz) = 15fc0c05963a69664713f1fb40a34bb85efc6477cd655e76b610c453e82c9170b81d6225676a0d9fc73f86806ea597a4f868d402598fef41c7413523b374de35
6Size (ffmpeg-2.8.6.tar.xz) = 7205300 bytes 6Size (ffmpeg-2.8.6.tar.xz) = 7205300 bytes
7SHA1 (patch-Makefile) = e3cb5cedccd2840f36ab90cd2f4b7987e1098a56 7SHA1 (patch-Makefile) = e3cb5cedccd2840f36ab90cd2f4b7987e1098a56
8SHA1 (patch-configure) = c739d4f002b0ed1850f88b5a961672b5e93f1dc1 8SHA1 (patch-configure) = c739d4f002b0ed1850f88b5a961672b5e93f1dc1
 9SHA1 (patch-doc_Makefile) = 48d3b3ccd800303a73fcda79e78533228f79d750
9SHA1 (patch-libavcodec_x86_ac3dsp_init.c) = f997271f4f4604987591d7f17c571aaaa8a6188a 10SHA1 (patch-libavcodec_x86_ac3dsp_init.c) = f997271f4f4604987591d7f17c571aaaa8a6188a
10SHA1 (patch-libavutil_common.h) = de36efed3a8a2069e170e5afe77eb122a46d14b2 11SHA1 (patch-libavutil_common.h) = de36efed3a8a2069e170e5afe77eb122a46d14b2
11SHA1 (patch-libavutil_opencl.c) = 00ea04f9febe60b9428ac8c3b7e14ae01a955685 12SHA1 (patch-libavutil_opencl.c) = 00ea04f9febe60b9428ac8c3b7e14ae01a955685
12SHA1 (patch-libavutil_x86_asm.h) = 85c5403e97449639253d3c97391dfbb4cadb2548 13SHA1 (patch-libavutil_x86_asm.h) = 85c5403e97449639253d3c97391dfbb4cadb2548
13SHA1 (patch-libavutil_x86_cpu.c) = 499b0fc3081971a2bba2724bd051aab14c531239 14SHA1 (patch-libavutil_x86_cpu.c) = 499b0fc3081971a2bba2724bd051aab14c531239
File Added: pkgsrc/multimedia/ffmpeg2/patches/patch-doc_Makefile
$NetBSD: patch-doc_Makefile,v 1.1 2016/04/28 09:20:53 leot Exp $

Honor --prog-suffix configure option also for man pages.

--- doc/Makefile.orig	2016-02-01 00:52:15.000000000 +0000
+++ doc/Makefile
@@ -14,8 +14,8 @@ COMPONENTS-$(CONFIG_AVFORMAT)   += ffmpe
 COMPONENTS-$(CONFIG_AVDEVICE)   += ffmpeg-devices
 COMPONENTS-$(CONFIG_AVFILTER)   += ffmpeg-filters
 
-MANPAGES1   = $(AVPROGS-yes:%=doc/%.1)    $(AVPROGS-yes:%=doc/%-all.1)    $(COMPONENTS-yes:%=doc/%.1)
-MANPAGES3   = $(LIBRARIES-yes:%=doc/%.3)
+MANPAGES1   = $(AVPROGS-yes:%=doc/%$(PROGSSUF).1)    $(AVPROGS-yes:%=doc/%-all$(PROGSSUF).1)    $(COMPONENTS-yes:%=doc/%$(PROGSSUF).1)
+MANPAGES3   = $(LIBRARIES-yes:%=doc/%$(PROGSSUF).3)
 MANPAGES    = $(MANPAGES1) $(MANPAGES3)
 PODPAGES    = $(AVPROGS-yes:%=doc/%.pod)  $(AVPROGS-yes:%=doc/%-all.pod)  $(COMPONENTS-yes:%=doc/%.pod)  $(LIBRARIES-yes:%=doc/%.pod)
 HTMLPAGES   = $(AVPROGS-yes:%=doc/%.html) $(AVPROGS-yes:%=doc/%-all.html) $(COMPONENTS-yes:%=doc/%.html) $(LIBRARIES-yes:%=doc/%.html) \
@@ -114,10 +114,10 @@ doc/%-all.pod: doc/%.texi $(SRC_PATH)/do
 	$(Q)$(TEXIDEP)
 	$(M)perl $(SRC_PATH)/doc/texi2pod.pl -Dconfig-all=yes -Idoc $< $@
 
-doc/%.1 doc/%.3: TAG = MAN
-doc/%.1: doc/%.pod $(GENTEXI)
+doc/%$(PROGSSUF).1 doc/%$(PROGSSUF).3: TAG = MAN
+doc/%$(PROGSSUF).1: doc/%.pod $(GENTEXI)
 	$(M)pod2man --section=1 --center=" " --release=" " --date=" " $< > $@
-doc/%.3: doc/%.pod $(GENTEXI)
+doc/%$(PROGSSUF).3: doc/%.pod $(GENTEXI)
 	$(M)pod2man --section=3 --center=" " --release=" " --date=" " $< > $@
 
 $(DOCS) doc/doxy/html: | doc/