* Re: [PR PATCH] [Updated] [NOMERGE ]ffmpeg: update to 4.3.
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-22980@inbox.vuxu.org>
2020-07-13 15:23 ` [NOMERGE ]ffmpeg: update to 4.3 ericonr
@ 2020-07-17 18:06 ` jnbr
2020-07-17 18:07 ` jnbr
` (7 subsequent siblings)
9 siblings, 0 replies; 10+ messages in thread
From: jnbr @ 2020-07-17 18:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 315 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/22980
[NOMERGE ]ffmpeg: update to 4.3.
A patch file from https://github.com/void-linux/void-packages/pull/22980.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ffmpeg-22980.patch --]
[-- Type: text/x-diff, Size: 6152 bytes --]
From 221ed2ef1fa36bf55927edaff12e0653548b4e39 Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Tue, 16 Jun 2020 20:16:13 +0200
Subject: [PATCH] ffmpeg: update to 4.3.
---
srcpkgs/ffmpeg/files/altivec.patch | 60 ++++++++++++++++++++++++++++++
srcpkgs/ffmpeg/template | 22 +++++++++--
2 files changed, 79 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/ffmpeg/files/altivec.patch
diff --git a/srcpkgs/ffmpeg/files/altivec.patch b/srcpkgs/ffmpeg/files/altivec.patch
new file mode 100644
index 00000000000..9c572004633
--- /dev/null
+++ b/srcpkgs/ffmpeg/files/altivec.patch
@@ -0,0 +1,60 @@
+revert some altivec specific change on all ppc* except ppc64le*
+
+q66: "We should also throw in a revert of FFmpeg/FFmpeg@3a557c5 but only
+conditionally, for ppc* but not ppc64le* (the new code is valid for
+POWER8 VSX which LE targets as a baseline but not BE)"
+
+
+This reverts commit 3a557c5d88b7b15b5954ba2743febb055549b536.
+---
+ libswscale/ppc/yuv2rgb_altivec.c | 24 ++++++++++++++++++++----
+ 1 file changed, 20 insertions(+), 4 deletions(-)
+
+diff --git a/libswscale/ppc/yuv2rgb_altivec.c b/libswscale/ppc/yuv2rgb_altivec.c
+index 536545293d..c1e2852adb 100644
+--- a/libswscale/ppc/yuv2rgb_altivec.c
++++ b/libswscale/ppc/yuv2rgb_altivec.c
+@@ -305,6 +305,9 @@ static int altivec_ ## name(SwsContext *c, const unsigned char **in, \
+ vector signed short R1, G1, B1; \
+ vector unsigned char R, G, B; \
+ \
++ const vector unsigned char *y1ivP, *y2ivP, *uivP, *vivP; \
++ vector unsigned char align_perm; \
++ \
+ vector signed short lCY = c->CY; \
+ vector signed short lOY = c->OY; \
+ vector signed short lCRV = c->CRV; \
+@@ -335,13 +338,26 @@ static int altivec_ ## name(SwsContext *c, const unsigned char **in, \
+ vec_dstst(oute, (0x02000002 | (((w * 3 + 32) / 32) << 16)), 1); \
+ \
+ for (j = 0; j < w / 16; j++) { \
+- y0 = vec_xl(0, y1i); \
++ y1ivP = (const vector unsigned char *) y1i; \
++ y2ivP = (const vector unsigned char *) y2i; \
++ uivP = (const vector unsigned char *) ui; \
++ vivP = (const vector unsigned char *) vi; \
++ \
++ align_perm = vec_lvsl(0, y1i); \
++ y0 = (vector unsigned char) \
++ vec_perm(y1ivP[0], y1ivP[1], align_perm); \
+ \
+- y1 = vec_xl(0, y2i); \
++ align_perm = vec_lvsl(0, y2i); \
++ y1 = (vector unsigned char) \
++ vec_perm(y2ivP[0], y2ivP[1], align_perm); \
+ \
+- u = (vector signed char) vec_xl(0, ui); \
++ align_perm = vec_lvsl(0, ui); \
++ u = (vector signed char) \
++ vec_perm(uivP[0], uivP[1], align_perm); \
+ \
+- v = (vector signed char) vec_xl(0, vi); \
++ align_perm = vec_lvsl(0, vi); \
++ v = (vector signed char) \
++ vec_perm(vivP[0], vivP[1], align_perm); \
+ \
+ u = (vector signed char) \
+ vec_sub(u, \
+--
+2.27.0
+
diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index ad986a72790..a09a8e52322 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.2.3
-revision=5
+version=4.3.1
+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=9df6c90aed1337634c1fb026fb01c154c29c82a64ea71291ff2da9aacb9aad31
+checksum=ad009240d46e307b4e03a213a0f49c11b650e445b1f8be0dda2a9212b34d2ffb
hostmakedepends="pkg-config perl yasm"
makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-devel
@@ -33,6 +33,22 @@ case "$XBPS_TARGET_MACHINE" in
mips*) CFLAGS="-mnan=legacy";;
esac
+_apply_patch() {
+ local args="$1" pname="$(basename $2)"
+
+ if [ ! -f ".${pname}_done" ]; then
+ patch -N $args -i $2
+ touch .${pname}_done
+ fi
+}
+
+post_patch() {
+ case "$XBPS_TARGET_MACHINE" in
+ ppc64le*) ;;
+ ppc*) _apply_patch -p1 ${FILESDIR}/altivec.patch ;;
+ esac
+}
+
do_configure() {
# Fix gcc on x86_64-musl only
if [ "$XBPS_TARGET_MACHINE" = "x86_64-musl" ]; then
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [NOMERGE ]ffmpeg: update to 4.3.
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-22980@inbox.vuxu.org>
2020-07-13 15:23 ` [NOMERGE ]ffmpeg: update to 4.3 ericonr
2020-07-17 18:06 ` [PR PATCH] [Updated] " jnbr
@ 2020-07-17 18:07 ` jnbr
2020-07-17 18:10 ` [PR REVIEW] " ericonr
` (6 subsequent siblings)
9 siblings, 0 replies; 10+ messages in thread
From: jnbr @ 2020-07-17 18:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 241 bytes --]
New comment by jnbr on void-packages repository
https://github.com/void-linux/void-packages/pull/22980#issuecomment-660261585
Comment:
Updated to 4.3.1 and added the altivec patch.
With chromium being patched, I think this is good to go.
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR REVIEW] [NOMERGE ]ffmpeg: update to 4.3.
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-22980@inbox.vuxu.org>
` (2 preceding siblings ...)
2020-07-17 18:07 ` jnbr
@ 2020-07-17 18:10 ` ericonr
2020-07-17 18:16 ` jnbr
` (5 subsequent siblings)
9 siblings, 0 replies; 10+ messages in thread
From: ericonr @ 2020-07-17 18:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 233 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/22980#discussion_r456598015
Comment:
Could we make this an exported function to be used in the case of conditional patches?
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR REVIEW] [NOMERGE ]ffmpeg: update to 4.3.
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-22980@inbox.vuxu.org>
` (3 preceding siblings ...)
2020-07-17 18:10 ` [PR REVIEW] " ericonr
@ 2020-07-17 18:16 ` jnbr
2020-07-17 18:35 ` ericonr
` (4 subsequent siblings)
9 siblings, 0 replies; 10+ messages in thread
From: jnbr @ 2020-07-17 18:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 259 bytes --]
New review comment by jnbr on void-packages repository
https://github.com/void-linux/void-packages/pull/22980#discussion_r456601040
Comment:
We could but I think conditional patches are a terrible idea and we should not make it more convenient to add them.
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR REVIEW] [NOMERGE ]ffmpeg: update to 4.3.
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-22980@inbox.vuxu.org>
` (4 preceding siblings ...)
2020-07-17 18:16 ` jnbr
@ 2020-07-17 18:35 ` ericonr
2020-07-18 0:31 ` q66
` (3 subsequent siblings)
9 siblings, 0 replies; 10+ messages in thread
From: ericonr @ 2020-07-17 18:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 159 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/22980#discussion_r456610190
Comment:
Fair enough.
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [NOMERGE ]ffmpeg: update to 4.3.
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-22980@inbox.vuxu.org>
` (5 preceding siblings ...)
2020-07-17 18:35 ` ericonr
@ 2020-07-18 0:31 ` q66
2020-07-22 2:01 ` ericonr
` (2 subsequent siblings)
9 siblings, 0 replies; 10+ messages in thread
From: q66 @ 2020-07-18 0:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 181 bytes --]
New comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/22980#issuecomment-660392929
Comment:
I'm not home till monday so i will look then
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [NOMERGE ]ffmpeg: update to 4.3.
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-22980@inbox.vuxu.org>
` (6 preceding siblings ...)
2020-07-18 0:31 ` q66
@ 2020-07-22 2:01 ` ericonr
2020-07-24 19:04 ` jnbr
2020-07-24 19:04 ` [PR PATCH] [Closed]: " jnbr
9 siblings, 0 replies; 10+ messages in thread
From: ericonr @ 2020-07-22 2:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 182 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/22980#issuecomment-662197868
Comment:
Maybe we can merge this one with #23542 ?
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [NOMERGE ]ffmpeg: update to 4.3.
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-22980@inbox.vuxu.org>
` (7 preceding siblings ...)
2020-07-22 2:01 ` ericonr
@ 2020-07-24 19:04 ` jnbr
2020-07-24 19:04 ` [PR PATCH] [Closed]: " jnbr
9 siblings, 0 replies; 10+ messages in thread
From: jnbr @ 2020-07-24 19:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 144 bytes --]
New comment by jnbr on void-packages repository
https://github.com/void-linux/void-packages/pull/22980#issuecomment-663687795
Comment:
merged
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR PATCH] [Closed]: [NOMERGE ]ffmpeg: update to 4.3.
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-22980@inbox.vuxu.org>
` (8 preceding siblings ...)
2020-07-24 19:04 ` jnbr
@ 2020-07-24 19:04 ` jnbr
9 siblings, 0 replies; 10+ messages in thread
From: jnbr @ 2020-07-24 19:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 166 bytes --]
There's a closed pull request on the void-packages repository
[NOMERGE ]ffmpeg: update to 4.3.
https://github.com/void-linux/void-packages/pull/22980
Description:
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [NOMERGE ]ffmpeg: update to 4.3.
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-22980@inbox.vuxu.org>
@ 2020-07-13 15:23 ` ericonr
2020-07-17 18:06 ` [PR PATCH] [Updated] " jnbr
` (8 subsequent siblings)
9 siblings, 0 replies; 10+ messages in thread
From: ericonr @ 2020-07-13 15:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 164 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/22980#issuecomment-657625106
Comment:
`4.3.1` is out already.
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2020-07-24 19:04 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-22980@inbox.vuxu.org>
2020-07-13 15:23 ` [NOMERGE ]ffmpeg: update to 4.3 ericonr
2020-07-17 18:06 ` [PR PATCH] [Updated] " jnbr
2020-07-17 18:07 ` jnbr
2020-07-17 18:10 ` [PR REVIEW] " ericonr
2020-07-17 18:16 ` jnbr
2020-07-17 18:35 ` ericonr
2020-07-18 0:31 ` q66
2020-07-22 2:01 ` ericonr
2020-07-24 19:04 ` jnbr
2020-07-24 19:04 ` [PR PATCH] [Closed]: " 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).