git » neatvnc.git » commit b0c082d

upgpkg: 0.8.1-3: ffmpeg 7.1/x265 4.0 rebuild

author Antonio Rojas
2024-10-12 11:57:01 UTC
committer Antonio Rojas
2024-10-12 11:57:01 UTC
parent 5e8bf9e3210d62a75e9eabce0d6b90b6296a5a67

upgpkg: 0.8.1-3: ffmpeg 7.1/x265 4.0 rebuild

.SRCINFO +3 -1
PKGBUILD +10 -3
ffmpeg-7.1.patch +13 -0

diff --git a/.SRCINFO b/.SRCINFO
index a222524..cd2b621 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = neatvnc
 	pkgdesc = Fast and neat VNC server library
 	pkgver = 0.8.1
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/any1/neatvnc
 	arch = x86_64
 	license = custom:ISC
@@ -19,6 +19,8 @@ pkgbase = neatvnc
 	depends = zlib
 	provides = libneatvnc.so
 	source = git+https://github.com/any1/neatvnc.git#tag=07081567ab21a2b099ceb41ae8cab872a31cbb9a
+	source = ffmpeg-7.1.patch
 	b2sums = e5739d474e1d1610eed391625776a02c2bd1de93bde13bb88962bb8dec4e38aa8ff3db70065d0d29966dedbab10a2959fb83f631ee216650d2e199414a67c5c7
+	b2sums = 90ca045278e0bf54b900252836e6d76692ee7d99bc073403a784dfb270dd65aca9384d030558c27097044294a277c523cbbd260417e397635bcac5b33ca0e6b9
 
 pkgname = neatvnc
diff --git a/PKGBUILD b/PKGBUILD
index ed167e9..388d131 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=neatvnc
 pkgver=0.8.1
-pkgrel=2
+pkgrel=3
 pkgdesc='Fast and neat VNC server library'
 arch=(x86_64)
 url=https://github.com/any1/neatvnc
@@ -26,14 +26,21 @@ makedepends=(
 )
 provides=(libneatvnc.so)
 _tag=07081567ab21a2b099ceb41ae8cab872a31cbb9a
-source=(git+https://github.com/any1/neatvnc.git#tag=${_tag})
-b2sums=('e5739d474e1d1610eed391625776a02c2bd1de93bde13bb88962bb8dec4e38aa8ff3db70065d0d29966dedbab10a2959fb83f631ee216650d2e199414a67c5c7')
+source=(git+https://github.com/any1/neatvnc.git#tag=${_tag}
+        ffmpeg-7.1.patch)
+b2sums=('e5739d474e1d1610eed391625776a02c2bd1de93bde13bb88962bb8dec4e38aa8ff3db70065d0d29966dedbab10a2959fb83f631ee216650d2e199414a67c5c7'
+        '90ca045278e0bf54b900252836e6d76692ee7d99bc073403a784dfb270dd65aca9384d030558c27097044294a277c523cbbd260417e397635bcac5b33ca0e6b9')
 
 pkgver() {
   cd neatvnc
   git describe --tags | sed 's/^v//'
 }
 
+prepare() {
+  cd neatvnc
+  patch -p1 -i ../ffmpeg-7.1.patch
+}
+
 build() {
   arch-meson neatvnc build \
     -Djpeg=enabled \
diff --git a/ffmpeg-7.1.patch b/ffmpeg-7.1.patch
new file mode 100644
index 0000000..f483994
--- /dev/null
+++ b/ffmpeg-7.1.patch
@@ -0,0 +1,13 @@
+diff --git a/src/h264-encoder.c b/src/h264-encoder.c
+index 6ad0262..f4a4421 100644
+--- a/src/h264-encoder.c
++++ b/src/h264-encoder.c
+@@ -547,7 +547,7 @@ struct h264_encoder* h264_encoder_create(uint32_t width, uint32_t height,
+ 		goto codec_context_failure;
+ 
+ 	self->codec_ctx->hw_frames_ctx =
+-		av_buffer_ref(self->filter_out->inputs[0]->hw_frames_ctx);
++		av_buffer_ref(av_buffersink_get_hw_frames_ctx(self->filter_out));
+ 
+ 	AVDictionary *opts = NULL;
+ 	av_dict_set_int(&opts, "async_depth", 1, 0);