Tue Sep 27 20:57:54 2022 UTC ()
ffmpeg4: switch to x264

Bump PKGREVISION.


(wiz)
diff -r1.68 -r1.69 pkgsrc/multimedia/ffmpeg4/Makefile
diff -r1.8 -r1.9 pkgsrc/multimedia/ffmpeg4/buildlink3.mk
diff -r1.17 -r1.18 pkgsrc/multimedia/ffmpeg4/options.mk
cvs diff -r1.68 -r1.69 pkgsrc/multimedia/ffmpeg4/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/ffmpeg4/Makefile 2022/09/11 12:52:01 1.68
+++ pkgsrc/multimedia/ffmpeg4/Makefile 2022/09/27 20:57:54 1.69
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.68 2022/09/11 12:52:01 wiz Exp $ 1# $NetBSD: Makefile,v 1.69 2022/09/27 20:57:54 wiz Exp $
2 2
3PKGNAME= ${DISTNAME:S/ffmpeg/ffmpeg4/} 3PKGNAME= ${DISTNAME:S/ffmpeg/ffmpeg4/}
4PKGREVISION= 4 4PKGREVISION= 5
5MAINTAINER= pkgsrc-users@NetBSD.org 5MAINTAINER= pkgsrc-users@NetBSD.org
6HOMEPAGE= https://ffmpeg.org/ 6HOMEPAGE= https://ffmpeg.org/
7COMMENT= Decoding, encoding and streaming software (v4.x) 7COMMENT= Decoding, encoding and streaming software (v4.x)
8 8
9CONFIGURE_ARGS+= --enable-avfilter 9CONFIGURE_ARGS+= --enable-avfilter
10CONFIGURE_ARGS+= --enable-avresample 10CONFIGURE_ARGS+= --enable-avresample
11CONFIGURE_ARGS+= --enable-postproc 11CONFIGURE_ARGS+= --enable-postproc
12CONFIGURE_ARGS+= --enable-rpath 12CONFIGURE_ARGS+= --enable-rpath
13CONFIGURE_ARGS+= --disable-ffplay 13CONFIGURE_ARGS+= --disable-ffplay
14 14
15INSTALLATION_DIRS= lib/ffmpeg4 share/doc/ffmpeg4 share/examples/ffmpeg4 15INSTALLATION_DIRS= lib/ffmpeg4 share/doc/ffmpeg4 share/examples/ffmpeg4
16 16
17.include "../../mk/bsd.prefs.mk" 17.include "../../mk/bsd.prefs.mk"
cvs diff -r1.8 -r1.9 pkgsrc/multimedia/ffmpeg4/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/multimedia/ffmpeg4/buildlink3.mk 2022/06/28 11:34:54 1.8
+++ pkgsrc/multimedia/ffmpeg4/buildlink3.mk 2022/09/27 20:57:54 1.9
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1# $NetBSD: buildlink3.mk,v 1.8 2022/06/28 11:34:54 wiz Exp $ 1# $NetBSD: buildlink3.mk,v 1.9 2022/09/27 20:57:54 wiz Exp $
2 2
3BUILDLINK_TREE+= ffmpeg4 3BUILDLINK_TREE+= ffmpeg4
4 4
5.if !defined(FFMPEG4_BUILDLINK3_MK) 5.if !defined(FFMPEG4_BUILDLINK3_MK)
6FFMPEG4_BUILDLINK3_MK:= 6FFMPEG4_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.ffmpeg4+= ffmpeg4>=4.0 8BUILDLINK_API_DEPENDS.ffmpeg4+= ffmpeg4>=4.0
9BUILDLINK_ABI_DEPENDS.ffmpeg4+= ffmpeg4>=4.4.2nb1 9BUILDLINK_ABI_DEPENDS.ffmpeg4+= ffmpeg4>=4.4.2nb5
10BUILDLINK_PKGSRCDIR.ffmpeg4?= ../../multimedia/ffmpeg4 10BUILDLINK_PKGSRCDIR.ffmpeg4?= ../../multimedia/ffmpeg4
11 11
12pkgbase := ffmpeg4 12pkgbase := ffmpeg4
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 ${PKG_BUILD_OPTIONS.ffmpeg4:Mav1} 17.if ${PKG_BUILD_OPTIONS.ffmpeg4:Mav1}
18. include "../../multimedia/libaom/buildlink3.mk" 18. include "../../multimedia/libaom/buildlink3.mk"
19.endif 19.endif
20 20
21.if ${PKG_BUILD_OPTIONS.ffmpeg4:Mfreetype} 21.if ${PKG_BUILD_OPTIONS.ffmpeg4:Mfreetype}
22. include "../../graphics/freetype2/buildlink3.mk" 22. include "../../graphics/freetype2/buildlink3.mk"
@@ -25,27 +25,27 @@ pkgbase := ffmpeg4 @@ -25,27 +25,27 @@ pkgbase := ffmpeg4
25.if ${PKG_BUILD_OPTIONS.ffmpeg4:Mfontconfig} 25.if ${PKG_BUILD_OPTIONS.ffmpeg4:Mfontconfig}
26. include "../../fonts/fontconfig/buildlink3.mk" 26. include "../../fonts/fontconfig/buildlink3.mk"
27.endif 27.endif
28 28
29.if ${PKG_BUILD_OPTIONS.ffmpeg4:Mtheora} 29.if ${PKG_BUILD_OPTIONS.ffmpeg4:Mtheora}
30. include "../../multimedia/libtheora/buildlink3.mk" 30. include "../../multimedia/libtheora/buildlink3.mk"
31.endif 31.endif
32 32
33.if ${PKG_BUILD_OPTIONS.ffmpeg4:Mxvid} 33.if ${PKG_BUILD_OPTIONS.ffmpeg4:Mxvid}
34. include "../../multimedia/xvidcore/buildlink3.mk" 34. include "../../multimedia/xvidcore/buildlink3.mk"
35.endif 35.endif
36 36
37.if ${PKG_BUILD_OPTIONS.ffmpeg4:Mx264} 37.if ${PKG_BUILD_OPTIONS.ffmpeg4:Mx264}
38. include "../../multimedia/x264-devel/buildlink3.mk" 38. include "../../multimedia/x264/buildlink3.mk"
39.endif 39.endif
40 40
41.if ${PKG_BUILD_OPTIONS.ffmpeg4:Mlibvpx} 41.if ${PKG_BUILD_OPTIONS.ffmpeg4:Mlibvpx}
42. include "../../multimedia/libvpx/buildlink3.mk" 42. include "../../multimedia/libvpx/buildlink3.mk"
43.endif 43.endif
44 44
45.if ${PKG_BUILD_OPTIONS.ffmpeg4:Mvaapi} 45.if ${PKG_BUILD_OPTIONS.ffmpeg4:Mvaapi}
46. include "../../multimedia/libva/buildlink3.mk" 46. include "../../multimedia/libva/buildlink3.mk"
47.endif 47.endif
48 48
49.if ${PKG_BUILD_OPTIONS.ffmpeg4:Mvdpau} 49.if ${PKG_BUILD_OPTIONS.ffmpeg4:Mvdpau}
50. include "../../multimedia/libvdpau/buildlink3.mk" 50. include "../../multimedia/libvdpau/buildlink3.mk"
51.endif 51.endif
cvs diff -r1.17 -r1.18 pkgsrc/multimedia/ffmpeg4/options.mk (expand / switch to unified diff)

