haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-23 12:10:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

ffmpeg: bump version

Browse Source
This commit is contained in:
Sergei Reznikov
2020-06-20 09:21:31 +00:00
parent 6f476ae72a
commit e597819386
11 changed files with 10 additions and 2161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
media-video/ffmpeg/ffmpeg-4.2.2.recipe → media-video/ffmpeg/ffmpeg-4.3.recipe
View File

@@ -4,11 +4,11 @@ and stream audio and video. It includes libavcodec - the leading audio/video \
codec library."
HOMEPAGE="https://ffmpeg.org/"
COPYRIGHT="2000-2003 Fabrice Bellard
2003-2019 the FFmpeg developers"
2003-2020 the FFmpeg developers"
LICENSE="GNU LGPL v3"
REVISION="5"
REVISION="1"
SOURCE_URI="https://ffmpeg.org/releases/ffmpeg-$portVersion.tar.xz"
CHECKSUM_SHA256="cb754255ab0ee2ea5f66f8850e1bd6ad5cac1cd855d0a2f4990fb8c668b0d29c"
CHECKSUM_SHA256="1d0ad06484f44bcb97eba5e93c40bcb893890f9f64aeb43e46cd9bb4cbd6795d"
PATCHES="ffmpeg-$portVersion.patchset"
ADDITIONAL_FILES="gcc_runtime.c"
@@ -25,13 +25,13 @@ ffmpegLibs="\
libswscale \
"
# Do not sort alphabetically
libavutilVersion="56.31.100"
libavcodecVersion="58.54.100"
libavformatVersion="58.29.100"
libavdeviceVersion="58.8.100"
libavfilterVersion="7.57.100"
libswscaleVersion="5.5.100"
libswresampleVersion="3.5.100"
libavutilVersion="56.51.100"
libavcodecVersion="58.91.100"
libavformatVersion="58.45.100"
libavdeviceVersion="58.10.100"
libavfilterVersion="7.85.100"
libswscaleVersion="5.7.100"
libswresampleVersion="3.7.100"
portVersionCompat="$portVersion compat >= 4"
for i in $ffmpegLibs; do
eval "${i}VersionCompat=\"\$${i}Version compat >= \${${i}Version%%.*}\""

1738
media-video/ffmpeg/patches/ffmpeg-0.10.16.patchset
View File

File diff suppressed because it is too large Load Diff

21
media-video/ffmpeg/patches/ffmpeg-2.8.11.patchset
View File

@@ -1,21 +0,0 @@
From 88bf339b083a0945ddb56ca5b78708bbc1141fa6 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 9 Apr 2016 17:37:09 +0000
Subject: disable ebx on x86.
diff --git a/configure b/configure
index 475c087..5a95b97 100755
--- a/configure
+++ b/configure
@@ -5783,6 +5783,7 @@ enabled threads && ! enabled pthreads && ! enabled atomics_native && die "non pt
if test $target_os = "haiku"; then
disable memalign
disable posix_memalign
+ enabled x86_32 && enabled shared && disable ebx_available
fi
enabled_all dxva2 dxva2api_cobj CoTaskMemFree &&
--
2.7.0

21
media-video/ffmpeg/patches/ffmpeg-3.2.4.patchset
View File

@@ -1,21 +0,0 @@
From 88bf339b083a0945ddb56ca5b78708bbc1141fa6 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 9 Apr 2016 17:37:09 +0000
Subject: disable ebx on x86.
diff --git a/configure b/configure
index a1818dc..26af622 100755
--- a/configure
+++ b/configure
@@ -6324,6 +6324,7 @@ enabled threads && ! enabled pthreads && ! enabled atomics_native && die "non pt
if test $target_os = "haiku"; then
disable memalign
disable posix_memalign
+ enabled x86_32 && enabled shared && disable ebx_available
fi
enabled_all dxva2 dxva2api_cobj CoTaskMemFree &&
--
2.7.0

21
media-video/ffmpeg/patches/ffmpeg-3.3.6.patchset
View File

