[Git][archlinux/packaging/packages/avidemux][main] upgpkg: 2.8.1-5: ffmpeg 7.1/x265 4.0 rebuild

[Antonio Rojas (@arojas)]

Antonio Rojas pushed to branch main at Arch Linux / Packaging / Packages / 
avidemux


Commits:
a96edf35 by Antonio Rojas at 2024-10-12T11:16:21+02:00
upgpkg: 2.8.1-5: ffmpeg 7.1/x265 4.0 rebuild

- - - - -


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 = 4
+       pkgrel = 5
        url = http://fixounet.free.fr/avidemux/
        arch = x86_64
        license = GPL2
@@ -41,12 +41,15 @@ pkgbase = avidemux
        source = 
https://downloads.sourceforge.net/avidemux/avidemux_2.8.1.tar.gz
        source = log.diff
        source = https://github.com/FFmpeg/FFmpeg/commit/effadce6.patch
+       source = x265-4.0.patch
        sha256sums = 
77d9bdca8683ce57c192b69d207cfab7cf92a7759ce0f63fa37b5c8e42ad3da2
        sha256sums = 
8b751d137037f22fd4ae6750709014bcf61269a18f1c32e1a91f481285c807aa
        sha256sums = 
8fad5f253bcda7a17523dbfcbfcfd60b3db23783dcdb65998005cddc7c7776c3
+       sha256sums = 
7785408b5b9dcc5180d3d75299bd4ae06d6d93c9015b16a6c461bc7910ad160f
        sha512sums = 
c8df5c0d7f20fd9003560dee7cc0964ba810fc2786cefd525c09fd9f740339dd92a42989938ca48c16aca778ed5bd93a56572b0c6397fe04e47225cc109e7d75
        sha512sums = 
bbae5b4a549113b12e728c4c0ac8c1c92a0b7500be8dcecc791c16c9a913406feaa9f7bc477985970a920d2df391cc9392457512d84b9c4b829981cc072f2b2e
        sha512sums = 
243553763c688f7d7c3d662061659fc650e2460c98128426a8e279c78dad412279a45340042b6db9a230564fe5c8e18915331077f9792fada936564835ca7d8f
+       sha512sums = 
9c52f38ff12b41d25c986ec47acdbaeb1792f935ba7ee7f190295dd24b33020a566dcbfa2011092807ea682fbc55ff9ba274e21ae6858e2c6e5ab6061a45fae1
 
 pkgname = avidemux-cli
        depends = libxml2


=====================================
PKGBUILD
=====================================
@@ -4,7 +4,7 @@
 pkgbase=avidemux
 pkgname=('avidemux-cli' 'avidemux-qt')
 pkgver=2.8.1
-pkgrel=4
+pkgrel=5
 pkgdesc='Graphical tool to edit video (filter/re-encode/split)'
 url='http://fixounet.free.fr/avidemux/'
 arch=('x86_64')
@@ -16,13 +16,16 @@ makedepends=('cmake' 'libxslt' 'qt5-base' 'jack' 
'libvorbis' 'libxv' 'opus' 'des
 options=('!emptydirs')
 source=(https://downloads.sourceforge.net/avidemux/avidemux_${pkgver}.tar.gz
         log.diff
-        https://github.com/FFmpeg/FFmpeg/commit/effadce6.patch)
+        https://github.com/FFmpeg/FFmpeg/commit/effadce6.patch
+        x265-4.0.patch)
 sha256sums=('77d9bdca8683ce57c192b69d207cfab7cf92a7759ce0f63fa37b5c8e42ad3da2'
             '8b751d137037f22fd4ae6750709014bcf61269a18f1c32e1a91f481285c807aa'
-            '8fad5f253bcda7a17523dbfcbfcfd60b3db23783dcdb65998005cddc7c7776c3')
+            '8fad5f253bcda7a17523dbfcbfcfd60b3db23783dcdb65998005cddc7c7776c3'
+            '7785408b5b9dcc5180d3d75299bd4ae06d6d93c9015b16a6c461bc7910ad160f')
 
sha512sums=('c8df5c0d7f20fd9003560dee7cc0964ba810fc2786cefd525c09fd9f740339dd92a42989938ca48c16aca778ed5bd93a56572b0c6397fe04e47225cc109e7d75'
             
'bbae5b4a549113b12e728c4c0ac8c1c92a0b7500be8dcecc791c16c9a913406feaa9f7bc477985970a920d2df391cc9392457512d84b9c4b829981cc072f2b2e'
-            
'243553763c688f7d7c3d662061659fc650e2460c98128426a8e279c78dad412279a45340042b6db9a230564fe5c8e18915331077f9792fada936564835ca7d8f')
+            
'243553763c688f7d7c3d662061659fc650e2460c98128426a8e279c78dad412279a45340042b6db9a230564fe5c8e18915331077f9792fada936564835ca7d8f'
+            
'9c52f38ff12b41d25c986ec47acdbaeb1792f935ba7ee7f190295dd24b33020a566dcbfa2011092807ea682fbc55ff9ba274e21ae6858e2c6e5ab6061a45fae1')
 
 prepare() {
   cd ${pkgbase}_${pkgver}
@@ -30,6 +33,7 @@ prepare() {
   sed -i 's|../avidemux/qt4|../avidemux/qt4 
-DLRELEASE_EXECUTABLE=/usr/bin/lrelease-qt5|' bootStrap.bash
   sed -e 's|0.19|1.0|' -i avidemux_plugins/ADM_videoFilters6/ass/CMakeLists.txt
   mv "$srcdir"/effadce6.patch avidemux_core/ffmpeg_package/patches/upstream # 
Fix build with binutils 2.41
+  patch -p1 -i ../x265-4.0.patch # Fix build with x265 4.0
 }
 
 build() {


=====================================
x265-4.0.patch
=====================================
@@ -0,0 +1,23 @@
+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 @@
+     //
+       x265_nal          *nal;
+       uint32_t          nbNal = 0;
+-      x265_picture      pic_out;
+-      api->picture_init(&param,&pic_out);
++      x265_picture      *pic_out;
++      api->picture_init(&param,pic_out);
+       out->flags = 0;
+       
+         int er;
+@@ -236,7 +236,7 @@
+ 
+ 
+     // 3-encode
+-    if(false==postAmble(out,nbNal,nal,&pic_out))
++    if(false==postAmble(out,nbNal,nal,pic_out))
+     {
+         ADM_warning("[x265] postAmble failed\n");
+         return false;     



View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/avidemux/-/commit/a96edf35e66addf92f8d6377ea512ced4e54d4ad

-- 
View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/avidemux/-/commit/a96edf35e66addf92f8d6377ea512ced4e54d4ad
You're receiving this email because of your account on gitlab.archlinux.org.