* Re: [PR PATCH] [Updated] x265: update to 3.5.
2021-07-14 0:03 [PR PATCH] x265: update to 3.5 ardadem
@ 2021-07-14 0:20 ` ardadem
2021-07-14 2:41 ` [PR REVIEW] " ericonr
` (22 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: ardadem @ 2021-07-14 0:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1587 bytes --]
There is an updated pull request by ardadem against master on the void-packages repository
https://github.com/ardadem/void-packages pr-x265
https://github.com/void-linux/void-packages/pull/31945
x265: update to 3.5.
<!-- 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/31945.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pr-x265-31945.patch --]
[-- Type: text/x-diff, Size: 6096 bytes --]
From e892b8a2fe98f9a37963ccbf1b95192ab730f9c8 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Wed, 14 Jul 2021 03:00:23 +0300
Subject: [PATCH 1/7] x265: update to 3.5.
---
common/shlibs | 2 +-
srcpkgs/x265/template | 12 ++++++++----
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 9df122c0edfe..54599671b542 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1976,7 +1976,7 @@ libQt5TextToSpeech.so.5 qt5-speech-5.15.2_3
libQt5Bodymovin.so.5 qt5-lottie-5.15.2_3
libQt5WebKit.so.5 qt5-webkit-5.6.0_1
libQt5WebKitWidgets.so.5 qt5-webkit-5.6.0_1
-libx265.so.192 x265-3.4_1
+libx265.so.199 x265-3.5_1
libQt5Xdg.so.3 libqtxdg-3.1.0_1
libQt5XdgIconLoader.so.3 libqtxdg-3.1.0_1
libqwt.so.6 qwt-6.1.3_1
diff --git a/srcpkgs/x265/template b/srcpkgs/x265/template
index 2b858bad487f..e9148e1d9a30 100644
--- a/srcpkgs/x265/template
+++ b/srcpkgs/x265/template
@@ -1,18 +1,19 @@
# Template file for 'x265'
pkgname=x265
-version=3.4
+version=3.5
revision=1
-_commit="a4f320054d67"
+_commit="f0c1022b6be1"
wrksrc="multicoreware-x265_git-${_commit}"
build_wrksrc=source
build_style=cmake
configure_args="-DENABLE_PIC=1"
+hostmakedepends="git"
short_desc="Open Source H.265/HEVC video encoder"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://x265.org/"
distfiles="https://bitbucket.org/multicoreware/x265_git/get/${version}.tar.gz"
-checksum=7f2771799bea0f53b5ab47603d5bea46ea2a221e047a7ff398115e9976fd5f86
+checksum=5ca3403c08de4716719575ec56c686b1eb55b078c0fe50a064dcf1ac20af1618
build_options="altivec assembly"
@@ -29,7 +30,10 @@ esac
if [ "$build_option_assembly" ]; then
case "$XBPS_TARGET_MACHINE" in
- x86_64*|i686*) hostmakedepends+=" nasm" ;;
+ x86_64*|i686*)
+ hostmakedepends+=" nasm"
+ configure_args+=" -DCMAKE_ASM_NASM_FLAGS=-w-macro-params-legacy"
+ ;;
*) ;;
esac
fi
From a9cf3426ac0243c472ef07e4eb559e24cce9cae2 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Wed, 14 Jul 2021 03:17:33 +0300
Subject: [PATCH 2/7] avidemux: revbump for x265
---
srcpkgs/avidemux/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/avidemux/template b/srcpkgs/avidemux/template
index e62a3bc2c436..c4936a930e7f 100644
--- a/srcpkgs/avidemux/template
+++ b/srcpkgs/avidemux/template
@@ -1,7 +1,7 @@
# Template file for 'avidemux'
pkgname=avidemux
version=2.7.6
-revision=1
+revision=2
# Can't be compiled for aarch64, arm* or mips*
archs="x86_64* i686*"
wrksrc="${pkgname}_${version}"
From 8228a79356ab978d3bbe198af2e6ca485a90a856 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Wed, 14 Jul 2021 03:17:43 +0300
Subject: [PATCH 3/7] ffmpeg: revbump for x265
---
srcpkgs/ffmpeg/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index e6667478fe13..ea58b30216ad 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -2,7 +2,7 @@
# audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
pkgname=ffmpeg
version=4.3.2
-revision=1
+revision=2
short_desc="Decoding, encoding and streaming software"
maintainer="Johannes <johannes.brechtmann@gmail.com>"
license="GPL-3.0-or-later"
From a09ab4309a2300df49213a2f9869369d838b5f33 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Wed, 14 Jul 2021 03:18:04 +0300
Subject: [PATCH 4/7] gst-plugins-bad1: revbump for x265
---
srcpkgs/gst-plugins-bad1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index 7b97a3e3184b..b4ef83c7aa2d 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-bad1'
pkgname=gst-plugins-bad1
version=1.18.4
-revision=3
+revision=4
wrksrc="${pkgname/1/}-${version}"
build_helper="gir"
build_style=meson
From a94f84e96b4739d4e8559cecb0333ad3c26c0ba7 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Wed, 14 Jul 2021 03:18:17 +0300
Subject: [PATCH 5/7] handbrake: revbump for x265
---
srcpkgs/handbrake/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template
index 6992bc520ed3..26bf2564421c 100644
--- a/srcpkgs/handbrake/template
+++ b/srcpkgs/handbrake/template
@@ -1,7 +1,7 @@
# Template file for 'handbrake'
pkgname=handbrake
version=1.3.3
-revision=3
+revision=4
wrksrc="HandBrake-${version}"
build_style=gnu-configure
configure_args="--force --disable-gtk-update-checks --disable-df-fetch --harden
From d1895e7709ed454c27b833195cafccc7ba6bffa1 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Wed, 14 Jul 2021 03:18:27 +0300
Subject: [PATCH 6/7] libheif: revbump for x265
---
srcpkgs/libheif/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libheif/template b/srcpkgs/libheif/template
index d4812d123fd4..1972c5b8ad7c 100644
--- a/srcpkgs/libheif/template
+++ b/srcpkgs/libheif/template
@@ -1,7 +1,7 @@
# Template file for 'libheif'
pkgname=libheif
version=1.12.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-option-checking"
hostmakedepends="automake autoconf pkg-config libtool"
From dea9701bdb23c4ee35c8e94929085a8ee29241a9 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Wed, 14 Jul 2021 03:18:33 +0300
Subject: [PATCH 7/7] vlc: revbump for x265
---
srcpkgs/vlc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 00bc1873f996..c2b617656cd9 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.16
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
^ permalink raw reply [flat|nested] 25+ messages in thread* Re: [PR REVIEW] x265: update to 3.5.
2021-07-14 0:03 [PR PATCH] x265: update to 3.5 ardadem
2021-07-14 0:20 ` [PR PATCH] [Updated] " ardadem
@ 2021-07-14 2:41 ` ericonr
2021-07-14 2:41 ` ericonr
` (21 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: ericonr @ 2021-07-14 2:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 227 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/31945#discussion_r669238055
Comment:
Does it clone things or just try to run `git describe` or similar at some point?
^ permalink raw reply [flat|nested] 25+ messages in thread* Re: [PR REVIEW] x265: update to 3.5.
2021-07-14 0:03 [PR PATCH] x265: update to 3.5 ardadem
2021-07-14 0:20 ` [PR PATCH] [Updated] " ardadem
2021-07-14 2:41 ` [PR REVIEW] " ericonr
@ 2021-07-14 2:41 ` ericonr
2021-07-14 7:25 ` ardadem
` (20 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: ericonr @ 2021-07-14 2:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 237 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/31945#discussion_r669238623
Comment:
Can you add a comment for the flag? Is it because our nasm is too old/new or here to stay?
^ permalink raw reply [flat|nested] 25+ messages in thread* Re: [PR REVIEW] x265: update to 3.5.
2021-07-14 0:03 [PR PATCH] x265: update to 3.5 ardadem
` (2 preceding siblings ...)
2021-07-14 2:41 ` ericonr
@ 2021-07-14 7:25 ` ardadem
2021-07-14 7:36 ` ardadem
` (19 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: ardadem @ 2021-07-14 7:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 217 bytes --]
New review comment by ardadem on void-packages repository
https://github.com/void-linux/void-packages/pull/31945#discussion_r669358895
Comment:
yes smth like git describe, you can check `source/cmake/Version.cmake`
^ permalink raw reply [flat|nested] 25+ messages in thread* Re: [PR REVIEW] x265: update to 3.5.
2021-07-14 0:03 [PR PATCH] x265: update to 3.5 ardadem
` (3 preceding siblings ...)
2021-07-14 7:25 ` ardadem
@ 2021-07-14 7:36 ` ardadem
2021-07-14 8:33 ` [PR PATCH] [Updated] " ardadem
` (18 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: ardadem @ 2021-07-14 7:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 398 bytes --]
New review comment by ardadem on void-packages repository
https://github.com/void-linux/void-packages/pull/31945#discussion_r669365874
Comment:
can i just put this issue as comment? https://bitbucket.org/multicoreware/x265_git/issues/559/warnings-when-assembling-with-nasm-215
also i can remove it if you want, it produce too much warnings without this flag so makes it hard to read the logs.
^ permalink raw reply [flat|nested] 25+ messages in thread* Re: [PR PATCH] [Updated] x265: update to 3.5.
2021-07-14 0:03 [PR PATCH] x265: update to 3.5 ardadem
` (4 preceding siblings ...)
2021-07-14 7:36 ` ardadem
@ 2021-07-14 8:33 ` ardadem
2021-07-14 13:14 ` [PR REVIEW] " ericonr
` (17 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: ardadem @ 2021-07-14 8:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1587 bytes --]
There is an updated pull request by ardadem against master on the void-packages repository
https://github.com/ardadem/void-packages pr-x265
https://github.com/void-linux/void-packages/pull/31945
x265: update to 3.5.
<!-- 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/31945.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pr-x265-31945.patch --]
[-- Type: text/x-diff, Size: 6164 bytes --]
From d046155bd141c47797c0e01cac08977f414be933 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Wed, 14 Jul 2021 03:00:23 +0300
Subject: [PATCH 1/7] x265: update to 3.5.
---
common/shlibs | 2 +-
srcpkgs/x265/template | 13 +++++++++----
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 9df122c0edfe..54599671b542 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1976,7 +1976,7 @@ libQt5TextToSpeech.so.5 qt5-speech-5.15.2_3
libQt5Bodymovin.so.5 qt5-lottie-5.15.2_3
libQt5WebKit.so.5 qt5-webkit-5.6.0_1
libQt5WebKitWidgets.so.5 qt5-webkit-5.6.0_1
-libx265.so.192 x265-3.4_1
+libx265.so.199 x265-3.5_1
libQt5Xdg.so.3 libqtxdg-3.1.0_1
libQt5XdgIconLoader.so.3 libqtxdg-3.1.0_1
libqwt.so.6 qwt-6.1.3_1
diff --git a/srcpkgs/x265/template b/srcpkgs/x265/template
index 2b858bad487f..e3f9f998152b 100644
--- a/srcpkgs/x265/template
+++ b/srcpkgs/x265/template
@@ -1,18 +1,19 @@
# Template file for 'x265'
pkgname=x265
-version=3.4
+version=3.5
revision=1
-_commit="a4f320054d67"
+_commit="f0c1022b6be1"
wrksrc="multicoreware-x265_git-${_commit}"
build_wrksrc=source
build_style=cmake
configure_args="-DENABLE_PIC=1"
+hostmakedepends="git"
short_desc="Open Source H.265/HEVC video encoder"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://x265.org/"
distfiles="https://bitbucket.org/multicoreware/x265_git/get/${version}.tar.gz"
-checksum=7f2771799bea0f53b5ab47603d5bea46ea2a221e047a7ff398115e9976fd5f86
+checksum=5ca3403c08de4716719575ec56c686b1eb55b078c0fe50a064dcf1ac20af1618
build_options="altivec assembly"
@@ -29,7 +30,11 @@ esac
if [ "$build_option_assembly" ]; then
case "$XBPS_TARGET_MACHINE" in
- x86_64*|i686*) hostmakedepends+=" nasm" ;;
+ x86_64*|i686*)
+ # see https://bitbucket.org/multicoreware/x265_git/issues/559
+ configure_args+=" -DCMAKE_ASM_NASM_FLAGS=-w-macro-params-legacy"
+ hostmakedepends+=" nasm"
+ ;;
*) ;;
esac
fi
From 6bff01d45d3909bd08d94fa4f6944138f1d39c34 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Wed, 14 Jul 2021 03:17:33 +0300
Subject: [PATCH 2/7] avidemux: revbump for x265
---
srcpkgs/avidemux/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/avidemux/template b/srcpkgs/avidemux/template
index e62a3bc2c436..c4936a930e7f 100644
--- a/srcpkgs/avidemux/template
+++ b/srcpkgs/avidemux/template
@@ -1,7 +1,7 @@
# Template file for 'avidemux'
pkgname=avidemux
version=2.7.6
-revision=1
+revision=2
# Can't be compiled for aarch64, arm* or mips*
archs="x86_64* i686*"
wrksrc="${pkgname}_${version}"
From ff8102ed09205a8cd0a1c718738aaee6a9c7ccb3 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Wed, 14 Jul 2021 03:17:43 +0300
Subject: [PATCH 3/7] ffmpeg: revbump for x265
---
srcpkgs/ffmpeg/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index e6667478fe13..ea58b30216ad 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -2,7 +2,7 @@
# audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
pkgname=ffmpeg
version=4.3.2
-revision=1
+revision=2
short_desc="Decoding, encoding and streaming software"
maintainer="Johannes <johannes.brechtmann@gmail.com>"
license="GPL-3.0-or-later"
From 01116c84934e09e2ea1ab05d0204d4db136df2d2 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Wed, 14 Jul 2021 03:18:04 +0300
Subject: [PATCH 4/7] gst-plugins-bad1: revbump for x265
---
srcpkgs/gst-plugins-bad1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index 7b97a3e3184b..b4ef83c7aa2d 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-bad1'
pkgname=gst-plugins-bad1
version=1.18.4
-revision=3
+revision=4
wrksrc="${pkgname/1/}-${version}"
build_helper="gir"
build_style=meson
From bd39a540f079b048ae4ec20be72d746333b0d9d1 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Wed, 14 Jul 2021 03:18:17 +0300
Subject: [PATCH 5/7] handbrake: revbump for x265
---
srcpkgs/handbrake/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template
index 6992bc520ed3..26bf2564421c 100644
--- a/srcpkgs/handbrake/template
+++ b/srcpkgs/handbrake/template
@@ -1,7 +1,7 @@
# Template file for 'handbrake'
pkgname=handbrake
version=1.3.3
-revision=3
+revision=4
wrksrc="HandBrake-${version}"
build_style=gnu-configure
configure_args="--force --disable-gtk-update-checks --disable-df-fetch --harden
From 986833f466971df46da0d192b0520e65c59fa9a8 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Wed, 14 Jul 2021 03:18:27 +0300
Subject: [PATCH 6/7] libheif: revbump for x265
---
srcpkgs/libheif/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libheif/template b/srcpkgs/libheif/template
index d4812d123fd4..1972c5b8ad7c 100644
--- a/srcpkgs/libheif/template
+++ b/srcpkgs/libheif/template
@@ -1,7 +1,7 @@
# Template file for 'libheif'
pkgname=libheif
version=1.12.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-option-checking"
hostmakedepends="automake autoconf pkg-config libtool"
From 1e224e71fec41b60ceb320ceb608908059da746b Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Wed, 14 Jul 2021 03:18:33 +0300
Subject: [PATCH 7/7] vlc: revbump for x265
---
srcpkgs/vlc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 00bc1873f996..c2b617656cd9 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.16
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
^ permalink raw reply [flat|nested] 25+ messages in thread* Re: [PR REVIEW] x265: update to 3.5.
2021-07-14 0:03 [PR PATCH] x265: update to 3.5 ardadem
` (5 preceding siblings ...)
2021-07-14 8:33 ` [PR PATCH] [Updated] " ardadem
@ 2021-07-14 13:14 ` ericonr
2021-07-19 17:01 ` [PR PATCH] [Updated] " ardadem
` (16 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: ericonr @ 2021-07-14 13:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 176 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/31945#discussion_r669603764
Comment:
The comment is great, thanks.
^ permalink raw reply [flat|nested] 25+ messages in thread* Re: [PR PATCH] [Updated] x265: update to 3.5.
2021-07-14 0:03 [PR PATCH] x265: update to 3.5 ardadem
` (6 preceding siblings ...)
2021-07-14 13:14 ` [PR REVIEW] " ericonr
@ 2021-07-19 17:01 ` ardadem
2021-07-19 17:29 ` ardadem
` (15 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: ardadem @ 2021-07-19 17:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1587 bytes --]
There is an updated pull request by ardadem against master on the void-packages repository
https://github.com/ardadem/void-packages pr-x265
https://github.com/void-linux/void-packages/pull/31945
x265: update to 3.5.
<!-- 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/31945.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pr-x265-31945.patch --]
[-- Type: text/x-diff, Size: 6164 bytes --]
From 571794aed7c7e1d1d848b6be2329ff7b787b2eb2 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Wed, 14 Jul 2021 03:00:23 +0300
Subject: [PATCH 1/7] x265: update to 3.5.
---
common/shlibs | 2 +-
srcpkgs/x265/template | 13 +++++++++----
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 77c205b376d2..f6acf948b749 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1982,7 +1982,7 @@ libQt5TextToSpeech.so.5 qt5-speech-5.15.2_3
libQt5Bodymovin.so.5 qt5-lottie-5.15.2_3
libQt5WebKit.so.5 qt5-webkit-5.6.0_1
libQt5WebKitWidgets.so.5 qt5-webkit-5.6.0_1
-libx265.so.192 x265-3.4_1
+libx265.so.199 x265-3.5_1
libQt5Xdg.so.3 libqtxdg-3.1.0_1
libQt5XdgIconLoader.so.3 libqtxdg-3.1.0_1
libqwt.so.6 qwt-6.1.3_1
diff --git a/srcpkgs/x265/template b/srcpkgs/x265/template
index 2b858bad487f..e3f9f998152b 100644
--- a/srcpkgs/x265/template
+++ b/srcpkgs/x265/template
@@ -1,18 +1,19 @@
# Template file for 'x265'
pkgname=x265
-version=3.4
+version=3.5
revision=1
-_commit="a4f320054d67"
+_commit="f0c1022b6be1"
wrksrc="multicoreware-x265_git-${_commit}"
build_wrksrc=source
build_style=cmake
configure_args="-DENABLE_PIC=1"
+hostmakedepends="git"
short_desc="Open Source H.265/HEVC video encoder"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://x265.org/"
distfiles="https://bitbucket.org/multicoreware/x265_git/get/${version}.tar.gz"
-checksum=7f2771799bea0f53b5ab47603d5bea46ea2a221e047a7ff398115e9976fd5f86
+checksum=5ca3403c08de4716719575ec56c686b1eb55b078c0fe50a064dcf1ac20af1618
build_options="altivec assembly"
@@ -29,7 +30,11 @@ esac
if [ "$build_option_assembly" ]; then
case "$XBPS_TARGET_MACHINE" in
- x86_64*|i686*) hostmakedepends+=" nasm" ;;
+ x86_64*|i686*)
+ # see https://bitbucket.org/multicoreware/x265_git/issues/559
+ configure_args+=" -DCMAKE_ASM_NASM_FLAGS=-w-macro-params-legacy"
+ hostmakedepends+=" nasm"
+ ;;
*) ;;
esac
fi
From b3243b3bc6bb7b832a4a4a8e280a408efe6ec829 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Wed, 14 Jul 2021 03:17:33 +0300
Subject: [PATCH 2/7] avidemux: revbump for x265
---
srcpkgs/avidemux/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/avidemux/template b/srcpkgs/avidemux/template
index e62a3bc2c436..c4936a930e7f 100644
--- a/srcpkgs/avidemux/template
+++ b/srcpkgs/avidemux/template
@@ -1,7 +1,7 @@
# Template file for 'avidemux'
pkgname=avidemux
version=2.7.6
-revision=1
+revision=2
# Can't be compiled for aarch64, arm* or mips*
archs="x86_64* i686*"
wrksrc="${pkgname}_${version}"
From 84f8a58e13374fa4ac5b183ae8be891487d1f5a5 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Wed, 14 Jul 2021 03:17:43 +0300
Subject: [PATCH 3/7] ffmpeg: revbump for x265
---
srcpkgs/ffmpeg/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index e6667478fe13..ea58b30216ad 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -2,7 +2,7 @@
# audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
pkgname=ffmpeg
version=4.3.2
-revision=1
+revision=2
short_desc="Decoding, encoding and streaming software"
maintainer="Johannes <johannes.brechtmann@gmail.com>"
license="GPL-3.0-or-later"
From 2730d15f21c760b50497c57b6a038ba9e6055b3a Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Wed, 14 Jul 2021 03:18:04 +0300
Subject: [PATCH 4/7] gst-plugins-bad1: revbump for x265
---
srcpkgs/gst-plugins-bad1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index 7b97a3e3184b..b4ef83c7aa2d 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-bad1'
pkgname=gst-plugins-bad1
version=1.18.4
-revision=3
+revision=4
wrksrc="${pkgname/1/}-${version}"
build_helper="gir"
build_style=meson
From 8e4f81fddc222c5b4839786cb0d507452e0c2839 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Wed, 14 Jul 2021 03:18:17 +0300
Subject: [PATCH 5/7] handbrake: revbump for x265
---
srcpkgs/handbrake/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template
index 6992bc520ed3..26bf2564421c 100644
--- a/srcpkgs/handbrake/template
+++ b/srcpkgs/handbrake/template
@@ -1,7 +1,7 @@
# Template file for 'handbrake'
pkgname=handbrake
version=1.3.3
-revision=3
+revision=4
wrksrc="HandBrake-${version}"
build_style=gnu-configure
configure_args="--force --disable-gtk-update-checks --disable-df-fetch --harden
From 44990cc980dbb7bc2d465bf06b21fa401aa8fcca Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Wed, 14 Jul 2021 03:18:27 +0300
Subject: [PATCH 6/7] libheif: revbump for x265
---
srcpkgs/libheif/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libheif/template b/srcpkgs/libheif/template
index d4812d123fd4..1972c5b8ad7c 100644
--- a/srcpkgs/libheif/template
+++ b/srcpkgs/libheif/template
@@ -1,7 +1,7 @@
# Template file for 'libheif'
pkgname=libheif
version=1.12.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-option-checking"
hostmakedepends="automake autoconf pkg-config libtool"
From 903d56ad8a1791175baab6931372e750cffe4d9b Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Wed, 14 Jul 2021 03:18:33 +0300
Subject: [PATCH 7/7] vlc: revbump for x265
---
srcpkgs/vlc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 00bc1873f996..c2b617656cd9 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.16
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
^ permalink raw reply [flat|nested] 25+ messages in thread* Re: x265: update to 3.5.
2021-07-14 0:03 [PR PATCH] x265: update to 3.5 ardadem
` (7 preceding siblings ...)
2021-07-19 17:01 ` [PR PATCH] [Updated] " ardadem
@ 2021-07-19 17:29 ` ardadem
2021-08-09 14:05 ` [PR PATCH] [Closed]: " ardadem
` (14 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: ardadem @ 2021-07-19 17:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 220 bytes --]
New comment by ardadem on void-packages repository
https://github.com/void-linux/void-packages/pull/31945#issuecomment-882728181
Comment:
There is no issues when i build vlc locally so i don't know why it's fail on CI
^ permalink raw reply [flat|nested] 25+ messages in thread* Re: [PR PATCH] [Closed]: x265: update to 3.5.
2021-07-14 0:03 [PR PATCH] x265: update to 3.5 ardadem
` (8 preceding siblings ...)
2021-07-19 17:29 ` ardadem
@ 2021-08-09 14:05 ` ardadem
2021-08-09 14:12 ` ericonr
` (13 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: ardadem @ 2021-08-09 14:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1431 bytes --]
There's a closed pull request on the void-packages repository
x265: update to 3.5.
https://github.com/void-linux/void-packages/pull/31945
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] 25+ messages in thread* Re: x265: update to 3.5.
2021-07-14 0:03 [PR PATCH] x265: update to 3.5 ardadem
` (9 preceding siblings ...)
2021-08-09 14:05 ` [PR PATCH] [Closed]: " ardadem
@ 2021-08-09 14:12 ` ericonr
2021-08-09 14:18 ` ardadem
` (12 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: ericonr @ 2021-08-09 14:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 168 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/31945#issuecomment-895258876
Comment:
Hi, why did you close this?
^ permalink raw reply [flat|nested] 25+ messages in thread* Re: x265: update to 3.5.
2021-07-14 0:03 [PR PATCH] x265: update to 3.5 ardadem
` (10 preceding siblings ...)
2021-08-09 14:12 ` ericonr
@ 2021-08-09 14:18 ` ardadem
2021-08-09 14:50 ` ericonr
` (11 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: ardadem @ 2021-08-09 14:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 187 bytes --]
New comment by ardadem on void-packages repository
https://github.com/void-linux/void-packages/pull/31945#issuecomment-895263862
Comment:
I couldn't figure out why VLC test fails on CI
^ permalink raw reply [flat|nested] 25+ messages in thread* Re: x265: update to 3.5.
2021-07-14 0:03 [PR PATCH] x265: update to 3.5 ardadem
` (11 preceding siblings ...)
2021-08-09 14:18 ` ardadem
@ 2021-08-09 14:50 ` ericonr
2021-08-09 15:47 ` ardadem
` (10 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: ericonr @ 2021-08-09 14:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 231 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/31945#issuecomment-895289153
Comment:
Can you reopen? I can take a look (or if they work locally, just add `make_check=ci-skip`)
^ permalink raw reply [flat|nested] 25+ messages in thread* Re: x265: update to 3.5.
2021-07-14 0:03 [PR PATCH] x265: update to 3.5 ardadem
` (12 preceding siblings ...)
2021-08-09 14:50 ` ericonr
@ 2021-08-09 15:47 ` ardadem
2021-08-09 16:32 ` [PR PATCH] [Updated] " ardadem
` (9 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: ardadem @ 2021-08-09 15:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 145 bytes --]
New comment by ardadem on void-packages repository
https://github.com/void-linux/void-packages/pull/31945#issuecomment-895333956
Comment:
Sure
^ permalink raw reply [flat|nested] 25+ messages in thread* Re: [PR PATCH] [Updated] x265: update to 3.5.
2021-07-14 0:03 [PR PATCH] x265: update to 3.5 ardadem
` (13 preceding siblings ...)
2021-08-09 15:47 ` ardadem
@ 2021-08-09 16:32 ` ardadem
2021-08-09 16:56 ` ardadem
` (8 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: ardadem @ 2021-08-09 16:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1587 bytes --]
There is an updated pull request by ardadem against master on the void-packages repository
https://github.com/ardadem/void-packages pr-x265
https://github.com/void-linux/void-packages/pull/31945
x265: update to 3.5.
<!-- 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/31945.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pr-x265-31945.patch --]
[-- Type: text/x-diff, Size: 6149 bytes --]
From af29a3fee271d7aa22ba9c5db22204cc3c29086c Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Wed, 14 Jul 2021 03:00:23 +0300
Subject: [PATCH 1/7] x265: update to 3.5.
---
common/shlibs | 2 +-
srcpkgs/x265/template | 13 +++++++++----
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 278d2456072f..11e56dcb28b9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1957,7 +1957,7 @@ libQt5TextToSpeech.so.5 qt5-speech-5.15.2_3
libQt5Bodymovin.so.5 qt5-lottie-5.15.2_3
libQt5WebKit.so.5 qt5-webkit-5.6.0_1
libQt5WebKitWidgets.so.5 qt5-webkit-5.6.0_1
-libx265.so.192 x265-3.4_1
+libx265.so.199 x265-3.5_1
libQt5Xdg.so.3 libqtxdg-3.1.0_1
libQt5XdgIconLoader.so.3 libqtxdg-3.1.0_1
libqwt.so.6 qwt-6.1.3_1
diff --git a/srcpkgs/x265/template b/srcpkgs/x265/template
index 2b858bad487f..e3f9f998152b 100644
--- a/srcpkgs/x265/template
+++ b/srcpkgs/x265/template
@@ -1,18 +1,19 @@
# Template file for 'x265'
pkgname=x265
-version=3.4
+version=3.5
revision=1
-_commit="a4f320054d67"
+_commit="f0c1022b6be1"
wrksrc="multicoreware-x265_git-${_commit}"
build_wrksrc=source
build_style=cmake
configure_args="-DENABLE_PIC=1"
+hostmakedepends="git"
short_desc="Open Source H.265/HEVC video encoder"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://x265.org/"
distfiles="https://bitbucket.org/multicoreware/x265_git/get/${version}.tar.gz"
-checksum=7f2771799bea0f53b5ab47603d5bea46ea2a221e047a7ff398115e9976fd5f86
+checksum=5ca3403c08de4716719575ec56c686b1eb55b078c0fe50a064dcf1ac20af1618
build_options="altivec assembly"
@@ -29,7 +30,11 @@ esac
if [ "$build_option_assembly" ]; then
case "$XBPS_TARGET_MACHINE" in
- x86_64*|i686*) hostmakedepends+=" nasm" ;;
+ x86_64*|i686*)
+ # see https://bitbucket.org/multicoreware/x265_git/issues/559
+ configure_args+=" -DCMAKE_ASM_NASM_FLAGS=-w-macro-params-legacy"
+ hostmakedepends+=" nasm"
+ ;;
*) ;;
esac
fi
From 0a0ec542ead8851da17b74b78bf5a9997cdd82dc Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Mon, 9 Aug 2021 19:30:44 +0300
Subject: [PATCH 2/7] ffmpeg: revbump for x265
---
srcpkgs/ffmpeg/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 0a0d24683082..33d3e0bfc2d6 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -2,7 +2,7 @@
# audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
pkgname=ffmpeg
version=4.3.2
-revision=2
+revision=3
short_desc="Decoding, encoding and streaming software"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
From 87da78dbda7a0a3f1b421a09ceccdcc639998dd9 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Mon, 9 Aug 2021 19:30:55 +0300
Subject: [PATCH 3/7] vlc: revbump for x265
---
srcpkgs/vlc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 00bc1873f996..c2b617656cd9 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.16
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From 550c58e66074a2a1b47957088e2bc67cb01051d0 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Mon, 9 Aug 2021 19:31:00 +0300
Subject: [PATCH 4/7] libheif: revbump for x265
---
srcpkgs/libheif/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libheif/template b/srcpkgs/libheif/template
index d4812d123fd4..1972c5b8ad7c 100644
--- a/srcpkgs/libheif/template
+++ b/srcpkgs/libheif/template
@@ -1,7 +1,7 @@
# Template file for 'libheif'
pkgname=libheif
version=1.12.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-option-checking"
hostmakedepends="automake autoconf pkg-config libtool"
From 8c131ff6774ec23ac364eebe9e7c6f85d5e07809 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Mon, 9 Aug 2021 19:31:08 +0300
Subject: [PATCH 5/7] handbrake: revbump for x265
---
srcpkgs/handbrake/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template
index 6992bc520ed3..26bf2564421c 100644
--- a/srcpkgs/handbrake/template
+++ b/srcpkgs/handbrake/template
@@ -1,7 +1,7 @@
# Template file for 'handbrake'
pkgname=handbrake
version=1.3.3
-revision=3
+revision=4
wrksrc="HandBrake-${version}"
build_style=gnu-configure
configure_args="--force --disable-gtk-update-checks --disable-df-fetch --harden
From ededb4d79b2bdd3b3a8f84365b00afac2b7f8337 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Mon, 9 Aug 2021 19:31:15 +0300
Subject: [PATCH 6/7] gst-plugins-bad1: revbump for x265
---
srcpkgs/gst-plugins-bad1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index 7b97a3e3184b..b4ef83c7aa2d 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-bad1'
pkgname=gst-plugins-bad1
version=1.18.4
-revision=3
+revision=4
wrksrc="${pkgname/1/}-${version}"
build_helper="gir"
build_style=meson
From 783df3a7b2aa46f01ae25f56d634f7b57ea6f636 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Mon, 9 Aug 2021 19:31:22 +0300
Subject: [PATCH 7/7] avidemux: revbump for x265
---
srcpkgs/avidemux/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/avidemux/template b/srcpkgs/avidemux/template
index e62a3bc2c436..c4936a930e7f 100644
--- a/srcpkgs/avidemux/template
+++ b/srcpkgs/avidemux/template
@@ -1,7 +1,7 @@
# Template file for 'avidemux'
pkgname=avidemux
version=2.7.6
-revision=1
+revision=2
# Can't be compiled for aarch64, arm* or mips*
archs="x86_64* i686*"
wrksrc="${pkgname}_${version}"
^ permalink raw reply [flat|nested] 25+ messages in thread* Re: x265: update to 3.5.
2021-07-14 0:03 [PR PATCH] x265: update to 3.5 ardadem
` (14 preceding siblings ...)
2021-08-09 16:32 ` [PR PATCH] [Updated] " ardadem
@ 2021-08-09 16:56 ` ardadem
2021-08-09 17:09 ` ardadem
` (7 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: ardadem @ 2021-08-09 16:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 897 bytes --]
New comment by ardadem on void-packages repository
https://github.com/void-linux/void-packages/pull/31945#issuecomment-895382474
Comment:
double checked locally but it didn't fail.
```
make check-TESTS
make[3]: Entering directory '/builddir/vlc-3.0.16'
make[4]: Entering directory '/builddir/vlc-3.0.16'
PASS: test/run_vlc.sh
============================================================================
Testsuite summary for vlc 3.0.16
============================================================================
# TOTAL: 1
# PASS: 1
# SKIP: 0
# XFAIL: 0
# FAIL: 0
# XPASS: 0
# ERROR: 0
============================================================================
make[4]: Leaving directory '/builddir/vlc-3.0.16'
make[3]: Leaving directory '/builddir/vlc-3.0.16'
make[2]: Leaving directory '/builddir/vlc-3.0.16'
make[1]: Leaving directory '/builddir/vlc-3.0.16'
```
^ permalink raw reply [flat|nested] 25+ messages in thread* Re: x265: update to 3.5.
2021-07-14 0:03 [PR PATCH] x265: update to 3.5 ardadem
` (15 preceding siblings ...)
2021-08-09 16:56 ` ardadem
@ 2021-08-09 17:09 ` ardadem
2021-08-10 18:39 ` ericonr
` (6 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: ardadem @ 2021-08-09 17:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 926 bytes --]
New comment by ardadem on void-packages repository
https://github.com/void-linux/void-packages/pull/31945#issuecomment-895382474
Comment:
double checked locally but it didn't fail.
EDIT: and x86_64-musl too
```
make check-TESTS
make[3]: Entering directory '/builddir/vlc-3.0.16'
make[4]: Entering directory '/builddir/vlc-3.0.16'
PASS: test/run_vlc.sh
============================================================================
Testsuite summary for vlc 3.0.16
============================================================================
# TOTAL: 1
# PASS: 1
# SKIP: 0
# XFAIL: 0
# FAIL: 0
# XPASS: 0
# ERROR: 0
============================================================================
make[4]: Leaving directory '/builddir/vlc-3.0.16'
make[3]: Leaving directory '/builddir/vlc-3.0.16'
make[2]: Leaving directory '/builddir/vlc-3.0.16'
make[1]: Leaving directory '/builddir/vlc-3.0.16'
```
^ permalink raw reply [flat|nested] 25+ messages in thread* Re: x265: update to 3.5.
2021-07-14 0:03 [PR PATCH] x265: update to 3.5 ardadem
` (16 preceding siblings ...)
2021-08-09 17:09 ` ardadem
@ 2021-08-10 18:39 ` ericonr
2021-08-12 13:25 ` [PR PATCH] [Updated] " ardadem
` (5 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: ericonr @ 2021-08-10 18:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 254 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/31945#issuecomment-896225164
Comment:
Feel free to add `make_check=ci-skip` to the template, then, with a comment on the failure that's observed on CI.
^ permalink raw reply [flat|nested] 25+ messages in thread* Re: [PR PATCH] [Updated] x265: update to 3.5.
2021-07-14 0:03 [PR PATCH] x265: update to 3.5 ardadem
` (17 preceding siblings ...)
2021-08-10 18:39 ` ericonr
@ 2021-08-12 13:25 ` ardadem
2021-08-12 14:00 ` ardadem
` (4 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: ardadem @ 2021-08-12 13:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1587 bytes --]
There is an updated pull request by ardadem against master on the void-packages repository
https://github.com/ardadem/void-packages pr-x265
https://github.com/void-linux/void-packages/pull/31945
x265: update to 3.5.
<!-- 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/31945.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pr-x265-31945.patch --]
[-- Type: text/x-diff, Size: 6600 bytes --]
From af29a3fee271d7aa22ba9c5db22204cc3c29086c Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Wed, 14 Jul 2021 03:00:23 +0300
Subject: [PATCH 1/7] x265: update to 3.5.
---
common/shlibs | 2 +-
srcpkgs/x265/template | 13 +++++++++----
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 278d2456072f..11e56dcb28b9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1957,7 +1957,7 @@ libQt5TextToSpeech.so.5 qt5-speech-5.15.2_3
libQt5Bodymovin.so.5 qt5-lottie-5.15.2_3
libQt5WebKit.so.5 qt5-webkit-5.6.0_1
libQt5WebKitWidgets.so.5 qt5-webkit-5.6.0_1
-libx265.so.192 x265-3.4_1
+libx265.so.199 x265-3.5_1
libQt5Xdg.so.3 libqtxdg-3.1.0_1
libQt5XdgIconLoader.so.3 libqtxdg-3.1.0_1
libqwt.so.6 qwt-6.1.3_1
diff --git a/srcpkgs/x265/template b/srcpkgs/x265/template
index 2b858bad487f..e3f9f998152b 100644
--- a/srcpkgs/x265/template
+++ b/srcpkgs/x265/template
@@ -1,18 +1,19 @@
# Template file for 'x265'
pkgname=x265
-version=3.4
+version=3.5
revision=1
-_commit="a4f320054d67"
+_commit="f0c1022b6be1"
wrksrc="multicoreware-x265_git-${_commit}"
build_wrksrc=source
build_style=cmake
configure_args="-DENABLE_PIC=1"
+hostmakedepends="git"
short_desc="Open Source H.265/HEVC video encoder"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://x265.org/"
distfiles="https://bitbucket.org/multicoreware/x265_git/get/${version}.tar.gz"
-checksum=7f2771799bea0f53b5ab47603d5bea46ea2a221e047a7ff398115e9976fd5f86
+checksum=5ca3403c08de4716719575ec56c686b1eb55b078c0fe50a064dcf1ac20af1618
build_options="altivec assembly"
@@ -29,7 +30,11 @@ esac
if [ "$build_option_assembly" ]; then
case "$XBPS_TARGET_MACHINE" in
- x86_64*|i686*) hostmakedepends+=" nasm" ;;
+ x86_64*|i686*)
+ # see https://bitbucket.org/multicoreware/x265_git/issues/559
+ configure_args+=" -DCMAKE_ASM_NASM_FLAGS=-w-macro-params-legacy"
+ hostmakedepends+=" nasm"
+ ;;
*) ;;
esac
fi
From 0a0ec542ead8851da17b74b78bf5a9997cdd82dc Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Mon, 9 Aug 2021 19:30:44 +0300
Subject: [PATCH 2/7] ffmpeg: revbump for x265
---
srcpkgs/ffmpeg/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 0a0d24683082..33d3e0bfc2d6 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -2,7 +2,7 @@
# audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
pkgname=ffmpeg
version=4.3.2
-revision=2
+revision=3
short_desc="Decoding, encoding and streaming software"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
From 3ba2a5fcd3d88940612192144d944061bef63293 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Mon, 9 Aug 2021 19:30:55 +0300
Subject: [PATCH 3/7] vlc: revbump for x265
also add ci-skip due to fail on test/run_vlc.sh
---
srcpkgs/vlc/template | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 00bc1873f996..426d29c7da33 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.16
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
@@ -42,6 +42,8 @@ makedepends="
$(vopt_if svg librsvg-devel) $(vopt_if sndio sndio-devel)
$(vopt_if chromecast protobuf-devel) $(vopt_if chromecast libmicrodns-devel)"
depends="freefont-ttf hicolor-icon-theme desktop-file-utils"
+# test/run_vlc.sh fail on CI
+make_check=ci-skip
# Package build options
build_options="lua notify opengl qt rpi smb svg v4l2 vaapi vdpau x265 sndio chromecast"
From 82aa3f01ef1bdd5a0703d4ec4e15cc2678fa185c Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Mon, 9 Aug 2021 19:31:00 +0300
Subject: [PATCH 4/7] libheif: revbump for x265
---
srcpkgs/libheif/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libheif/template b/srcpkgs/libheif/template
index d4812d123fd4..1972c5b8ad7c 100644
--- a/srcpkgs/libheif/template
+++ b/srcpkgs/libheif/template
@@ -1,7 +1,7 @@
# Template file for 'libheif'
pkgname=libheif
version=1.12.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-option-checking"
hostmakedepends="automake autoconf pkg-config libtool"
From fc12b45502fce0dea80737f7f4de4c50294095a5 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Mon, 9 Aug 2021 19:31:08 +0300
Subject: [PATCH 5/7] handbrake: revbump for x265
---
srcpkgs/handbrake/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template
index 6992bc520ed3..26bf2564421c 100644
--- a/srcpkgs/handbrake/template
+++ b/srcpkgs/handbrake/template
@@ -1,7 +1,7 @@
# Template file for 'handbrake'
pkgname=handbrake
version=1.3.3
-revision=3
+revision=4
wrksrc="HandBrake-${version}"
build_style=gnu-configure
configure_args="--force --disable-gtk-update-checks --disable-df-fetch --harden
From a1efe5fc7d8db5bc8946cd01fbb68057ec1c3fcf Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Mon, 9 Aug 2021 19:31:15 +0300
Subject: [PATCH 6/7] gst-plugins-bad1: revbump for x265
---
srcpkgs/gst-plugins-bad1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index 7b97a3e3184b..b4ef83c7aa2d 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-bad1'
pkgname=gst-plugins-bad1
version=1.18.4
-revision=3
+revision=4
wrksrc="${pkgname/1/}-${version}"
build_helper="gir"
build_style=meson
From bb6425737102e91b8b2355e8afd9fac567fea655 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Mon, 9 Aug 2021 19:31:22 +0300
Subject: [PATCH 7/7] avidemux: revbump for x265
---
srcpkgs/avidemux/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/avidemux/template b/srcpkgs/avidemux/template
index e62a3bc2c436..c4936a930e7f 100644
--- a/srcpkgs/avidemux/template
+++ b/srcpkgs/avidemux/template
@@ -1,7 +1,7 @@
# Template file for 'avidemux'
pkgname=avidemux
version=2.7.6
-revision=1
+revision=2
# Can't be compiled for aarch64, arm* or mips*
archs="x86_64* i686*"
wrksrc="${pkgname}_${version}"
^ permalink raw reply [flat|nested] 25+ messages in thread* Re: [PR PATCH] [Updated] x265: update to 3.5.
2021-07-14 0:03 [PR PATCH] x265: update to 3.5 ardadem
` (18 preceding siblings ...)
2021-08-12 13:25 ` [PR PATCH] [Updated] " ardadem
@ 2021-08-12 14:00 ` ardadem
2021-08-14 6:40 ` ardadem
` (3 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: ardadem @ 2021-08-12 14:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1587 bytes --]
There is an updated pull request by ardadem against master on the void-packages repository
https://github.com/ardadem/void-packages pr-x265
https://github.com/void-linux/void-packages/pull/31945
x265: update to 3.5.
<!-- 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/31945.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pr-x265-31945.patch --]
[-- Type: text/x-diff, Size: 6600 bytes --]
From fdedc96eed7fb23c52bb54f85b17efa5df8f97d3 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Wed, 14 Jul 2021 03:00:23 +0300
Subject: [PATCH 1/7] x265: update to 3.5.
---
common/shlibs | 2 +-
srcpkgs/x265/template | 13 +++++++++----
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 8d1e95f063ec..fc9e2c71bec6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1957,7 +1957,7 @@ libQt5TextToSpeech.so.5 qt5-speech-5.15.2_3
libQt5Bodymovin.so.5 qt5-lottie-5.15.2_3
libQt5WebKit.so.5 qt5-webkit-5.6.0_1
libQt5WebKitWidgets.so.5 qt5-webkit-5.6.0_1
-libx265.so.192 x265-3.4_1
+libx265.so.199 x265-3.5_1
libQt5Xdg.so.3 libqtxdg-3.1.0_1
libQt5XdgIconLoader.so.3 libqtxdg-3.1.0_1
libqwt.so.6 qwt-6.1.3_1
diff --git a/srcpkgs/x265/template b/srcpkgs/x265/template
index 2b858bad487f..e3f9f998152b 100644
--- a/srcpkgs/x265/template
+++ b/srcpkgs/x265/template
@@ -1,18 +1,19 @@
# Template file for 'x265'
pkgname=x265
-version=3.4
+version=3.5
revision=1
-_commit="a4f320054d67"
+_commit="f0c1022b6be1"
wrksrc="multicoreware-x265_git-${_commit}"
build_wrksrc=source
build_style=cmake
configure_args="-DENABLE_PIC=1"
+hostmakedepends="git"
short_desc="Open Source H.265/HEVC video encoder"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://x265.org/"
distfiles="https://bitbucket.org/multicoreware/x265_git/get/${version}.tar.gz"
-checksum=7f2771799bea0f53b5ab47603d5bea46ea2a221e047a7ff398115e9976fd5f86
+checksum=5ca3403c08de4716719575ec56c686b1eb55b078c0fe50a064dcf1ac20af1618
build_options="altivec assembly"
@@ -29,7 +30,11 @@ esac
if [ "$build_option_assembly" ]; then
case "$XBPS_TARGET_MACHINE" in
- x86_64*|i686*) hostmakedepends+=" nasm" ;;
+ x86_64*|i686*)
+ # see https://bitbucket.org/multicoreware/x265_git/issues/559
+ configure_args+=" -DCMAKE_ASM_NASM_FLAGS=-w-macro-params-legacy"
+ hostmakedepends+=" nasm"
+ ;;
*) ;;
esac
fi
From 5d2a96187356c1b70a153903abffa358b91016d7 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Mon, 9 Aug 2021 19:30:44 +0300
Subject: [PATCH 2/7] ffmpeg: revbump for x265
---
srcpkgs/ffmpeg/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 0a0d24683082..33d3e0bfc2d6 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -2,7 +2,7 @@
# audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
pkgname=ffmpeg
version=4.3.2
-revision=2
+revision=3
short_desc="Decoding, encoding and streaming software"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
From 9ea0876e0c45f378037b39afc9676c7879f2002c Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Mon, 9 Aug 2021 19:30:55 +0300
Subject: [PATCH 3/7] vlc: revbump for x265
also add ci-skip due to fail on test/run_vlc.sh
---
srcpkgs/vlc/template | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 00bc1873f996..426d29c7da33 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.16
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
@@ -42,6 +42,8 @@ makedepends="
$(vopt_if svg librsvg-devel) $(vopt_if sndio sndio-devel)
$(vopt_if chromecast protobuf-devel) $(vopt_if chromecast libmicrodns-devel)"
depends="freefont-ttf hicolor-icon-theme desktop-file-utils"
+# test/run_vlc.sh fail on CI
+make_check=ci-skip
# Package build options
build_options="lua notify opengl qt rpi smb svg v4l2 vaapi vdpau x265 sndio chromecast"
From 2309002f27b6a8ab28550a97940ce5d1f9e22a80 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Mon, 9 Aug 2021 19:31:00 +0300
Subject: [PATCH 4/7] libheif: revbump for x265
---
srcpkgs/libheif/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libheif/template b/srcpkgs/libheif/template
index d4812d123fd4..1972c5b8ad7c 100644
--- a/srcpkgs/libheif/template
+++ b/srcpkgs/libheif/template
@@ -1,7 +1,7 @@
# Template file for 'libheif'
pkgname=libheif
version=1.12.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-option-checking"
hostmakedepends="automake autoconf pkg-config libtool"
From 1993da51fdefa12ffcfc10433f3ab544d19f922d Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Mon, 9 Aug 2021 19:31:08 +0300
Subject: [PATCH 5/7] handbrake: revbump for x265
---
srcpkgs/handbrake/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template
index 6992bc520ed3..26bf2564421c 100644
--- a/srcpkgs/handbrake/template
+++ b/srcpkgs/handbrake/template
@@ -1,7 +1,7 @@
# Template file for 'handbrake'
pkgname=handbrake
version=1.3.3
-revision=3
+revision=4
wrksrc="HandBrake-${version}"
build_style=gnu-configure
configure_args="--force --disable-gtk-update-checks --disable-df-fetch --harden
From 724b5f2820ffa97abc5025c63da6ff73fb8f51d4 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Mon, 9 Aug 2021 19:31:15 +0300
Subject: [PATCH 6/7] gst-plugins-bad1: revbump for x265
---
srcpkgs/gst-plugins-bad1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index 7b97a3e3184b..b4ef83c7aa2d 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-bad1'
pkgname=gst-plugins-bad1
version=1.18.4
-revision=3
+revision=4
wrksrc="${pkgname/1/}-${version}"
build_helper="gir"
build_style=meson
From f2189d62898ee45b44209b34335c01c36f34bed1 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Mon, 9 Aug 2021 19:31:22 +0300
Subject: [PATCH 7/7] avidemux: revbump for x265
---
srcpkgs/avidemux/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/avidemux/template b/srcpkgs/avidemux/template
index e62a3bc2c436..c4936a930e7f 100644
--- a/srcpkgs/avidemux/template
+++ b/srcpkgs/avidemux/template
@@ -1,7 +1,7 @@
# Template file for 'avidemux'
pkgname=avidemux
version=2.7.6
-revision=1
+revision=2
# Can't be compiled for aarch64, arm* or mips*
archs="x86_64* i686*"
wrksrc="${pkgname}_${version}"
^ permalink raw reply [flat|nested] 25+ messages in thread* Re: [PR PATCH] [Updated] x265: update to 3.5.
2021-07-14 0:03 [PR PATCH] x265: update to 3.5 ardadem
` (19 preceding siblings ...)
2021-08-12 14:00 ` ardadem
@ 2021-08-14 6:40 ` ardadem
2021-08-14 7:33 ` ardadem
` (2 subsequent siblings)
23 siblings, 0 replies; 25+ messages in thread
From: ardadem @ 2021-08-14 6:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1587 bytes --]
There is an updated pull request by ardadem against master on the void-packages repository
https://github.com/ardadem/void-packages pr-x265
https://github.com/void-linux/void-packages/pull/31945
x265: update to 3.5.
<!-- 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/31945.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pr-x265-31945.patch --]
[-- Type: text/x-diff, Size: 6600 bytes --]
From 3519ee36abb62a16a051462d44c29d82d4e1402e Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Wed, 14 Jul 2021 03:00:23 +0300
Subject: [PATCH 1/7] x265: update to 3.5.
---
common/shlibs | 2 +-
srcpkgs/x265/template | 13 +++++++++----
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index f96d3f36b3ae..153198ac9ecb 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1957,7 +1957,7 @@ libQt5TextToSpeech.so.5 qt5-speech-5.15.2_3
libQt5Bodymovin.so.5 qt5-lottie-5.15.2_3
libQt5WebKit.so.5 qt5-webkit-5.6.0_1
libQt5WebKitWidgets.so.5 qt5-webkit-5.6.0_1
-libx265.so.192 x265-3.4_1
+libx265.so.199 x265-3.5_1
libQt5Xdg.so.3 libqtxdg-3.1.0_1
libQt5XdgIconLoader.so.3 libqtxdg-3.1.0_1
libqwt.so.6 qwt-6.1.3_1
diff --git a/srcpkgs/x265/template b/srcpkgs/x265/template
index 2b858bad487f..e3f9f998152b 100644
--- a/srcpkgs/x265/template
+++ b/srcpkgs/x265/template
@@ -1,18 +1,19 @@
# Template file for 'x265'
pkgname=x265
-version=3.4
+version=3.5
revision=1
-_commit="a4f320054d67"
+_commit="f0c1022b6be1"
wrksrc="multicoreware-x265_git-${_commit}"
build_wrksrc=source
build_style=cmake
configure_args="-DENABLE_PIC=1"
+hostmakedepends="git"
short_desc="Open Source H.265/HEVC video encoder"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://x265.org/"
distfiles="https://bitbucket.org/multicoreware/x265_git/get/${version}.tar.gz"
-checksum=7f2771799bea0f53b5ab47603d5bea46ea2a221e047a7ff398115e9976fd5f86
+checksum=5ca3403c08de4716719575ec56c686b1eb55b078c0fe50a064dcf1ac20af1618
build_options="altivec assembly"
@@ -29,7 +30,11 @@ esac
if [ "$build_option_assembly" ]; then
case "$XBPS_TARGET_MACHINE" in
- x86_64*|i686*) hostmakedepends+=" nasm" ;;
+ x86_64*|i686*)
+ # see https://bitbucket.org/multicoreware/x265_git/issues/559
+ configure_args+=" -DCMAKE_ASM_NASM_FLAGS=-w-macro-params-legacy"
+ hostmakedepends+=" nasm"
+ ;;
*) ;;
esac
fi
From 0242f4cc32978f7d7a3486e1939f46ad187fc7db Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Mon, 9 Aug 2021 19:30:44 +0300
Subject: [PATCH 2/7] ffmpeg: revbump for x265
---
srcpkgs/ffmpeg/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 0a0d24683082..33d3e0bfc2d6 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -2,7 +2,7 @@
# audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
pkgname=ffmpeg
version=4.3.2
-revision=2
+revision=3
short_desc="Decoding, encoding and streaming software"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
From b883fa96de1cc1eaf6c147e2af6b21e51af54b0d Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Mon, 9 Aug 2021 19:30:55 +0300
Subject: [PATCH 3/7] vlc: revbump for x265
also add ci-skip due to fail on test/run_vlc.sh
---
srcpkgs/vlc/template | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 00bc1873f996..426d29c7da33 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.16
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
@@ -42,6 +42,8 @@ makedepends="
$(vopt_if svg librsvg-devel) $(vopt_if sndio sndio-devel)
$(vopt_if chromecast protobuf-devel) $(vopt_if chromecast libmicrodns-devel)"
depends="freefont-ttf hicolor-icon-theme desktop-file-utils"
+# test/run_vlc.sh fail on CI
+make_check=ci-skip
# Package build options
build_options="lua notify opengl qt rpi smb svg v4l2 vaapi vdpau x265 sndio chromecast"
From 3ef867c0281c2a169bed369bc492a9ea9be8889f Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Mon, 9 Aug 2021 19:31:00 +0300
Subject: [PATCH 4/7] libheif: revbump for x265
---
srcpkgs/libheif/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libheif/template b/srcpkgs/libheif/template
index d4812d123fd4..1972c5b8ad7c 100644
--- a/srcpkgs/libheif/template
+++ b/srcpkgs/libheif/template
@@ -1,7 +1,7 @@
# Template file for 'libheif'
pkgname=libheif
version=1.12.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-option-checking"
hostmakedepends="automake autoconf pkg-config libtool"
From 52619bd9e516643040c49d97332d0d29c7070b61 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Mon, 9 Aug 2021 19:31:08 +0300
Subject: [PATCH 5/7] handbrake: revbump for x265
---
srcpkgs/handbrake/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template
index 6992bc520ed3..26bf2564421c 100644
--- a/srcpkgs/handbrake/template
+++ b/srcpkgs/handbrake/template
@@ -1,7 +1,7 @@
# Template file for 'handbrake'
pkgname=handbrake
version=1.3.3
-revision=3
+revision=4
wrksrc="HandBrake-${version}"
build_style=gnu-configure
configure_args="--force --disable-gtk-update-checks --disable-df-fetch --harden
From abf2d347a7212b0298887dac8346334870ee5a33 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Mon, 9 Aug 2021 19:31:15 +0300
Subject: [PATCH 6/7] gst-plugins-bad1: revbump for x265
---
srcpkgs/gst-plugins-bad1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index 7b97a3e3184b..b4ef83c7aa2d 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-bad1'
pkgname=gst-plugins-bad1
version=1.18.4
-revision=3
+revision=4
wrksrc="${pkgname/1/}-${version}"
build_helper="gir"
build_style=meson
From e8a4b3e9349f4084b74e07863fd1bc5e68f9fe9a Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Mon, 9 Aug 2021 19:31:22 +0300
Subject: [PATCH 7/7] avidemux: revbump for x265
---
srcpkgs/avidemux/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/avidemux/template b/srcpkgs/avidemux/template
index e62a3bc2c436..c4936a930e7f 100644
--- a/srcpkgs/avidemux/template
+++ b/srcpkgs/avidemux/template
@@ -1,7 +1,7 @@
# Template file for 'avidemux'
pkgname=avidemux
version=2.7.6
-revision=1
+revision=2
# Can't be compiled for aarch64, arm* or mips*
archs="x86_64* i686*"
wrksrc="${pkgname}_${version}"
^ permalink raw reply [flat|nested] 25+ messages in thread* Re: x265: update to 3.5.
2021-07-14 0:03 [PR PATCH] x265: update to 3.5 ardadem
` (20 preceding siblings ...)
2021-08-14 6:40 ` ardadem
@ 2021-08-14 7:33 ` ardadem
2021-08-15 21:17 ` ericonr
2021-08-15 21:17 ` [PR PATCH] [Merged]: " ericonr
23 siblings, 0 replies; 25+ messages in thread
From: ardadem @ 2021-08-14 7:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 180 bytes --]
New comment by ardadem on void-packages repository
https://github.com/void-linux/void-packages/pull/31945#issuecomment-898859477
Comment:
Ok, aarch64 build error is icu related.
^ permalink raw reply [flat|nested] 25+ messages in thread* Re: x265: update to 3.5.
2021-07-14 0:03 [PR PATCH] x265: update to 3.5 ardadem
` (21 preceding siblings ...)
2021-08-14 7:33 ` ardadem
@ 2021-08-15 21:17 ` ericonr
2021-08-15 21:17 ` [PR PATCH] [Merged]: " ericonr
23 siblings, 0 replies; 25+ messages in thread
From: ericonr @ 2021-08-15 21:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 161 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/31945#issuecomment-899111015
Comment:
Thanks for the push!
^ permalink raw reply [flat|nested] 25+ messages in thread* Re: [PR PATCH] [Merged]: x265: update to 3.5.
2021-07-14 0:03 [PR PATCH] x265: update to 3.5 ardadem
` (22 preceding siblings ...)
2021-08-15 21:17 ` ericonr
@ 2021-08-15 21:17 ` ericonr
23 siblings, 0 replies; 25+ messages in thread
From: ericonr @ 2021-08-15 21:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1431 bytes --]
There's a merged pull request on the void-packages repository
x265: update to 3.5.
https://github.com/void-linux/void-packages/pull/31945
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] 25+ messages in thread