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


Commits:
617d6299 by Antonio Rojas at 2024-10-12T11:42:55+02:00
upgpkg: 2.6.6-3: ffmpeg 7.1/x265 4.0 rebuild

- - - - -


3 changed files:

- .SRCINFO
- PKGBUILD
- + x265-4.0.patch


Changes:

=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
 pkgbase = fceux
        pkgdesc = Fast and ultra-compatible NES/Famicom emulator
        pkgver = 2.6.6
-       pkgrel = 2
+       pkgrel = 3
        url = https://github.com/TASEmulators/fceux
        arch = x86_64
        license = GPL
@@ -19,6 +19,8 @@ pkgbase = fceux
        depends = sdl2
        optdepends = ffmpeg: for recording
        source = 
git+https://github.com/TASEmulators/fceux#commit=34eb7601c415b81901fd02afbd5cfdc84b5047ac
-       b2sums = SKIP
+       source = x265-4.0.patch
+       b2sums = 
df1b8706f3639c52ec5905a542052ee0eb7c5a727c9ee27af7c9f53b2b9f97b0445c6c6ff9f9504cef51a90cddc97b08b7f92ee7882de1bfb2baf879eac613c1
+       b2sums = 
cba322a2d9aa02c1440dad5f91dfff219778b79f1373716f4f32b55a98198242ff191e43239d6bff2d9bcc52161b6e7b08356b11ee02c1c599578dc18ec7f8b2
 
 pkgname = fceux


=====================================
PKGBUILD
=====================================
@@ -4,7 +4,7 @@
 
 pkgname=fceux
 pkgver=2.6.6
-pkgrel=2
+pkgrel=3
 pkgdesc='Fast and ultra-compatible NES/Famicom emulator'
 arch=(x86_64)
 url='https://github.com/TASEmulators/fceux'
@@ -12,14 +12,17 @@ license=(GPL)
 depends=(gd lua minizip qt5-base sdl2)
 makedepends=(cmake git glu mesa-libgl ninja setconf scons)
 optdepends=('ffmpeg: for recording')
-source=("git+$url#commit=34eb7601c415b81901fd02afbd5cfdc84b5047ac") # tag: 
v2.6.6
-b2sums=('SKIP')
+source=("git+$url#commit=34eb7601c415b81901fd02afbd5cfdc84b5047ac" # tag: 
v2.6.6
+         x265-4.0.patch)
+b2sums=('df1b8706f3639c52ec5905a542052ee0eb7c5a727c9ee27af7c9f53b2b9f97b0445c6c6ff9f9504cef51a90cddc97b08b7f92ee7882de1bfb2baf879eac613c1'
+        
'cba322a2d9aa02c1440dad5f91dfff219778b79f1373716f4f32b55a98198242ff191e43239d6bff2d9bcc52161b6e7b08356b11ee02c1c599578dc18ec7f8b2')
 
 prepare() {
   cd $pkgname
   sed -i 's/-interim git//g' src/version.h
   setconf scripts/genGitHdr.sh GIT_URL "'""${source:4:34}""'"
   setconf scripts/genGitHdr.sh GIT_REV "${source#*=}"
+  patch -p1 -i ../x265-4.0.patch # Fix build with x265 4.0
 }
 
 build() {


=====================================
x265-4.0.patch
=====================================
@@ -0,0 +1,31 @@
+diff --git a/src/drivers/Qt/AviRecord.cpp b/src/drivers/Qt/AviRecord.cpp
+index e6a695d9..0b7d4c25 100644
+--- a/src/drivers/Qt/AviRecord.cpp
++++ b/src/drivers/Qt/AviRecord.cpp
+@@ -388,7 +388,7 @@ namespace X265
+ {
+ static x265_param *param = NULL;
+ static x265_picture *pic = NULL;
+-static x265_picture pic_out;
++static x265_picture *pic_out;
+ static x265_encoder *hdl = NULL;
+ static x265_nal *nal = NULL;
+ static unsigned int i_nal = 0;
+@@ -471,7 +471,7 @@ static int encode_frame( unsigned char *inBuf, int width, 
int height )
+               flags = 0;
+               totalPayload = 0;
+ 
+-              if ( IS_X265_TYPE_I(pic_out.sliceType) )
++              if ( IS_X265_TYPE_I(pic_out->sliceType) )
+               {
+                       flags |= gwavi_t::IF_KEYFRAME;
+               }
+@@ -504,7 +504,7 @@ static int close(void)
+               totalPayload = 0;
+               flags = 0;
+ 
+-              if ( IS_X265_TYPE_I(pic_out.sliceType) )
++              if ( IS_X265_TYPE_I(pic_out->sliceType) )
+               {
+                       flags |= gwavi_t::IF_KEYFRAME;
+               }



View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/fceux/-/commit/617d6299d83ad54c105c457f151ee340a6c71de8

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


Reply via email to