Antonio Rojas pushed to branch main at Arch Linux / Packaging / Packages / avidemux
Commits: a47ce8b0 by Antonio Rojas at 2024-12-14T21:21:15+01:00 Fix x265 patch Fixes https://gitlab.archlinux.org/archlinux/packaging/packages/avidemux/-/issues/1 - - - - - 3 changed files: - .SRCINFO - PKGBUILD - x265-4.0.patch Changes: ===================================== .SRCINFO ===================================== @@ -1,7 +1,7 @@ pkgbase = avidemux pkgdesc = Graphical tool to edit video (filter/re-encode/split) pkgver = 2.8.1 - pkgrel = 5 + pkgrel = 6 url = http://fixounet.free.fr/avidemux/ arch = x86_64 license = GPL2 @@ -45,11 +45,11 @@ pkgbase = avidemux sha256sums = 77d9bdca8683ce57c192b69d207cfab7cf92a7759ce0f63fa37b5c8e42ad3da2 sha256sums = 8b751d137037f22fd4ae6750709014bcf61269a18f1c32e1a91f481285c807aa sha256sums = 8fad5f253bcda7a17523dbfcbfcfd60b3db23783dcdb65998005cddc7c7776c3 - sha256sums = 7785408b5b9dcc5180d3d75299bd4ae06d6d93c9015b16a6c461bc7910ad160f + sha256sums = 89c2129ef17137f189b33ec752d12fd622cfb15058662b1ce0ae1ffb8113a0f6 sha512sums = c8df5c0d7f20fd9003560dee7cc0964ba810fc2786cefd525c09fd9f740339dd92a42989938ca48c16aca778ed5bd93a56572b0c6397fe04e47225cc109e7d75 sha512sums = bbae5b4a549113b12e728c4c0ac8c1c92a0b7500be8dcecc791c16c9a913406feaa9f7bc477985970a920d2df391cc9392457512d84b9c4b829981cc072f2b2e sha512sums = 243553763c688f7d7c3d662061659fc650e2460c98128426a8e279c78dad412279a45340042b6db9a230564fe5c8e18915331077f9792fada936564835ca7d8f - sha512sums = 9c52f38ff12b41d25c986ec47acdbaeb1792f935ba7ee7f190295dd24b33020a566dcbfa2011092807ea682fbc55ff9ba274e21ae6858e2c6e5ab6061a45fae1 + sha512sums = 874d25fcae4e8d07b9a482e1eacf1910a44ca6b0256e716778ed9a3518f94289a4e9f632db8414ebd177a898d7a820c32016805c51279fd7404913f4d0f8c9f9 pkgname = avidemux-cli depends = libxml2 ===================================== PKGBUILD ===================================== @@ -4,7 +4,7 @@ pkgbase=avidemux pkgname=('avidemux-cli' 'avidemux-qt') pkgver=2.8.1 -pkgrel=5 +pkgrel=6 pkgdesc='Graphical tool to edit video (filter/re-encode/split)' url='http://fixounet.free.fr/avidemux/' arch=('x86_64') @@ -21,11 +21,11 @@ source=(https://downloads.sourceforge.net/avidemux/avidemux_${pkgver}.tar.gz sha256sums=('77d9bdca8683ce57c192b69d207cfab7cf92a7759ce0f63fa37b5c8e42ad3da2' '8b751d137037f22fd4ae6750709014bcf61269a18f1c32e1a91f481285c807aa' '8fad5f253bcda7a17523dbfcbfcfd60b3db23783dcdb65998005cddc7c7776c3' - '7785408b5b9dcc5180d3d75299bd4ae06d6d93c9015b16a6c461bc7910ad160f') + '89c2129ef17137f189b33ec752d12fd622cfb15058662b1ce0ae1ffb8113a0f6') sha512sums=('c8df5c0d7f20fd9003560dee7cc0964ba810fc2786cefd525c09fd9f740339dd92a42989938ca48c16aca778ed5bd93a56572b0c6397fe04e47225cc109e7d75' 'bbae5b4a549113b12e728c4c0ac8c1c92a0b7500be8dcecc791c16c9a913406feaa9f7bc477985970a920d2df391cc9392457512d84b9c4b829981cc072f2b2e' '243553763c688f7d7c3d662061659fc650e2460c98128426a8e279c78dad412279a45340042b6db9a230564fe5c8e18915331077f9792fada936564835ca7d8f' - '9c52f38ff12b41d25c986ec47acdbaeb1792f935ba7ee7f190295dd24b33020a566dcbfa2011092807ea682fbc55ff9ba274e21ae6858e2c6e5ab6061a45fae1') + '874d25fcae4e8d07b9a482e1eacf1910a44ca6b0256e716778ed9a3518f94289a4e9f632db8414ebd177a898d7a820c32016805c51279fd7404913f4d0f8c9f9') prepare() { cd ${pkgbase}_${pkgver} ===================================== x265-4.0.patch ===================================== @@ -1,23 +1,46 @@ diff -ru avidemux_2.8.1.orig/avidemux_plugins/ADM_videoEncoder/x265/ADM_x265.cpp avidemux_2.8.1/avidemux_plugins/ADM_videoEncoder/x265/ADM_x265.cpp --- avidemux_2.8.1.orig/avidemux_plugins/ADM_videoEncoder/x265/ADM_x265.cpp 2024-10-12 10:07:58.005741891 +0200 +++ avidemux_2.8.1/avidemux_plugins/ADM_videoEncoder/x265/ADM_x265.cpp 2024-10-12 11:12:13.519781376 +0200 -@@ -205,8 +205,8 @@ +@@ -205,15 +205,20 @@ again: // x265_nal *nal; uint32_t nbNal = 0; - x265_picture pic_out; - api->picture_init(¶m,&pic_out); -+ 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; -@@ -236,7 +236,7 @@ + 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 @@ again: + } + }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 @@ again: // 3-encode - if(false==postAmble(out,nbNal,nal,&pic_out)) -+ 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; View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/avidemux/-/commit/a47ce8b05b670c835be6c0cd954297ecf8e5bf56 -- View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/avidemux/-/commit/a47ce8b05b670c835be6c0cd954297ecf8e5bf56 You're receiving this email because of your account on gitlab.archlinux.org.
