Re: [PR PATCH] [Updated] x265: update to 3.5.

[ardadem <ardadem@users.noreply.github.com>]

[-- 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