From fdedc96eed7fb23c52bb54f85b17efa5df8f97d3 Mon Sep 17 00:00:00 2001 From: Arda Demir 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 " 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 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 " license="GPL-3.0-or-later" From 9ea0876e0c45f378037b39afc9676c7879f2002c Mon Sep 17 00:00:00 2001 From: Arda Demir 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 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 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 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 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}"