From fd442ef2ed4961519e7458da4291695f888775c8 Mon Sep 17 00:00:00 2001 From: 1is7ac3 Date: Sun, 1 Jun 2025 16:20:07 -0400 Subject: [PATCH] avidemux: rebuild for x265-4.0. --- srcpkgs/avidemux/patches/ADM_x265.patch | 44 +++++++++++++++++++++++++ srcpkgs/avidemux/template | 6 ++-- 2 files changed, 48 insertions(+), 2 deletions(-) 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 00000000000..6db76d7ffc3 --- /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 d66f8524bd0..4b1f3149fd4 100644 --- a/srcpkgs/avidemux/template +++ b/srcpkgs/avidemux/template @@ -1,10 +1,10 @@ # 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" +hostmakedepends="cmake-bootstrap pkg-config qt5-host-tools qt5-devel tar yasm" makedepends="alsa-lib-devel faac-devel faad2-devel gettext-devel jack-devel glu-devel lame-devel libass-devel libdca-devel libvorbis-devel libXv-devel vapoursynth-devel libmp4v2-devel sqlite-devel libva-devel libvdpau-devel @@ -25,6 +25,8 @@ case "${XBPS_TARGET_MACHINE}" in i686*) CFLAGS="-fno-PIC" ;; esac +export PATH="$PATH:/usr/libexec/xbps-src/bin" + # uses parts of an internal ffmpeg4.4.2 tar post_extract() { cp ${FILESDIR}/*patch ${wrksrc}/avidemux_core/ffmpeg_package/patches/