--- pkgsrc/multimedia/ffmpeg4/options.mk 2021/05/17 12:19:07 1.17
+++ pkgsrc/multimedia/ffmpeg4/options.mk 2022/09/27 20:57:54 1.18
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.17 2021/05/17 12:19:07 nia Exp $ 1# $NetBSD: options.mk,v 1.18 2022/09/27 20:57:54 wiz Exp $
2 2
3# Global and legacy options 3# Global and legacy options
4 4
5PKG_OPTIONS_OPTIONAL_GROUPS= ssl 5PKG_OPTIONS_OPTIONAL_GROUPS= ssl
6PKG_OPTIONS_GROUP.ssl= gnutls mbedtls openssl 6PKG_OPTIONS_GROUP.ssl= gnutls mbedtls openssl
7 7
8PKG_OPTIONS_VAR= PKG_OPTIONS.ffmpeg4 8PKG_OPTIONS_VAR= PKG_OPTIONS.ffmpeg4
9PKG_SUPPORTED_OPTIONS= ass av1 bluray doc fdk-aac fontconfig freetype jack \ 9PKG_SUPPORTED_OPTIONS= ass av1 bluray doc fdk-aac fontconfig freetype jack \
10 lame libvpx libwebp opencore-amr opus pulseaudio rpi rtmp \ 10 lame libvpx libwebp opencore-amr opus pulseaudio rpi rtmp \
11 speex tesseract theora vorbis x11 x264 x265 xvid 11 speex tesseract theora vorbis x11 x264 x265 xvid
12PKG_SUGGESTED_OPTIONS= ass av1 bluray freetype fontconfig gnutls lame \ 12PKG_SUGGESTED_OPTIONS= ass av1 bluray freetype fontconfig gnutls lame \
13 libvpx libwebp opus speex theora vorbis x11 x264 x265 xvid 13 libvpx libwebp opus speex theora vorbis x11 x264 x265 xvid
14 14
@@ -163,27 +163,27 @@ CONFIGURE_ARGS+= --disable-libtesseract @@ -163,27 +163,27 @@ CONFIGURE_ARGS+= --disable-libtesseract
163CONFIGURE_ARGS+= --enable-libtheora 163CONFIGURE_ARGS+= --enable-libtheora
164.include "../../multimedia/libtheora/buildlink3.mk" 164.include "../../multimedia/libtheora/buildlink3.mk"
165.endif 165.endif
166 166
167# OGG Vorbis support 167# OGG Vorbis support
168.if !empty(PKG_OPTIONS:Mvorbis) 168.if !empty(PKG_OPTIONS:Mvorbis)
169CONFIGURE_ARGS+= --enable-libvorbis 169CONFIGURE_ARGS+= --enable-libvorbis
170.include "../../audio/libvorbis/buildlink3.mk" 170.include "../../audio/libvorbis/buildlink3.mk"
171.endif 171.endif
172 172
173# LAME MP3 encoder 173# LAME MP3 encoder
174.if !empty(PKG_OPTIONS:Mlame) 174.if !empty(PKG_OPTIONS:Mlame)
175# "lame-3.98" isn't compatible with "ffmpeg" which breaks audio encoding. 175# "lame-3.98" isn't compatible with "ffmpeg" which breaks audio encoding.
176BUILDLINK_ABI_DEPENDS.lame+= lame>=3.98.2nb1 176BUILDLINK_API_DEPENDS.lame+= lame>=3.98.2nb1
177CONFIGURE_ARGS+= --enable-libmp3lame 177CONFIGURE_ARGS+= --enable-libmp3lame
178.include "../../audio/lame/buildlink3.mk" 178.include "../../audio/lame/buildlink3.mk"
179.endif 179.endif
180 180
181# OPUS support 181# OPUS support
182.if !empty(PKG_OPTIONS:Mopus) 182.if !empty(PKG_OPTIONS:Mopus)
183CONFIGURE_ARGS+= --enable-libopus 183CONFIGURE_ARGS+= --enable-libopus
184.include "../../audio/libopus/buildlink3.mk" 184.include "../../audio/libopus/buildlink3.mk"
185.endif 185.endif
186 186
187# Speex support 187# Speex support
188.if !empty(PKG_OPTIONS:Mspeex) 188.if !empty(PKG_OPTIONS:Mspeex)
189CONFIGURE_ARGS+= --enable-libspeex 189CONFIGURE_ARGS+= --enable-libspeex
@@ -202,30 +202,28 @@ SUBST_FILES.vc= configure @@ -202,30 +202,28 @@ SUBST_FILES.vc= configure
202SUBST_SED.vc+= -e 's;-isystem/opt/vc;-I${PREFIX};g' 202SUBST_SED.vc+= -e 's;-isystem/opt/vc;-I${PREFIX};g'
203SUBST_SED.vc+= -e 's;/opt/vc;${PREFIX};g' 203SUBST_SED.vc+= -e 's;/opt/vc;${PREFIX};g'
204.include "../../misc/raspberrypi-userland/buildlink3.mk" 204.include "../../misc/raspberrypi-userland/buildlink3.mk"
205.endif 205.endif
206 206
207# XviD support 207# XviD support
208.if !empty(PKG_OPTIONS:Mxvid) 208.if !empty(PKG_OPTIONS:Mxvid)
209CONFIGURE_ARGS+= --enable-libxvid 209CONFIGURE_ARGS+= --enable-libxvid
210.include "../../multimedia/xvidcore/buildlink3.mk" 210.include "../../multimedia/xvidcore/buildlink3.mk"
211.endif 211.endif
212 212
213# x264 support 213# x264 support
214.if !empty(PKG_OPTIONS:Mx264) 214.if !empty(PKG_OPTIONS:Mx264)
215# ABI change between 20090326 and 20100201 
216BUILDLINK_API_DEPENDS.x264-devel+= x264-devel>=20111207 
217CONFIGURE_ARGS+= --enable-libx264 215CONFIGURE_ARGS+= --enable-libx264
218.include "../../multimedia/x264-devel/buildlink3.mk" 216.include "../../multimedia/x264/buildlink3.mk"
219.else 217.else
220CONFIGURE_ARGS+= --disable-libx264 218CONFIGURE_ARGS+= --disable-libx264
221.endif 219.endif
222 220
223# x265 support 221# x265 support
224.if !empty(PKG_OPTIONS:Mx265) 222.if !empty(PKG_OPTIONS:Mx265)
225CONFIGURE_ARGS+= --enable-libx265 223CONFIGURE_ARGS+= --enable-libx265
226.include "../../multimedia/x265/buildlink3.mk" 224.include "../../multimedia/x265/buildlink3.mk"
227.else 225.else
228CONFIGURE_ARGS+= --disable-libx265 226CONFIGURE_ARGS+= --disable-libx265
229.endif 227.endif
230 228
231# VDPAU support 229# VDPAU support