@@ -1,21 +0,0 @@
From 88bf339b083a0945ddb56ca5b78708bbc1141fa6 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 9 Apr 2016 17:37:09 +0000
Subject: disable ebx on x86.
diff --git a/configure b/configure
index 23823e3..275f2ff 100755
--- a/configure
+++ b/configure
@@ -6401,6 +6401,7 @@ enabled threads && ! enabled pthreads && ! enabled atomics_native && die "non pt
if test $target_os = "haiku"; then
disable memalign
disable posix_memalign
+ enabled x86_32 && enabled shared && disable ebx_available
fi
enabled_all dxva2 dxva2api_cobj CoTaskMemFree &&
--
2.16.2

151
media-video/ffmpeg/patches/ffmpeg-3.4.2.patchset
View File

@@ -1,151 +0,0 @@
From 6ed8a346799f20ba114b314d1054a30add1c4044 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Mon, 16 Oct 2017 18:31:07 +0200
Subject: disable ebx on x86.
diff --git a/configure b/configure
index 231c6c3..404b93e 100755
--- a/configure
+++ b/configure
@@ -6595,6 +6595,7 @@ enabled threads && ! enabled pthreads && ! enabled atomics_native && die "non pt
if test $target_os = "haiku"; then
disable memalign
disable posix_memalign
+ enabled x86_32 && enabled shared && disable ebx_available
fi
# add_dep lib dep
--
2.16.1
From 3780da8297339a332322d7c38e16f7dd42337bd9 Mon Sep 17 00:00:00 2001
From: Nicolas George <george@nsup.org>
Date: Fri, 27 Oct 2017 20:46:28 +0200
Subject: lavf/avio: temporarily accept 0 as EOF.
Print a warning to let applicatios fix their use.
After a deprecation period, check with a low-level assert.
Also make the constraint explicit in the doxygen comment.
Signed-off-by: Nicolas George <george@nsup.org>
diff --git a/libavformat/avio.h b/libavformat/avio.h
index f9c5972..250cf90 100644
--- a/libavformat/avio.h
+++ b/libavformat/avio.h
@@ -452,6 +452,8 @@ void avio_free_directory_entry(AVIODirEntry **entry);
* @param write_flag Set to 1 if the buffer should be writable, 0 otherwise.
* @param opaque An opaque pointer to user-specific data.
* @param read_packet A function for refilling the buffer, may be NULL.
+ * For stream protocols, must never return 0 but rather
+ * a proper AVERROR code.
* @param write_packet A function for writing the buffer contents, may be NULL.
* The function may not change the input buffers content.
* @param seek A function for seeking to specified byte position, may be NULL.
diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c
index 636cb46..a862d27 100644
--- a/libavformat/aviobuf.c
+++ b/libavformat/aviobuf.c
@@ -531,6 +531,24 @@ void avio_write_marker(AVIOContext *s, int64_t time, enum AVIODataMarkerType typ
s->last_time = time;
}
+static int read_packet_wrapper(AVIOContext *s, uint8_t *buf, int size)
+{
+ int ret;
+
+ if (!s->read_packet)
+ return AVERROR_EOF;
+ ret = s->read_packet(s->opaque, buf, size);
+#if FF_API_OLD_AVIO_EOF_0
+ if (!ret && !s->max_packet_size) {
+ av_log(NULL, AV_LOG_WARNING, "Invalid return value 0 for stream protocol\n");
+ ret = AVERROR_EOF;
+ }
+#else
+ av_assert2(ret || s->max_packet_size);
+#endif
+ return ret;
+}
+
/* Input stream */
static void fill_buffer(AVIOContext *s)
@@ -569,10 +587,7 @@ static void fill_buffer(AVIOContext *s)
len = s->orig_buffer_size;
}
- if (s->read_packet)
- len = s->read_packet(s->opaque, dst, len);
- else
- len = 0;
+ len = read_packet_wrapper(s, dst, len);
if (len <= 0) {
/* do not modify buffer if EOF reached so that a seek back can
be done without rereading data */
@@ -644,8 +659,7 @@ int avio_read(AVIOContext *s, unsigned char *buf, int size)
if (len == 0 || s->write_flag) {
if((s->direct || size > s->buffer_size) && !s->update_checksum) {
// bypass the buffer and read data directly into buf
- if(s->read_packet)
- len = s->read_packet(s->opaque, buf, size);
+ len = read_packet_wrapper(s, buf, size);
if (len <= 0) {
/* do not modify buffer if EOF reached so that a seek back can
@@ -711,7 +725,7 @@ int avio_read_partial(AVIOContext *s, unsigned char *buf, int size)
return -1;
if (s->read_packet && s->write_flag) {
- len = s->read_packet(s->opaque, buf, size);
+ len = read_packet_wrapper(s, buf, size);
if (len > 0)
s->pos += len;
return len;
diff --git a/libavformat/version.h b/libavformat/version.h
index 878917d..ba400e1 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -97,6 +97,9 @@
#ifndef FF_API_OLD_ROTATE_API
#define FF_API_OLD_ROTATE_API (LIBAVFORMAT_VERSION_MAJOR < 58)
#endif
+#ifndef FF_API_OLD_AVIO_EOF_0
+#define FF_API_OLD_AVIO_EOF_0 (LIBAVFORMAT_VERSION_MAJOR < 58)
+#endif
#ifndef FF_API_R_FRAME_RATE
--
2.15.1
From f449ce0153359ef24e5afbf49144c539be92f789 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Fri, 2 Feb 2018 11:39:47 +0100
Subject: Re-enable memalign for Haiku
This had been disabled in 2011:
https://lists.ffmpeg.org/pipermail/ffmpeg-cvslog/2011-June/038362.html
If there are still problems with it we should rather fix them on Haiku
side.
diff --git a/configure b/configure
index 404b93e..fcd5d55 100755
--- a/configure
+++ b/configure
@@ -6593,8 +6593,6 @@ enabled threads && ! enabled pthreads && ! enabled atomics_native && die "non pt
if test $target_os = "haiku"; then
- disable memalign
- disable posix_memalign
enabled x86_32 && enabled shared && disable ebx_available
fi
--
2.16.1

50
media-video/ffmpeg/patches/ffmpeg-4.0.1.patchset
View File

@@ -1,50 +0,0 @@
From 6ed8a346799f20ba114b314d1054a30add1c4044 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Mon, 16 Oct 2017 18:31:07 +0200
Subject: disable ebx on x86.
diff --git a/configure b/configure
index dee507c..f0d0c09 100755
--- a/configure
+++ b/configure
@@ -6678,6 +6678,7 @@ enabled avresample && warn "Building with deprecated library libavresample"
if test $target_os = "haiku"; then
disable memalign
disable posix_memalign
+ enabled x86_32 && enabled shared && disable ebx_available
fi
flatten_extralibs(){
--
2.16.2
From f449ce0153359ef24e5afbf49144c539be92f789 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Fri, 2 Feb 2018 11:39:47 +0100
Subject: Re-enable memalign for Haiku
This had been disabled in 2011:
https://lists.ffmpeg.org/pipermail/ffmpeg-cvslog/2011-June/038362.html
If there are still problems with it we should rather fix them on Haiku
side.
diff --git a/configure b/configure
index f0d0c09..cd5dbf3 100755
--- a/configure
+++ b/configure
@@ -6676,8 +6676,6 @@ enabled threads && ! enabled pthreads && ! enabled atomics_native && die "non pt
enabled avresample && warn "Building with deprecated library libavresample"
if test $target_os = "haiku"; then
- disable memalign
- disable posix_memalign
enabled x86_32 && enabled shared && disable ebx_available
fi
--
2.16.2

50
media-video/ffmpeg/patches/ffmpeg-4.0.2.patchset
View File

@@ -1,50 +0,0 @@
From 6ed8a346799f20ba114b314d1054a30add1c4044 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Mon, 16 Oct 2017 18:31:07 +0200
Subject: disable ebx on x86.
diff --git a/configure b/configure
index dee507c..f0d0c09 100755
--- a/configure
+++ b/configure
@@ -6678,6 +6678,7 @@ enabled avresample && warn "Building with deprecated library libavresample"
if test $target_os = "haiku"; then
disable memalign
disable posix_memalign
+ enabled x86_32 && enabled shared && disable ebx_available
fi
flatten_extralibs(){
--
2.16.2
From f449ce0153359ef24e5afbf49144c539be92f789 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Fri, 2 Feb 2018 11:39:47 +0100
Subject: Re-enable memalign for Haiku
This had been disabled in 2011:
https://lists.ffmpeg.org/pipermail/ffmpeg-cvslog/2011-June/038362.html
If there are still problems with it we should rather fix them on Haiku
side.
diff --git a/configure b/configure
index f0d0c09..cd5dbf3 100755
--- a/configure
+++ b/configure
@@ -6676,8 +6676,6 @@ enabled threads && ! enabled pthreads && ! enabled atomics_native && die "non pt
enabled avresample && warn "Building with deprecated library libavresample"
if test $target_os = "haiku"; then
- disable memalign
- disable posix_memalign
enabled x86_32 && enabled shared && disable ebx_available
fi
--
2.16.2

50
media-video/ffmpeg/patches/ffmpeg-4.0.3.patchset
View File

@@ -1,50 +0,0 @@
From 6ed8a346799f20ba114b314d1054a30add1c4044 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Mon, 16 Oct 2017 18:31:07 +0200
Subject: disable ebx on x86.
diff --git a/configure b/configure
index dee507c..f0d0c09 100755
--- a/configure
+++ b/configure
@@ -6678,6 +6678,7 @@ enabled avresample && warn "Building with deprecated library libavresample"
if test $target_os = "haiku"; then
disable memalign
disable posix_memalign
+ enabled x86_32 && enabled shared && disable ebx_available
fi
flatten_extralibs(){
--
2.16.2
From f449ce0153359ef24e5afbf49144c539be92f789 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Fri, 2 Feb 2018 11:39:47 +0100
Subject: Re-enable memalign for Haiku
This had been disabled in 2011:
https://lists.ffmpeg.org/pipermail/ffmpeg-cvslog/2011-June/038362.html
If there are still problems with it we should rather fix them on Haiku
side.
diff --git a/configure b/configure
index f0d0c09..cd5dbf3 100755
--- a/configure
+++ b/configure
@@ -6676,8 +6676,6 @@ enabled threads && ! enabled pthreads && ! enabled atomics_native && die "non pt
enabled avresample && warn "Building with deprecated library libavresample"
if test $target_os = "haiku"; then
- disable memalign
- disable posix_memalign
enabled x86_32 && enabled shared && disable ebx_available
fi
--
2.16.2

49
media-video/ffmpeg/patches/ffmpeg-4.1.4.patchset
View File

@@ -1,49 +0,0 @@
From b23b1b46b089645399db6650af4494cc845d8320 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Mon, 16 Oct 2017 18:31:07 +0200
Subject: disable ebx on x86.
diff --git a/configure b/configure
index 7310b96..e754f1a 100755
--- a/configure
+++ b/configure
@@ -6785,6 +6785,7 @@ enabled avresample && warn "Building with deprecated library libavresample"
if test $target_os = "haiku"; then
disable memalign
disable posix_memalign
+ enabled x86_32 && enabled shared && disable ebx_available
fi
flatten_extralibs(){
--
2.19.1
From eea5a92a4edbc3b9343c668d19051dda3f223f32 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Fri, 2 Feb 2018 11:39:47 +0100
Subject: Re-enable memalign for Haiku
This had been disabled in 2011:
https://lists.ffmpeg.org/pipermail/ffmpeg-cvslog/2011-June/038362.html
If there are still problems with it we should rather fix them on Haiku
side.
diff --git a/configure b/configure
index e754f1a..31131ab 100755
--- a/configure
+++ b/configure
@@ -6783,8 +6783,6 @@ enabled threads && ! enabled pthreads && ! enabled atomics_native && die "non pt
enabled avresample && warn "Building with deprecated library libavresample"
if test $target_os = "haiku"; then
- disable memalign
- disable posix_memalign
enabled x86_32 && enabled shared && disable ebx_available
fi
--
2.19.1

0
media-video/ffmpeg/patches/ffmpeg-4.2.2.patchset → media-video/ffmpeg/patches/ffmpeg-4.3.patchset
View File