diff options
author | nia <nia@pkgsrc.org> | 2020-06-29 19:22:34 +0000 |
---|---|---|
committer | nia <nia@pkgsrc.org> | 2020-06-29 19:22:34 +0000 |
commit | f480ae97f485a2f14adb10a09a667c1d9bd3dbe2 (patch) | |
tree | d67862dfae44f1d65447def11481b676b39f335b /multimedia | |
parent | 29c41598965bc1a78bd524b3c7919bb27cfdf927 (diff) | |
download | pkgsrc-f480ae97f485a2f14adb10a09a667c1d9bd3dbe2.tar.gz |
ffmpeg*: Remove hacks for partial SCTP header in NetBSD 7
Diffstat (limited to 'multimedia')
-rw-r--r-- | multimedia/ffmpeg3/distinfo | 3 | ||||
-rw-r--r-- | multimedia/ffmpeg3/patches/patch-libavformat_sctp.c | 17 | ||||
-rw-r--r-- | multimedia/ffmpeg4/distinfo | 3 | ||||
-rw-r--r-- | multimedia/ffmpeg4/patches/patch-libavformat_sctp.c | 17 |
4 files changed, 2 insertions, 38 deletions
diff --git a/multimedia/ffmpeg3/distinfo b/multimedia/ffmpeg3/distinfo index a50192ebc91..048b83fc6f3 100644 --- a/multimedia/ffmpeg3/distinfo +++ b/multimedia/ffmpeg3/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.33 2020/06/26 21:19:16 nia Exp $ +$NetBSD: distinfo,v 1.34 2020/06/29 19:22:34 nia Exp $ SHA1 (ffmpeg-3.4.7.tar.xz) = b9c4b52cda84b0d23c9a542beaf32a68b204c287 RMD160 (ffmpeg-3.4.7.tar.xz) = 7dfd08aac3295785034047bd73967a18ce4b8d79 @@ -7,7 +7,6 @@ Size (ffmpeg-3.4.7.tar.xz) = 8497552 bytes SHA1 (patch-Makefile) = 0c35f53878b0420aeea49d8ccb249279e705eb40 SHA1 (patch-configure) = 48245369d03cb41576ab18abb4e93cfc5c2c5267 SHA1 (patch-doc_Makefile) = 50ee7aaf74f8a5c439b11f141b5408322659543a -SHA1 (patch-libavformat_sctp.c) = 22bad9c7dc152aec3c60e0009899af241f495535 SHA1 (patch-libavutil_common.h) = d0f1093bc82567807b39dde990ee347f90a082c9 SHA1 (patch-libavutil_x86_asm.h) = 8f48f9e8ec08b5176bb40fc0021f3bb913dbef22 SHA1 (patch-libavutil_x86_cpu.c) = 9c97e68fde0fcb19741e034a803d509040ea4487 diff --git a/multimedia/ffmpeg3/patches/patch-libavformat_sctp.c b/multimedia/ffmpeg3/patches/patch-libavformat_sctp.c deleted file mode 100644 index b6cb0a3ec6a..00000000000 --- a/multimedia/ffmpeg3/patches/patch-libavformat_sctp.c +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-libavformat_sctp.c,v 1.1 2018/02/12 20:45:27 adam Exp $ - -Fix for NetBSD 7. - ---- libavformat/sctp.c.orig 2018-02-12 19:57:53.000000000 +0000 -+++ libavformat/sctp.c -@@ -40,6 +40,10 @@ - #include <netinet/in.h> - #include <netinet/sctp.h> - -+#ifndef IPPROTO_SCTP -+#define IPPROTO_SCTP 132 -+#endif -+ - #include "config.h" - - #if HAVE_POLL_H diff --git a/multimedia/ffmpeg4/distinfo b/multimedia/ffmpeg4/distinfo index c8361114406..89f1824d176 100644 --- a/multimedia/ffmpeg4/distinfo +++ b/multimedia/ffmpeg4/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.17 2020/06/26 21:10:03 nia Exp $ +$NetBSD: distinfo,v 1.18 2020/06/29 19:22:34 nia Exp $ SHA1 (ffmpeg-4.3.tar.xz) = dd618212469347feb5deb8934023ef6e1ae5f533 RMD160 (ffmpeg-4.3.tar.xz) = 8e5d102b55e2f8b1c4da585eb9d003ab03e5e30e @@ -16,7 +16,6 @@ SHA1 (patch-libavdevice_sunau.c) = 44dba866c58d508c0f873ffdd9ad8d25c059cc8a SHA1 (patch-libavdevice_sunau.h) = 2678d87f81e7b3faa42b5cc9814e373c4ad812f6 SHA1 (patch-libavdevice_sunau__dec.c) = d2fc01e941c68ab8b6f5e0b98ee536a32cc56bdc SHA1 (patch-libavdevice_sunau__enc.c) = efe765b99ad6379d0237c619ac0dce41306431be -SHA1 (patch-libavformat_sctp.c) = 22bad9c7dc152aec3c60e0009899af241f495535 SHA1 (patch-libavutil_common.h) = d0f1093bc82567807b39dde990ee347f90a082c9 SHA1 (patch-libavutil_x86_asm.h) = 8f48f9e8ec08b5176bb40fc0021f3bb913dbef22 SHA1 (patch-libavutil_x86_cpu.c) = 9c97e68fde0fcb19741e034a803d509040ea4487 diff --git a/multimedia/ffmpeg4/patches/patch-libavformat_sctp.c b/multimedia/ffmpeg4/patches/patch-libavformat_sctp.c deleted file mode 100644 index e1aebc152a3..00000000000 --- a/multimedia/ffmpeg4/patches/patch-libavformat_sctp.c +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-libavformat_sctp.c,v 1.1 2018/04/26 07:56:57 adam Exp $ - -Fix for NetBSD 7. - ---- libavformat/sctp.c.orig 2018-02-12 19:57:53.000000000 +0000 -+++ libavformat/sctp.c -@@ -40,6 +40,10 @@ - #include <netinet/in.h> - #include <netinet/sctp.h> - -+#ifndef IPPROTO_SCTP -+#define IPPROTO_SCTP 132 -+#endif -+ - #include "config.h" - - #if HAVE_POLL_H |