* [PR PATCH] ffmpeg: update to 4.3.2.
@ 2021-03-04 21:01 jnbr
2021-03-05 15:27 ` [PR REVIEW] " biopsin
` (6 more replies)
0 siblings, 7 replies; 8+ messages in thread
From: jnbr @ 2021-03-04 21:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1579 bytes --]
There is a new pull request by jnbr against master on the void-packages repository
https://github.com/jnbr/void-packages ffmpeg
https://github.com/void-linux/void-packages/pull/29229
ffmpeg: update to 4.3.2.
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/29229.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ffmpeg-29229.patch --]
[-- Type: text/x-diff, Size: 3756 bytes --]
From 1a35276588c93186060bc108730f54f9bda70b71 Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Thu, 4 Mar 2021 21:59:09 +0100
Subject: [PATCH] ffmpeg: update to 4.3.2.
---
.../patches/x86-yuv2rgb-crash-fix.patch | 59 -------------------
srcpkgs/ffmpeg/template | 4 +-
2 files changed, 2 insertions(+), 61 deletions(-)
delete mode 100644 srcpkgs/ffmpeg/patches/x86-yuv2rgb-crash-fix.patch
diff --git a/srcpkgs/ffmpeg/patches/x86-yuv2rgb-crash-fix.patch b/srcpkgs/ffmpeg/patches/x86-yuv2rgb-crash-fix.patch
deleted file mode 100644
index 1438ac4ee26..00000000000
--- a/srcpkgs/ffmpeg/patches/x86-yuv2rgb-crash-fix.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From ba3e771a42c29ee02c34e7769cfc1b2dbc5c760a Mon Sep 17 00:00:00 2001
-From: James Almer <jamrial@gmail.com>
-Date: Sun, 12 Jul 2020 21:32:01 -0300
-Subject: [PATCH] x86/yuv2rgb: fix crashes when storing data on unaligned
- buffers
-
-Regression since fc6a5883d6af8cae0e96af84dda0ad74b360a084 on SSSE3 enabled
-CPUs.
-
-Fixes ticket #8747
-
-Signed-off-by: James Almer <jamrial@gmail.com>
----
- libswscale/x86/yuv_2_rgb.asm | 18 +++++++++---------
- 1 file changed, 9 insertions(+), 9 deletions(-)
-
-diff --git libswscale/x86/yuv_2_rgb.asm b/libswscale/x86/yuv_2_rgb.asm
-index 575a84d921e9..003dff1f259c 100644
---- libswscale/x86/yuv_2_rgb.asm
-+++ libswscale/x86/yuv_2_rgb.asm
-@@ -268,9 +268,9 @@ cglobal %1_420_%2%3, GPR_num, GPR_num, reg_num, parameters
- por m2, m7
- por m1, m6 ; g5 b5 r6 g6 b6 r7 g7 b7 r8 g8 b8 r9 g9 b9 r10 g10
- por m2, m3 ; b10 r11 g11 b11 r12 g12 b12 r13 g13 b13 r14 g14 b14 r15 g15 b15
-- mova [imageq], m0
-- mova [imageq + 16], m1
-- mova [imageq + 32], m2
-+ movu [imageq], m0
-+ movu [imageq + 16], m1
-+ movu [imageq + 32], m2
- %endif ; mmsize = 16
- %else ; PACK RGB15/16/32
- packuswb m0, m1
-@@ -300,10 +300,10 @@ cglobal %1_420_%2%3, GPR_num, GPR_num, reg_num, parameters
- punpckhwd m_green, m_red
- punpcklwd m5, m6
- punpckhwd m_alpha, m6
-- mova [imageq + 0], m_blue
-- mova [imageq + 8 * time_num], m_green
-- mova [imageq + 16 * time_num], m5
-- mova [imageq + 24 * time_num], m_alpha
-+ movu [imageq + 0], m_blue
-+ movu [imageq + 8 * time_num], m_green
-+ movu [imageq + 16 * time_num], m5
-+ movu [imageq + 24 * time_num], m_alpha
- %else ; PACK RGB15/16
- %define depth 2
- %if cpuflag(ssse3)
-@@ -342,8 +342,8 @@ cglobal %1_420_%2%3, GPR_num, GPR_num, reg_num, parameters
- mova m2, m0
- punpcklbw m0, m1
- punpckhbw m2, m1
-- mova [imageq], m0
-- mova [imageq + 8 * time_num], m2
-+ movu [imageq], m0
-+ movu [imageq + 8 * time_num], m2
- %endif ; PACK RGB15/16
- %endif ; PACK RGB15/16/32
-
diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 7a23a790029..f6ca5e2653e 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -1,7 +1,7 @@
# Template file for 'ffmpeg'
# audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
pkgname=ffmpeg
-version=4.3.1
+version=4.3.2
revision=7
short_desc="Decoding, encoding and streaming software"
maintainer="Johannes <johannes.brechtmann@gmail.com>"
@@ -9,7 +9,7 @@ license="GPL-3.0-or-later"
homepage="https://www.ffmpeg.org"
changelog="https://raw.githubusercontent.com/FFmpeg/FFmpeg/master/Changelog"
distfiles="${homepage}/releases/ffmpeg-${version}.tar.xz"
-checksum=ad009240d46e307b4e03a213a0f49c11b650e445b1f8be0dda2a9212b34d2ffb
+checksum=46e4e64f1dd0233cbc0934b9f1c0da676008cad34725113fb7f802cfa84ccddb
hostmakedepends="pkg-config perl yasm"
makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-devel
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR REVIEW] ffmpeg: update to 4.3.2.
2021-03-04 21:01 [PR PATCH] ffmpeg: update to 4.3.2 jnbr
@ 2021-03-05 15:27 ` biopsin
2021-03-05 16:13 ` jnbr
` (5 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: biopsin @ 2021-03-05 15:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 167 bytes --]
New review comment by biopsin on void-packages repository
https://github.com/void-linux/void-packages/pull/29229#discussion_r588383060
Comment:
revision should be 1
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR REVIEW] ffmpeg: update to 4.3.2.
2021-03-04 21:01 [PR PATCH] ffmpeg: update to 4.3.2 jnbr
2021-03-05 15:27 ` [PR REVIEW] " biopsin
@ 2021-03-05 16:13 ` jnbr
2021-03-08 3:45 ` ericonr
` (4 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: jnbr @ 2021-03-05 16:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 163 bytes --]
New review comment by jnbr on void-packages repository
https://github.com/void-linux/void-packages/pull/29229#discussion_r588428836
Comment:
Good catch, thanks.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: ffmpeg: update to 4.3.2.
2021-03-04 21:01 [PR PATCH] ffmpeg: update to 4.3.2 jnbr
2021-03-05 15:27 ` [PR REVIEW] " biopsin
2021-03-05 16:13 ` jnbr
@ 2021-03-08 3:45 ` ericonr
2021-03-08 3:46 ` ericonr
` (3 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: ericonr @ 2021-03-08 3:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 148 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/29229#issuecomment-792441702
Comment:
Ping :)
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: ffmpeg: update to 4.3.2.
2021-03-04 21:01 [PR PATCH] ffmpeg: update to 4.3.2 jnbr
` (2 preceding siblings ...)
2021-03-08 3:45 ` ericonr
@ 2021-03-08 3:46 ` ericonr
2021-03-08 18:52 ` [PR PATCH] [Updated] " jnbr
` (2 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: ericonr @ 2021-03-08 3:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 148 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/29229#issuecomment-792441702
Comment:
Ping :)
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Updated] ffmpeg: update to 4.3.2.
2021-03-04 21:01 [PR PATCH] ffmpeg: update to 4.3.2 jnbr
` (3 preceding siblings ...)
2021-03-08 3:46 ` ericonr
@ 2021-03-08 18:52 ` jnbr
2021-03-08 19:06 ` jnbr
2021-03-08 19:07 ` [PR PATCH] [Merged]: " jnbr
6 siblings, 0 replies; 8+ messages in thread
From: jnbr @ 2021-03-08 18:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1584 bytes --]
There is an updated pull request by jnbr against master on the void-packages repository
https://github.com/jnbr/void-packages ffmpeg
https://github.com/void-linux/void-packages/pull/29229
ffmpeg: update to 4.3.2.
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/29229.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ffmpeg-29229.patch --]
[-- Type: text/x-diff, Size: 3755 bytes --]
From 151931cc8496ce1fec0b1a75bf67cada43df5083 Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Thu, 4 Mar 2021 21:59:09 +0100
Subject: [PATCH] ffmpeg: update to 4.3.2.
---
.../patches/x86-yuv2rgb-crash-fix.patch | 59 -------------------
srcpkgs/ffmpeg/template | 6 +-
2 files changed, 3 insertions(+), 62 deletions(-)
delete mode 100644 srcpkgs/ffmpeg/patches/x86-yuv2rgb-crash-fix.patch
diff --git a/srcpkgs/ffmpeg/patches/x86-yuv2rgb-crash-fix.patch b/srcpkgs/ffmpeg/patches/x86-yuv2rgb-crash-fix.patch
deleted file mode 100644
index 1438ac4ee26..00000000000
--- a/srcpkgs/ffmpeg/patches/x86-yuv2rgb-crash-fix.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From ba3e771a42c29ee02c34e7769cfc1b2dbc5c760a Mon Sep 17 00:00:00 2001
-From: James Almer <jamrial@gmail.com>
-Date: Sun, 12 Jul 2020 21:32:01 -0300
-Subject: [PATCH] x86/yuv2rgb: fix crashes when storing data on unaligned
- buffers
-
-Regression since fc6a5883d6af8cae0e96af84dda0ad74b360a084 on SSSE3 enabled
-CPUs.
-
-Fixes ticket #8747
-
-Signed-off-by: James Almer <jamrial@gmail.com>
----
- libswscale/x86/yuv_2_rgb.asm | 18 +++++++++---------
- 1 file changed, 9 insertions(+), 9 deletions(-)
-
-diff --git libswscale/x86/yuv_2_rgb.asm b/libswscale/x86/yuv_2_rgb.asm
-index 575a84d921e9..003dff1f259c 100644
---- libswscale/x86/yuv_2_rgb.asm
-+++ libswscale/x86/yuv_2_rgb.asm
-@@ -268,9 +268,9 @@ cglobal %1_420_%2%3, GPR_num, GPR_num, reg_num, parameters
- por m2, m7
- por m1, m6 ; g5 b5 r6 g6 b6 r7 g7 b7 r8 g8 b8 r9 g9 b9 r10 g10
- por m2, m3 ; b10 r11 g11 b11 r12 g12 b12 r13 g13 b13 r14 g14 b14 r15 g15 b15
-- mova [imageq], m0
-- mova [imageq + 16], m1
-- mova [imageq + 32], m2
-+ movu [imageq], m0
-+ movu [imageq + 16], m1
-+ movu [imageq + 32], m2
- %endif ; mmsize = 16
- %else ; PACK RGB15/16/32
- packuswb m0, m1
-@@ -300,10 +300,10 @@ cglobal %1_420_%2%3, GPR_num, GPR_num, reg_num, parameters
- punpckhwd m_green, m_red
- punpcklwd m5, m6
- punpckhwd m_alpha, m6
-- mova [imageq + 0], m_blue
-- mova [imageq + 8 * time_num], m_green
-- mova [imageq + 16 * time_num], m5
-- mova [imageq + 24 * time_num], m_alpha
-+ movu [imageq + 0], m_blue
-+ movu [imageq + 8 * time_num], m_green
-+ movu [imageq + 16 * time_num], m5
-+ movu [imageq + 24 * time_num], m_alpha
- %else ; PACK RGB15/16
- %define depth 2
- %if cpuflag(ssse3)
-@@ -342,8 +342,8 @@ cglobal %1_420_%2%3, GPR_num, GPR_num, reg_num, parameters
- mova m2, m0
- punpcklbw m0, m1
- punpckhbw m2, m1
-- mova [imageq], m0
-- mova [imageq + 8 * time_num], m2
-+ movu [imageq], m0
-+ movu [imageq + 8 * time_num], m2
- %endif ; PACK RGB15/16
- %endif ; PACK RGB15/16/32
-
diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 7a23a790029..76c9423d02f 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -1,15 +1,15 @@
# Template file for 'ffmpeg'
# audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
pkgname=ffmpeg
-version=4.3.1
-revision=7
+version=4.3.2
+revision=1
short_desc="Decoding, encoding and streaming software"
maintainer="Johannes <johannes.brechtmann@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://www.ffmpeg.org"
changelog="https://raw.githubusercontent.com/FFmpeg/FFmpeg/master/Changelog"
distfiles="${homepage}/releases/ffmpeg-${version}.tar.xz"
-checksum=ad009240d46e307b4e03a213a0f49c11b650e445b1f8be0dda2a9212b34d2ffb
+checksum=46e4e64f1dd0233cbc0934b9f1c0da676008cad34725113fb7f802cfa84ccddb
hostmakedepends="pkg-config perl yasm"
makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-devel
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: ffmpeg: update to 4.3.2.
2021-03-04 21:01 [PR PATCH] ffmpeg: update to 4.3.2 jnbr
` (4 preceding siblings ...)
2021-03-08 18:52 ` [PR PATCH] [Updated] " jnbr
@ 2021-03-08 19:06 ` jnbr
2021-03-08 19:07 ` [PR PATCH] [Merged]: " jnbr
6 siblings, 0 replies; 8+ messages in thread
From: jnbr @ 2021-03-08 19:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 196 bytes --]
New comment by jnbr on void-packages repository
https://github.com/void-linux/void-packages/pull/29229#issuecomment-792999278
Comment:
CI fails because dolphin-emu isn't cleaned from i686 repo.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Merged]: ffmpeg: update to 4.3.2.
2021-03-04 21:01 [PR PATCH] ffmpeg: update to 4.3.2 jnbr
` (5 preceding siblings ...)
2021-03-08 19:06 ` jnbr
@ 2021-03-08 19:07 ` jnbr
6 siblings, 0 replies; 8+ messages in thread
From: jnbr @ 2021-03-08 19:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1435 bytes --]
There's a merged pull request on the void-packages repository
ffmpeg: update to 4.3.2.
https://github.com/void-linux/void-packages/pull/29229
Description:
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2021-03-08 19:07 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-04 21:01 [PR PATCH] ffmpeg: update to 4.3.2 jnbr
2021-03-05 15:27 ` [PR REVIEW] " biopsin
2021-03-05 16:13 ` jnbr
2021-03-08 3:45 ` ericonr
2021-03-08 3:46 ` ericonr
2021-03-08 18:52 ` [PR PATCH] [Updated] " jnbr
2021-03-08 19:06 ` jnbr
2021-03-08 19:07 ` [PR PATCH] [Merged]: " jnbr
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).