* [Buildroot] [PATCH 1/1] package/ffmpeg: bump version to 4.3
@ 2020-06-20 21:34 Bernd Kuhls
2020-06-21 7:54 ` Yann E. MORIN
0 siblings, 1 reply; 3+ messages in thread
From: Bernd Kuhls @ 2020-06-20 21:34 UTC (permalink / raw)
To: buildroot
Added patch to fix build without ssse3.
Updated license hash due to various changes since August 2019, these
changes are unrelated to buildroot:
http://git.videolan.org/?p=ffmpeg.git;a=history;f=LICENSE.md;h=613070e1b631a919a74c862f2a75a0f249a631ff;hb=8e12af29d1a3f95c9e952d78354e3c8b1c0431a8
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
...-x86-yuv2rgb-Fix-build-without-SSSE3.patch | 40 +++++++++++++++++++
package/ffmpeg/ffmpeg.hash | 4 +-
package/ffmpeg/ffmpeg.mk | 2 +-
3 files changed, 43 insertions(+), 3 deletions(-)
create mode 100644 package/ffmpeg/0001-swscale-x86-yuv2rgb-Fix-build-without-SSSE3.patch
diff --git a/package/ffmpeg/0001-swscale-x86-yuv2rgb-Fix-build-without-SSSE3.patch b/package/ffmpeg/0001-swscale-x86-yuv2rgb-Fix-build-without-SSSE3.patch
new file mode 100644
index 0000000000..27a9029984
--- /dev/null
+++ b/package/ffmpeg/0001-swscale-x86-yuv2rgb-Fix-build-without-SSSE3.patch
@@ -0,0 +1,40 @@
+From bf8eae2d30a205bb76ac625e04c0351106981b9e Mon Sep 17 00:00:00 2001
+From: Parker Ernest <@>
+Date: Sun, 23 Feb 2020 13:22:42 +0100
+Subject: [PATCH] swscale/x86/yuv2rgb: Fix build without SSSE3
+
+commit fc6a5883d6af8cae0e96af84dda0ad74b360a084 breaks build on
+x86_64 CPUs which do not have SSSE3, e.g. AMD Phenom-II
+
+Downloaded from upstream patchworks:
+https://patchwork.ffmpeg.org/project/ffmpeg/patch/20200223122256.23402-1-michael at niedermayer.cc/
+
+Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ libswscale/x86/yuv2rgb.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/libswscale/x86/yuv2rgb.c b/libswscale/x86/yuv2rgb.c
+index c12e88cbb5..4791e5b93a 100644
+--- a/libswscale/x86/yuv2rgb.c
++++ b/libswscale/x86/yuv2rgb.c
+@@ -83,6 +83,7 @@ av_cold SwsFunc ff_yuv2rgb_init_x86(SwsContext *c)
+ #if HAVE_X86ASM
+ int cpu_flags = av_get_cpu_flags();
+
++#if HAVE_SSSE3
+ if (EXTERNAL_SSSE3(cpu_flags)) {
+ switch (c->dstFormat) {
+ case AV_PIX_FMT_RGB32:
+@@ -111,6 +112,7 @@ av_cold SwsFunc ff_yuv2rgb_init_x86(SwsContext *c)
+ return yuv420_rgb15_ssse3;
+ }
+ }
++#endif
+
+ if (EXTERNAL_MMXEXT(cpu_flags)) {
+ switch (c->dstFormat) {
+--
+2.26.2
+
diff --git a/package/ffmpeg/ffmpeg.hash b/package/ffmpeg/ffmpeg.hash
index 35bd681326..1572285cd6 100644
--- a/package/ffmpeg/ffmpeg.hash
+++ b/package/ffmpeg/ffmpeg.hash
@@ -1,5 +1,5 @@
# Locally calculated
-sha256 9df6c90aed1337634c1fb026fb01c154c29c82a64ea71291ff2da9aacb9aad31 ffmpeg-4.2.3.tar.xz
+sha256 1d0ad06484f44bcb97eba5e93c40bcb893890f9f64aeb43e46cd9bb4cbd6795d ffmpeg-4.3.tar.xz
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPLv2
sha256 b634ab5640e258563c536e658cad87080553df6f34f62269a21d554844e58bfe COPYING.LGPLv2.1
-sha256 cad1218c22121b169fb1380178ab7a0b33cb38a3ff6d3915b8533d1d954f3ce7 LICENSE.md
+sha256 cb48bf09a11f5fb576cddb0431c8f5ed0a60157a9ec942adffc13907cbe083f2 LICENSE.md
diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk
index 736aa5b4ba..aeebc0effc 100644
--- a/package/ffmpeg/ffmpeg.mk
+++ b/package/ffmpeg/ffmpeg.mk
@@ -4,7 +4,7 @@
#
################################################################################
-FFMPEG_VERSION = 4.2.3
+FFMPEG_VERSION = 4.3
FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.xz
FFMPEG_SITE = http://ffmpeg.org/releases
FFMPEG_INSTALL_STAGING = YES
--
2.26.2
^ permalink raw reply related [flat|nested] 3+ messages in thread* [Buildroot] [PATCH 1/1] package/ffmpeg: bump version to 4.3
2020-06-20 21:34 [Buildroot] [PATCH 1/1] package/ffmpeg: bump version to 4.3 Bernd Kuhls
@ 2020-06-21 7:54 ` Yann E. MORIN
2020-06-21 7:55 ` Yann E. MORIN
0 siblings, 1 reply; 3+ messages in thread
From: Yann E. MORIN @ 2020-06-21 7:54 UTC (permalink / raw)
To: buildroot
Bernd, All,
On 2020-06-20 23:34 +0200, Bernd Kuhls spake thusly:
> Added patch to fix build without ssse3.
>
> Updated license hash due to various changes since August 2019, these
> changes are unrelated to buildroot:
That's wrong: any change in the licensing terms *is* worth explaining.
Blindly changing the license hashes without explaining what has changed
makes the hashes useless.
So I've expanded the commit log with a summary of those changes.
Plus, see below...
> http://git.videolan.org/?p=ffmpeg.git;a=history;f=LICENSE.md;h=613070e1b631a919a74c862f2a75a0f249a631ff;hb=8e12af29d1a3f95c9e952d78354e3c8b1c0431a8
>
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
> ...-x86-yuv2rgb-Fix-build-without-SSSE3.patch | 40 +++++++++++++++++++
> package/ffmpeg/ffmpeg.hash | 4 +-
> package/ffmpeg/ffmpeg.mk | 2 +-
> 3 files changed, 43 insertions(+), 3 deletions(-)
> create mode 100644 package/ffmpeg/0001-swscale-x86-yuv2rgb-Fix-build-without-SSSE3.patch
>
> diff --git a/package/ffmpeg/0001-swscale-x86-yuv2rgb-Fix-build-without-SSSE3.patch b/package/ffmpeg/0001-swscale-x86-yuv2rgb-Fix-build-without-SSSE3.patch
> new file mode 100644
> index 0000000000..27a9029984
> --- /dev/null
> +++ b/package/ffmpeg/0001-swscale-x86-yuv2rgb-Fix-build-without-SSSE3.patch
> @@ -0,0 +1,40 @@
> +From bf8eae2d30a205bb76ac625e04c0351106981b9e Mon Sep 17 00:00:00 2001
> +From: Parker Ernest <@>
> +Date: Sun, 23 Feb 2020 13:22:42 +0100
> +Subject: [PATCH] swscale/x86/yuv2rgb: Fix build without SSSE3
> +
> +commit fc6a5883d6af8cae0e96af84dda0ad74b360a084 breaks build on
> +x86_64 CPUs which do not have SSSE3, e.g. AMD Phenom-II
> +
> +Downloaded from upstream patchworks:
> +https://patchwork.ffmpeg.org/project/ffmpeg/patch/20200223122256.23402-1-michael at niedermayer.cc/
> +
> +Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> +Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
The SoB lines are representing the chain of who did what with a patch.
So, the correct ordering is the following:
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
[bernd.kuhls at t-online.de:
- retrieved from upstream patchwork:
https://patchwork.ffmpeg.org/project/ffmpeg/patch/20200223122256.23402-1-michael at niedermayer.cc/
]
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Which means:
1. Michael authored the patch
2. Bernd got it from somewhere
3. Bernd propagated the patch
And since I was also involved in fixing that, I've added:
[yann.morin.1998 at free.fr: fix reference to patchwork and SoB order]
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
This now provides a clear history of the patch, where it originates
from, who did what with it, and in which order.
Regards,
Yann E. MORIN.
> +---
> + libswscale/x86/yuv2rgb.c | 2 ++
> + 1 file changed, 2 insertions(+)
> +
> +diff --git a/libswscale/x86/yuv2rgb.c b/libswscale/x86/yuv2rgb.c
> +index c12e88cbb5..4791e5b93a 100644
> +--- a/libswscale/x86/yuv2rgb.c
> ++++ b/libswscale/x86/yuv2rgb.c
> +@@ -83,6 +83,7 @@ av_cold SwsFunc ff_yuv2rgb_init_x86(SwsContext *c)
> + #if HAVE_X86ASM
> + int cpu_flags = av_get_cpu_flags();
> +
> ++#if HAVE_SSSE3
> + if (EXTERNAL_SSSE3(cpu_flags)) {
> + switch (c->dstFormat) {
> + case AV_PIX_FMT_RGB32:
> +@@ -111,6 +112,7 @@ av_cold SwsFunc ff_yuv2rgb_init_x86(SwsContext *c)
> + return yuv420_rgb15_ssse3;
> + }
> + }
> ++#endif
> +
> + if (EXTERNAL_MMXEXT(cpu_flags)) {
> + switch (c->dstFormat) {
> +--
> +2.26.2
> +
> diff --git a/package/ffmpeg/ffmpeg.hash b/package/ffmpeg/ffmpeg.hash
> index 35bd681326..1572285cd6 100644
> --- a/package/ffmpeg/ffmpeg.hash
> +++ b/package/ffmpeg/ffmpeg.hash
> @@ -1,5 +1,5 @@
> # Locally calculated
> -sha256 9df6c90aed1337634c1fb026fb01c154c29c82a64ea71291ff2da9aacb9aad31 ffmpeg-4.2.3.tar.xz
> +sha256 1d0ad06484f44bcb97eba5e93c40bcb893890f9f64aeb43e46cd9bb4cbd6795d ffmpeg-4.3.tar.xz
> sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPLv2
> sha256 b634ab5640e258563c536e658cad87080553df6f34f62269a21d554844e58bfe COPYING.LGPLv2.1
> -sha256 cad1218c22121b169fb1380178ab7a0b33cb38a3ff6d3915b8533d1d954f3ce7 LICENSE.md
> +sha256 cb48bf09a11f5fb576cddb0431c8f5ed0a60157a9ec942adffc13907cbe083f2 LICENSE.md
> diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk
> index 736aa5b4ba..aeebc0effc 100644
> --- a/package/ffmpeg/ffmpeg.mk
> +++ b/package/ffmpeg/ffmpeg.mk
> @@ -4,7 +4,7 @@
> #
> ################################################################################
>
> -FFMPEG_VERSION = 4.2.3
> +FFMPEG_VERSION = 4.3
> FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.xz
> FFMPEG_SITE = http://ffmpeg.org/releases
> FFMPEG_INSTALL_STAGING = YES
> --
> 2.26.2
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 3+ messages in thread* [Buildroot] [PATCH 1/1] package/ffmpeg: bump version to 4.3
2020-06-21 7:54 ` Yann E. MORIN
@ 2020-06-21 7:55 ` Yann E. MORIN
0 siblings, 0 replies; 3+ messages in thread
From: Yann E. MORIN @ 2020-06-21 7:55 UTC (permalink / raw)
To: buildroot
Bernd, All,
On 2020-06-21 09:54 +0200, Yann E. MORIN spake thusly:
> On 2020-06-20 23:34 +0200, Bernd Kuhls spake thusly:
> > Added patch to fix build without ssse3.
> >
> > Updated license hash due to various changes since August 2019, these
> > changes are unrelated to buildroot:
>
> That's wrong: any change in the licensing terms *is* worth explaining.
> Blindly changing the license hashes without explaining what has changed
> makes the hashes useless.
>
> So I've expanded the commit log with a summary of those changes.
[--SNIP--]
> This now provides a clear history of the patch, where it originates
> from, who did what with it, and in which order.
And of course: applied to master, thanks! :-)
Regards,
Yann E. MORIN.
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-06-21 7:55 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-06-20 21:34 [Buildroot] [PATCH 1/1] package/ffmpeg: bump version to 4.3 Bernd Kuhls
2020-06-21 7:54 ` Yann E. MORIN
2020-06-21 7:55 ` Yann E. MORIN
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox