Skip to content

Commit 58dfb2c

Browse files
committed
ffmpeg7: Update to 7.1.3
1 parent 0aee6de commit 58dfb2c

File tree

6 files changed

+22
-18
lines changed

6 files changed

+22
-18
lines changed

multimedia/ffmpeg7/Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
# $NetBSD: Makefile,v 1.12 2024/11/24 06:59:09 adam Exp $
1+
# $NetBSD: Makefile,v 1.22 2025/11/21 14:22:04 adam Exp $
22

33
PKGNAME= ${DISTNAME:S/ffmpeg/ffmpeg7/}
4-
PKGREVISION= 5
54
MAINTAINER= [email protected]
65
HOMEPAGE= https://ffmpeg.org/
76
COMMENT= Decoding, encoding and streaming software (v7.x)

multimedia/ffmpeg7/Makefile.common

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
# $NetBSD: Makefile.common,v 1.6 2024/10/21 12:16:51 nia Exp $
1+
# $NetBSD: Makefile.common,v 1.15 2025/11/21 14:22:04 adam Exp $
22
# used by multimedia/ffmpeg7/Makefile
33
# used by multimedia/ffplay7/Makefile
44

5-
DISTNAME= ffmpeg-7.1
5+
DISTNAME= ffmpeg-7.1.3
66
CATEGORIES= multimedia
77
MASTER_SITES= https://www.ffmpeg.org/releases/
88
EXTRACT_SUFX= .tar.xz
@@ -34,8 +34,16 @@ CONFIGURE_ARGS+= --incdir=${PREFIX}/include/ffmpeg7
3434
CONFIGURE_ARGS+= --libdir=${PREFIX}/lib/ffmpeg7
3535
CONFIGURE_ARGS+= --shlibdir=${PREFIX}/lib/ffmpeg7
3636
LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/ffmpeg7
37+
38+
.include "../../mk/compiler.mk"
39+
3740
# https://github.com/homebrew-ffmpeg/homebrew-ffmpeg/issues/140
41+
.if ${CC_VERSION:Mclang-15.*}
3842
LDFLAGS.Darwin+= -Wl,-ld_classic
43+
.endif
44+
45+
# Reserve header space on macOS for later install_name_tool fixes
46+
LDFLAGS.Darwin+= -Wl,-headerpad_max_install_names
3947

4048
.if ${USE_CROSS_COMPILE:tl} == yes
4149
CONFIGURE_ARGS+= --enable-cross-compile
@@ -78,8 +86,6 @@ CONFIG_SHELL= ${TOOLS_PATH.bash}
7886
# Let's not put garbage into /tmp
7987
CONFIGURE_ENV+= TMPDIR=${WRKSRC}/tmp
8088

81-
.include "../../mk/compiler.mk"
82-
8389
.if !empty(PKGSRC_COMPILER:Msunpro)
8490
SUBST_CLASSES+= sunwspro
8591
SUBST_MESSAGE.sunwspro= Fixing compiler options for SunStudio C compiler.

multimedia/ffmpeg7/PLIST

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@comment $NetBSD: PLIST,v 1.2 2024/10/09 04:29:58 ryoon Exp $
1+
@comment $NetBSD: PLIST,v 1.3 2025/03/03 16:14:24 adam Exp $
22
bin/ffmpeg7
33
bin/ffprobe7
44
include/ffmpeg7/libavcodec/ac3_parser.h
@@ -145,7 +145,7 @@ include/ffmpeg7/libswscale/version_major.h
145145
lib/ffmpeg7/libavcodec.a
146146
lib/ffmpeg7/libavcodec.so
147147
lib/ffmpeg7/libavcodec.so.61
148-
lib/ffmpeg7/libavcodec.so.61.19.100
148+
lib/ffmpeg7/libavcodec.so.61.19.101
149149
lib/ffmpeg7/libavdevice.a
150150
lib/ffmpeg7/libavdevice.so
151151
lib/ffmpeg7/libavdevice.so.61
@@ -157,7 +157,7 @@ lib/ffmpeg7/libavfilter.so.10.4.100
157157
lib/ffmpeg7/libavformat.a
158158
lib/ffmpeg7/libavformat.so
159159
lib/ffmpeg7/libavformat.so.61
160-
lib/ffmpeg7/libavformat.so.61.${PKGVERSION}00
160+
lib/ffmpeg7/libavformat.so.61.7.100
161161
lib/ffmpeg7/libavutil.a
162162
lib/ffmpeg7/libavutil.so
163163
lib/ffmpeg7/libavutil.so.59

