From 74caa7a1c165e53fec922db9e2a93e2b02e7c33a Mon Sep 17 00:00:00 2001 From: 1is7ac3 Date: Mon, 3 Feb 2025 16:13:06 -0300 Subject: [PATCH 01/11] x265: update to 4.0. --- common/shlibs | 2 +- .../x265/patches/handbrake-ambientlight.patch | 50 +++++++++---------- srcpkgs/x265/template | 28 +++++------ 3 files changed, 38 insertions(+), 42 deletions(-) diff --git a/common/shlibs b/common/shlibs index 175786786b4936..fa604a005cf107 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1953,7 +1953,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.209 x265-3.6_1 +libx265.so.212 x265-4.0_1 libQt5Xdg.so.3 libqt5xdg-3.2.0_1 libQt5XdgIconLoader.so.3 libqt5xdg-3.2.0_1 libQt6Xdg.so.4 libqtxdg-4.0.0_1 diff --git a/srcpkgs/x265/patches/handbrake-ambientlight.patch b/srcpkgs/x265/patches/handbrake-ambientlight.patch index ab36a9c35c9de4..5c966e42f0c373 100644 --- a/srcpkgs/x265/patches/handbrake-ambientlight.patch +++ b/srcpkgs/x265/patches/handbrake-ambientlight.patch @@ -1,8 +1,7 @@ -diff --git a/source/common/param.cpp b/source/common/param.cpp -index 8c32fafa2..0b56235c9 100755 ---- a/source/common/param.cpp -+++ b/source/common/param.cpp -@@ -378,6 +378,7 @@ void x265_param_default(x265_param* param) +diff -ru a/source/common/param.cpp b/source/common/param.cpp +--- a/source/common/param.cpp 2024-09-13 09:51:43.000000000 -0300 ++++ b/source/common/param.cpp 2025-02-03 13:27:31.474334833 -0300 +@@ -380,6 +380,7 @@ param->preferredTransferCharacteristics = -1; param->pictureStructure = -1; param->bEmitCLL = 1; @@ -10,7 +9,7 @@ index 8c32fafa2..0b56235c9 100755 param->bEnableFrameDuplication = 0; param->dupThreshold = 70; -@@ -1880,6 +1881,7 @@ int x265_check_params(x265_param* param) +@@ -1929,6 +1930,7 @@ || param->bEmitIDRRecoverySEI || !!param->interlaceMode || param->preferredTransferCharacteristics > 1 @@ -18,7 +17,7 @@ index 8c32fafa2..0b56235c9 100755 || param->toneMapFile || param->naluFile); -@@ -2766,6 +2768,10 @@ void x265_copy_params(x265_param* dst, x265_param* src) +@@ -2850,6 +2852,10 @@ dst->bEmitCLL = src->bEmitCLL; dst->maxCLL = src->maxCLL; dst->maxFALL = src->maxFALL; @@ -29,11 +28,10 @@ index 8c32fafa2..0b56235c9 100755 dst->log2MaxPocLsb = src->log2MaxPocLsb; dst->bEmitVUIHRDInfo = src->bEmitVUIHRDInfo; dst->bEmitVUITimingInfo = src->bEmitVUITimingInfo; -diff --git a/source/encoder/encoder.cpp b/source/encoder/encoder.cpp -index 5950f87e9..545283474 100644 ---- a/source/encoder/encoder.cpp -+++ b/source/encoder/encoder.cpp -@@ -3276,6 +3276,15 @@ void Encoder::getStreamHeaders(NALList& list, Entropy& sbacCoder, Bitstream& bs) +diff -ru a/source/encoder/encoder.cpp b/source/encoder/encoder.cpp +--- a/source/encoder/encoder.cpp 2024-09-13 09:51:43.000000000 -0300 ++++ b/source/encoder/encoder.cpp 2025-02-03 13:28:37.551336750 -0300 +@@ -3423,6 +3423,15 @@ } } @@ -49,11 +47,10 @@ index 5950f87e9..545283474 100644 if (m_param->bEmitInfoSEI) { char *opts = x265_param2string(m_param, m_sps.conformanceWindow.rightOffset, m_sps.conformanceWindow.bottomOffset); -diff --git a/source/encoder/sei.h b/source/encoder/sei.h -index 03e210639..712e4efb4 100644 ---- a/source/encoder/sei.h -+++ b/source/encoder/sei.h -@@ -242,6 +242,25 @@ public: +diff -ru a/source/encoder/sei.h b/source/encoder/sei.h +--- a/source/encoder/sei.h 2024-09-13 09:51:43.000000000 -0300 ++++ b/source/encoder/sei.h 2025-02-03 13:30:41.386953402 -0300 +@@ -464,6 +464,25 @@ } }; @@ -79,19 +76,18 @@ index 03e210639..712e4efb4 100644 class SEIDecodedPictureHash : public SEI { public: -diff --git a/source/x265.h b/source/x265.h -index 9f3abd9d9..b6a4d3fe1 100644 ---- a/source/x265.h -+++ b/source/x265.h -@@ -371,6 +371,7 @@ typedef enum +diff -ru a/source/x265.h b/source/x265.h +--- a/source/x265.h 2024-09-13 09:51:43.000000000 -0300 ++++ b/source/x265.h 2025-02-03 13:32:46.662499030 -0300 +@@ -371,6 +371,7 @@ MASTERING_DISPLAY_INFO = 137, CONTENT_LIGHT_LEVEL_INFO = 144, ALTERNATIVE_TRANSFER_CHARACTERISTICS = 147, + AMBIENT_VIEWING_ENVIRONMENT = 148, - } SEIPayloadType; - - typedef struct x265_sei_payload -@@ -1903,6 +1904,11 @@ typedef struct x265_param + ALPHA_CHANNEL_INFO = 165, + THREE_DIMENSIONAL_REFERENCE_DISPLAYS_INFO = 176, + MULTIVIEW_SCENE_INFO = 178, +@@ -1956,6 +1957,11 @@ * value to that value. */ uint16_t maxLuma; @@ -103,7 +99,7 @@ index 9f3abd9d9..b6a4d3fe1 100644 /* Maximum of the picture order count */ int log2MaxPocLsb; -@@ -2114,6 +2120,9 @@ typedef struct x265_param +@@ -2167,6 +2173,9 @@ /*Emit content light level info SEI*/ int bEmitCLL; diff --git a/srcpkgs/x265/template b/srcpkgs/x265/template index 7991e00bac7642..81ffbd521ca957 100644 --- a/srcpkgs/x265/template +++ b/srcpkgs/x265/template @@ -1,6 +1,6 @@ # Template file for 'x265' pkgname=x265 -version=3.6 +version=4.0 revision=1 build_wrksrc=source build_style=cmake @@ -11,7 +11,7 @@ maintainer="Orphaned " license="GPL-2.0-or-later" homepage="http://x265.org/" distfiles="https://bitbucket.org/multicoreware/x265_git/get/${version}.tar.gz" -checksum=206329b9599c78d06969a1b7b7bb939f7c99a459ab283b2e93f76854bd34ca7b +checksum=66b64be4b316362fdadb33ad8273a74236042cc380691bdbec42946b0437a389 build_options="altivec assembly" @@ -22,28 +22,28 @@ case "$XBPS_TARGET_MACHINE" in ppc64le*) build_options_default="altivec" ;; # on ARM, enabling it currently fails with undefined reference to # x265::setupAssemblyPrimitives(x265::EncoderPrimitives&, int) - x86_64*|i686*) build_options_default="assembly" ;; + x86_64* | i686*) build_options_default="assembly" ;; *) ;; esac if [ "$build_option_assembly" ]; then case "$XBPS_TARGET_MACHINE" in - x86_64*|i686*) - # see https://bitbucket.org/multicoreware/x265_git/issues/559 - configure_args+=" -DCMAKE_ASM_NASM_FLAGS=-w-macro-params-legacy" - 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 case "$XBPS_TARGET_MACHINE" in - ppc64*) - # altivec does not build without power8 being enabled - configure_args+=" -DENABLE_ALTIVEC=$(vopt_if altivec ON OFF) +ppc64*) + # altivec does not build without power8 being enabled + configure_args+=" -DENABLE_ALTIVEC=$(vopt_if altivec ON OFF) -DCPU_POWER8=$(vopt_if altivec ON OFF)" - ;; - *) configure_args+=" -DENABLE_ASSEMBLY=$(vopt_if assembly ON OFF)" ;; + ;; +*) configure_args+=" -DENABLE_ASSEMBLY=$(vopt_if assembly ON OFF)" ;; esac pre_configure() { From dd8d2788f9c6d1579e7489be5848f81224783abd Mon Sep 17 00:00:00 2001 From: 1is7ac3 Date: Mon, 3 Feb 2025 16:16:34 -0300 Subject: [PATCH 02/11] ffmpeg: update to 4.4.5. --- srcpkgs/ffmpeg/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template index 6b36bcfc98137f..91eccfd78c1b04 100644 --- a/srcpkgs/ffmpeg/template +++ b/srcpkgs/ffmpeg/template @@ -1,8 +1,8 @@ # Template file for 'ffmpeg' # audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname! pkgname=ffmpeg -version=4.4.4 -revision=10 +version=4.4.5 +revision=1 build_style=meta short_desc="Decoding, encoding and streaming software (transitional dummy package)" maintainer="Orphaned " @@ -10,7 +10,7 @@ license="GPL-3.0-or-later" homepage="https://www.ffmpeg.org" changelog="https://raw.githubusercontent.com/FFmpeg/FFmpeg/master/Changelog" distfiles="https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz" -checksum=e80b380d595c809060f66f96a5d849511ef4a76a26b76eacf5778b94c3570309 +checksum=f9514e0d3515aee5a271283df71636e1d1ff7274b15853bcd84e144be416ab07 hostmakedepends="pkg-config perl" makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-devel From 1bd49db5fb256b57ea87e4e638f91d44118ca930 Mon Sep 17 00:00:00 2001 From: 1is7ac3 Date: Mon, 3 Feb 2025 16:16:41 -0300 Subject: [PATCH 03/11] libheif: update to 1.19.5. --- srcpkgs/libheif/template | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/srcpkgs/libheif/template b/srcpkgs/libheif/template index 8edff25f6f05d4..18d356aa1000c5 100644 --- a/srcpkgs/libheif/template +++ b/srcpkgs/libheif/template @@ -1,8 +1,9 @@ -# Template file for 'libheif'. +# Template file for 'libheif' pkgname=libheif -version=1.18.1 -revision=2 +version=1.19.5 +revision=1 build_style=cmake +configure_args="-DBUILD_TESTING=OFF" makedepends="libjpeg-turbo-devel libpng-devel libde265-devel x265-devel libaom-devel" short_desc="ISO/IEC 23008-12:2017 HEIF file format decoder and encoder" @@ -11,7 +12,7 @@ license="LGPL-3.0-or-later" homepage="https://github.com/strukturag/libheif" changelog="https://github.com/strukturag/libheif/releases" distfiles="https://github.com/strukturag/libheif/archive/v${version}.tar.gz" -checksum=73bc94442038d44d56fe730f72516ae53134eb15b878a7ad89ef60fac93a3318 +checksum=5cd9a3e28493310358e1c1299cd596cc4c7ae5fb985eceb758fa6141424e58bb libheif-devel_package() { short_desc+=" - development files" From ee4e92246b879791624828fc24d4e105a7464b27 Mon Sep 17 00:00:00 2001 From: 1is7ac3 Date: Mon, 3 Feb 2025 16:17:29 -0300 Subject: [PATCH 04/11] vlc: revbump for x265-4.0. --- srcpkgs/vlc/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template index 854e8815c90a9d..8bcd63d55db21f 100644 --- a/srcpkgs/vlc/template +++ b/srcpkgs/vlc/template @@ -1,7 +1,7 @@ # Template file for 'vlc' pkgname=vlc version=3.0.21 -revision=2 +revision=3 build_style=gnu-configure configure_args="--disable-gme --disable-libtar --enable-jack --enable-live555 --disable-fluidsynth --enable-dvdread From da402f42918197579f334ccaa7ae15a0a00b5173 Mon Sep 17 00:00:00 2001 From: 1is7ac3 Date: Mon, 3 Feb 2025 16:18:02 -0300 Subject: [PATCH 05/11] gimp: revbump for x265-4.0. --- srcpkgs/gimp/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template index a50409d5ce5af1..d6d0d3291d2f19 100644 --- a/srcpkgs/gimp/template +++ b/srcpkgs/gimp/template @@ -1,7 +1,7 @@ # Template file for 'gimp' pkgname=gimp version=2.10.38 -revision=3 +revision=4 build_style=gnu-configure configure_args="--disable-check-update --datadir=/usr/share --disable-python" hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool From 0a710f15dc41cabbd4a0b275ed6516e2c4618a3c Mon Sep 17 00:00:00 2001 From: 1is7ac3 Date: Mon, 3 Feb 2025 16:18:29 -0300 Subject: [PATCH 06/11] digikam: revbump for x265-4.0. --- srcpkgs/digikam/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/digikam/template b/srcpkgs/digikam/template index 1a64d3c760563f..68208cb1f36a93 100644 --- a/srcpkgs/digikam/template +++ b/srcpkgs/digikam/template @@ -1,7 +1,7 @@ # Template file for 'digikam' pkgname=digikam version=8.5.0 -revision=2 +revision=3 build_style=cmake configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins -DBUILD_WITH_QT6=ON From faf625b47fea2ce509f0df7c56a45af818dbd787 Mon Sep 17 00:00:00 2001 From: 1is7ac3 Date: Mon, 3 Feb 2025 16:19:12 -0300 Subject: [PATCH 07/11] ffmpeg6: revbump for x265-4.0. --- srcpkgs/ffmpeg6/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/ffmpeg6/template b/srcpkgs/ffmpeg6/template index 9b66727465200e..5ca80c5f1b7f8f 100644 --- a/srcpkgs/ffmpeg6/template +++ b/srcpkgs/ffmpeg6/template @@ -2,7 +2,7 @@ # audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname! pkgname=ffmpeg6 version=6.1.2 -revision=3 +revision=4 hostmakedepends="pkg-config perl" makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-devel libXext-devel libXvMC-devel libxcb-devel lame-devel libtheora-devel From cb43cce26ac60b5169487649715fc95a445bd21f Mon Sep 17 00:00:00 2001 From: 1is7ac3 Date: Mon, 3 Feb 2025 16:19:42 -0300 Subject: [PATCH 08/11] baresip: revbump for x265-4.0. --- srcpkgs/baresip/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/baresip/template b/srcpkgs/baresip/template index 5f5ff9f179a7b2..b81b265a5a39bc 100644 --- a/srcpkgs/baresip/template +++ b/srcpkgs/baresip/template @@ -1,7 +1,7 @@ # Template file for 'baresip' pkgname=baresip version=3.18.0 -revision=1 +revision=2 build_style=cmake hostmakedepends="pkg-config glib-devel" makedepends="libgsm-devel libpng-devel openssl-devel libsndfile-devel From a58186a4489f6f59bad4e24ad2007f7ab60c7832 Mon Sep 17 00:00:00 2001 From: 1is7ac3 Date: Mon, 3 Feb 2025 16:20:16 -0300 Subject: [PATCH 09/11] oneVPL: update to 2.14.0. --- srcpkgs/oneVPL/patches/cross-pc.patch | 4 ++-- srcpkgs/oneVPL/template | 11 +++-------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/srcpkgs/oneVPL/patches/cross-pc.patch b/srcpkgs/oneVPL/patches/cross-pc.patch index 0b24a2124c9b2f..a330997ccea6dd 100644 --- a/srcpkgs/oneVPL/patches/cross-pc.patch +++ b/srcpkgs/oneVPL/patches/cross-pc.patch @@ -1,5 +1,5 @@ ---- a/dispatcher/pkgconfig/vpl.pc.in 2023-07-21 23:28:38.000000000 +0200 -+++ - 2023-11-14 10:16:46.665168740 +0100 +--- a/libvpl/pkgconfig/vpl.pc.in 2023-11-29 19:59:08.000000000 -0300 ++++ b/libvpl/pkgconfig/vpl.pc.in 2025-02-03 06:53:57.919092912 -0300 @@ -1,6 +1,6 @@ -prefix=@pc_rel_prefix@ -libdir=@pc_rel_libdir@ diff --git a/srcpkgs/oneVPL/template b/srcpkgs/oneVPL/template index 20dcd04f5f4976..605da7db149743 100644 --- a/srcpkgs/oneVPL/template +++ b/srcpkgs/oneVPL/template @@ -1,7 +1,7 @@ # Template file for 'oneVPL' pkgname=oneVPL -version=2023.3.1 -revision=2 +version=2.14.0 +revision=1 build_style=cmake hostmakedepends="pkg-config" makedepends="libva-devel libX11-devel" @@ -11,7 +11,7 @@ license="MIT" homepage="https://github.com/oneapi-src/oneVPL" changelog="https://github.com/oneapi-src/oneVPL/blob/master/CHANGELOG.md" distfiles="https://github.com/oneapi-src/oneVPL/archive/refs/tags/v$version.tar.gz" -checksum=4411543519486a2450f6f5af06a077596e7888a551768594e9dfa2a46b23b6f5 +checksum=7c6bff1c1708d910032c2e6c44998ffff3f5fdbf06b00972bc48bf2dd9e5ac06 post_install() { vlicense LICENSE @@ -33,11 +33,6 @@ oneVPL-examples_package() { short_desc+=" - examples" depends="${sourcepkg}>=${version}_${revision}" pkg_install() { - vmove usr/bin/sample_decode - vmove usr/bin/sample_encode - vmove usr/bin/sample_multi_transcode - vmove usr/bin/sample_vpp - vmove usr/bin/vpl-inspect vmove usr/share/vpl/examples } } From 6f9d51cff539bd48ea4f04a393ddac3a033687e2 Mon Sep 17 00:00:00 2001 From: 1is7ac3 Date: Mon, 3 Feb 2025 16:20:44 -0300 Subject: [PATCH 10/11] avidemux: revbump for x265-4.0. --- srcpkgs/avidemux/patches/ADM_x265.patch | 44 +++++++++++++++++++++++++ srcpkgs/avidemux/template | 2 +- 2 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/avidemux/patches/ADM_x265.patch diff --git a/srcpkgs/avidemux/patches/ADM_x265.patch b/srcpkgs/avidemux/patches/ADM_x265.patch new file mode 100644 index 00000000000000..6db76d7ffc332e --- /dev/null +++ b/srcpkgs/avidemux/patches/ADM_x265.patch @@ -0,0 +1,44 @@ +--- a/avidemux_plugins/ADM_videoEncoder/x265/ADM_x265.cpp 2022-09-17 10:59:17.000000000 -0300 ++++ b/avidemux_plugins/ADM_videoEncoder/x265/ADM_x265.cpp 2025-01-26 19:27:19.796218401 -0300 +@@ -205,15 +205,20 @@ + // + x265_nal *nal; + uint32_t nbNal = 0; +- x265_picture pic_out; +- api->picture_init(¶m,&pic_out); ++ x265_picture pic_out[MAX_SCALABLE_LAYERS]; ++ x265_picture *pic_out_ptr[MAX_SCALABLE_LAYERS]; + out->flags = 0; + ++ for (int i = 0; i < MAX_SCALABLE_LAYERS; i++) ++ { ++ api->picture_init(¶m,&pic_out[i]); ++ pic_out_ptr[i] = &pic_out[i]; ++ } + int er; + if(false==gotFrame) + { + ADM_info("Flushing delayed frames\n"); +- er = api->encoder_encode(handle, &nal, &nbNal, NULL, &pic_out); ++ er = api->encoder_encode(handle, &nal, &nbNal, NULL, pic_out_ptr); + if(er<=0) + { + ADM_info ("End of flush\n"); +@@ -221,7 +226,7 @@ + } + }else + { +- er = api->encoder_encode(handle, &nal, &nbNal, &pic, &pic_out); ++ er = api->encoder_encode(handle, &nal, &nbNal, &pic, pic_out_ptr); + if(er<0) + { + ADM_error ("[x265] Error encoding %d\n",er); +@@ -236,7 +241,7 @@ + + + // 3-encode +- if(false==postAmble(out,nbNal,nal,&pic_out)) ++ if(false==postAmble(out,nbNal,nal,pic_out_ptr[0])) + { + ADM_warning("[x265] postAmble failed\n"); + return false; diff --git a/srcpkgs/avidemux/template b/srcpkgs/avidemux/template index d66f8524bd0e28..b972ecac92ed31 100644 --- a/srcpkgs/avidemux/template +++ b/srcpkgs/avidemux/template @@ -1,7 +1,7 @@ # Template file for 'avidemux' pkgname=avidemux version=2.8.1 -revision=2 +revision=3 # Can't be compiled for aarch64, arm* or mips* archs="x86_64* i686*" hostmakedepends="cmake pkg-config qt5-host-tools qt5-devel tar yasm" From db6e232853e78552a9da5bf25f2a977f0beaf957 Mon Sep 17 00:00:00 2001 From: 1is7ac3 Date: Mon, 3 Feb 2025 16:21:09 -0300 Subject: [PATCH 11/11] handbrake: revbump for x265-4.0. --- srcpkgs/handbrake/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template index d32651a0abd02d..22fb9b6f4eb7d7 100644 --- a/srcpkgs/handbrake/template +++ b/srcpkgs/handbrake/template @@ -1,7 +1,7 @@ # Template file for 'handbrake' pkgname=handbrake version=1.8.1 -revision=1 +revision=2 build_style=gnu-configure configure_args="--force --disable-df-fetch --harden $(vopt_enable fdk_aac fdk-aac) $(vopt_enable nvenc) $(vopt_enable qsv)"