neatvnc/fix-build-in-15.6.patch
Michael Vetter 62a03f6a4c - Update to 0.8.1+git20241008.b539421 adding a _service file to
get the sources from git. This fixes a FTBFS with ffmpeg-7 in
  Factory. Note that we can't use @PARENT_TAG@ in the _service
  file because 0.8.1 was branched from the v0.8 branch so using it
  would look like going back to 0.8.0.
- Add a patch to keep building with older ffmpeg versions too
  as well as find the gmp dependency, which can't be found using
  pkgconfig in 15.6:
  * fix-build-in-15.6.patch

OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/neatvnc?expand=0&rev=28
2024-10-23 10:11:19 +00:00

29 lines
1.4 KiB
Diff

Index: neatvnc-0.8.0+git20241008.b539421/src/enc/h264/ffmpeg-impl.c
===================================================================
--- neatvnc-0.8.0+git20241008.b539421.orig/src/enc/h264/ffmpeg-impl.c
+++ neatvnc-0.8.0+git20241008.b539421/src/enc/h264/ffmpeg-impl.c
@@ -224,8 +224,10 @@ static int h264_encoder__init_buffersrc(
params->sample_aspect_ratio = (AVRational){1, 1};
params->time_base = self->timebase;
params->hw_frames_ctx = self->hw_frames_ctx;
+#if LIBAVFILTER_VERSION_INT >= AV_VERSION_INT(10,1,100)
params->color_space = AVCOL_SPC_RGB;
params->color_range = AVCOL_RANGE_JPEG;
+#endif
rc = av_buffersrc_parameters_set(self->filter_in, params);
assert(rc == 0);
Index: neatvnc-0.8.0+git20241008.b539421/meson.build
===================================================================
--- neatvnc-0.8.0+git20241008.b539421.orig/meson.build
+++ neatvnc-0.8.0+git20241008.b539421/meson.build
@@ -54,7 +54,7 @@ libturbojpeg = dependency('libturbojpeg'
gnutls = dependency('gnutls', required: get_option('tls'))
nettle = dependency('nettle', required: get_option('nettle'))
hogweed = dependency('hogweed', required: get_option('nettle'))
-gmp = dependency('gmp', required: get_option('nettle'))
+gmp = cc.find_library('gmp')
zlib = dependency('zlib')
gbm = dependency('gbm', required: get_option('gbm'))
libdrm = dependency('libdrm', required: get_option('h264'))