multimedia/ffmpeg7/distinfo

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
$NetBSD: distinfo,v 1.4 2024/10/09 04:29:58 ryoon Exp $
1+
$NetBSD: distinfo,v 1.7 2025/11/21 14:22:04 adam Exp $
22

3-
BLAKE2s (ffmpeg-7.1.tar.xz) = bb512b5e3ad7414fbe04fa646ea3721dd679781cd6d26a8dbd9d11c325dca945
4-
SHA512 (ffmpeg-7.1.tar.xz) = 7282fff068452bf154b2bf814e7f20d44ed4d961687dffd841bd77b88f26d9eee2cf4cf02e9a60b48b50e77a0c34731580d9e7c0945e3bc14c8ace840d920cde
5-
Size (ffmpeg-7.1.tar.xz) = 11011364 bytes
3+
BLAKE2s (ffmpeg-7.1.3.tar.xz) = 0f1f1a239dc1784b568f5961561bf692d382315e32a6a57ee219ef8a57374077
4+
SHA512 (ffmpeg-7.1.3.tar.xz) = 1231cb6fe8305e040565d9c2a05228af6e90ded88b8548b24b1e7c46964ea25e43db44eb2b677837c0d68bc4e2a10ea5db101c2d2a24d2e3132cd20d599b0da0
5+
Size (ffmpeg-7.1.3.tar.xz) = 11032252 bytes
66
SHA1 (patch-Makefile) = 2d27f218ee49179fdea14bb5c86c506dfb64dbd6
7-
SHA1 (patch-configure) = 700bcd9aa67b0dd57eabbae3676090a14e432e97
7+
SHA1 (patch-configure) = 4abb1ebb94f354a8ada383207fde1e753e5793c7
88
SHA1 (patch-doc_Makefile) = 35a23c09f3f735131647888cdc1ba725ff0f33ac
99
SHA1 (patch-doc_general__contents.texi) = 13704795d2688dc0377a512dc6e65025ad674724
1010
SHA1 (patch-doc_indevs.texi) = 8cd421a67f34ebbe6099102bf1de7c6cdb13dcb7

multimedia/ffmpeg7/patches/patch-configure

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
$NetBSD: patch-configure,v 1.2 2024/10/09 04:29:58 ryoon Exp $
1+
$NetBSD: patch-configure,v 1.3 2025/03/03 16:14:24 adam Exp $
22

33
Sun audio support.
44

@@ -8,7 +8,7 @@ Fix install_name_dir on Darwin.
88

99
Do not use 'rsync'.
1010

11-
--- configure.orig 2024-09-29 23:31:47.000000000 +0000
11+
--- configure.orig 2025-03-03 00:22:08.000000000 +0000
1212
+++ configure
1313
@@ -2299,6 +2299,7 @@ HEADERS_LIST="
1414
sys_resource_h
@@ -64,7 +64,7 @@ Do not use 'rsync'.
6464
disabled makeinfo_html && texi2html --help 2> /dev/null | grep -q 'init-file' && enable texi2html || disable texi2html
6565
perl -v > /dev/null 2>&1 && enable perl || disable perl
6666
pod2man --help > /dev/null 2>&1 && enable pod2man || disable pod2man
67-
-rsync --help 2> /dev/null | grep -q 'contimeout' && enable rsync_contimeout || disable rsync_contimeout
67+
-rsync --help 2> /dev/null | grep -q 'contimeout=' && enable rsync_contimeout || disable rsync_contimeout
6868
xmllint --version > /dev/null 2>&1 && enable xmllint || disable xmllint
6969

7070
check_headers linux/fb.h

multimedia/ffplay7/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# $NetBSD: Makefile,v 1.6 2024/11/14 22:20:57 wiz Exp $
22

33
PKGNAME= ${DISTNAME:S/ffmpeg/ffplay7/}
4-
PKGREVISION= 4
54
MAINTAINER= [email protected]
65
HOMEPAGE= https://ffmpeg.org/
76
COMMENT= Simple SDL frontend for FFmpeg

0 commit comments

Comments
 (0)