mirror of
https://github.com/void-linux/void-packages.git
synced 2025-08-02 02:42:56 +02:00
avidemux: rebuild for x265-4.0.
This commit is contained in:
parent
a309916e17
commit
fd442ef2ed
2 changed files with 48 additions and 2 deletions
44
srcpkgs/avidemux/patches/ADM_x265.patch
Normal file
44
srcpkgs/avidemux/patches/ADM_x265.patch
Normal file
|
@ -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;
|
|
@ -1,10 +1,10 @@
|
||||||
# Template file for 'avidemux'
|
# Template file for 'avidemux'
|
||||||
pkgname=avidemux
|
pkgname=avidemux
|
||||||
version=2.8.1
|
version=2.8.1
|
||||||
revision=2
|
revision=3
|
||||||
# Can't be compiled for aarch64, arm* or mips*
|
# Can't be compiled for aarch64, arm* or mips*
|
||||||
archs="x86_64* i686*"
|
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
|
makedepends="alsa-lib-devel faac-devel faad2-devel gettext-devel jack-devel glu-devel
|
||||||
lame-devel libass-devel libdca-devel libvorbis-devel libXv-devel
|
lame-devel libass-devel libdca-devel libvorbis-devel libXv-devel
|
||||||
vapoursynth-devel libmp4v2-devel sqlite-devel libva-devel libvdpau-devel
|
vapoursynth-devel libmp4v2-devel sqlite-devel libva-devel libvdpau-devel
|
||||||
|
@ -25,6 +25,8 @@ case "${XBPS_TARGET_MACHINE}" in
|
||||||
i686*) CFLAGS="-fno-PIC" ;;
|
i686*) CFLAGS="-fno-PIC" ;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
export PATH="$PATH:/usr/libexec/xbps-src/bin"
|
||||||
|
|
||||||
# uses parts of an internal ffmpeg4.4.2 tar
|
# uses parts of an internal ffmpeg4.4.2 tar
|
||||||
post_extract() {
|
post_extract() {
|
||||||
cp ${FILESDIR}/*patch ${wrksrc}/avidemux_core/ffmpeg_package/patches/
|
cp ${FILESDIR}/*patch ${wrksrc}/avidemux_core/ffmpeg_package/patches/
|
||||||
|
|
Loading…
Add table
Reference in a new issue